From 0b92c473600a9a9f4e572b8365875df900d4d779 Mon Sep 17 00:00:00 2001 From: Jason Gauci Date: Wed, 4 May 2022 23:28:11 -0500 Subject: [PATCH] Update submodule imports --- .../sentry-native/.github/workflows/ci.yml | 8 +- external_imported/sentry-native/.gitignore | 1 + external_imported/sentry-native/CHANGELOG.md | 72 +- .../sentry-native/CMakeLists.txt | 21 +- .../sentry-native/CONTRIBUTING.md | 1 + external_imported/sentry-native/Makefile | 13 +- external_imported/sentry-native/README.md | 10 +- .../sentry-native/examples/example.c | 43 + .../sentry-native/external/CMakeLists.txt | 4 +- .../breakpad/.github/workflows/coverity.yml | 7 +- .../external/breakpad/docs/symbol_files.md | 121 +- .../client/linux/handler/exception_handler.cc | 2 +- .../microdump_writer/microdump_writer.cc | 2 +- .../linux/minidump_writer/linux_dumper.cc | 2 + .../linux_ptrace_dumper_unittest.cc | 2 + .../linux/minidump_writer/minidump_writer.cc | 2 +- .../minidump_writer_unittest.cc | 2 + .../client/mac/handler/minidump_generator.cc | 4 +- .../solaris/handler/minidump_generator.cc | 1 + .../breakpad/src/common/dwarf/dwarf2reader.cc | 2 +- .../breakpad/src/common/dwarf_cu_to_module.cc | 51 +- .../breakpad/src/common/linux/dump_symbols.cc | 4 +- .../breakpad/src/common/linux/file_id.cc | 2 + .../breakpad/src/common/linux/file_id.h | 2 + .../src/common/linux/file_id_unittest.cc | 2 + .../src/common/mac/SymbolCollectorClient.h | 3 +- .../src/common/mac/SymbolCollectorClient.m | 18 +- .../breakpad/src/common/mac/dump_syms.cc | 50 +- .../breakpad/src/common/mac/dump_syms.h | 36 +- .../breakpad/src/common/mac/file_id.cc | 47 +- .../breakpad/src/common/mac/file_id.h | 25 +- .../breakpad/src/common/mac/macho_id.cc | 148 +- .../breakpad/src/common/mac/macho_id.h | 26 +- .../external/breakpad/src/common/module.cc | 43 +- .../external/breakpad/src/common/module.h | 35 +- .../src/common/solaris/dump_symbols.cc | 2 +- .../breakpad/src/common/solaris/file_id.cc | 11 +- .../breakpad/src/common/solaris/file_id.h | 2 + .../common/windows/pdb_source_line_writer.cc | 351 ++- .../common/windows/pdb_source_line_writer.h | 141 +- .../breakpad/src/common/windows/pe_util.cc | 11 +- .../common/windows/symbol_collector_client.cc | 12 +- .../common/windows/symbol_collector_client.h | 3 + .../google_breakpad/processor/stack_frame.h | 20 +- .../processor/stack_frame_cpu.h | 5 +- .../processor/basic_source_line_resolver.cc | 8 +- .../basic_source_line_resolver_unittest.cc | 22 +- .../processor/fast_source_line_resolver.cc | 34 +- .../fast_source_line_resolver_types.h | 13 +- .../fast_source_line_resolver_unittest.cc | 8 +- .../src/processor/simple_serializer-inl.h | 11 +- .../src/processor/simple_serializer.h | 2 + .../processor/source_line_resolver_base.cc | 13 +- .../src/processor/stackwalker_amd64.cc | 54 +- .../src/processor/stackwalker_amd64.h | 5 + .../breakpad/src/processor/stackwalker_arm.cc | 6 +- .../src/processor/stackwalker_arm64.cc | 6 +- .../src/processor/stackwalker_mips.cc | 3 +- .../breakpad/src/processor/stackwalker_ppc.cc | 7 +- .../src/processor/stackwalker_ppc64.cc | 7 +- .../src/processor/stackwalker_sparc.cc | 7 +- .../breakpad/src/processor/stackwalker_x86.cc | 49 +- .../src/processor/testdata/module1.out | 4 +- .../src/tools/mac/symupload/symupload.mm | 24 +- .../tools/mac/upload_system_symbols/go.mod | 3 + .../src/tools/windows/dump_syms/dump_syms.cc | 56 +- .../src/tools/windows/symupload/symupload.cc | 30 +- .../sentry-native/external/crashpad/.gn | 1 + .../sentry-native/external/crashpad/.vpython3 | 32 + .../sentry-native/external/crashpad/BUILD.gn | 5 +- .../external/crashpad/CMakeLists.txt | 2 +- .../sentry-native/external/crashpad/DEPS | 12 +- .../build/ios/convert_gn_xcodeproj.py | 336 ++- .../crashpad/build/ios/setup_ios_gn.py | 635 ++--- .../build/ios/xcodescheme-testable.template | 10 + .../crashpad/build/ios/xcodescheme.template | 80 + .../external/crashpad/build/run_tests.py | 31 +- .../external/crashpad/client/annotation.h | 6 +- .../crashpad/client/annotation_list.h | 4 +- .../crashpad/client/crash_report_database.cc | 8 +- .../client/crash_report_database_generic.cc | 8 +- .../client/crash_report_database_mac.mm | 21 +- .../client/crash_report_database_test.cc | 10 +- .../client/crash_report_database_win.cc | 6 +- .../crashpad/client/crashpad_client.h | 63 +- .../crashpad/client/crashpad_client_ios.cc | 224 +- .../client/crashpad_client_ios_test.mm | 102 +- .../crashpad/client/crashpad_client_linux.cc | 128 +- .../client/crashpad_client_linux_test.cc | 97 +- .../crashpad/client/crashpad_client_mac.cc | 6 +- .../crashpad/client/crashpad_client_win.cc | 19 +- .../external/crashpad/client/crashpad_info.cc | 17 +- .../external/crashpad/client/crashpad_info.h | 8 +- .../crashpad/client/crashpad_info_note.S | 2 +- .../client/ios_handler/exception_processor.h | 29 +- .../client/ios_handler/exception_processor.mm | 221 +- .../client/ios_handler/in_process_handler.cc | 301 ++- .../client/ios_handler/in_process_handler.h | 175 +- .../ios_handler/in_process_handler_test.cc | 3 +- .../in_process_intermediate_dump_handler.cc | 9 +- ..._process_intermediate_dump_handler_test.cc | 15 +- ...rmediate_dumps_and_crash_reports_thread.cc | 24 +- ...ermediate_dumps_and_crash_reports_thread.h | 4 + .../external/crashpad/client/settings.cc | 40 +- .../external/crashpad/client/settings.h | 29 +- .../external/crashpad/client/settings_test.cc | 2 +- .../external/crashpad/client/simulate_crash.h | 8 +- .../crashpad/client/simulate_crash_mac.cc | 7 +- .../client/simulate_crash_mac_test.cc | 9 +- .../external/crashpad/doc/developing.md | 5 +- .../crashpad/doc/support/generate_doxygen.py | 2 +- .../handler/crash_report_upload_thread.cc | 26 +- .../handler/crash_report_upload_thread.h | 8 +- .../crashpad_handler_test_extended_handler.cc | 8 +- .../external/crashpad/handler/handler_main.cc | 301 +-- .../external/crashpad/handler/handler_main.h | 2 +- .../linux/crash_report_exception_handler.cc | 4 +- .../handler/linux/exception_handler_server.cc | 2 +- .../linux/exception_handler_server_test.cc | 2 +- .../handler/mac/file_limit_annotation.cc | 4 +- .../external/crashpad/handler/main.cc | 8 +- .../handler/win/crash_other_program.cc | 3 +- .../handler/win/crashy_test_program.cc | 6 +- .../crashpad/handler/win/hanging_program.cc | 5 +- .../infra/config/generated/cr-buildbucket.cfg | 60 +- .../infra/config/generated/luci-scheduler.cfg | 28 +- .../infra/config/generated/project.cfg | 3 +- .../external/crashpad/infra/config/main.star | 22 +- .../minidump_annotation_writer_test.cc | 4 +- .../minidump_byte_array_writer_test.cc | 6 +- .../minidump/minidump_context_writer.cc | 5 +- .../minidump_exception_writer_test.cc | 4 +- .../minidump/minidump_file_writer_test.cc | 13 +- .../minidump/minidump_memory_writer_test.cc | 8 +- .../minidump/minidump_misc_info_writer.cc | 34 +- .../minidump_misc_info_writer_test.cc | 59 +- ...nidump_module_crashpad_info_writer_test.cc | 8 +- .../minidump/minidump_module_writer_test.cc | 12 +- .../minidump/minidump_rva_list_writer_test.cc | 6 +- .../minidump/minidump_string_writer_test.cc | 22 +- .../minidump/minidump_system_info_writer.cc | 5 +- .../minidump_system_info_writer_test.cc | 4 +- .../minidump/minidump_thread_id_map_test.cc | 7 +- .../minidump/minidump_thread_writer_test.cc | 12 +- .../crashpad/minidump/minidump_writable.cc | 5 +- .../test/minidump_context_test_util.cc | 73 +- .../external/crashpad/snapshot/BUILD.gn | 6 +- .../crashpad/snapshot/capture_memory.cc | 8 +- .../external/crashpad/snapshot/cpu_context.cc | 7 +- .../crashpad/snapshot/cpu_context_test.cc | 23 +- .../crashpad_info_client_options_test.cc | 28 +- ...rashpad_info_client_options_test_module.cc | 10 +- .../crashpad_info_size_test_module.cc | 29 +- .../snapshot/crashpad_info_size_test_note.S | 2 +- .../crashpad_types/crashpad_info_reader.cc | 6 +- .../crashpad_info_reader_test.cc | 4 +- .../image_annotation_reader_test.cc | 4 +- .../crashpad/snapshot/elf/elf_image_reader.cc | 4 +- .../snapshot/elf/elf_image_reader_test.cc | 23 +- .../snapshot/elf/elf_image_reader_test_note.S | 2 +- .../memory_map_region_snapshot_fuchsia.cc | 5 +- .../fuchsia/process_reader_fuchsia_test.cc | 5 +- .../fuchsia/process_snapshot_fuchsia_test.cc | 17 +- ...xception_snapshot_ios_intermediate_dump.cc | 10 +- .../memory_snapshot_ios_intermediate_dump.cc | 25 + .../memory_snapshot_ios_intermediate_dump.h | 8 + ...ory_snapshot_ios_intermediate_dump_test.cc | 161 ++ .../linux/capture_memory_delegate_linux.cc | 16 +- .../snapshot/linux/debug_rendezvous.cc | 6 +- .../snapshot/linux/debug_rendezvous_test.cc | 14 +- .../linux/exception_snapshot_linux.cc | 19 +- .../snapshot/linux/exception_snapshot_linux.h | 3 +- .../linux/exception_snapshot_linux_test.cc | 22 +- .../snapshot/linux/process_reader_linux.cc | 10 +- .../linux/process_reader_linux_test.cc | 19 +- .../snapshot/linux/process_snapshot_linux.cc | 24 +- .../crashpad/snapshot/linux/signal_context.h | 4 +- .../snapshot/linux/system_snapshot_linux.cc | 19 +- .../linux/system_snapshot_linux_test.cc | 4 +- .../snapshot/mac/mach_o_image_reader.cc | 7 +- .../mac/mach_o_image_segment_reader_test.cc | 9 +- .../snapshot/mac/process_reader_mac_test.cc | 8 +- .../crashpad/snapshot/mac/process_types.cc | 4 +- .../snapshot/mac/process_types/custom.cc | 9 +- .../snapshot/mac/process_types_test.cc | 8 +- .../minidump/minidump_context_converter.cc | 19 +- .../minidump/module_snapshot_minidump.cc | 10 +- .../minidump/process_snapshot_minidump.cc | 2 +- .../process_snapshot_minidump_test.cc | 35 +- .../crashpad/snapshot/posix/timezone.cc | 12 +- .../crashpad/snapshot/posix/timezone_test.cc | 4 +- .../process_snapshot_sanitized_test.cc | 7 +- .../sanitization_information_test.cc | 7 +- .../snapshot/test/test_cpu_context.cc | 32 +- .../win/capture_memory_delegate_win.cc | 16 +- .../snapshot/win/cpu_context_win_test.cc | 9 +- .../crashpad_snapshot_test_image_reader.cc | 9 +- .../crashpad/snapshot/win/end_to_end_test.py | 20 +- .../snapshot/win/exception_snapshot_win.cc | 12 +- .../snapshot/win/exception_snapshot_win.h | 3 +- .../win/exception_snapshot_win_test.cc | 1 - .../win/pe_image_annotations_reader.cc | 6 +- .../crashpad/snapshot/win/pe_image_reader.cc | 4 +- .../snapshot/win/process_reader_win_test.cc | 7 +- .../snapshot/win/process_snapshot_win.cc | 59 +- .../snapshot/win/process_snapshot_win.h | 3 +- .../snapshot/win/system_snapshot_win.cc | 127 +- .../crashpad/snapshot/x86/cpuid_reader.cc | 13 +- .../external/crashpad/test/errors.cc | 10 +- .../external/crashpad/test/errors.h | 2 +- .../external/crashpad/test/file.cc | 32 +- .../external/crashpad/test/file.h | 6 + .../external/crashpad/test/filesystem.cc | 37 +- .../external/crashpad/test/filesystem.h | 4 +- .../external/crashpad/test/gtest_death.h | 8 +- .../external/crashpad/test/gtest_main.cc | 32 +- .../external/crashpad/test/hex_string.h | 4 +- .../external/crashpad/test/hex_string_test.cc | 5 +- .../crashpad/test/ios/crash_type_xctest.mm | 188 +- .../external/crashpad/test/ios/host/BUILD.gn | 3 + .../ios/host/cptest_application_delegate.mm | 231 +- .../test/ios/host/cptest_shared_object.h | 45 +- .../ios/host/handler_forbidden_allocators.cc | 295 +++ .../ios/host/handler_forbidden_allocators.h | 31 + .../crashpad/test/mac/mach_multiprocess.cc | 4 +- .../external/crashpad/test/multiprocess.h | 18 +- .../crashpad/test/multiprocess_exec.cc | 3 +- .../crashpad/test/multiprocess_exec.h | 6 +- .../crashpad/test/multiprocess_exec_posix.cc | 8 +- .../crashpad/test/multiprocess_exec_test.cc | 4 +- .../test/multiprocess_exec_test_child.cc | 18 +- .../crashpad/test/multiprocess_posix.cc | 12 +- .../external/crashpad/test/process_type.cc | 14 +- .../external/crashpad/test/process_type.h | 18 +- .../crashpad/test/scoped_module_handle.cc | 5 +- .../crashpad/test/scoped_module_handle.h | 8 +- .../crashpad/test/scoped_temp_dir_posix.cc | 2 +- .../crashpad/test/scoped_temp_dir_test.cc | 14 +- .../external/crashpad/test/test_paths.cc | 56 +- .../external/crashpad/test/test_paths.h | 8 +- .../crashpad/third_party/edo/BUILD.gn | 10 +- .../crashpad/third_party/googletest/BUILD.gn | 32 +- .../external/crashpad/third_party/lss/lss.h | 2 +- .../crashpad/third_party/lss/lss/DIR_METADATA | 12 + .../crashpad/third_party/lss/lss/LICENSE | 28 + .../crashpad/third_party/lss/lss/OWNERS | 2 + .../crashpad/third_party/lss/lss/README.md | 2 +- .../lss/lss/linux_syscall_support.h | 406 +++- .../third_party/lss/lss/tests/Makefile | 11 +- .../third_party/lss/lss/tests/fallocate.c | 2 + .../third_party/lss/lss/tests/getrandom.c | 59 + .../third_party/lss/lss/tests/lstat.c | 97 + .../third_party/lss/lss/tests/sigaction.c | 54 + .../crashpad/third_party/lss/lss/tests/stat.c | 67 + .../third_party/lss/lss/tests/test_skel.h | 4 + .../third_party/mini_chromium/CMakeLists.txt | 1 - .../mini_chromium/build/chromeos_buildflags.h | 4 +- .../mini_chromium/mini_chromium/.style.yapf | 7 + .../mini_chromium/mini_chromium/base/BUILD.gn | 1 - .../mini_chromium/base/atomicops.h | 8 +- .../mini_chromium/base/compiler_specific.h | 34 +- .../mini_chromium/base/files/file_path.h | 29 +- .../mini_chromium/base/files/file_util.h | 4 +- .../mini_chromium/base/files/scoped_file.cc | 6 +- .../mini_chromium/base/files/scoped_file.h | 8 +- .../mini_chromium/base/format_macros.h | 8 +- .../mini_chromium/base/ignore_result.h | 14 - .../mini_chromium/base/logging.cc | 121 +- .../mini_chromium/base/logging.h | 22 +- .../mini_chromium/base/mac/foundation_util.h | 4 +- .../mini_chromium/base/mac/foundation_util.mm | 4 +- .../mini_chromium/base/mac/mach_logging.cc | 8 +- .../mini_chromium/base/mac/mach_logging.h | 4 +- .../base/mac/scoped_nsautorelease_pool.h | 10 +- .../mini_chromium/base/mac/scoped_typeref.h | 5 +- .../base/numerics/checked_math.h | 8 +- .../mini_chromium/base/posix/eintr_wrapper.h | 4 +- .../mini_chromium/base/posix/safe_strerror.cc | 4 +- .../mini_chromium/base/process/memory.h | 5 +- .../mini_chromium/base/rand_util.cc | 18 +- .../base/scoped_clear_last_error.h | 6 +- .../mini_chromium/base/scoped_generic.h | 4 +- .../mini_chromium/base/strings/string_util.h | 5 +- .../base/strings/stringprintf.cc | 5 +- .../base/strings/sys_string_conversions.h | 4 +- .../base/synchronization/lock.cc | 4 +- .../mini_chromium/base/synchronization/lock.h | 8 +- .../base/synchronization/lock_impl.h | 8 +- .../mini_chromium/base/sys_byteorder.h | 16 +- .../base/threading/thread_local_storage.cc | 6 +- .../base/threading/thread_local_storage.h | 13 +- .../mini_chromium/build/BUILD.gn | 3 +- .../mini_chromium/build/build_config.h | 82 +- .../mini_chromium/build/buildflag.h | 9 +- .../mini_chromium/build/config/BUILD.gn | 13 +- .../build/ios/XCTRunnerAddition+Info.plist | 2 +- .../mini_chromium/build/ios/codesign.py | 234 +- .../build/ios/find_signing_identity.py | 85 +- .../mini_chromium/build/ios/ios_sdk.gni | 19 +- .../mini_chromium/build/ios/plist_util.py | 125 +- .../mini_chromium/build/ios/rules.gni | 26 +- .../mini_chromium/build/ios/sdk_info.py | 116 +- .../mini_chromium/build/ios/strip_arm64e.py | 7 +- .../mini_chromium/build/win_helper.py | 44 +- .../build/write_buildflag_header.py | 132 +- .../mini_chromium/testing/platform_test.h | 4 +- .../external/crashpad/tools/base94_encoder.cc | 8 +- .../crashpad/tools/crashpad_database_util.cc | 18 +- .../crashpad/tools/crashpad_http_upload.cc | 9 +- .../external/crashpad/tools/generate_dump.cc | 38 +- .../tools/mac/catch_exception_tool.cc | 2 + .../crashpad/tools/mac/exception_port_tool.cc | 2 + .../tools/mac/on_demand_service_tool.mm | 2 + .../crashpad/tools/run_with_crashpad.cc | 14 +- .../external/crashpad/tools/tool_support.cc | 21 +- .../external/crashpad/tools/tool_support.h | 8 +- .../external/crashpad/util/BUILD.gn | 11 +- .../external/crashpad/util/CMakeLists.txt | 17 +- .../util/file/delimited_file_reader.cc | 4 +- .../util/file/delimited_file_reader_test.cc | 8 +- .../crashpad/util/file/directory_reader.h | 14 +- .../util/file/directory_reader_test.cc | 13 +- .../external/crashpad/util/file/file_io.h | 20 +- .../crashpad/util/file/file_io_posix.cc | 10 +- .../crashpad/util/file/file_io_test.cc | 17 +- .../crashpad/util/file/file_writer.cc | 18 +- .../external/crashpad/util/file/file_writer.h | 3 +- .../crashpad/util/file/filesystem_posix.cc | 4 +- .../crashpad/util/file/filesystem_test.cc | 38 +- .../util/ios/ios_system_data_collector.h | 28 +- .../util/ios/ios_system_data_collector.mm | 82 +- .../external/crashpad/util/ios/raw_logging.cc | 20 +- .../external/crashpad/util/ios/raw_logging.h | 7 + .../util/ios/scoped_background_task.h | 40 + .../util/ios/scoped_background_task.mm | 58 + .../util/linux/auxiliary_vector_test.cc | 4 +- .../util/linux/exception_handler_client.cc | 2 +- .../util/linux/exception_handler_protocol.cc | 12 +- .../util/linux/exception_handler_protocol.h | 2 +- .../crashpad/util/linux/memory_map.cc | 10 +- .../crashpad/util/linux/memory_map_test.cc | 18 +- .../crashpad/util/linux/proc_stat_reader.cc | 5 +- .../crashpad/util/linux/proc_task_reader.cc | 5 +- .../crashpad/util/linux/ptrace_client.cc | 4 +- .../crashpad/util/linux/thread_info.h | 7 +- .../mac/checked_mach_address_range_test.cc | 8 +- .../crashpad/util/mac/launchd_test.mm | 10 +- .../util/mach/child_port_handshake.cc | 6 +- .../crashpad/util/mach/child_port_handshake.h | 4 +- .../crashpad/util/mach/child_port_server.cc | 5 +- .../composite_mach_message_server_test.cc | 15 +- .../util/mach/exc_client_variants_test.cc | 11 +- .../crashpad/util/mach/exc_server_variants.cc | 12 +- .../util/mach/exc_server_variants_test.cc | 51 +- .../util/mach/exception_behaviors_test.cc | 5 +- .../util/mach/exception_types_test.cc | 9 +- .../crashpad/util/mach/mach_extensions.cc | 12 +- .../util/mach/mach_extensions_test.cc | 12 +- .../crashpad/util/mach/mach_message.cc | 9 +- .../crashpad/util/mach/mach_message.h | 4 +- .../util/mach/mach_message_server_test.cc | 4 +- .../crashpad/util/mach/mach_message_test.cc | 10 +- .../external/crashpad/util/mach/mig.py | 2 +- .../external/crashpad/util/mach/mig_fix.py | 40 +- .../external/crashpad/util/mach/mig_gen.py | 2 +- .../crashpad/util/mach/notify_server.cc | 5 +- .../util/mach/symbolic_constants_mach.cc | 28 +- .../util/mach/symbolic_constants_mach_test.cc | 50 +- .../crashpad/util/misc/address_types.h | 16 +- .../{arm64_bti_note.S => arm64_pac_bti.S} | 49 +- .../external/crashpad/util/misc/arraysize.h | 6 +- .../crashpad/util/misc/arraysize_test.cc | 31 +- .../crashpad/util/misc/capture_context.h | 20 +- .../util/misc/capture_context_linux.S | 7 +- .../util/misc/capture_context_test.cc | 4 +- .../misc/capture_context_test_util_win.cc | 11 +- .../crashpad/util/misc/clock_posix.cc | 2 +- .../external/crashpad/util/misc/clock_test.cc | 13 +- .../util/misc/initialization_state_dcheck.h | 15 +- .../external/crashpad/util/misc/metrics.cc | 12 +- .../external/crashpad/util/misc/metrics.h | 4 +- .../crashpad/util/misc/no_cfi_icall.h | 18 +- .../crashpad/util/misc/no_cfi_icall_test.cc | 6 +- .../external/crashpad/util/misc/paths_win.cc | 11 +- .../crashpad/util/misc/random_string_test.cc | 6 +- .../util/misc/scoped_forbid_return_test.cc | 10 +- .../external/crashpad/util/misc/time.h | 12 +- .../external/crashpad/util/misc/time_test.cc | 9 +- .../external/crashpad/util/misc/uuid.cc | 23 +- .../external/crashpad/util/misc/uuid.h | 14 +- .../external/crashpad/util/misc/uuid_test.cc | 17 +- .../util/net/http_transport_socket.cc | 13 +- .../crashpad/util/net/http_transport_test.cc | 6 +- .../util/net/http_transport_test_server.cc | 6 +- .../crashpad/util/net/http_transport_win.cc | 5 +- .../util/numeric/checked_address_range.cc | 21 +- .../numeric/checked_address_range_test.cc | 8 +- .../util/numeric/checked_range_test.cc | 12 +- .../crashpad/util/posix/close_multiple.cc | 21 +- .../crashpad/util/posix/close_stdio.cc | 5 +- .../crashpad/util/posix/drop_privileges.cc | 4 +- .../crashpad/util/posix/process_info.h | 16 +- .../crashpad/util/posix/process_info_mac.cc | 11 +- .../crashpad/util/posix/process_info_test.cc | 21 +- .../crashpad/util/posix/scoped_mmap.cc | 4 +- .../crashpad/util/posix/scoped_mmap_test.cc | 17 +- .../external/crashpad/util/posix/signals.cc | 33 +- .../crashpad/util/posix/signals_test.cc | 39 +- .../util/posix/symbolic_constants_posix.cc | 21 +- .../posix/symbolic_constants_posix_test.cc | 66 +- .../crashpad/util/process/process_id.h | 12 +- .../crashpad/util/process/process_memory.h | 4 +- .../util/process/process_memory_native.h | 16 +- .../util/process/process_memory_range_test.cc | 21 +- .../process/process_memory_sanitized_test.cc | 13 +- .../util/process/process_memory_test.cc | 33 +- .../crashpad/util/stdlib/aligned_allocator.cc | 24 +- .../util/stdlib/aligned_allocator_test.cc | 18 +- .../stdlib/string_number_conversion_test.cc | 6 +- .../crashpad/util/stdlib/strlcpy_test.cc | 14 +- .../external/crashpad/util/stdlib/strnlen.cc | 4 +- .../external/crashpad/util/stdlib/strnlen.h | 4 +- .../util/stdlib/thread_safe_vector_test.cc | 11 +- .../util/stream/base94_output_stream_test.cc | 4 +- .../crashpad/util/stream/file_encoder.cc | 4 +- .../util/stream/zlib_output_stream.cc | 9 +- .../util/stream/zlib_output_stream_test.cc | 4 +- .../crashpad/util/synchronization/semaphore.h | 12 +- .../util/synchronization/semaphore_posix.cc | 7 +- .../util/synchronization/semaphore_test.cc | 40 +- .../external/crashpad/util/thread/thread.h | 24 +- .../util/thread/thread_log_messages_test.cc | 9 +- .../crashpad/util/thread/thread_posix.cc | 10 + .../util/thread/worker_thread_test.cc | 3 +- .../crashpad/util/win/command_line_test.cc | 17 +- .../crashpad/util/win/exception_codes.h | 37 + .../util/win/exception_handler_server.cc | 6 +- .../crashpad/util/win/ntstatus_logging.cc | 4 +- .../util/win/registration_protocol_win.cc | 10 +- .../util/win/safe_terminate_process_test.cc | 6 +- .../sentry-native/include/sentry.h | 539 ++++- .../sentry-native/src/CMakeLists.txt | 2 + .../src/backends/sentry_backend_crashpad.cpp | 18 + .../src/backends/sentry_backend_inproc.c | 2 + .../modulefinder/sentry_modulefinder_linux.c | 120 +- .../modulefinder/sentry_modulefinder_linux.h | 6 + .../sentry-native/src/sentry_backend.h | 1 + .../sentry-native/src/sentry_core.c | 440 +++- .../sentry-native/src/sentry_core.h | 41 +- .../sentry-native/src/sentry_database.c | 35 +- .../sentry-native/src/sentry_database.h | 10 + .../sentry-native/src/sentry_envelope.c | 63 +- .../sentry-native/src/sentry_envelope.h | 6 + .../sentry-native/src/sentry_json.c | 44 + .../sentry-native/src/sentry_options.c | 6 +- .../sentry-native/src/sentry_os.c | 81 +- .../sentry-native/src/sentry_ratelimiter.c | 8 + .../sentry-native/src/sentry_ratelimiter.h | 6 + .../sentry-native/src/sentry_scope.c | 81 +- .../sentry-native/src/sentry_scope.h | 16 + .../sentry-native/src/sentry_session.c | 16 +- .../sentry-native/src/sentry_string.c | 61 - .../sentry-native/src/sentry_string.h | 74 +- .../sentry-native/src/sentry_sync.c | 72 + .../sentry-native/src/sentry_sync.h | 6 + .../sentry-native/src/sentry_tracing.c | 520 +++++ .../sentry-native/src/sentry_tracing.h | 51 + .../sentry-native/src/sentry_transport.c | 19 + .../sentry-native/src/sentry_transport.h | 7 + .../sentry-native/src/sentry_utils.c | 18 +- .../sentry-native/src/sentry_utils.h | 2 +- .../sentry-native/src/sentry_uuid.h | 3 +- .../sentry-native/src/sentry_value.c | 35 + .../sentry-native/src/sentry_value.h | 19 + .../src/transports/sentry_transport_curl.c | 13 + .../src/transports/sentry_transport_winhttp.c | 18 + .../sentry-native/tests/__init__.py | 50 +- .../sentry-native/tests/assertions.py | 55 +- .../sentry-native/tests/requirements.txt | 2 +- .../tests/test_integration_http.py | 61 +- .../tests/test_integration_ratelimits.py | 12 + .../tests/test_integration_stdout.py | 22 + .../sentry-native/tests/unit/CMakeLists.txt | 2 + .../sentry-native/tests/unit/fuzz.c | 2 - .../tests/unit/test_attachments.c | 1 - .../sentry-native/tests/unit/test_basic.c | 70 +- .../tests/unit/test_concurrency.c | 29 +- .../sentry-native/tests/unit/test_consent.c | 1 - .../sentry-native/tests/unit/test_envelopes.c | 33 +- .../sentry-native/tests/unit/test_failures.c | 1 - .../tests/unit/test_fuzzfailures.c | 2 +- .../sentry-native/tests/unit/test_logger.c | 1 - .../tests/unit/test_modulefinder.c | 1 - .../sentry-native/tests/unit/test_mpack.c | 1 - .../sentry-native/tests/unit/test_path.c | 1 - .../tests/unit/test_ratelimiter.c | 1 - .../sentry-native/tests/unit/test_sampling.c | 37 + .../sentry-native/tests/unit/test_session.c | 1 - .../sentry-native/tests/unit/test_slice.c | 1 - .../tests/unit/test_symbolizer.c | 1 - .../sentry-native/tests/unit/test_sync.c | 20 + .../sentry-native/tests/unit/test_tracing.c | 811 +++++++ .../sentry-native/tests/unit/test_uninit.c | 2 - .../sentry-native/tests/unit/test_unwinder.c | 1 - .../sentry-native/tests/unit/test_utils.c | 31 +- .../sentry-native/tests/unit/test_uuid.c | 4 +- .../sentry-native/tests/unit/test_value.c | 57 +- .../sentry-native/tests/unit/tests.inc | 23 + .../other-type-of-bug-report.md | 2 +- .../report-package-build-failure.md | 2 +- .../vcpkg/.github/pull_request_template.md | 8 +- .../vcpkg/.github/workflows/trustedPR.yml | 10 +- .../vcpkg/.github/workflows/untrustedPR.yml | 29 +- external_imported/vcpkg/CONTRIBUTING_zh.md | 33 + external_imported/vcpkg/README_es.md | 13 +- external_imported/vcpkg/README_ko_KR.md | 220 +- external_imported/vcpkg/README_zh_CN.md | 24 +- external_imported/vcpkg/docs/README.md | 9 +- .../docs/examples/packaging-github-repos.md | 11 +- .../vcpkg/docs/examples/patching.md | 2 +- .../CMakeLists.txt | 2 +- .../maintainers/authoring-script-ports.md | 45 + .../docs/maintainers/cmake-guidelines.md | 2 +- .../docs/maintainers/maintainer-guide.md | 36 +- .../vcpkg/docs/maintainers/manifest-files.md | 97 + .../docs/maintainers/portfile-functions.md | 2 +- .../vcpkg_cmake_config_fixup.md | 13 +- .../ports/vcpkg-cmake/vcpkg_cmake_build.md | 2 + .../vcpkg-cmake/vcpkg_cmake_configure.md | 2 +- .../ports/vcpkg-cmake/vcpkg_cmake_get_vars.md | 10 + .../ports/vcpkg-cmake/vcpkg_cmake_install.md | 2 +- .../x_vcpkg_pkgconfig_get_modules.md | 1 + .../docs/maintainers/vcpkg_check_features.md | 12 +- .../vcpkg_extract_source_archive.md | 5 + .../maintainers/vcpkg_fail_port_install.md | 2 + .../docs/maintainers/vcpkg_find_fortran.md | 2 +- external_imported/vcpkg/docs/users/android.md | 40 +- .../vcpkg/docs/users/authentication.md | 12 + .../vcpkg/docs/users/host-dependencies.md | 14 +- .../vcpkg/docs/users/manifests.md | 5 + .../vcpkg/ports/3fd/portfile.cmake | 2 - external_imported/vcpkg/ports/3fd/vcpkg.json | 2 +- .../vcpkg/ports/7zip/7zip-config.cmake.in | 5 + .../vcpkg/ports/7zip/CMakeLists.txt | 169 +- .../vcpkg/ports/7zip/License.txt | 90 - .../vcpkg/ports/7zip/portfile.cmake | 34 +- .../vcpkg/ports/7zip/unRarLicense.txt | 41 - external_imported/vcpkg/ports/7zip/vcpkg.json | 17 +- .../vcpkg/ports/ace/portfile.cmake | 149 +- external_imported/vcpkg/ports/ace/vcpkg.json | 5 +- .../vcpkg/ports/activemq-cpp/vcpkg.json | 4 +- .../vcpkg/ports/akali/portfile.cmake | 2 - .../vcpkg/ports/akali/vcpkg.json | 2 +- .../vcpkg/ports/alembic/portfile.cmake | 5 - .../vcpkg/ports/alembic/vcpkg.json | 1 + ...1-control-empty-fix-the-static-build.patch | 28 - .../vcpkg/ports/alsa/portfile.cmake | 6 +- external_imported/vcpkg/ports/alsa/vcpkg.json | 3 +- .../vcpkg/ports/ampl-asl/portfile.cmake | 15 +- .../vcpkg/ports/ampl-asl/vcpkg.json | 17 +- .../vcpkg/ports/ampl-mp/portfile.cmake | 4 +- .../vcpkg/ports/ampl-mp/vcpkg.json | 2 +- .../vcpkg/ports/amqpcpp/portfile.cmake | 2 - .../vcpkg/ports/amqpcpp/vcpkg.json | 1 + .../vcpkg/ports/anax/osx-arm.patch | 15 + .../vcpkg/ports/anax/portfile.cmake | 13 +- external_imported/vcpkg/ports/anax/vcpkg.json | 13 +- .../vcpkg/ports/antlr4/export_guid.patch | 26 +- .../ports/antlr4/fix_utfcpp_dependency.patch | 66 +- .../vcpkg/ports/antlr4/portfile.cmake | 15 +- .../ports/antlr4/uuid_discovery_fix.patch | 31 +- .../vcpkg/ports/antlr4/vcpkg.json | 6 +- .../ports/approval-tests-cpp/portfile.cmake | 10 +- .../vcpkg/ports/approval-tests-cpp/vcpkg.json | 2 +- .../vcpkg/ports/apr-util/portfile.cmake | 3 +- .../vcpkg/ports/apr-util/vcpkg.json | 4 +- .../vcpkg/ports/apr/portfile.cmake | 1 - external_imported/vcpkg/ports/apr/vcpkg.json | 2 +- .../vcpkg/ports/apsi/portfile.cmake | 4 - external_imported/vcpkg/ports/apsi/vcpkg.json | 3 +- .../vcpkg/ports/arb/portfile.cmake | 2 - external_imported/vcpkg/ports/arb/vcpkg.json | 2 + .../vcpkg/ports/arcus/portfile.cmake | 4 +- .../vcpkg/ports/arcus/vcpkg.json | 2 +- .../vcpkg/ports/args/portfile.cmake | 6 +- external_imported/vcpkg/ports/args/vcpkg.json | 3 +- .../vcpkg/ports/argtable3/portfile.cmake | 33 +- .../vcpkg/ports/argtable3/vcpkg.json | 16 +- .../vcpkg/ports/armadillo/portfile.cmake | 7 +- .../vcpkg/ports/armadillo/vcpkg.json | 2 +- external_imported/vcpkg/ports/arrow/all.patch | 2 +- .../vcpkg/ports/arrow/fix-dependencies.patch | 63 +- .../vcpkg/ports/arrow/portfile.cmake | 9 +- .../vcpkg/ports/arrow/vcpkg.json | 14 +- .../vcpkg/ports/ashes/fix-cast.patch | 39 - .../vcpkg/ports/ashes/portfile.cmake | 51 +- .../vcpkg/ports/ashes/vcpkg.json | 11 +- .../vcpkg/ports/asio-grpc/portfile.cmake | 4 +- .../vcpkg/ports/asio-grpc/vcpkg.json | 3 +- .../vcpkg/ports/asio/portfile.cmake | 4 +- external_imported/vcpkg/ports/asio/vcpkg.json | 4 +- .../vcpkg/ports/asiosdk/portfile.cmake | 2 - .../vcpkg/ports/asiosdk/vcpkg.json | 2 +- .../vcpkg/ports/asmjit/portfile.cmake | 2 - .../vcpkg/ports/asmjit/vcpkg.json | 1 + .../ports/audiofile/fix-cmakeLists.patch | 29 +- .../vcpkg/ports/audiofile/portfile.cmake | 4 +- .../vcpkg/ports/audiofile/vcpkg.json | 4 +- .../vcpkg/ports/avisynthplus/portfile.cmake | 2 - .../vcpkg/ports/avisynthplus/vcpkg.json | 4 +- .../vcpkg/ports/avro-c/avro.patch | 21 +- .../vcpkg/ports/avro-c/portfile.cmake | 3 +- .../vcpkg/ports/avro-c/vcpkg.json | 3 +- .../vcpkg/ports/aws-c-auth/vcpkg.json | 4 +- .../vcpkg/ports/aws-c-cal/vcpkg.json | 4 +- .../vcpkg/ports/aws-c-common/vcpkg.json | 4 +- .../vcpkg/ports/aws-c-compression/vcpkg.json | 4 +- .../vcpkg/ports/aws-c-event-stream/vcpkg.json | 4 +- .../vcpkg/ports/aws-c-http/vcpkg.json | 4 +- .../vcpkg/ports/aws-c-io/vcpkg.json | 4 +- .../vcpkg/ports/aws-c-mqtt/vcpkg.json | 7 +- .../vcpkg/ports/aws-c-s3/vcpkg.json | 4 +- .../vcpkg/ports/aws-checksums/vcpkg.json | 4 +- .../vcpkg/ports/aws-crt-cpp/vcpkg.json | 4 +- .../vcpkg/ports/aws-lambda-cpp/portfile.cmake | 2 - .../vcpkg/ports/aws-lambda-cpp/vcpkg.json | 3 +- .../vcpkg/ports/aws-sdk-cpp/fix-config.patch | 12 - .../ports/aws-sdk-cpp/fix-openssl3.patch | 13 + .../vcpkg/ports/aws-sdk-cpp/portfile.cmake | 6 +- .../vcpkg/ports/aws-sdk-cpp/vcpkg.json | 5 +- .../fix-install-location-preview.patch | 13 + .../fix-install-location.patch | 13 + .../improve-dependencies-preview.patch | 68 + .../improve-dependencies.patch | 67 + .../azure-c-shared-utility/openssl.patch | 13 + .../azure-c-shared-utility/portfile.cmake | 28 +- .../ports/azure-c-shared-utility/vcpkg.json | 14 +- .../vcpkg/ports/azure-core-cpp/portfile.cmake | 4 +- .../vcpkg/ports/azure-core-cpp/vcpkg.json | 5 +- .../ports/azure-identity-cpp/portfile.cmake | 4 +- .../vcpkg/ports/azure-identity-cpp/vcpkg.json | 5 +- ...cmake.patch => fix-install-location.patch} | 8 +- .../fix-iothubclient-includes.patch | 13 + .../improve-external-deps-preview.patch | 112 + .../improve-external-deps.patch | 104 +- .../ports/azure-iot-sdk-c/portfile.cmake | 32 +- .../ports/azure-iot-sdk-c/remove-werror.patch | 18 - .../vcpkg/ports/azure-iot-sdk-c/vcpkg.json | 14 +- .../fix-build-imgui.patch | 13 + .../azure-kinect-sensor-sdk/portfile.cmake | 46 +- .../ports/azure-kinect-sensor-sdk/vcpkg.json | 16 +- .../ports/azure-macro-utils-c/vcpkg.json | 3 +- .../portfile.cmake | 8 +- .../azure-security-attestation-cpp/vcpkg.json | 29 + .../portfile.cmake | 4 +- .../vcpkg.json | 4 +- .../vcpkg.json | 24 - .../portfile.cmake | 4 +- .../vcpkg.json | 4 +- .../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 +- .../ports/azure-storage-cpp/portfile.cmake | 2 - .../vcpkg/ports/azure-storage-cpp/vcpkg.json | 2 +- .../portfile.cmake | 4 +- .../vcpkg.json | 4 +- .../portfile.cmake | 4 +- .../azure-storage-files-shares-cpp/vcpkg.json | 4 +- .../azure-storage-queues-cpp/portfile.cmake | 4 +- .../ports/azure-storage-queues-cpp/vcpkg.json | 4 +- .../vcpkg/ports/azure-uamqp-c/portfile.cmake | 6 +- .../vcpkg/ports/azure-uamqp-c/vcpkg.json | 4 +- .../package-location-fix-preview.patch | 13 + .../vcpkg/ports/azure-uhttp-c/portfile.cmake | 21 +- .../vcpkg/ports/azure-uhttp-c/vcpkg.json | 14 +- .../package-location-fix-preview.patch | 13 + .../vcpkg/ports/azure-umqtt-c/portfile.cmake | 19 +- .../vcpkg/ports/azure-umqtt-c/vcpkg.json | 14 +- .../vcpkg/ports/bddisasm/portfile.cmake | 1 - .../vcpkg/ports/bddisasm/vcpkg.json | 1 + external_imported/vcpkg/ports/bde/vcpkg.json | 6 +- .../vcpkg/ports/bdwgc/portfile.cmake | 13 +- .../vcpkg/ports/bdwgc/vcpkg.json | 13 +- .../ports/behaviortree-cpp/portfile.cmake | 2 - .../vcpkg/ports/behaviortree-cpp/vcpkg.json | 2 +- .../vcpkg/ports/benchmark/portfile.cmake | 7 +- .../vcpkg/ports/benchmark/vcpkg.json | 3 +- .../vcpkg/ports/berkeleydb/portfile.cmake | 4 +- .../vcpkg/ports/berkeleydb/vcpkg.json | 4 +- .../vcpkg/ports/bext-di/portfile.cmake | 2 +- .../vcpkg/ports/bext-di/vcpkg.json | 3 +- .../vcpkg/ports/blend2d/portfile.cmake | 18 +- .../vcpkg/ports/blend2d/vcpkg.json | 19 +- .../vcpkg/ports/blitz/portfile.cmake | 4 +- .../vcpkg/ports/blitz/vcpkg.json | 8 +- .../vcpkg/ports/blosc/0001-find-deps.patch | 55 - .../vcpkg/ports/blosc/vcpkg.json | 2 +- .../boinc/001-add-openssl3-support.patch | 13 + .../vcpkg/ports/boinc/portfile.cmake | 5 +- .../vcpkg/ports/boinc/vcpkg.json | 3 +- .../boost-build/0002-fix-get-version.patch | 13 + .../vcpkg/ports/boost-build/portfile.cmake | 4 +- .../vcpkg/ports/boost-build/vcpkg.json | 1 + .../ports/boost-iostreams/b2-options.cmake | 12 - .../vcpkg/ports/boost-iostreams/vcpkg.json | 2 + .../boost-modular-build-helper/CMakeLists.txt | 206 +- .../boost-modular-build.cmake | 14 + .../user-config.jam.in | 2 +- .../boost-modular-build-helper/vcpkg.json | 2 + .../boost-modular-headers.cmake | 18 +- .../ports/boost-vcpkg-helpers/portfile.cmake | 13 +- .../ports/boost-vcpkg-helpers/vcpkg.json | 1 + .../vcpkg/ports/boringssl/portfile.cmake | 4 +- .../vcpkg/ports/boringssl/vcpkg.json | 1 + .../vcpkg/ports/botan/embed-debug-info.patch | 17 + .../vcpkg/ports/botan/portfile.cmake | 16 +- .../vcpkg/ports/botan/vcpkg.json | 9 +- .../vcpkg/ports/box2d/portfile.cmake | 2 - .../vcpkg/ports/box2d/vcpkg.json | 2 +- .../vcpkg/ports/braft/export-target.patch | 48 + .../vcpkg/ports/braft/fix-build.patch | 56 + .../vcpkg/ports/braft/fix-dependency.patch | 16 + .../vcpkg/ports/braft/portfile.cmake | 26 + .../vcpkg/ports/braft/vcpkg.json | 24 + .../ports/brpc/fix-protobuf-deprecated.patch | 13 - .../vcpkg/ports/brpc/portfile.cmake | 21 +- external_imported/vcpkg/ports/brpc/vcpkg.json | 18 +- .../vcpkg/ports/brynet/portfile.cmake | 4 +- .../vcpkg/ports/brynet/vcpkg.json | 3 +- .../portfile.cmake | 1 - .../buck-yeh-bux-mariadb-client/vcpkg.json | 1 + .../ports/buck-yeh-bux/fix-errorC7595.patch | 15 + .../vcpkg/ports/buck-yeh-bux/portfile.cmake | 2 +- .../vcpkg/ports/buck-yeh-bux/vcpkg.json | 1 + .../vcpkg/ports/bullet3/portfile.cmake | 11 +- .../vcpkg/ports/bullet3/vcpkg.json | 5 +- .../vcpkg/ports/c-ares/avoid-docs.patch | 13 + .../vcpkg/ports/c-ares/portfile.cmake | 12 +- .../vcpkg/ports/c-ares/vcpkg.json | 4 +- .../vcpkg/ports/c-dbg-macro/portfile.cmake | 14 + .../vcpkg/ports/c-dbg-macro/vcpkg.json | 6 + .../vcpkg/ports/c89stringutils/portfile.cmake | 18 + .../vcpkg/ports/c89stringutils/vcpkg.json | 17 + .../vcpkg/ports/caffe2/no-inout-macros.patch | 18 + .../vcpkg/ports/caffe2/portfile.cmake | 53 +- .../vcpkg/ports/caffe2/vcpkg.json | 11 +- ...son-fix-macOS-build-and-add-macOS-ci.patch | 112 - .../vcpkg/ports/cairo/cairo_static_fix.patch | 94 +- .../cairo/disable-atomic-ops-check.patch | 13 + .../vcpkg/ports/cairo/portfile.cmake | 20 +- .../vcpkg/ports/cairo/vcpkg.json | 5 +- .../ports/cairomm/build-support-msvc2022.diff | 41 + .../vcpkg/ports/cairomm/portfile.cmake | 6 +- .../vcpkg/ports/cairomm/undef.win32.patch | 12 - .../vcpkg/ports/cairomm/vcpkg.json | 4 +- .../vcpkg/ports/calceph/makefilevc.patch | 56 - .../vcpkg/ports/calceph/portfile.cmake | 7 +- .../vcpkg/ports/calceph/vcpkg.json | 4 +- .../vcpkg/ports/camport3/portfile.cmake | 14 +- .../vcpkg/ports/camport3/vcpkg.json | 2 +- .../vcpkg/ports/capnproto/portfile.cmake | 5 - .../vcpkg/ports/capnproto/vcpkg.json | 4 +- ...-silence-windows-crt-secure-warnings.patch | 15 + .../vcpkg/ports/capstone/portfile.cmake | 42 +- .../vcpkg/ports/capstone/vcpkg.json | 17 +- .../vcpkg/ports/cargs/portfile.cmake | 21 + .../vcpkg/ports/cargs/vcpkg.json | 16 + .../vcpkg/ports/catch2/portfile.cmake | 1 + .../vcpkg/ports/catch2/vcpkg.json | 2 + .../vcpkg/ports/cello/vcpkg.json | 6 +- .../vcpkg/ports/cereal/portfile.cmake | 7 +- .../vcpkg/ports/cereal/vcpkg.json | 6 +- .../vcpkg/ports/ceres/portfile.cmake | 47 +- .../vcpkg/ports/ceres/vcpkg.json | 12 +- .../vcpkg/ports/cfitsio/portfile.cmake | 2 +- .../vcpkg/ports/cfitsio/vcpkg.json | 2 +- .../vcpkg/ports/cgal/portfile.cmake | 4 +- external_imported/vcpkg/ports/cgal/vcpkg.json | 3 +- .../vcpkg/ports/chakracore/portfile.cmake | 8 +- .../vcpkg/ports/chakracore/vcpkg.json | 5 +- .../vcpkg/ports/charls/portfile.cmake | 17 +- .../vcpkg/ports/charls/vcpkg.json | 16 +- .../vcpkg/ports/chartdir/portfile.cmake | 2 +- .../vcpkg/ports/chartdir/vcpkg.json | 2 +- .../vcpkg/ports/chromium-base/portfile.cmake | 32 +- .../vcpkg/ports/chromium-base/vcpkg.json | 2 +- .../vcpkg/ports/civetweb/portfile.cmake | 2 - .../vcpkg/ports/civetweb/vcpkg.json | 1 + .../vcpkg/ports/clamav/portfile.cmake | 3 +- .../vcpkg/ports/clamav/vcpkg.json | 2 +- .../vcpkg/ports/clapack/portfile.cmake | 2 +- .../vcpkg/ports/clapack/vcpkg.json | 4 +- .../vcpkg/ports/clblast/portfile.cmake | 27 +- .../vcpkg/ports/clblast/vcpkg.json | 3 +- .../vcpkg/ports/clockutils/portfile.cmake | 30 +- .../vcpkg/ports/clockutils/vcpkg.json | 13 +- .../vcpkg/ports/clrng/portfile.cmake | 2 - .../vcpkg/ports/clrng/vcpkg.json | 2 +- .../vcpkg/ports/cnats/portfile.cmake | 76 + .../vcpkg/ports/cnats/vcpkg.json | 26 + .../vcpkg/ports/co/portfile.cmake | 37 +- external_imported/vcpkg/ports/co/vcpkg.json | 30 +- .../{co => cocoyaxi}/fix-event-destruct.patch | 0 .../ports/{co => cocoyaxi}/install-dll.patch | 0 .../vcpkg/ports/cocoyaxi/portfile.cmake | 32 + .../vcpkg/ports/cocoyaxi/vcpkg.json | 34 + .../vcpkg/ports/coin/portfile.cmake | 6 +- external_imported/vcpkg/ports/coin/vcpkg.json | 2 +- ...freeimage.patch => fix-dependencies.patch} | 8 +- .../vcpkg/ports/colmap/portfile.cmake | 6 +- .../vcpkg/ports/colmap/vcpkg.json | 6 +- .../vcpkg/ports/color-console/portfile.cmake | 16 + .../vcpkg/ports/color-console/usage | 4 + .../vcpkg/ports/color-console/vcpkg.json | 7 + .../vcpkg/ports/comms/portfile.cmake | 9 +- .../vcpkg/ports/comms/vcpkg.json | 2 + .../vcpkg/ports/commsdsl/portfile.cmake | 1 - .../vcpkg/ports/commsdsl/vcpkg.json | 1 + .../vcpkg/ports/concurrencpp/portfile.cmake | 6 +- .../vcpkg/ports/concurrencpp/vcpkg.json | 3 +- .../vcpkg/ports/coroutine/gsl-4_0_0.patch | 80 + .../vcpkg/ports/coroutine/portfile.cmake | 3 +- .../vcpkg/ports/coroutine/vcpkg.json | 4 +- .../vcpkg/ports/cpp-httplib/portfile.cmake | 4 +- .../vcpkg/ports/cpp-httplib/vcpkg.json | 5 +- .../vcpkg/ports/cpp-ipc/portfile.cmake | 4 +- .../vcpkg/ports/cpp-ipc/vcpkg.json | 1 + .../vcpkg/ports/cpp-netlib/portfile.cmake | 2 - .../vcpkg/ports/cpp-netlib/vcpkg.json | 2 +- .../vcpkg/ports/cpp-redis/fix-sleep_for.patch | 12 + .../vcpkg/ports/cpp-redis/portfile.cmake | 7 +- .../vcpkg/ports/cpp-redis/vcpkg.json | 15 +- .../vcpkg/ports/cppad/portfile.cmake | 4 - .../vcpkg/ports/cppad/vcpkg.json | 3 +- .../vcpkg/ports/cppcms/portfile.cmake | 2 - .../vcpkg/ports/cppcms/vcpkg.json | 2 +- .../vcpkg/ports/cppcoro/portfile.cmake | 1 - .../vcpkg/ports/cppcoro/vcpkg.json | 4 +- .../vcpkg/ports/cppgraphqlgen/portfile.cmake | 4 +- .../vcpkg/ports/cppgraphqlgen/vcpkg.json | 3 +- .../vcpkg/ports/cppunit/portfile.cmake | 7 +- .../vcpkg/ports/cppunit/vcpkg.json | 2 +- .../vcpkg/ports/cppxaml/portfile.cmake | 11 + .../vcpkg/ports/cppxaml/vcpkg.json | 7 + .../vcpkg/ports/cpr/001-cpr-config.patch | 18 +- .../vcpkg/ports/cpr/portfile.cmake | 15 +- external_imported/vcpkg/ports/cpr/vcpkg.json | 26 +- .../vcpkg/ports/cpu-features/portfile.cmake | 2 - .../vcpkg/ports/cpu-features/vcpkg.json | 1 + .../vcpkg/ports/cpuid/portfile.cmake | 1 - .../vcpkg/ports/cpuid/vcpkg.json | 4 +- .../vcpkg/ports/cpuinfo/fix-install.patch | 81 - .../vcpkg/ports/cpuinfo/portfile.cmake | 65 +- .../vcpkg/ports/cpuinfo/vcpkg.json | 14 +- .../vcpkg/ports/crashpad/portfile.cmake | 10 +- .../vcpkg/ports/crashpad/vcpkg.json | 4 +- .../vcpkg/ports/crashrpt/portfile.cmake | 4 +- .../vcpkg/ports/crashrpt/vcpkg.json | 3 +- .../vcpkg/ports/crfsuite/portfile.cmake | 3 - .../vcpkg/ports/crfsuite/vcpkg.json | 4 +- .../vcpkg/ports/croncpp/no-test.patch | 17 + .../vcpkg/ports/croncpp/portfile.cmake | 19 +- .../vcpkg/ports/croncpp/vcpkg.json | 17 +- .../vcpkg/ports/crossguid/portfile.cmake | 2 + .../vcpkg/ports/crossguid/vcpkg.json | 4 +- .../vcpkg/ports/crossguid/warnings.patch | 20 + .../vcpkg/ports/crow/portfile.cmake | 18 +- external_imported/vcpkg/ports/crow/vcpkg.json | 22 +- .../vcpkg/ports/cryptopp/cmake.patch | 20 +- .../vcpkg/ports/cryptopp/portfile.cmake | 15 +- .../vcpkg/ports/cryptopp/vcpkg.json | 13 +- .../vcpkg/ports/cspice/CMakeLists.txt | 4 +- .../vcpkg/ports/cspice/portfile.cmake | 69 +- .../vcpkg/ports/cspice/vcpkg.json | 18 +- .../vcpkg/ports/ctemplate/vcpkg.json | 5 +- .../vcpkg/ports/cub/fix-usage.patch | 24 + .../vcpkg/ports/cub/portfile.cmake | 28 +- external_imported/vcpkg/ports/cub/usage | 4 + external_imported/vcpkg/ports/cub/vcpkg.json | 13 +- external_imported/vcpkg/ports/cuda/vcpkg.json | 8 +- .../vcpkg/ports/cudnn/vcpkg.json | 5 +- .../vcpkg/ports/curl/0002_fix_uwp.patch | 23 +- .../ports/curl/0005_remove_imp_suffix.patch | 18 +- .../ports/curl/0006_fix_tool_depends.patch | 22 - ...0007_disable_tool_export_curl_target.patch | 18 - .../ports/curl/0011_fix_static_build.patch | 13 - .../ports/curl/0012-fix-dependency-idn2.patch | 2 +- .../vcpkg/ports/curl/0020-fix-pc-file.patch | 48 +- .../ports/curl/0022-deduplicate-libs.patch | 13 - .../curl/0023-fix-static-libs-export.patch | 14 - .../ports/curl/cmake-project-include.cmake | 82 + .../vcpkg/ports/curl/export-components.patch | 23 + .../vcpkg/ports/curl/mbedtls-ws2_32.patch | 14 + .../vcpkg/ports/curl/portfile.cmake | 37 +- .../ports/curl/vcpkg-cmake-wrapper.cmake | 31 +- external_imported/vcpkg/ports/curl/vcpkg.json | 11 +- .../vcpkg/ports/curlpp/portfile.cmake | 10 +- .../vcpkg/ports/curlpp/vcpkg.json | 2 +- .../vcpkg/ports/darknet/portfile.cmake | 35 +- .../vcpkg/ports/darknet/vcpkg.json | 14 +- .../ports/date/fix-uninitialized-values.patch | 40 + .../vcpkg/ports/date/portfile.cmake | 1 + external_imported/vcpkg/ports/date/vcpkg.json | 2 +- .../vcpkg/ports/dav1d/portfile.cmake | 2 - .../vcpkg/ports/dav1d/vcpkg.json | 2 +- .../vcpkg/ports/dbghelp/portfile.cmake | 1 - .../vcpkg/ports/dbghelp/vcpkg.json | 4 +- .../vcpkg/ports/dcmtk/vcpkg.json | 5 +- .../vcpkg/ports/detours/portfile.cmake | 2 +- .../vcpkg/ports/detours/vcpkg.json | 7 +- .../ports/devicenameresolver/portfile.cmake | 15 +- .../vcpkg/ports/devicenameresolver/vcpkg.json | 11 +- .../vcpkg/ports/dimcli/fix-build.patch | 39 + .../vcpkg/ports/dimcli/portfile.cmake | 17 +- .../vcpkg/ports/dimcli/vcpkg.json | 11 +- .../ports/directx-headers/portfile.cmake | 2 - .../vcpkg/ports/directx-headers/vcpkg.json | 1 + .../vcpkg/ports/directxmath/portfile.cmake | 16 +- .../vcpkg/ports/directxmath/vcpkg.json | 17 +- .../vcpkg/ports/directxmesh/portfile.cmake | 16 +- .../vcpkg/ports/directxmesh/vcpkg.json | 2 +- .../vcpkg/ports/directxsdk/portfile.cmake | 2 - .../vcpkg/ports/directxsdk/vcpkg.json | 2 +- .../directxtex/enable_openexr_support.patch | 6 +- .../vcpkg/ports/directxtex/portfile.cmake | 44 +- .../vcpkg/ports/directxtex/vcpkg.json | 2 +- .../vcpkg/ports/directxtk/portfile.cmake | 24 +- .../vcpkg/ports/directxtk/vcpkg.json | 2 +- .../vcpkg/ports/directxtk12/portfile.cmake | 24 +- .../vcpkg/ports/directxtk12/vcpkg.json | 2 +- .../ports/discord-game-sdk/portfile.cmake | 9 +- .../vcpkg/ports/discord-game-sdk/vcpkg.json | 2 +- .../vcpkg/ports/discordcoreapi/portfile.cmake | 35 + .../vcpkg/ports/discordcoreapi/vcpkg.json | 25 + .../vcpkg/ports/dlfcn-win32/portfile.cmake | 19 +- .../vcpkg/ports/dlfcn-win32/vcpkg.json | 13 +- .../vcpkg/ports/dlib/portfile.cmake | 4 +- external_imported/vcpkg/ports/dlib/vcpkg.json | 3 +- .../vcpkg/ports/dmlc/portfile.cmake | 2 - external_imported/vcpkg/ports/dmlc/vcpkg.json | 2 +- .../vcpkg/ports/doctest/portfile.cmake | 4 +- .../vcpkg/ports/doctest/vcpkg.json | 4 +- .../ports/double-conversion/portfile.cmake | 19 +- .../vcpkg/ports/double-conversion/vcpkg.json | 15 +- .../vcpkg/ports/drlibs/portfile.cmake | 4 +- .../vcpkg/ports/drlibs/vcpkg.json | 5 +- external_imported/vcpkg/ports/drogon/fs.patch | 19 - .../vcpkg/ports/drogon/portfile.cmake | 8 +- external_imported/vcpkg/ports/drogon/usage | 4 + .../vcpkg/ports/drogon/use-libmariadb.patch | 31 + .../vcpkg/ports/drogon/vcpkg.json | 4 +- .../ports/dstorage/dstorage-config.cmake.in | 25 + .../vcpkg/ports/dstorage/portfile.cmake | 28 + .../vcpkg/ports/dstorage/vcpkg.json | 8 + .../vcpkg/ports/duilib/portfile.cmake | 27 +- .../vcpkg/ports/duilib/vcpkg.json | 13 +- .../dxsdk-d3dx/dxsdk-d3dx-config.cmake.in | 48 + .../vcpkg/ports/dxsdk-d3dx/portfile.cmake | 4 +- .../vcpkg/ports/dxsdk-d3dx/vcpkg.json | 3 +- .../vcpkg/ports/dxut/portfile.cmake | 2 - external_imported/vcpkg/ports/dxut/vcpkg.json | 1 + .../vcpkg/ports/earcut-hpp/portfile.cmake | 13 + .../vcpkg/ports/earcut-hpp/vcpkg.json | 7 + .../vcpkg/ports/eastl/Fix-error-C2338.patch | 14 + .../vcpkg/ports/eastl/portfile.cmake | 1 + .../vcpkg/ports/eastl/vcpkg.json | 3 +- .../vcpkg/ports/easyhook/portfile.cmake | 38 +- .../vcpkg/ports/easyhook/vcpkg.json | 4 +- .../vcpkg/ports/eathread/portfile.cmake | 3 +- .../vcpkg/ports/eathread/vcpkg.json | 3 +- .../vcpkg/ports/ebml/include-limits.patch | 24 + .../vcpkg/ports/ebml/portfile.cmake | 2 + external_imported/vcpkg/ports/ebml/vcpkg.json | 1 + .../vcpkg/ports/ecsutil/portfile.cmake | 2 - .../vcpkg/ports/ecsutil/vcpkg.json | 2 +- .../vcpkg/ports/effects11/portfile.cmake | 3 - .../vcpkg/ports/effects11/vcpkg.json | 2 +- .../vcpkg/ports/efsw/portfile.cmake | 2 - external_imported/vcpkg/ports/efsw/vcpkg.json | 4 +- ...isable_pkgconfig_absolute_path_check.patch | 18 - .../vcpkg/ports/eigen3/fix-cuda-error.patch | 30 - .../fix-vectorized-reductions-half.patch | 26 + .../vcpkg/ports/eigen3/portfile.cmake | 25 +- .../eigen3/remove_configure_checks.patch | 37 + .../vcpkg/ports/eigen3/vcpkg.json | 17 +- .../vcpkg/ports/elfio/portfile.cmake | 11 +- .../vcpkg/ports/elfio/vcpkg.json | 15 +- .../vcpkg/ports/elfutils/configure.ac.patch | 6 +- .../vcpkg/ports/elfutils/portfile.cmake | 4 +- .../vcpkg/ports/elfutils/vcpkg.json | 3 +- .../vcpkg/ports/embree2/vcpkg.json | 3 +- .../vcpkg/ports/eventpp/portfile.cmake | 22 + .../vcpkg/ports/eventpp/vcpkg.json | 17 + .../vcpkg/ports/exiv2/portfile.cmake | 3 - .../vcpkg/ports/exiv2/vcpkg.json | 1 + .../vcpkg/ports/expat/pkgconfig.patch | 13 - .../vcpkg/ports/expat/portfile.cmake | 37 +- .../ports/expat/vcpkg-cmake-wrapper.cmake | 2 +- .../vcpkg/ports/expat/vcpkg.json | 16 +- .../vcpkg/ports/exprtk/copyright | 4 +- .../vcpkg/ports/exprtk/portfile.cmake | 5 +- .../vcpkg/ports/exprtk/vcpkg.json | 7 +- .../vcpkg/ports/ezc3d/portfile.cmake | 40 +- .../vcpkg/ports/ezc3d/vcpkg.json | 3 +- .../vcpkg/ports/faad2/CMakeLists.txt | 2 +- .../vcpkg/ports/faad2/vcpkg.json | 2 +- .../vcpkg/ports/faiss/portfile.cmake | 6 +- .../vcpkg/ports/faiss/vcpkg.json | 2 +- .../vcpkg/ports/fakeit/portfile.cmake | 4 +- .../vcpkg/ports/fakeit/vcpkg.json | 5 +- .../vcpkg/ports/fastcgi/portfile.cmake | 22 +- .../vcpkg/ports/fastcgi/vcpkg.json | 5 +- .../vcpkg/ports/fbgemm/fix-cmakelists.patch | 10 +- .../vcpkg/ports/fbgemm/portfile.cmake | 2 - .../vcpkg/ports/fbgemm/vcpkg.json | 3 +- .../ports/fbthrift/fix-sodium-target.patch | 16 - .../vcpkg/ports/fbthrift/fix-zlib.patch | 100 - .../vcpkg/ports/fbthrift/portfile.cmake | 76 +- .../vcpkg/ports/fbthrift/vcpkg.json | 13 +- .../ports/ffmpeg/0004-fix-debug-build.patch | 7 +- .../vcpkg/ports/ffmpeg/build.sh.in | 4 +- .../vcpkg/ports/ffmpeg/portfile.cmake | 242 +- .../vcpkg/ports/ffmpeg/vcpkg.json | 51 +- .../vcpkg/ports/ffnvcodec/vcpkg.json | 3 +- .../vcpkg/ports/fftw3/portfile.cmake | 2 +- .../vcpkg/ports/fftw3/vcpkg.json | 2 +- .../vcpkg/ports/fftwpp/vcpkg.json | 6 +- .../ports/field3d/0001_fix_build_errors.patch | 148 -- .../0002_improve_win_compatibility.patch | 43 - .../vcpkg/ports/field3d/0003_hdf5_api.patch | 12 - .../vcpkg/ports/field3d/portfile.cmake | 35 - .../vcpkg/ports/field3d/vcpkg.json | 20 - .../vcpkg/ports/fizz/0001-fix-libsodium.patch | 35 + .../vcpkg/ports/fizz/0002-fix-libevent.patch | 30 + .../vcpkg/ports/fizz/fix-zlib.patch | 36 - .../vcpkg/ports/fizz/portfile.cmake | 22 +- external_imported/vcpkg/ports/fizz/vcpkg.json | 13 +- .../vcpkg/ports/flann/fix-build-error.patch | 24 +- .../ports/flann/fix-dependency-hdf5.patch | 13 +- .../vcpkg/ports/flann/portfile.cmake | 17 +- .../vcpkg/ports/flann/vcpkg.json | 13 +- .../ports/flash-runtime-extensions/README.md | 2 + .../flash-runtime-extensions/portfile.cmake | 23 + .../ports/flash-runtime-extensions/vcpkg.json | 18 + .../vcpkg/ports/flatbuffers/portfile.cmake | 33 +- .../vcpkg/ports/flatbuffers/vcpkg.json | 20 +- .../vcpkg/ports/flint/portfile.cmake | 6 +- .../vcpkg/ports/flint/vcpkg.json | 1 + .../vcpkg/ports/fltk/fltk_version.dat | 1 - .../vcpkg/ports/fltk/portfile.cmake | 10 +- external_imported/vcpkg/ports/fltk/vcpkg.json | 3 +- .../vcpkg/ports/fluidsynth/portfile.cmake | 4 +- .../vcpkg/ports/fluidsynth/vcpkg.json | 4 +- .../vcpkg/ports/fmt/fix-invalid-command.patch | 11 + .../vcpkg/ports/fmt/portfile.cmake | 5 +- external_imported/vcpkg/ports/fmt/vcpkg.json | 3 +- .../vcpkg/ports/folly/portfile.cmake | 39 +- .../vcpkg/ports/folly/vcpkg.json | 16 +- .../ports/fontconfig/no-etc-symlinks.patch | 19 + .../vcpkg/ports/fontconfig/portfile.cmake | 23 +- .../vcpkg/ports/fontconfig/vcpkg.json | 5 +- .../vcpkg/ports/freeglut/gcc10.patch | 31 - .../vcpkg/ports/freeglut/portfile.cmake | 65 +- ...use_targets_to_export_x11_dependency.patch | 23 - .../ports/freeglut/vcpkg-cmake-wrapper.cmake | 35 +- .../vcpkg/ports/freeglut/vcpkg.json | 16 +- .../freeglut/windows-static-output-name.patch | 29 + .../freeglut/x11-dependencies-export.patch | 63 + .../vcpkg/ports/freeimage/CMakeLists.txt | 23 +- .../vcpkg/ports/freeimage/vcpkg.json | 2 +- .../vcpkg/ports/freerdp/portfile.cmake | 6 +- .../vcpkg/ports/freerdp/vcpkg.json | 4 +- .../vcpkg/ports/freetds/portfile.cmake | 2 - .../vcpkg/ports/freetds/vcpkg.json | 4 +- .../ports/freetype/fix-2.11-msvc-build.patch | 152 -- .../vcpkg/ports/freetype/portfile.cmake | 45 +- .../ports/freetype/vcpkg-cmake-wrapper.cmake | 107 +- .../vcpkg/ports/freetype/vcpkg.json | 4 +- .../ports/fribidi/meson-crosscompile.patch | 36 + .../vcpkg/ports/fribidi/portfile.cmake | 40 +- .../vcpkg/ports/fribidi/vcpkg.json | 14 +- .../vcpkg/ports/ftxui/portfile.cmake | 6 +- .../vcpkg/ports/ftxui/vcpkg.json | 3 +- .../functions-framework-cpp/portfile.cmake | 4 +- .../ports/functions-framework-cpp/vcpkg.json | 3 +- .../vcpkg/ports/fuzzylite/portfile.cmake | 36 +- .../vcpkg/ports/fuzzylite/vcpkg.json | 14 +- .../vcpkg/ports/g3log/portfile.cmake | 2 - .../vcpkg/ports/g3log/vcpkg.json | 2 +- .../vcpkg/ports/gainput/fix-build.patch | 44 + .../vcpkg/ports/gainput/portfile.cmake | 33 +- .../vcpkg/ports/gainput/vcpkg.json | 18 +- .../ports/gamedev-framework/portfile.cmake | 4 - .../vcpkg/ports/gamedev-framework/vcpkg.json | 2 +- .../gamenetworkingsockets/portfile.cmake | 9 +- .../ports/gamenetworkingsockets/vcpkg.json | 2 +- .../vcpkg/ports/gasol/portfile.cmake | 2 - .../vcpkg/ports/gasol/vcpkg.json | 7 +- .../vcpkg/ports/gazebo/0001-Fix-deps.patch | 102 + .../vcpkg/ports/gazebo/portfile.cmake | 52 + .../vcpkg/ports/gazebo/vcpkg.json | 125 + .../vcpkg/ports/gdal/0005-Fix-configure.patch | 12 + .../vcpkg/ports/gdal/0009-atlbase.patch | 72 + .../vcpkg/ports/gdal/0010-symprefix.patch | 13 + .../vcpkg/ports/gdal/dependency_win.cmake | 465 ++-- .../vcpkg/ports/gdal/portfile.cmake | 174 +- .../ports/gdal/vcpkg-cmake-wrapper.cmake | 43 +- external_imported/vcpkg/ports/gdal/vcpkg.json | 33 +- .../vcpkg/ports/geogram/portfile.cmake | 2 - .../vcpkg/ports/geogram/vcpkg.json | 2 +- .../vcpkg/ports/geographiclib/portfile.cmake | 7 - .../vcpkg/ports/geographiclib/vcpkg.json | 5 +- .../vcpkg/ports/getdns/disable-docs.patch | 42 + .../vcpkg/ports/getdns/portfile.cmake | 19 +- .../vcpkg/ports/getdns/vcpkg.json | 2 + .../vcpkg/ports/getopt-win32/getopt.h.patch | 50 + .../vcpkg/ports/getopt-win32/portfile.cmake | 1 + .../vcpkg/ports/getopt-win32/vcpkg.json | 3 +- .../gettext/0004-Fix-uwp-tools-build.patch | 116 + .../vcpkg/ports/gettext/portfile.cmake | 1 + .../vcpkg/ports/gettext/vcpkg.json | 2 +- .../ports/gherkin-c/fix-include-path.patch | 22 + .../ports/gherkin-c/fix-install-error.patch | 12 + .../vcpkg/ports/gherkin-c/portfile.cmake | 17 +- .../vcpkg/ports/gherkin-c/vcpkg.json | 12 +- .../vcpkg/ports/giflib/portfile.cmake | 2 - .../ports/giflib/vcpkg-cmake-wrapper.cmake | 3 - .../vcpkg/ports/giflib/vcpkg.json | 3 +- .../vcpkg/ports/glfw3/portfile.cmake | 4 +- .../vcpkg/ports/glfw3/vcpkg.json | 3 +- .../vcpkg/ports/glib/portfile.cmake | 9 +- external_imported/vcpkg/ports/glib/vcpkg.json | 3 +- .../glibmm/build-support-vs2022-builds.patch | 41 + .../vcpkg/ports/glibmm/portfile.cmake | 14 +- .../vcpkg/ports/glibmm/vcpkg.json | 5 +- .../glog/fix_glog_CMAKE_MODULE_PATH.patch | 77 + .../vcpkg/ports/glog/fix_log_every_n.patch | 848 +++++++ .../glog/glog_disable_debug_postfix.patch | 8 +- .../vcpkg/ports/glog/nogdi-nominmax.patch | 59 + .../vcpkg/ports/glog/portfile.cmake | 23 +- external_imported/vcpkg/ports/glog/vcpkg.json | 14 +- .../vcpkg/ports/glslang/portfile.cmake | 6 +- .../vcpkg/ports/glslang/vcpkg.json | 2 +- .../vcpkg/ports/gmmlib/portfile.cmake | 2 + .../vcpkg/ports/gmmlib/vcpkg.json | 2 + .../vcpkg/ports/gmp/adddef.patch | 12 - .../vcpkg/ports/gmp/msvc_symbol.patch | 28 + .../vcpkg/ports/gmp/portfile.cmake | 166 +- .../vcpkg/ports/gmp/runtime.patch | 180 -- external_imported/vcpkg/ports/gmp/vcpkg.json | 14 +- .../vcpkg/ports/gmp/vs.build.patch | 172 -- external_imported/vcpkg/ports/gmp/yasm.patch | 83 + .../0001-g-ir-tool-template.in.patch | 23 + .../0002-cross-build.patch | 60 + .../gobject-introspection/portfile.cmake | 82 + .../ports/gobject-introspection/vcpkg.json | 31 + .../ports/google-cloud-cpp/portfile.cmake | 12 +- .../google-cloud-cpp/support_absl_cxx17.patch | 32 + .../vcpkg/ports/google-cloud-cpp/vcpkg.json | 940 +++++++- .../vcpkg/ports/gperf/portfile.cmake | 2 - .../vcpkg/ports/gperf/vcpkg.json | 4 +- .../vcpkg/ports/gperftools/portfile.cmake | 2 - .../vcpkg/ports/gperftools/vcpkg.json | 2 +- .../vcpkg/ports/graphviz/portfile.cmake | 57 +- .../vcpkg/ports/graphviz/vcpkg.json | 8 +- .../vcpkg/ports/grpc/00001-fix-uwp.patch | 31 +- .../ports/grpc/00003-undef-base64-macro.patch | 8 +- .../grpc/00004-link-gdi32-on-windows.patch | 8 +- .../ports/grpc/00006-fix-uwp-error.patch | 13 + .../grpc/00010-add-feature-absl-sync.patch | 11 +- .../ports/grpc/00012-fix-use-cxx17.patch | 13 +- .../ports/grpc/00014-pkgconfig-upbdefs.patch | 6 +- .../vcpkg/ports/grpc/portfile.cmake | 5 +- external_imported/vcpkg/ports/grpc/vcpkg.json | 2 +- .../vcpkg/ports/gsoap/portfile.cmake | 4 +- .../vcpkg/ports/gsoap/vcpkg.json | 1 + .../gstreamer/gstreamer-disable-hot-doc.patch | 34 + .../gstreamer-disable-no-unused.patch | 15 + .../plugin-base-disable-no-unused.patch | 26 + .../gstreamer/plugins-ugly-disable-doc.patch | 16 + .../vcpkg/ports/gstreamer/portfile.cmake | 134 +- .../vcpkg/ports/gstreamer/vcpkg.json | 73 +- .../ports/gtest/clang-tidy-no-lint.patch | 13 + .../vcpkg/ports/gtest/portfile.cmake | 11 +- .../vcpkg/ports/gtest/remove-werror.patch | 20 + .../vcpkg/ports/gtest/vcpkg.json | 15 +- .../vcpkg/ports/gtk/0003-vs2022-rc.patch | 35 - .../vcpkg/ports/gtk/portfile.cmake | 7 +- external_imported/vcpkg/ports/gtk/vcpkg.json | 4 +- .../vcpkg/ports/gtkmm/portfile.cmake | 8 +- .../vcpkg/ports/gtkmm/vcpkg.json | 3 +- .../vcpkg/ports/gtl/portfile.cmake | 21 + external_imported/vcpkg/ports/gtl/vcpkg.json | 12 + .../vcpkg/ports/guetzli/CMakeLists.txt | 2 + .../vcpkg/ports/guetzli/portfile.cmake | 13 +- .../vcpkg/ports/guetzli/vcpkg.json | 10 +- .../vcpkg/ports/h3/portfile.cmake | 3 +- external_imported/vcpkg/ports/h3/vcpkg.json | 1 + .../vcpkg/ports/harfbuzz/fix-macos-build.diff | 43 + .../ports/harfbuzz/harfbuzzConfig.cmake.in | 22 +- .../vcpkg/ports/harfbuzz/portfile.cmake | 5 +- .../vcpkg/ports/harfbuzz/vcpkg.json | 4 +- .../vcpkg/ports/hdf5/portfile.cmake | 10 +- external_imported/vcpkg/ports/hdf5/vcpkg.json | 2 +- .../vcpkg/ports/hexl/portfile.cmake | 3 - external_imported/vcpkg/ports/hexl/vcpkg.json | 1 + .../vcpkg/ports/hps/portfile.cmake | 20 + external_imported/vcpkg/ports/hps/usage | 4 + external_imported/vcpkg/ports/hps/vcpkg.json | 7 + .../ports/hpx/fix-cmakecache-paths.patch | 22 + .../ports/hpx/fix-dependency-hwloc.patch | 15 + .../vcpkg/ports/hpx/portfile.cmake | 5 +- external_imported/vcpkg/ports/hpx/vcpkg.json | 3 +- .../ports/hunspell/0004-add-win-arm64.patch | 529 +++++ .../vcpkg/ports/hunspell/portfile.cmake | 19 +- .../vcpkg/ports/hunspell/vcpkg.json | 4 +- .../ports/hwloc/fix_shared_win_build.patch | 42 +- .../vcpkg/ports/hwloc/portfile.cmake | 19 +- .../vcpkg/ports/hwloc/vcpkg.json | 4 +- .../ports/icu/disable-escapestr-tool.patch | 4 +- .../vcpkg/ports/icu/fix-win-build.patch | 35 + .../vcpkg/ports/icu/portfile.cmake | 17 +- .../vcpkg/ports/icu/vcpkg-cmake-wrapper.cmake | 2 +- external_imported/vcpkg/ports/icu/vcpkg.json | 3 +- .../{libcurl_d.patch => fix-vcxproj.patch} | 31 +- .../vcpkg/ports/idevicerestore/portfile.cmake | 6 +- .../vcpkg/ports/idevicerestore/vcpkg.json | 4 +- .../vcpkg/ports/ignition-common3/vcpkg.json | 4 +- .../vcpkg/ports/ignition-msgs5/portfile.cmake | 6 +- .../vcpkg/ports/ignition-msgs5/vcpkg.json | 4 +- .../vcpkg/ports/ignition-msgs6/portfile.cmake | 4 +- .../vcpkg/ports/ignition-msgs6/vcpkg.json | 4 +- .../ports/ignition-transport4/portfile.cmake | 5 +- .../ports/ignition-transport4/uuid-osx.patch | 26 + .../ports/ignition-transport4/vcpkg.json | 6 +- .../ports/ignition-transport8/vcpkg.json | 4 +- .../ports/ignition-transport9/portfile.cmake | 5 +- .../ports/ignition-transport9/uuid-osx.patch | 26 + .../ports/ignition-transport9/vcpkg.json | 6 +- .../vcpkg/ports/igraph/portfile.cmake | 6 +- .../vcpkg/ports/igraph/vcpkg.json | 3 +- .../vcpkg/ports/iir1/portfile.cmake | 2 +- external_imported/vcpkg/ports/iir1/vcpkg.json | 1 + .../vcpkg/ports/imath/portfile.cmake | 4 +- .../vcpkg/ports/imath/vcpkg.json | 4 +- .../005-fix-imtextureid-define.patch | 9 - .../vcpkg/ports/imgui-sfml/portfile.cmake | 5 +- .../vcpkg/ports/imgui-sfml/vcpkg.json | 4 +- .../vcpkg/ports/imgui/portfile.cmake | 8 +- .../vcpkg/ports/imgui/vcpkg.json | 3 +- .../vcpkg/ports/immer/portfile.cmake | 4 +- .../vcpkg/ports/immer/vcpkg.json | 2 +- .../vcpkg/ports/implot/CMakeLists.txt | 1 + .../vcpkg/ports/implot/portfile.cmake | 4 +- .../vcpkg/ports/implot/vcpkg.json | 3 +- .../vcpkg/ports/infoware/portfile.cmake | 2 - .../vcpkg/ports/infoware/vcpkg.json | 1 + .../vcpkg/ports/intel-ipsec/CMakeLists.txt | 59 - .../intel-ipsec/always-generate-pdb.patch | 80 + .../intel-ipsec-targets-implib.cmake.in | 5 + .../intel-ipsec/intel-ipsec-targets.cmake.in | 4 + .../ports/intel-ipsec/intel-ipsecConfig.cmake | 17 - .../intel-ipsec/intel-ipsecConfig.cmake.in | 16 + .../vcpkg/ports/intel-ipsec/portfile.cmake | 155 +- .../vcpkg/ports/intel-ipsec/vcpkg.json | 6 +- .../ports/intelrdfpmathlib/portfile.cmake | 9 +- .../vcpkg/ports/intelrdfpmathlib/vcpkg.json | 10 +- .../vcpkg/ports/irrlicht/portfile.cmake | 23 +- .../vcpkg/ports/irrlicht/vcpkg.json | 2 +- .../vcpkg/ports/itk/cufftw.patch | 58 - external_imported/vcpkg/ports/itk/hdf5.patch | 20 - .../vcpkg/ports/itk/portfile.cmake | 20 +- .../vcpkg/ports/itk/python_gpu_wrapping.patch | 178 -- external_imported/vcpkg/ports/itk/vcpkg.json | 17 +- .../vcpkg/ports/ixwebsocket/portfile.cmake | 11 +- .../vcpkg/ports/ixwebsocket/vcpkg.json | 11 +- .../vcpkg/ports/jack2/portfile.cmake | 2 - .../vcpkg/ports/jack2/vcpkg.json | 1 + .../ports/jaeger-client-cpp/portfile.cmake | 2 - .../vcpkg/ports/jaeger-client-cpp/vcpkg.json | 1 + .../vcpkg/ports/jasper/portfile.cmake | 11 + .../vcpkg/ports/jasper/vcpkg.json | 23 +- .../vcpkg/ports/json-dto/portfile.cmake | 4 +- .../vcpkg/ports/json-dto/vcpkg.json | 2 +- .../vcpkg/ports/jsoncons/portfile.cmake | 4 +- .../vcpkg/ports/jsoncons/vcpkg.json | 2 +- .../vcpkg/ports/keystone/portfile.cmake | 4 +- .../vcpkg/ports/keystone/vcpkg.json | 2 +- .../kf5archive/control-dependencies.patch | 56 + .../vcpkg/ports/kf5archive/portfile.cmake | 12 +- .../kf5archive/use_cmake_to_find_zstd.patch | 49 - .../vcpkg/ports/kf5archive/vcpkg.json | 12 +- .../vcpkg/ports/kfr/portfile.cmake | 2 - external_imported/vcpkg/ports/kfr/vcpkg.json | 1 + .../vcpkg/ports/kinectsdk1/portfile.cmake | 4 +- .../vcpkg/ports/kinectsdk1/vcpkg.json | 4 +- .../vcpkg/ports/knet/portfile.cmake | 2 - external_imported/vcpkg/ports/knet/vcpkg.json | 1 + .../vcpkg/ports/krabsetw/portfile.cmake | 4 - .../vcpkg/ports/krabsetw/vcpkg.json | 3 +- .../vcpkg/ports/ktx/portfile.cmake | 26 +- external_imported/vcpkg/ports/ktx/vcpkg.json | 9 + .../kubernetes/001-fix-destination.patch | 10 +- .../vcpkg/ports/kubernetes/portfile.cmake | 8 +- .../vcpkg/ports/kubernetes/vcpkg.json | 3 +- .../vcpkg/ports/kwsys/portfile.cmake | 2 - .../vcpkg/ports/kwsys/vcpkg.json | 1 + .../vcpkg/ports/lager/portfile.cmake | 4 +- .../vcpkg/ports/lager/vcpkg.json | 3 +- .../ports/lapack-reference/portfile.cmake | 11 +- .../vcpkg/ports/lapack-reference/vcpkg.json | 10 +- .../vcpkg/ports/lapack/vcpkg.json | 8 +- .../vcpkg/ports/lazy-importer/portfile.cmake | 4 +- .../vcpkg/ports/lazy-importer/vcpkg.json | 2 +- .../vcpkg/ports/lcms/CMakeLists.txt | 2 +- external_imported/vcpkg/ports/lcms/vcpkg.json | 2 +- .../ports/leptonica/Modify-include-dir.patch | 13 - .../ports/leptonica/find-dependency.patch | 20 - .../ports/leptonica/fix-CMakeDependency.patch | 64 + .../ports/leptonica/fix-cmakelists.patch | 12 - .../ports/leptonica/fix-find-libwebp.patch | 27 - .../vcpkg/ports/leptonica/portfile.cmake | 25 +- .../vcpkg/ports/leptonica/vcpkg.json | 3 +- .../ports/leveldb/fix-dependencies.patch | 34 + .../ports/leveldb/leveldbConfig.cmake.in | 8 + .../vcpkg/ports/leveldb/portfile.cmake | 31 +- .../vcpkg/ports/leveldb/vcpkg.json | 33 +- .../vcpkg/ports/levmar/portfile.cmake | 4 - .../vcpkg/ports/levmar/vcpkg.json | 5 +- .../vcpkg/ports/libalkimia/portfile.cmake | 2 + .../vcpkg/ports/libalkimia/vcpkg.json | 2 + .../libao/0001-windows-build-patch.patch | 127 + .../vcpkg/ports/libao/portfile.cmake | 34 + .../vcpkg/ports/libao/vcpkg.json | 16 + .../ports/libarchive/fix-dependencies.patch | 42 +- .../ports/libarchive/pkgconfig-modules.patch | 10 +- .../vcpkg/ports/libarchive/portfile.cmake | 4 +- .../vcpkg/ports/libarchive/usage | 5 +- .../libarchive/vcpkg-cmake-wrapper.cmake.in | 11 +- .../vcpkg/ports/libarchive/vcpkg.json | 3 +- .../vcpkg/ports/libassuan/portfile.cmake | 4 +- .../vcpkg/ports/libassuan/vcpkg.json | 2 +- .../vcpkg/ports/libb2/portfile.cmake | 4 +- .../vcpkg/ports/libb2/vcpkg.json | 2 +- .../vcpkg/ports/libbacktrace/vcpkg.json | 4 +- .../vcpkg/ports/libcanberra/portfile.cmake | 3 +- .../vcpkg/ports/libcanberra/vcpkg.json | 2 +- .../libcpplocate/fix-install-paths.patch | 39 + .../vcpkg/ports/libcpplocate/portfile.cmake | 41 + .../vcpkg/ports/libcpplocate/vcpkg.json | 18 + .../vcpkg/ports/libcrafter/portfile.cmake | 4 +- .../vcpkg/ports/libcrafter/vcpkg.json | 2 +- .../ports/libcurl-simple-https/portfile.cmake | 19 + .../ports/libcurl-simple-https/vcpkg.json | 18 + .../libdatachannel/0001-fix-for-vcpkg.patch | 4 +- .../vcpkg/ports/libdatachannel/portfile.cmake | 14 +- .../ports/libdatachannel/uwp-warnings.patch | 14 + .../vcpkg/ports/libdatachannel/vcpkg.json | 3 +- .../vcpkg/ports/libdatrie/CMakeLists.txt | 35 +- .../vcpkg/ports/libdatrie/fix-trietool.patch | 31 - .../vcpkg/ports/libdatrie/portfile.cmake | 56 +- external_imported/vcpkg/ports/libdatrie/usage | 13 + .../vcpkg/ports/libdatrie/vcpkg.json | 23 +- .../vcpkg/ports/libde265/portfile.cmake | 9 + .../vcpkg/ports/libde265/vcpkg.json | 12 +- .../ports/libdshowcapture/portfile.cmake | 19 +- .../vcpkg/ports/libdshowcapture/vcpkg.json | 13 +- .../vcpkg/ports/libe57/0001_cmake.patch | 19 + .../libe57/0002_replace_tr1_with_cpp11.patch | 39 +- .../vcpkg/ports/libe57/portfile.cmake | 4 +- .../vcpkg/ports/libe57/vcpkg.json | 3 +- .../vcpkg/ports/libe57format/portfile.cmake | 18 + .../vcpkg/ports/libe57format/vcpkg.json | 16 + .../vcpkg/ports/libevent/portfile.cmake | 2 - .../vcpkg/ports/libevent/vcpkg.json | 2 +- .../vcpkg/ports/libevhtp/portfile.cmake | 6 +- .../vcpkg/ports/libevhtp/vcpkg.json | 5 +- .../vcpkg/ports/libexif/portfile.cmake | 2 - .../vcpkg/ports/libexif/vcpkg.json | 4 +- .../vcpkg/ports/libfabric/portfile.cmake | 2 - .../vcpkg/ports/libfabric/vcpkg.json | 3 +- .../vcpkg/ports/libfido2/fix_cmakelists.patch | 49 +- .../vcpkg/ports/libfido2/portfile.cmake | 8 +- .../vcpkg/ports/libfido2/vcpkg.json | 4 +- .../vcpkg/ports/libgeotiff/cmakelists.patch | 18 - .../ports/libgeotiff/fix-staticbuild.patch | 16 - .../ports/libgeotiff/geotiff-config.patch | 14 - .../vcpkg/ports/libgeotiff/portfile.cmake | 7 +- .../ports/libgeotiff/skip-doc-install.patch | 8 +- .../vcpkg/ports/libgeotiff/vcpkg.json | 5 +- .../vcpkg/ports/libgit2/fix-configcmake.patch | 62 +- .../vcpkg/ports/libgit2/portfile.cmake | 8 +- .../vcpkg/ports/libgit2/vcpkg.json | 3 +- .../vcpkg/ports/libgnutls/portfile.cmake | 1 + .../vcpkg/ports/libgnutls/vcpkg.json | 3 +- .../vcpkg/ports/libgo/portfile.cmake | 1 - .../vcpkg/ports/libgo/vcpkg.json | 2 +- .../vcpkg/ports/libgpiod/portfile.cmake | 42 + .../vcpkg/ports/libgpiod/vcpkg.json | 14 + .../vcpkg/ports/libgpod/portfile.cmake | 4 +- .../vcpkg/ports/libgpod/vcpkg.json | 3 +- .../vcpkg/ports/libgwenhywfar/portfile.cmake | 6 +- .../vcpkg/ports/libgwenhywfar/vcpkg.json | 2 +- .../vcpkg/ports/libhdfs3/portfile.cmake | 2 - .../vcpkg/ports/libhdfs3/vcpkg.json | 10 +- .../vcpkg/ports/libheif/portfile.cmake | 6 + .../vcpkg/ports/libheif/vcpkg.json | 3 +- .../vcpkg/ports/libhsplasma/portfile.cmake | 4 +- .../vcpkg/ports/libhsplasma/vcpkg.json | 1 + .../vcpkg/ports/libhv/fix-find_package.patch | 24 + .../vcpkg/ports/libhv/portfile.cmake | 14 +- .../vcpkg/ports/libhv/vcpkg.json | 14 +- .../vcpkg/ports/libiconv/portfile.cmake | 38 +- external_imported/vcpkg/ports/libiconv/usage | 4 + .../vcpkg/ports/libiconv/vcpkg.json | 2 +- .../vcpkg/ports/libidn2/CMakeLists.txt | 13 +- .../vcpkg/ports/libidn2/config.h | 456 +++- .../vcpkg/ports/libidn2/portfile.cmake | 7 +- .../vcpkg/ports/libidn2/vcpkg.json | 7 +- .../vcpkg/ports/libigl/portfile.cmake | 4 +- .../vcpkg/ports/libigl/vcpkg.json | 1 + .../vcpkg/ports/libjpeg-turbo/portfile.cmake | 28 +- .../libjpeg-turbo/vcpkg-cmake-wrapper.cmake | 10 +- .../vcpkg/ports/libjpeg-turbo/vcpkg.json | 4 +- .../vcpkg/ports/libjuice/portfile.cmake | 4 +- .../vcpkg/ports/libjuice/vcpkg.json | 2 +- .../vcpkg/ports/liblinear/portfile.cmake | 2 - .../vcpkg/ports/liblinear/vcpkg.json | 3 +- .../vcpkg/ports/liblsl/portfile.cmake | 26 +- .../ports/liblsl/use-find-package-asio.patch | 15 + .../vcpkg/ports/liblsl/vcpkg.json | 29 +- .../vcpkg/ports/liblzma/portfile.cmake | 91 +- .../ports/liblzma/vcpkg-cmake-wrapper.cmake | 70 +- .../vcpkg/ports/liblzma/vcpkg.json | 5 +- .../vcpkg/ports/liblzma/win_output_name.patch | 8 +- .../vcpkg/ports/libmesh/portfile.cmake | 23 +- .../vcpkg/ports/libmesh/vcpkg.json | 7 +- .../libmicrohttpd/fix-msvc-project.patch | 12 - .../vcpkg/ports/libmicrohttpd/portfile.cmake | 7 +- .../vcpkg/ports/libmicrohttpd/vcpkg.json | 3 +- .../vcpkg/ports/libmodbus/portfile.cmake | 4 +- .../vcpkg/ports/libmodbus/vcpkg.json | 4 +- .../vcpkg/ports/libmpeg2/portfile.cmake | 1 - .../vcpkg/ports/libmpeg2/vcpkg.json | 4 +- .../vcpkg/ports/libmt32emu/portfile.cmake | 11 +- .../vcpkg/ports/libmt32emu/vcpkg.json | 4 +- .../vcpkg/ports/libmupdf/portfile.cmake | 2 - .../vcpkg/ports/libmupdf/vcpkg.json | 3 +- .../vcpkg/ports/libmysql/openssl.patch | 125 + .../vcpkg/ports/libmysql/portfile.cmake | 1 + .../vcpkg/ports/libmysql/vcpkg.json | 2 +- .../vcpkg/ports/libnice/CMakeLists.txt | 159 -- .../vcpkg/ports/libnice/portfile.cmake | 52 +- .../vcpkg/ports/libnice/vcpkg.json | 9 +- .../vcpkg/ports/libnoise/fix-build.patch | 72 +- .../vcpkg/ports/libnoise/portfile.cmake | 15 +- .../vcpkg/ports/libnoise/vcpkg.json | 17 +- .../vcpkg/ports/libosip2/portfile.cmake | 2 - .../vcpkg/ports/libosip2/vcpkg.json | 2 +- .../vcpkg/ports/libosmium/vcpkg.json | 4 +- .../vcpkg/ports/libp7client/portfile.cmake | 2 - .../vcpkg/ports/libp7client/vcpkg.json | 2 +- .../vcpkg/ports/libpff/CMakeLists.txt | 2 +- .../vcpkg/ports/libpff/portfile.cmake | 16 +- .../vcpkg/ports/libpff/vcpkg.json | 15 +- external_imported/vcpkg/ports/libpq/config.pl | 1 + .../ports/libpq/patches/fix-configure.patch | 64 + .../ports/libpq/patches/linux/configure.patch | 4 +- .../patches/mingw/additional-zlib-names.patch | 186 -- .../windows/MSBuildProject-static-lib.patch | 2 +- .../MSBuildProject_fix_gendef_perl.patch | 2 +- .../windows/Mkvcbuild-static-lib.patch | 2 +- .../libpq/patches/windows/Solution.patch | 40 +- .../patches/windows/Solution_DEBUG.patch | 62 +- .../patches/windows/Solution_RELEASE.patch | 77 +- .../patches/windows/fix-compile-flag-Zi.patch | 4 +- .../ports/libpq/patches/windows/install.patch | 38 +- .../patches/windows/minimize_install.patch | 28 +- .../ports/libpq/patches/windows/msgfmt.patch | 18 +- .../patches/windows/openssl_exe_path.patch | 2 +- .../patches/windows/python3_build_DEBUG.patch | 4 +- .../windows/python3_build_RELEASE.patch | 4 +- .../libpq/patches/windows/python_lib.patch | 2 +- .../libpq/patches/windows/tcl_version.patch | 13 + .../patches/windows/win_bison_flex.patch | 8 +- .../vcpkg/ports/libpq/portfile.cmake | 125 +- .../vcpkg/ports/libpq/vcpkg.json | 28 +- .../fix_build_with_apple_clang_13.patch | 15 + .../vcpkg/ports/libpqxx/portfile.cmake | 1 + .../vcpkg/ports/libpqxx/vcpkg.json | 2 +- .../vcpkg/ports/libproxy/portfile.cmake | 2 - .../vcpkg/ports/libproxy/vcpkg.json | 3 +- .../vcpkg/ports/libqcow/portfile.cmake | 1 - .../vcpkg/ports/libqcow/vcpkg.json | 2 +- .../ports/librabbitmq/fix-uwpwarning.patch | 19 +- .../vcpkg/ports/librabbitmq/portfile.cmake | 22 +- .../vcpkg/ports/librabbitmq/vcpkg.json | 12 +- .../vcpkg/ports/libraqm/portfile.cmake | 9 +- .../vcpkg/ports/libraqm/vcpkg.json | 6 +- .../vcpkg/ports/librdkafka/lz4.patch | 28 + .../vcpkg/ports/librdkafka/portfile.cmake | 22 +- .../vcpkg/ports/librdkafka/vcpkg.json | 9 +- .../vcpkg/ports/libressl/portfile.cmake | 16 +- .../vcpkg/ports/libressl/vcpkg.json | 2 +- .../vcpkg/ports/librsync/portfile.cmake | 6 +- .../vcpkg/ports/librsync/vcpkg.json | 1 + .../vcpkg/ports/librtmp/CMakeLists.txt | 1 + .../vcpkg/ports/librtmp/vcpkg.json | 2 +- .../vcpkg/ports/libsass/portfile.cmake | 2 - .../vcpkg/ports/libsass/vcpkg.json | 1 + .../vcpkg/ports/libsbml/portfile.cmake | 6 +- .../vcpkg/ports/libsbml/vcpkg.json | 2 +- .../vcpkg/ports/libslirp/portfile.cmake | 27 + .../vcpkg/ports/libslirp/vcpkg.json | 16 + .../vcpkg/ports/libsmb2/portfile.cmake | 3 +- .../vcpkg/ports/libsmb2/vcpkg.json | 1 + .../vcpkg/ports/libsndfile/fix-mp3lame.patch | 73 + .../vcpkg/ports/libsndfile/fix-uwp.patch | 14 + .../vcpkg/ports/libsndfile/portfile.cmake | 26 +- .../vcpkg/ports/libsndfile/vcpkg.json | 38 +- .../vcpkg/ports/libsnoretoast/portfile.cmake | 4 +- .../vcpkg/ports/libsnoretoast/vcpkg.json | 2 +- .../ports/libsoundio/fix_cmakelists.patch | 11 +- .../vcpkg/ports/libsoundio/portfile.cmake | 3 - .../vcpkg/ports/libsoundio/vcpkg.json | 2 +- .../vcpkg/ports/libspatialite/portfile.cmake | 8 +- .../vcpkg/ports/libspatialite/vcpkg.json | 13 +- .../vcpkg/ports/libspnav/portfile.cmake | 2 - .../vcpkg/ports/libspnav/vcpkg.json | 4 +- .../vcpkg/ports/libsquish/portfile.cmake | 8 +- .../vcpkg/ports/libsquish/vcpkg.json | 13 +- .../vcpkg/ports/libsrt/portfile.cmake | 4 +- .../vcpkg/ports/libsrt/vcpkg.json | 2 +- .../vcpkg/ports/libsrtp/portfile.cmake | 15 +- .../vcpkg/ports/libsrtp/vcpkg.json | 13 +- .../vcpkg/ports/libssh/portfile.cmake | 6 +- .../vcpkg/ports/libssh/vcpkg.json | 2 +- .../vcpkg/ports/libssh2/0002-fix-macros.patch | 19 + .../ports/libssh2/0003-fix-openssl3.patch | 13 + external_imported/vcpkg/ports/libssh2/LICENSE | 41 - .../vcpkg/ports/libssh2/portfile.cmake | 40 +- .../vcpkg/ports/libssh2/vcpkg.json | 22 +- .../vcpkg/ports/libtcod/portfile.cmake | 4 +- .../vcpkg/ports/libtcod/vcpkg.json | 2 +- .../vcpkg/ports/libtins/portfile.cmake | 8 + .../vcpkg/ports/libtins/vcpkg.json | 3 +- .../vcpkg/ports/libtorrent/portfile.cmake | 70 +- .../vcpkg/ports/libtorrent/vcpkg.json | 16 +- .../vcpkg/ports/libu2f-server/CMakeLists.txt | 1 + .../vcpkg/ports/libu2f-server/vcpkg.json | 4 +- .../vcpkg/ports/libudis86/CMakeLists.txt | 3 + .../vcpkg/ports/libudis86/fix-macbuild.patch | 37 + .../vcpkg/ports/libudis86/portfile.cmake | 14 +- .../vcpkg/ports/libudis86/vcpkg.json | 10 +- .../vcpkg/ports/libunistring/portfile.cmake | 4 - .../vcpkg/ports/libunistring/vcpkg.json | 2 +- .../vcpkg/ports/liburing/portfile.cmake | 7 +- external_imported/vcpkg/ports/liburing/usage | 2 +- .../vcpkg/ports/liburing/vcpkg.json | 1 + .../vcpkg/ports/libusb-win32/portfile.cmake | 2 - .../vcpkg/ports/libusb-win32/vcpkg.json | 2 +- .../vcpkg/ports/libusbmuxd/portfile.cmake | 4 +- .../vcpkg/ports/libusbmuxd/vcpkg.json | 4 +- .../vcpkg/ports/libuuid/portfile.cmake | 2 - .../vcpkg/ports/libuuid/vcpkg.json | 4 +- .../vcpkg/ports/libuv/portfile.cmake | 4 +- .../vcpkg/ports/libuv/vcpkg.json | 3 +- .../vcpkg/ports/libvmdk/portfile.cmake | 2 - .../vcpkg/ports/libvmdk/vcpkg.json | 2 +- .../libvorbis/0003-def-mingw-compat.patch | 33 + .../vcpkg/ports/libvorbis/portfile.cmake | 25 +- external_imported/vcpkg/ports/libvorbis/usage | 13 + .../vcpkg/ports/libvorbis/vcpkg.json | 14 +- .../vcpkg/ports/libwandio/configure.lib.patch | 19 +- .../vcpkg/ports/libwandio/vcpkg.json | 5 +- .../ports/libwebsockets/fix-build-error.patch | 2 +- .../libwebsockets/fix-find-openssl.patch | 11 + .../vcpkg/ports/libwebsockets/portfile.cmake | 10 +- .../vcpkg/ports/libwebsockets/vcpkg.json | 6 +- .../vcpkg/ports/libxdiff/portfile.cmake | 4 +- .../vcpkg/ports/libxdiff/vcpkg.json | 4 +- .../ports/libxml2/vcpkg-cmake-wrapper.cmake | 2 +- .../vcpkg/ports/libxml2/vcpkg.json | 3 +- .../vcpkg/ports/libxmp-lite/portfile.cmake | 11 +- .../vcpkg/ports/libxmp-lite/vcpkg.json | 13 +- .../ports/libxslt/0001-Fix-makefile.patch | 6 +- .../vcpkg/ports/libxslt/vcpkg.json | 3 +- .../vcpkg/ports/licensepp/portfile.cmake | 2 - .../vcpkg/ports/licensepp/vcpkg.json | 4 +- .../vcpkg/ports/lilv/portfile.cmake | 2 - external_imported/vcpkg/ports/lilv/vcpkg.json | 3 +- .../lionkor-commandline/add-install.patch | 10 + .../ports/lionkor-commandline/portfile.cmake | 24 + .../ports/lionkor-commandline/vcpkg.json | 18 + .../ports/llfio/issue-83-fix-backport.patch | 35 + .../vcpkg/ports/llfio/portfile.cmake | 84 +- .../vcpkg/ports/llfio/vcpkg.json | 45 +- .../vcpkg/ports/llvm/portfile.cmake | 1 + external_imported/vcpkg/ports/llvm/vcpkg.json | 14 +- .../vcpkg/ports/lmdb/cmake/CMakeLists.txt | 3 +- .../vcpkg/ports/lmdb/portfile.cmake | 18 +- external_imported/vcpkg/ports/lmdb/vcpkg.json | 16 +- .../vcpkg/ports/log4cplus/vcpkg.json | 2 +- .../vcpkg/ports/log4cpp/portfile.cmake | 2 - .../vcpkg/ports/log4cpp/vcpkg.json | 4 +- .../vcpkg/ports/loguru/CMakeLists.txt | 7 + .../vcpkg/ports/loguru/portfile.cmake | 17 +- .../vcpkg/ports/loguru/vcpkg.json | 24 +- .../vcpkg/ports/lua/portfile.cmake | 29 +- external_imported/vcpkg/ports/lua/vcpkg.json | 14 +- .../vcpkg/ports/luajit/portfile.cmake | 16 +- .../vcpkg/ports/luajit/vcpkg.json | 4 +- .../vcpkg/ports/luasec/vcpkg.json | 2 + .../vcpkg/ports/luasocket/portfile.cmake | 31 +- .../vcpkg/ports/luasocket/vcpkg.json | 11 +- .../vcpkg/ports/lunasvg/fix-install.patch | 26 + .../vcpkg/ports/lunasvg/portfile.cmake | 24 + .../vcpkg/ports/lunasvg/vcpkg.json | 17 + .../vcpkg/ports/mailio/portfile.cmake | 13 +- .../vcpkg/ports/mailio/vcpkg.json | 10 +- .../vcpkg/ports/mapnik/portfile.cmake | 6 +- .../vcpkg/ports/mapnik/proj-find-fix.patch | 13 - .../vcpkg/ports/mapnik/vcpkg.json | 5 +- .../vcpkg/ports/marl/portfile.cmake | 19 +- external_imported/vcpkg/ports/marl/vcpkg.json | 14 +- .../vcpkg/ports/mbedtls/portfile.cmake | 17 +- .../vcpkg/ports/mbedtls/vcpkg.json | 14 +- .../vcpkg/ports/mdnsresponder/portfile.cmake | 2 - .../vcpkg/ports/mdnsresponder/vcpkg.json | 3 +- .../vcpkg/ports/mesa/portfile.cmake | 79 +- external_imported/vcpkg/ports/mesa/vcpkg.json | 6 + .../vcpkg/ports/mhook/portfile.cmake | 13 +- .../vcpkg/ports/mhook/vcpkg.json | 13 +- .../ports/milerius-sfml-imgui/cpp11.patch | 12 + .../ports/milerius-sfml-imgui/portfile.cmake | 18 +- .../ports/milerius-sfml-imgui/vcpkg.json | 14 +- .../vcpkg/ports/mimalloc/fix-cmake.patch | 35 +- .../vcpkg/ports/mimalloc/portfile.cmake | 14 +- .../vcpkg/ports/mimalloc/vcpkg.json | 3 +- .../vcpkg/ports/minhook/portfile.cmake | 15 +- .../vcpkg/ports/minhook/vcpkg.json | 16 +- .../vcpkg/ports/minizip-ng/portfile.cmake | 8 +- .../vcpkg/ports/minizip-ng/vcpkg.json | 3 +- .../vcpkg/ports/minizip/portfile.cmake | 1 - .../vcpkg/ports/minizip/vcpkg.json | 2 +- .../vcpkg/ports/mman/portfile.cmake | 11 +- external_imported/vcpkg/ports/mman/vcpkg.json | 11 +- .../vcpkg/ports/mmloader/portfile.cmake | 9 - .../vcpkg/ports/mmloader/vcpkg.json | 1 + .../vcpkg/ports/mnn/portfile.cmake | 1 - external_imported/vcpkg/ports/mnn/vcpkg.json | 2 +- .../vcpkg/ports/mongoose/portfile.cmake | 24 +- .../vcpkg/ports/mongoose/vcpkg.json | 13 +- .../vcpkg/ports/monkeys-audio/portfile.cmake | 2 - .../vcpkg/ports/monkeys-audio/vcpkg.json | 4 +- external_imported/vcpkg/ports/mpc/gmpd.patch | 15 - .../vcpkg/ports/mpc/portfile.cmake | 1 - external_imported/vcpkg/ports/mpc/vcpkg.json | 4 +- external_imported/vcpkg/ports/mpfr/gmpd.patch | 15 - .../vcpkg/ports/mpfr/portfile.cmake | 16 +- .../vcpkg/ports/mpfr/src-only.patch | 20 + external_imported/vcpkg/ports/mpfr/vcpkg.json | 5 +- .../vcpkg/ports/mpg123/portfile.cmake | 6 +- .../vcpkg/ports/mpg123/vcpkg.json | 8 +- .../vcpkg/ports/mpir/portfile.cmake | 129 +- external_imported/vcpkg/ports/mpir/vcpkg.json | 4 +- .../vcpkg/ports/ms-gltf/portfile.cmake | 1 - .../vcpkg/ports/ms-gltf/vcpkg.json | 1 + .../vcpkg/ports/ms-gsl/portfile.cmake | 15 +- .../vcpkg/ports/ms-gsl/vcpkg.json | 15 +- .../vcpkg/ports/msmpi/portfile.cmake | 4 +- .../vcpkg/ports/msmpi/vcpkg.json | 2 +- .../vcpkg/ports/munit/portfile.cmake | 6 +- .../vcpkg/ports/munit/vcpkg.json | 6 +- .../vcpkg/ports/muparser/portfile.cmake | 35 +- .../vcpkg/ports/muparser/vcpkg.json | 15 +- .../vcpkg/ports/murmurhash/portfile.cmake | 1 - .../vcpkg/ports/murmurhash/vcpkg.json | 7 +- .../vcpkg/ports/mvfst/portfile.cmake | 16 +- .../vcpkg/ports/mvfst/vcpkg.json | 2 +- .../vcpkg/ports/mygui/vcpkg.json | 3 +- .../vcpkg/ports/nanobench/portfile.cmake | 4 +- .../vcpkg/ports/nanobench/vcpkg.json | 6 +- .../vcpkg/ports/nanogui/portfile.cmake | 4 +- .../vcpkg/ports/nanogui/vcpkg.json | 4 +- .../vcpkg/ports/nanorange/portfile.cmake | 19 +- .../vcpkg/ports/nanorange/vcpkg.json | 7 +- .../vcpkg/ports/nanovg/portfile.cmake | 2 - .../vcpkg/ports/nanovg/vcpkg.json | 5 +- .../ports/nativefiledialog/portfile.cmake | 13 +- .../vcpkg/ports/nativefiledialog/vcpkg.json | 3 +- .../nayuki-qr-code-generator/CMakeLists.txt | 24 + .../nayuki-qr-code-generator/portfile.cmake | 24 + .../ports/nayuki-qr-code-generator/vcpkg.json | 16 + .../vcpkg/ports/nccl/portfile.cmake | 3 +- external_imported/vcpkg/ports/nccl/vcpkg.json | 4 +- .../vcpkg/ports/ncurses/portfile.cmake | 2 + .../vcpkg/ports/ncurses/vcpkg.json | 5 +- .../ned14-internal-quickcpplib/portfile.cmake | 58 +- .../sha_manifest.cmake | 4 +- .../ned14-internal-quickcpplib/vcpkg.json | 31 +- .../ports/netcdf-c/fix-dependency-mpi.patch | 11 + .../vcpkg/ports/netcdf-c/portfile.cmake | 1 + .../vcpkg/ports/netcdf-c/vcpkg.json | 2 +- .../vcpkg/ports/nethost/portfile.cmake | 2 - .../vcpkg/ports/nethost/vcpkg.json | 7 +- .../vcpkg/ports/nettle/compile.patch | 39 + .../vcpkg/ports/nettle/gmp.patch | 205 -- .../vcpkg/ports/nettle/hogweed-x64.def | 288 +++ .../vcpkg/ports/nettle/hogweed-x86.def | 281 +++ .../vcpkg/ports/nettle/libname-windows.patch | 67 + .../vcpkg/ports/nettle/name.dir.patch | 381 --- .../vcpkg/ports/nettle/nettle-x64.def | 509 ++++ .../vcpkg/ports/nettle/nettle-x86.def | 496 ++++ .../vcpkg/ports/nettle/portfile.cmake | 222 +- .../vcpkg/ports/nettle/remove_gmpd.patch | 44 + .../vcpkg/ports/nettle/runtime.patch | 168 -- .../vcpkg/ports/nettle/vcpkg.json | 14 +- .../vcpkg/ports/nettle/yasm.patch | 96 + .../ports/networkdirect-sdk/portfile.cmake | 3 - .../vcpkg/ports/networkdirect-sdk/vcpkg.json | 4 +- .../vcpkg/ports/ngspice/Fix-C2065.patch | 170 ++ .../vcpkg/ports/ngspice/portfile.cmake | 48 +- .../vcpkg/ports/ngspice/vcpkg.json | 4 +- .../vcpkg/ports/nlohmann-json/portfile.cmake | 12 +- .../vcpkg/ports/nlohmann-json/usage | 12 + .../vcpkg/ports/nlohmann-json/vcpkg.json | 3 +- .../vcpkg/ports/nmslib/portfile.cmake | 2 - .../vcpkg/ports/nmslib/vcpkg.json | 1 + .../vcpkg/ports/nnpack/fix-cmakelists.patch | 4 +- .../vcpkg/ports/nnpack/portfile.cmake | 6 +- .../vcpkg/ports/nnpack/vcpkg.json | 11 +- .../vcpkg/ports/nspr/portfile.cmake | 94 + external_imported/vcpkg/ports/nspr/vcpkg.json | 14 + .../ports/nss/01-nspr-no-lib-prefix.patch | 12 + .../nss/02-gen-debug-info-for-release.patch | 15 + .../vcpkg/ports/nss/portfile.cmake | 208 ++ external_imported/vcpkg/ports/nss/vcpkg.json | 20 + .../vcpkg/ports/nsync/export-targets.patch | 36 + .../vcpkg/ports/nsync/portfile.cmake | 14 +- .../vcpkg/ports/nsync/vcpkg.json | 14 +- .../ignore-pdb-install-symbols-in-lib.patch | 12 + .../ports/nu-book-zxing-cpp/portfile.cmake | 37 + .../vcpkg/ports/nu-book-zxing-cpp/vcpkg.json | 18 + .../ports/nvtt/fix-intrinsic-function.patch | 19 + .../vcpkg/ports/nvtt/portfile.cmake | 20 +- external_imported/vcpkg/ports/nvtt/vcpkg.json | 11 +- .../vcpkg/ports/oatpp-consul/portfile.cmake | 15 +- .../vcpkg/ports/oatpp-consul/vcpkg.json | 12 +- .../vcpkg/ports/oatpp-curl/portfile.cmake | 15 +- .../vcpkg/ports/oatpp-curl/vcpkg.json | 12 +- .../vcpkg/ports/oatpp-libressl/portfile.cmake | 15 +- .../vcpkg/ports/oatpp-libressl/vcpkg.json | 12 +- .../vcpkg/ports/oatpp-mbedtls/portfile.cmake | 15 +- .../vcpkg/ports/oatpp-mbedtls/vcpkg.json | 12 +- .../vcpkg/ports/oatpp-mongo/portfile.cmake | 11 +- .../vcpkg/ports/oatpp-mongo/vcpkg.json | 12 +- .../vcpkg/ports/oatpp-openssl/portfile.cmake | 8 +- .../vcpkg/ports/oatpp-openssl/vcpkg.json | 2 +- .../oatpp-postgresql/fix-windows-build.patch | 13 - .../ports/oatpp-postgresql/portfile.cmake | 13 +- .../vcpkg/ports/oatpp-postgresql/vcpkg.json | 12 +- .../vcpkg/ports/oatpp-sqlite/portfile.cmake | 15 +- .../vcpkg/ports/oatpp-sqlite/vcpkg.json | 12 +- .../oatpp-ssdp/fix_String_to_string.patch | 20 + .../ports/oatpp-ssdp/fix_win_close.patch | 20 + .../vcpkg/ports/oatpp-ssdp/portfile.cmake | 28 + .../vcpkg/ports/oatpp-ssdp/vcpkg.json | 17 + .../vcpkg/ports/oatpp-swagger/portfile.cmake | 22 +- .../vcpkg/ports/oatpp-swagger/vcpkg.json | 12 +- .../ports/oatpp-websocket/portfile.cmake | 22 +- .../vcpkg/ports/oatpp-websocket/vcpkg.json | 12 +- .../vcpkg/ports/oatpp-zlib/portfile.cmake | 11 +- .../vcpkg/ports/oatpp-zlib/vcpkg.json | 12 +- .../vcpkg/ports/oatpp/fix-windows-build.patch | 21 - .../vcpkg/ports/oatpp/portfile.cmake | 20 +- .../vcpkg/ports/oatpp/vcpkg.json | 14 +- .../ports/ocilib/fix-DisableWC4191.patch | 40 + .../vcpkg/ports/ocilib/portfile.cmake | 7 +- .../vcpkg/ports/ocilib/vcpkg.json | 2 + .../ogre-next/fix_find_package_sdl2.patch | 83 +- .../vcpkg/ports/ogre-next/portfile.cmake | 64 +- .../ports/ogre-next/rename_config_cmake.patch | 22 - .../ports/ogre-next/toolchain_fixes.patch | 88 +- .../vcpkg/ports/ogre-next/vcpkg.json | 12 +- .../vcpkg/ports/ogre/portfile.cmake | 36 +- external_imported/vcpkg/ports/ogre/vcpkg.json | 13 +- .../ois/0001_install_pkgconfig_win32.patch | 29 + .../vcpkg/ports/ois/portfile.cmake | 2 + external_imported/vcpkg/ports/ois/vcpkg.json | 2 + .../vcpkg/ports/onednn/portfile.cmake | 2 - .../vcpkg/ports/onednn/vcpkg.json | 1 + .../ports/onnx/fix-dependency-protobuf.patch | 12 + .../vcpkg/ports/onnx/portfile.cmake | 1 + external_imported/vcpkg/ports/onnx/vcpkg.json | 1 + .../ports/onnxruntime-gpu/portfile.cmake | 2 - .../vcpkg/ports/onnxruntime-gpu/vcpkg.json | 3 +- .../vcpkg/ports/open62541/openssl.patch | 22 + .../vcpkg/ports/open62541/portfile.cmake | 9 +- .../vcpkg/ports/open62541/vcpkg.json | 6 +- .../vcpkg/ports/openal-soft/portfile.cmake | 2 - .../vcpkg/ports/openal-soft/vcpkg.json | 2 +- .../ports/openblas/fix-marco-conflict.patch | 244 -- .../vcpkg/ports/openblas/portfile.cmake | 5 +- .../vcpkg/ports/openblas/vcpkg.json | 3 +- .../vcpkg/ports/opencc/portfile.cmake | 6 +- .../vcpkg/ports/opencc/vcpkg.json | 6 +- .../ports/opencolorio/fix-buildTools.patch | 13 + .../ports/opencolorio/fix-dependency.patch | 117 + .../vcpkg/ports/opencolorio/portfile.cmake | 22 +- .../vcpkg/ports/opencolorio/vcpkg.json | 5 +- .../vcpkg/ports/opencv/vcpkg.json | 15 +- .../vcpkg/ports/opencv2/portfile.cmake | 12 +- .../vcpkg/ports/opencv2/vcpkg.json | 6 +- .../vcpkg/ports/opencv3/0012-fix-zlib.patch | 14 + .../vcpkg/ports/opencv3/portfile.cmake | 8 +- .../vcpkg/ports/opencv3/vcpkg.json | 3 +- .../vcpkg/ports/opencv4/0012-fix-zlib.patch | 14 + .../vcpkg/ports/opencv4/0013-fix-opengl.patch | 11 + .../ports/opencv4/0014-fix-gstreamer.patch | 29 + .../ports/opencv4/0015-fix-freetype.patch | 16 + .../opencv4/0016-fix-freetype-contrib.patch | 17 + .../vcpkg/ports/opencv4/portfile.cmake | 78 +- .../vcpkg/ports/opencv4/vcpkg.json | 19 +- .../vcpkg/ports/opendnp3/deps/asio.cmake | 1 + .../vcpkg/ports/opendnp3/portfile.cmake | 31 +- .../vcpkg/ports/opendnp3/vcpkg.json | 1 + .../vcpkg/ports/opengl/glu.pc.in | 10 + .../vcpkg/ports/opengl/opengl.pc.in | 9 + .../vcpkg/ports/opengl/portfile.cmake | 12 + .../vcpkg/ports/opengl/vcpkg.json | 3 +- .../openimageio/fix-openjpeg-linkage.patch | 13 + .../vcpkg/ports/openimageio/portfile.cmake | 9 +- .../vcpkg/ports/openimageio/vcpkg.json | 8 +- .../vcpkg/ports/openmpi/portfile.cmake | 4 +- .../vcpkg/ports/openmpi/vcpkg.json | 2 +- .../vcpkg/ports/openmvg/0002-eigen-3.4.patch | 13 + .../vcpkg/ports/openmvg/build_fixes.patch | 63 +- .../vcpkg/ports/openmvg/portfile.cmake | 3 + .../vcpkg/ports/openmvg/vcpkg.json | 2 + .../vcpkg/ports/openssl/portfile.cmake | 18 +- .../vcpkg/ports/openssl/unix/CMakeLists.txt | 14 +- .../vcpkg/ports/openssl/unix/portfile.cmake | 16 +- .../ports/openssl/uwp/EnableUWPSupport.patch | 170 -- .../vcpkg/ports/openssl/uwp/portfile.cmake | 11 +- .../openssl/vcpkg-cmake-wrapper.cmake.in | 79 +- .../vcpkg/ports/openssl/vcpkg.json | 4 +- .../ports/openssl/windows/portfile.cmake | 39 +- .../vcpkg/ports/opensubdiv/portfile.cmake | 4 +- .../vcpkg/ports/opensubdiv/vcpkg.json | 2 +- .../ports/opentelemetry-cpp/portfile.cmake | 4 +- .../vcpkg/ports/opentelemetry-cpp/vcpkg.json | 4 +- .../vcpkg/ports/opentracing/portfile.cmake | 2 - .../vcpkg/ports/opentracing/vcpkg.json | 4 +- .../vcpkg/ports/openvdb/0003-fix-cmake.patch | 74 +- .../ports/openvdb/fix-Target-notfound.patch | 19 + .../vcpkg/ports/openvdb/portfile.cmake | 5 +- .../vcpkg/ports/openvdb/vcpkg.json | 3 +- .../vcpkg/ports/openvr/portfile.cmake | 1 - .../vcpkg/ports/openvr/vcpkg.json | 4 +- .../ports/openxr-loader/fix-jinja2.patch | 23 + .../vcpkg/ports/openxr-loader/portfile.cmake | 19 +- .../vcpkg/ports/openxr-loader/vcpkg.json | 7 +- .../vcpkg/ports/osgearth/blend2d-fix.patch | 15 + .../vcpkg/ports/osgearth/portfile.cmake | 1 + .../vcpkg/ports/osgearth/vcpkg.json | 2 +- .../vcpkg/ports/otl/portfile.cmake | 20 +- external_imported/vcpkg/ports/otl/vcpkg.json | 4 +- .../vcpkg/ports/pango/portfile.cmake | 4 +- .../vcpkg/ports/pango/vcpkg.json | 3 +- .../vcpkg/ports/pangomm/portfile.cmake | 2 - .../vcpkg/ports/pangomm/vcpkg.json | 2 + .../ports/parallel-hashmap/portfile.cmake | 11 +- .../vcpkg/ports/parallel-hashmap/vcpkg.json | 12 +- .../vcpkg/ports/paraview/portfile.cmake | 3 + .../vcpkg/ports/paraview/vcpkg.json | 1 + .../vcpkg/ports/pbc/portfile.cmake | 2 - external_imported/vcpkg/ports/pbc/vcpkg.json | 6 +- .../vcpkg/ports/pcapplusplus/CMakeLists.txt | 106 + .../vcpkg/ports/pcapplusplus/portfile.cmake | 102 +- .../vcpkg/ports/pcapplusplus/vcpkg.json | 8 +- .../ports/pcl/Workaround-ICE-in-release.patch | 20 + .../vcpkg/ports/pcl/fix-error-C3052.patch | 20 + .../vcpkg/ports/pcl/fix-find-qhull.patch | 20 +- .../vcpkg/ports/pcl/fix-namespace-cub.patch | 130 ++ .../vcpkg/ports/pcl/no-absolute.patch | 21 + .../vcpkg/ports/pcl/portfile.cmake | 9 +- external_imported/vcpkg/ports/pcl/vcpkg.json | 3 +- .../ports/pdal-c/cmake-project-include.cmake | 3 + .../vcpkg/ports/pdal-c/fix-docs-version.patch | 14 - .../vcpkg/ports/pdal-c/portfile.cmake | 36 +- .../ports/pdal-c/preserve-install-dir.patch | 13 - .../vcpkg/ports/pdal-c/remove-tests.patch | 12 - .../vcpkg/ports/pdal-c/vcpkg.json | 14 +- .../0001-win32_compiler_options.cmake.patch | 14 - .../pdal/0002-no-source-dir-writes.patch | 28 - .../ports/pdal/0003-fix-copy-vendor.patch | 79 +- .../pdal/0004-fix-const-overloaded.patch | 13 - .../vcpkg/ports/pdal/FindGEOS.cmake | 13 - .../vcpkg/ports/pdal/fix-CPL_DLL.patch | 15 - .../vcpkg/ports/pdal/fix-dependency.patch | 255 +- .../ports/pdal/fix-find-library-suffix.patch | 16 + .../pdal/fix-unix-compiler-options.patch | 13 + .../vcpkg/ports/pdal/libpq.patch | 33 - .../ports/pdal/no-pkgconfig-requires.patch | 12 + .../vcpkg/ports/pdal/no-rpath.patch | 12 + .../vcpkg/ports/pdal/portfile.cmake | 111 +- external_imported/vcpkg/ports/pdal/usage | 9 + .../vcpkg/ports/pdal/use-vcpkg-boost.patch | 66 + external_imported/vcpkg/ports/pdal/vcpkg.json | 108 +- .../vcpkg/ports/pegtl/portfile.cmake | 8 +- .../vcpkg/ports/pegtl/vcpkg.json | 3 +- .../vcpkg/ports/pfring/portfile.cmake | 20 +- .../vcpkg/ports/pfring/vcpkg.json | 5 +- .../vcpkg/ports/physx/portfile.cmake | 2 - .../vcpkg/ports/physx/vcpkg.json | 2 + .../vcpkg/ports/piex/CMakeLists.txt | 2 + .../vcpkg/ports/piex/portfile.cmake | 13 +- external_imported/vcpkg/ports/piex/vcpkg.json | 12 +- .../ports/pixel/001-prevent-examples.patch | 38 + .../vcpkg/ports/pixel/portfile.cmake | 23 +- .../vcpkg/ports/pixel/vcpkg.json | 9 +- .../ports/pixman/no-host-cpu-checks.patch | 108 + .../vcpkg/ports/pixman/portfile.cmake | 4 +- .../vcpkg/ports/pixman/vcpkg.json | 3 +- .../vcpkg/ports/pkgconf/portfile.cmake | 53 + .../vcpkg/ports/pkgconf/vcpkg.json | 2 +- .../vcpkg/ports/plibsys/portfile.cmake | 4 - .../vcpkg/ports/plibsys/vcpkg.json | 4 +- .../vcpkg/ports/pmdk/portfile.cmake | 2 - external_imported/vcpkg/ports/pmdk/vcpkg.json | 1 + .../vcpkg/ports/poco/portfile.cmake | 4 +- external_imported/vcpkg/ports/poco/vcpkg.json | 4 +- .../vcpkg/ports/polyhook2/portfile.cmake | 40 +- .../vcpkg/ports/polyhook2/vcpkg.json | 14 +- .../0002-remove-test-subdirectory.patch | 24 - .../0003-fix-gperf-not-recognized.patch | 15 - .../poppler/0004-disable-clang-format.patch | 12 - .../ports/poppler/cmake-project-include.cmake | 29 + .../poppler/export-unofficial-poppler.patch | 36 + .../vcpkg/ports/poppler/portfile.cmake | 73 +- .../poppler/unofficial-poppler-config.cmake | 22 + external_imported/vcpkg/ports/poppler/usage | 6 + .../vcpkg/ports/poppler/vcpkg.json | 73 +- .../popsift/fix_missing_thrust_include.patch | 21 + .../vcpkg/ports/popsift/portfile.cmake | 20 +- .../vcpkg/ports/popsift/vcpkg.json | 4 +- .../vcpkg/ports/portaudio/portfile.cmake | 1 - .../vcpkg/ports/portaudio/vcpkg.json | 2 +- .../vcpkg/ports/portmidi/portfile.cmake | 2 - .../vcpkg/ports/portmidi/vcpkg.json | 1 + .../vcpkg/ports/portsmf/portfile.cmake | 2 - .../vcpkg/ports/portsmf/vcpkg.json | 1 + .../vcpkg/ports/presentmon/portfile.cmake | 2 - .../vcpkg/ports/presentmon/vcpkg.json | 1 + .../fix-proj4-targets-cmake.patch | 0 .../{proj4 => proj}/fix-win-output-name.patch | 0 .../vcpkg/ports/proj/portfile.cmake | 70 +- .../ports/{proj4 => proj}/tools-cmake.patch | 10 +- .../vcpkg/ports/{proj4 => proj}/usage | 2 +- external_imported/vcpkg/ports/proj/vcpkg.json | 58 +- .../vcpkg/ports/proj4/pkgconfig.patch | 53 - .../vcpkg/ports/proj4/portfile.cmake | 71 +- .../vcpkg/ports/proj4/vcpkg.json | 55 +- .../ports/protobuf/fix-static-build.patch | 39 +- .../vcpkg/ports/protobuf/fix-uwp-build.patch | 13 - .../vcpkg/ports/protobuf/portfile.cmake | 44 +- .../vcpkg/ports/protobuf/vcpkg.json | 11 +- .../ports/protozero/fix-builderror.patch | 13 + .../vcpkg/ports/protozero/portfile.cmake | 8 +- .../vcpkg/ports/protozero/vcpkg.json | 12 +- .../proxygen/fix-duplicated-target.patch | 16 - .../proxygen/fix-zstd-zlib-dependency.patch | 30 + .../vcpkg/ports/proxygen/portfile.cmake | 21 +- .../vcpkg/ports/proxygen/vcpkg.json | 11 +- .../vcpkg/ports/ptex/portfile.cmake | 4 +- external_imported/vcpkg/ports/ptex/vcpkg.json | 2 +- .../vcpkg/ports/pybind11/portfile.cmake | 8 +- .../vcpkg/ports/pybind11/vcpkg.json | 4 +- .../vcpkg/ports/python2/008-bz2d.patch | 19 + .../vcpkg/ports/python2/portfile.cmake | 58 + .../vcpkg/ports/python2/vcpkg.json | 5 +- .../python3/0008-fix-parallel-install.patch | 15 - .../ports/python3/0009-python-embed.pc.patch | 11 - .../vcpkg/ports/python3/0009-python.pc.patch | 16 + .../vcpkg/ports/python3/0010-bz2d.patch | 19 + .../vcpkg/ports/python3/portfile.cmake | 70 +- .../vcpkg/ports/python3/vcpkg.json | 5 +- .../vcpkg/ports/qhttpengine/portfile.cmake | 5 + .../vcpkg/ports/qhttpengine/vcpkg.json | 1 + .../vcpkg/ports/qhull/portfile.cmake | 54 +- external_imported/vcpkg/ports/qhull/usage | 9 + .../vcpkg/ports/qhull/vcpkg.json | 17 +- .../vcpkg/ports/qnnpack/portfile.cmake | 1 - .../vcpkg/ports/qnnpack/use-packages.patch | 4 +- .../vcpkg/ports/qnnpack/vcpkg.json | 2 + .../ports/qpid-proton/fix-openssl3.patch | 22 + .../vcpkg/ports/qpid-proton/portfile.cmake | 20 +- .../ports/qpid-proton/qpid-protonConfig.cmake | 4 + .../vcpkg/ports/qpid-proton/vcpkg.json | 2 +- external_imported/vcpkg/ports/qt/vcpkg.json | 3 +- .../vcpkg/ports/qt5-3d/portfile.cmake | 2 +- .../vcpkg/ports/qt5-3d/vcpkg.json | 4 +- .../vcpkg/ports/qt5-activeqt/vcpkg.json | 4 +- .../vcpkg/ports/qt5-androidextras/vcpkg.json | 4 +- .../qt5-base/cmake/qt_build_submodule.cmake | 8 +- .../cmake/qt_download_submodule.cmake | 2 +- .../ports/qt5-base/cmake/qt_port_hashes.cmake | 95 +- .../cmake/qt_port_hashes_latest.cmake | 92 +- .../qt5-base/patches/limits_include.patch | 38 - .../vcpkg/ports/qt5-base/patches/zstdd.patch | 16 - .../vcpkg/ports/qt5-base/portfile.cmake | 6 +- .../vcpkg/ports/qt5-base/vcpkg.json | 5 +- .../vcpkg/ports/qt5-charts/vcpkg.json | 4 +- .../vcpkg/ports/qt5-connectivity/vcpkg.json | 4 +- .../vcpkg/ports/qt5-datavis3d/vcpkg.json | 4 +- .../ports/qt5-declarative/portfile.cmake | 5 +- .../vcpkg/ports/qt5-declarative/vcpkg.json | 4 +- .../vcpkg/ports/qt5-doc/vcpkg.json | 4 +- .../vcpkg/ports/qt5-gamepad/vcpkg.json | 4 +- .../ports/qt5-graphicaleffects/vcpkg.json | 4 +- .../ports/qt5-imageformats/portfile.cmake | 2 +- .../vcpkg/ports/qt5-imageformats/vcpkg.json | 4 +- .../vcpkg/ports/qt5-location/vcpkg.json | 4 +- .../vcpkg/ports/qt5-macextras/vcpkg.json | 4 +- .../vcpkg/ports/qt5-mqtt/portfile.cmake | 28 +- .../vcpkg/ports/qt5-mqtt/vcpkg.json | 4 +- .../vcpkg/ports/qt5-multimedia/vcpkg.json | 4 +- .../vcpkg/ports/qt5-networkauth/vcpkg.json | 4 +- .../vcpkg/ports/qt5-purchasing/vcpkg.json | 4 +- .../vcpkg/ports/qt5-quickcontrols/vcpkg.json | 4 +- .../vcpkg/ports/qt5-quickcontrols2/vcpkg.json | 4 +- .../vcpkg/ports/qt5-remoteobjects/vcpkg.json | 4 +- .../vcpkg/ports/qt5-script/vcpkg.json | 4 +- .../vcpkg/ports/qt5-scxml/vcpkg.json | 4 +- .../vcpkg/ports/qt5-sensors/vcpkg.json | 4 +- .../vcpkg/ports/qt5-serialbus/vcpkg.json | 4 +- .../vcpkg/ports/qt5-serialport/vcpkg.json | 4 +- .../vcpkg/ports/qt5-speech/vcpkg.json | 4 +- .../vcpkg/ports/qt5-svg/vcpkg.json | 4 +- .../vcpkg/ports/qt5-tools/vcpkg.json | 4 +- .../vcpkg/ports/qt5-translations/vcpkg.json | 4 +- .../ports/qt5-virtualkeyboard/vcpkg.json | 4 +- .../vcpkg/ports/qt5-wayland/vcpkg.json | 4 +- .../vcpkg/ports/qt5-webchannel/vcpkg.json | 4 +- .../vcpkg/ports/qt5-webengine/build_1.patch | 6 +- .../vcpkg/ports/qt5-webengine/build_2.patch | 15 +- .../vcpkg/ports/qt5-webengine/build_3.patch | 17 - .../vcpkg/ports/qt5-webengine/portfile.cmake | 3 +- .../vcpkg/ports/qt5-webengine/vcpkg.json | 5 +- .../vcpkg/ports/qt5-webglplugin/vcpkg.json | 4 +- .../vcpkg/ports/qt5-websockets/vcpkg.json | 4 +- .../vcpkg/ports/qt5-webview/vcpkg.json | 4 +- .../qt5-winextras/patches/require_quick.patch | 12 + .../patches/unrequire_quick.patch | 12 + .../vcpkg/ports/qt5-winextras/portfile.cmake | 15 +- .../vcpkg/ports/qt5-winextras/vcpkg.json | 22 +- .../vcpkg/ports/qt5-x11extras/vcpkg.json | 4 +- .../vcpkg/ports/qt5-xmlpatterns/vcpkg.json | 4 +- external_imported/vcpkg/ports/qt5/vcpkg.json | 20 +- .../vcpkg/ports/qt5compat/portfile.cmake | 2 + .../vcpkg/ports/qt5compat/vcpkg.json | 3 +- .../vcpkg/ports/qtactiveqt/portfile.cmake | 1 + .../vcpkg/ports/qtactiveqt/vcpkg.json | 3 +- .../ports/qtapplicationmanager/portfile.cmake | 2 +- .../ports/qtapplicationmanager/vcpkg.json | 4 +- .../qtbase/cmake/qt_install_submodule.cmake | 90 +- .../ports/qtbase/cmake/qt_port_details.cmake | 83 +- .../ports/qtbase/dont_force_cmakecache.patch | 62 +- .../vcpkg/ports/qtbase/env.patch | 16 + .../vcpkg/ports/qtbase/portfile.cmake | 102 +- .../vcpkg/ports/qtbase/vcpkg.json | 29 +- .../vcpkg/ports/qtcharts/portfile.cmake | 1 + .../vcpkg/ports/qtcharts/vcpkg.json | 3 +- .../vcpkg/ports/qtcoap/vcpkg.json | 3 +- .../vcpkg/ports/qtconnectivity/vcpkg.json | 3 +- .../vcpkg/ports/qtdatavis3d/vcpkg.json | 3 +- .../vcpkg/ports/qtdeclarative/portfile.cmake | 4 +- .../vcpkg/ports/qtdeclarative/vcpkg.json | 4 +- .../vcpkg/ports/qtdeviceutilities/vcpkg.json | 3 +- .../vcpkg/ports/qtdoc/vcpkg.json | 3 +- .../vcpkg/ports/qtimageformats/portfile.cmake | 4 + .../vcpkg/ports/qtimageformats/vcpkg.json | 3 +- .../ports/qtinterfaceframework/portfile.cmake | 6 +- .../ports/qtinterfaceframework/vcpkg.json | 7 +- .../vcpkg/ports/qtlocation/vcpkg.json | 3 +- .../vcpkg/ports/qtlottie/portfile.cmake | 1 + .../vcpkg/ports/qtlottie/vcpkg.json | 3 +- .../vcpkg/ports/qtmqtt/vcpkg.json | 3 +- .../vcpkg/ports/qtmultimedia/portfile.cmake | 4 + .../vcpkg/ports/qtmultimedia/vcpkg.json | 3 +- .../vcpkg/ports/qtnetworkauth/vcpkg.json | 3 +- .../vcpkg/ports/qtopcua/portfile.cmake | 3 +- .../vcpkg/ports/qtopcua/vcpkg.json | 3 +- .../vcpkg/ports/qtpositioning/portfile.cmake | 1 + .../vcpkg/ports/qtpositioning/vcpkg.json | 3 +- .../vcpkg/ports/qtquick3d/portfile.cmake | 1 + .../vcpkg/ports/qtquick3d/vcpkg.json | 3 +- .../vcpkg/ports/qtquicktimeline/vcpkg.json | 3 +- .../ports/qtremoteobjects/portfile.cmake | 1 + .../vcpkg/ports/qtremoteobjects/vcpkg.json | 3 +- .../vcpkg/ports/qtscxml/portfile.cmake | 1 + .../vcpkg/ports/qtscxml/vcpkg.json | 3 +- .../vcpkg/ports/qtsensors/portfile.cmake | 1 + .../vcpkg/ports/qtsensors/vcpkg.json | 3 +- .../vcpkg/ports/qtserialbus/vcpkg.json | 3 +- .../vcpkg/ports/qtserialport/vcpkg.json | 3 +- .../vcpkg/ports/qtshadertools/vcpkg.json | 3 +- .../vcpkg/ports/qtsvg/vcpkg.json | 3 +- .../vcpkg/ports/qttools/no_src_changes.patch | 41 + .../vcpkg/ports/qttools/portfile.cmake | 13 +- .../vcpkg/ports/qttools/vcpkg.json | 3 +- .../vcpkg/ports/qttranslations/portfile.cmake | 8 +- .../vcpkg/ports/qttranslations/vcpkg.json | 3 +- .../vcpkg/ports/qtvirtualkeyboard/vcpkg.json | 3 +- .../vcpkg/ports/qtwayland/portfile.cmake | 1 + .../vcpkg/ports/qtwayland/vcpkg.json | 3 +- .../vcpkg/ports/qtwebchannel/portfile.cmake | 1 + .../vcpkg/ports/qtwebchannel/vcpkg.json | 3 +- .../vcpkg/ports/qtwebengine/portfile.cmake | 27 +- .../vcpkg/ports/qtwebengine/vcpkg.json | 7 +- .../vcpkg/ports/qtwebsockets/portfile.cmake | 1 + .../vcpkg/ports/qtwebsockets/vcpkg.json | 3 +- .../vcpkg/ports/qtwebview/portfile.cmake | 3 + .../vcpkg/ports/qtwebview/vcpkg.json | 3 +- .../vcpkg/ports/quantlib/portfile.cmake | 20 +- external_imported/vcpkg/ports/quantlib/usage | 4 + .../vcpkg/ports/quantlib/vcpkg.json | 13 +- .../ports/quickfix/00001-fix-build.patch | 24 +- .../vcpkg/ports/quickfix/portfile.cmake | 19 +- .../vcpkg/ports/quickfix/vcpkg.json | 15 +- .../vcpkg/ports/quill/portfile.cmake | 4 +- .../vcpkg/ports/quill/vcpkg.json | 2 +- .../vcpkg/ports/qwtw/portfile.cmake | 4 +- external_imported/vcpkg/ports/qwtw/vcpkg.json | 4 +- .../vcpkg/ports/randomstr/portfile.cmake | 18 + .../vcpkg/ports/randomstr/vcpkg.json | 16 + .../vcpkg/ports/raylib/fix-linkGlfw.patch | 29 + .../vcpkg/ports/raylib/portfile.cmake | 23 +- external_imported/vcpkg/ports/raylib/usage | 5 - .../ports/raylib/vcpkg-cmake-wrapper.cmake | 11 - .../vcpkg/ports/raylib/vcpkg.json | 6 + .../vcpkg/ports/readline-unix/portfile.cmake | 4 +- .../vcpkg/ports/readline-unix/vcpkg.json | 6 +- .../vcpkg/ports/readline-win32/vcpkg.json | 7 +- .../realsense2/fix-dependency-glfw3.patch | 13 - .../vcpkg/ports/realsense2/portfile.cmake | 9 +- .../vcpkg/ports/realsense2/vcpkg.json | 11 +- .../ports/redis-plus-plus/portfile.cmake | 4 +- .../vcpkg/ports/redis-plus-plus/vcpkg.json | 3 +- .../vcpkg/ports/rendergraph/portfile.cmake | 37 + .../vcpkg/ports/rendergraph/vcpkg.json | 19 + .../vcpkg/ports/replxx/portfile.cmake | 2 - .../vcpkg/ports/replxx/vcpkg.json | 1 + .../vcpkg/ports/reproc/portfile.cmake | 2 - .../vcpkg/ports/reproc/vcpkg.json | 1 + .../vcpkg/ports/restclient-cpp/portfile.cmake | 17 +- .../vcpkg/ports/restclient-cpp/vcpkg.json | 14 +- .../vcpkg/ports/rhash/portfile.cmake | 2 - .../vcpkg/ports/rhash/vcpkg.json | 4 +- .../vcpkg/ports/rhasheq/portfile.cmake | 18 + .../vcpkg/ports/rhasheq/vcpkg.json | 19 + .../ports/robin-hood-hashing/portfile.cmake | 4 +- .../vcpkg/ports/robin-hood-hashing/vcpkg.json | 2 +- .../vcpkg/ports/rs-core-lib/portfile.cmake | 12 - .../vcpkg/ports/rs-core-lib/vcpkg.json | 7 - .../vcpkg/ports/rsasynccpp/portfile.cmake | 7 +- .../vcpkg/ports/rsasynccpp/vcpkg.json | 1 + .../vcpkg/ports/rsm-binary-io/portfile.cmake | 1 - .../vcpkg/ports/rsm-binary-io/vcpkg.json | 1 + .../vcpkg/ports/rsm-bsa/portfile.cmake | 12 +- .../vcpkg/ports/rsm-bsa/vcpkg.json | 4 +- .../vcpkg/ports/rsm-mmio/portfile.cmake | 1 - .../vcpkg/ports/rsm-mmio/vcpkg.json | 2 +- .../vcpkg/ports/rsocket/fix-folly.patch | 13 + .../vcpkg/ports/rsocket/portfile.cmake | 1 + .../vcpkg/ports/rsocket/vcpkg.json | 1 + .../rtabmap/0001-add-bigobj-for-msvc.patch | 24 + .../vcpkg/ports/rtabmap/portfile.cmake | 14 +- .../vcpkg/ports/rtabmap/vcpkg.json | 4 +- .../vcpkg/ports/rtlsdr/portfile.cmake | 5 - .../vcpkg/ports/rtlsdr/vcpkg.json | 4 +- .../vcpkg/ports/rtmidi/portfile.cmake | 2 - .../vcpkg/ports/rtmidi/vcpkg.json | 2 +- .../vcpkg/ports/rxspencer/portfile.cmake | 4 +- .../vcpkg/ports/rxspencer/vcpkg.json | 1 + .../vcpkg/ports/ryu/portfile.cmake | 6 +- external_imported/vcpkg/ports/ryu/vcpkg.json | 4 +- .../vcpkg/ports/s2geometry/portfile.cmake | 2 - .../vcpkg/ports/s2geometry/vcpkg.json | 1 + .../vcpkg/ports/s2n/portfile.cmake | 13 +- .../vcpkg/ports/s2n/remove-trycompile.patch | 36 + external_imported/vcpkg/ports/s2n/vcpkg.json | 2 +- .../vcpkg/ports/sail/portfile.cmake | 7 +- external_imported/vcpkg/ports/sail/vcpkg.json | 4 +- .../vcpkg/ports/sbp/portfile.cmake | 2 - external_imported/vcpkg/ports/sbp/vcpkg.json | 1 + .../vcpkg/ports/scintilla/portfile.cmake | 2 - .../vcpkg/ports/scintilla/vcpkg.json | 1 + .../vcpkg/ports/sciter-js/portfile.cmake | 10 +- .../vcpkg/ports/sciter-js/vcpkg.json | 2 +- .../vcpkg/ports/sciter/portfile.cmake | 2 +- .../vcpkg/ports/sciter/vcpkg.json | 3 +- .../vcpkg/ports/scnlib/portfile.cmake | 4 +- .../vcpkg/ports/scnlib/vcpkg.json | 3 +- .../vcpkg/ports/scylla-wrapper/portfile.cmake | 17 +- .../vcpkg/ports/scylla-wrapper/vcpkg.json | 9 +- .../vcpkg/ports/sdformat10/fix-quote.patch | 85 + .../vcpkg/ports/sdformat10/no-absolute.patch | 38 + .../vcpkg/ports/sdformat10/portfile.cmake | 19 +- .../vcpkg/ports/sdformat10/vcpkg.json | 14 +- .../vcpkg/ports/sdformat6/disable-test.patch | 34 + .../sdformat6/fix-dependency-urdfdom.patch | 34 + .../vcpkg/ports/sdformat6/portfile.cmake | 11 +- .../vcpkg/ports/sdformat6/vcpkg.json | 3 +- .../vcpkg/ports/sdformat9/fix-quote.patch | 85 + .../vcpkg/ports/sdformat9/no-absolute.patch | 38 + .../vcpkg/ports/sdformat9/portfile.cmake | 4 +- .../use-external-tinyxml-windows.patch | 26 + .../vcpkg/ports/sdformat9/vcpkg.json | 3 +- .../vcpkg/ports/sdl1/portfile.cmake | 9 +- external_imported/vcpkg/ports/sdl1/vcpkg.json | 4 +- ...ialized_local-pointer-variable-start.patch | 12 + .../vcpkg/ports/sdl2-image/portfile.cmake | 22 +- .../vcpkg/ports/sdl2-image/vcpkg.json | 12 +- ...-creation-of-pkg-cfg-file-on-windows.patch | 17 +- .../sdl2/0002-sdl2-skip-ibus-on-linux.patch | 6 +- ...disable-sdlmain-target-search-on-uwp.patch | 8 +- .../ports/sdl2/0004-Define-crt-macros.patch | 15 + .../0004-sdl2-alias-on-static-build.patch | 20 - .../ports/sdl2/0005-Fix-uwp-joystick.patch | 25 + .../sdl2/0005-sdl2-fix-mingw-checks.patch | 21 - .../sdl2/0006-Update-SDL_sysurl.cpp.patch | 15 + ...pten-declaration-after-statement-err.patch | 45 + .../vcpkg/ports/sdl2/portfile.cmake | 22 +- external_imported/vcpkg/ports/sdl2/vcpkg.json | 4 +- external_imported/vcpkg/ports/seal/gsl.patch | 13 + .../vcpkg/ports/seal/portfile.cmake | 3 + .../vcpkg/ports/seal/shared-zstd.patch | 13 + external_imported/vcpkg/ports/seal/vcpkg.json | 2 +- .../vcpkg/ports/sentencepiece/vcpkg.json | 2 + .../vcpkg/ports/sentry-native/portfile.cmake | 21 +- .../vcpkg/ports/sentry-native/vcpkg.json | 5 +- .../vcpkg/ports/serdepp/portfile.cmake | 28 + .../vcpkg/ports/serdepp/vcpkg.json | 19 + .../vcpkg/ports/sfml/arm64.patch | 21 + .../vcpkg/ports/sfml/portfile.cmake | 44 +- external_imported/vcpkg/ports/sfml/vcpkg.json | 12 +- .../ports/shaderc/fix-export-cmakefiles.patch | 93 + .../vcpkg/ports/shaderc/portfile.cmake | 14 +- .../vcpkg/ports/shaderc/vcpkg.json | 13 +- .../vcpkg/ports/shaderwriter/portfile.cmake | 32 +- .../vcpkg/ports/shaderwriter/vcpkg.json | 15 +- .../vcpkg/ports/shapelib/fix-usage.patch | 34 + .../vcpkg/ports/shapelib/vcpkg.json | 4 +- .../vcpkg/ports/shiva/no_copy_dll.patch | 13 + .../vcpkg/ports/shiva/portfile.cmake | 30 +- .../vcpkg/ports/shiva/vcpkg.json | 14 +- .../vcpkg/ports/shogun/eigen-3.4.patch | 65 + .../vcpkg/ports/shogun/portfile.cmake | 1 + .../vcpkg/ports/shogun/vcpkg.json | 2 +- .../vcpkg/ports/simage/portfile.cmake | 2 - .../vcpkg/ports/simage/vcpkg.json | 2 +- .../vcpkg/ports/simbody/portfile.cmake | 2 + .../vcpkg/ports/simbody/vcpkg.json | 1 + .../vcpkg/ports/simpleini/portfile.cmake | 9 +- .../vcpkg/ports/simpleini/vcpkg.json | 6 +- .../vcpkg/ports/skia/portfile.cmake | 22 +- external_imported/vcpkg/ports/skia/vcpkg.json | 4 +- .../vcpkg/ports/skyr-url/portfile.cmake | 11 +- .../vcpkg/ports/skyr-url/vcpkg.json | 14 +- .../vcpkg/ports/sleef/portfile.cmake | 13 +- .../vcpkg/ports/sleef/vcpkg.json | 1 + .../vcpkg/ports/sleepy-discord/portfile.cmake | 12 +- .../vcpkg/ports/sleepy-discord/vcpkg.json | 3 +- .../vcpkg/ports/slikenet/portfile.cmake | 2 - .../vcpkg/ports/slikenet/vcpkg.json | 1 + .../vcpkg/ports/sockpp/portfile.cmake | 9 +- .../vcpkg/ports/sockpp/vcpkg.json | 15 +- .../vcpkg/ports/soem/portfile.cmake | 2 - external_imported/vcpkg/ports/soem/vcpkg.json | 4 +- .../vcpkg/ports/soil/portfile.cmake | 2 - external_imported/vcpkg/ports/soil/vcpkg.json | 1 + .../soil2/Workaround-ICE-in-release.patch | 20 + .../vcpkg/ports/soil2/portfile.cmake | 18 +- .../vcpkg/ports/soil2/vcpkg.json | 10 +- .../vcpkg/ports/sophus/disable-werror.patch | 18 - .../vcpkg/ports/sophus/fix_cmakelists.patch | 12 - .../vcpkg/ports/sophus/portfile.cmake | 23 +- .../vcpkg/ports/sophus/vcpkg.json | 15 +- .../vcpkg/ports/soundtouch/portfile.cmake | 2 - .../vcpkg/ports/soundtouch/vcpkg.json | 2 +- .../vcpkg/ports/spdk-isal/CMakeLists.txt | 56 - .../vcpkg/ports/spdk-isal/portfile.cmake | 48 +- .../vcpkg/ports/spdk-isal/vcpkg.json | 5 +- .../vcpkg/ports/spdlog/fix-mingw-build.patch | 13 - .../vcpkg/ports/spdlog/portfile.cmake | 25 +- .../vcpkg/ports/spdlog/vcpkg.json | 2 +- .../vcpkg/ports/speex/portfile.cmake | 11 +- .../vcpkg/ports/speex/vcpkg.json | 14 +- .../vcpkg/ports/speexdsp/jitter_ctl.patch | 14 + .../vcpkg/ports/speexdsp/portfile.cmake | 2 + .../vcpkg/ports/speexdsp/vcpkg.json | 4 +- .../vcpkg/ports/spirv-headers/portfile.cmake | 4 +- .../vcpkg/ports/spirv-headers/vcpkg.json | 2 +- .../vcpkg/ports/spirv-reflect/CMakeLists.txt | 33 + .../vcpkg/ports/spirv-reflect/portfile.cmake | 22 + .../vcpkg/ports/spirv-reflect/vcpkg.json | 18 + .../spirv-tools/0001-don-t-use-MP4.patch | 58 - .../ports/spirv-tools/cmake-install.patch | 23 - .../spirv-tools/install-config-typo.patch | 17 - .../vcpkg/ports/spirv-tools/portfile.cmake | 83 +- .../vcpkg/ports/spirv-tools/vcpkg.json | 13 +- .../vcpkg/ports/sqlcipher/CMakeLists.txt | 5 +- .../vcpkg/ports/sqlcipher/portfile.cmake | 6 +- .../vcpkg/ports/sqlcipher/vcpkg.json | 2 +- .../vcpkg/ports/sqlite3/CMakeLists.txt | 125 +- .../vcpkg/ports/sqlite3/portfile.cmake | 25 +- .../vcpkg/ports/sqlite3/sqlite3.pc.in | 2 +- .../vcpkg/ports/sqlite3/vcpkg.json | 47 +- .../vcpkg/ports/starlink-ast/portfile.cmake | 10 +- .../vcpkg/ports/starlink-ast/vcpkg.json | 3 +- .../vcpkg/ports/superlu/portfile.cmake | 2 - .../vcpkg/ports/superlu/vcpkg.json | 4 +- .../vcpkg/ports/taglib/portfile.cmake | 10 +- .../vcpkg/ports/taglib/vcpkg.json | 6 +- .../vcpkg/ports/taskflow/portfile.cmake | 17 +- .../vcpkg/ports/taskflow/vcpkg.json | 15 +- .../vcpkg/ports/tbb/portfile.cmake | 4 +- external_imported/vcpkg/ports/tbb/vcpkg.json | 2 +- .../vcpkg/ports/tcb-span/portfile.cmake | 20 + .../vcpkg/ports/tcb-span/vcpkg.json | 7 + .../vcpkg/ports/teemo/portfile.cmake | 2 - .../vcpkg/ports/teemo/vcpkg.json | 1 + .../vcpkg/ports/tensorflow-cc/portfile.cmake | 2 - .../vcpkg/ports/tensorflow-cc/vcpkg.json | 2 +- .../vcpkg/ports/tensorflow/portfile.cmake | 2 - .../vcpkg/ports/tensorflow/vcpkg.json | 2 +- .../vcpkg/ports/tensorpipe/portfile.cmake | 1 - .../vcpkg/ports/tensorpipe/vcpkg.json | 1 + .../vcpkg/ports/tesseract/vcpkg.json | 4 +- .../vcpkg/ports/tfhe/portfile.cmake | 2 - external_imported/vcpkg/ports/tfhe/vcpkg.json | 2 +- .../vcpkg/ports/tgbot-cpp/portfile.cmake | 11 +- .../vcpkg/ports/tgbot-cpp/vcpkg.json | 8 +- .../vcpkg/ports/tgui/portfile.cmake | 9 +- external_imported/vcpkg/ports/tgui/vcpkg.json | 13 +- .../vcpkg/ports/theia/eigen-3.4.patch | 24 + .../vcpkg/ports/theia/portfile.cmake | 1 + .../vcpkg/ports/theia/vcpkg.json | 2 +- .../vcpkg/ports/tidy-html5/portfile.cmake | 29 +- .../vcpkg/ports/tidy-html5/vcpkg.json | 17 +- .../vcpkg/ports/tiff/fix-pkgconfig.patch | 30 +- .../vcpkg/ports/tiff/portfile.cmake | 7 - .../ports/tiff/vcpkg-cmake-wrapper.cmake.in | 4 +- external_imported/vcpkg/ports/tiff/vcpkg.json | 6 +- .../vcpkg/ports/tinkerforge/portfile.cmake | 2 - .../vcpkg/ports/tinkerforge/vcpkg.json | 4 +- .../vcpkg/ports/tinycbor/CMakeLists.txt | 9 + .../vcpkg/ports/tinycbor/portfile.cmake | 20 + .../vcpkg/ports/tinycbor/vcpkg.json | 14 + .../vcpkg/ports/tinyexif/portfile.cmake | 17 +- .../vcpkg/ports/tinyexif/vcpkg.json | 13 +- .../ports/tinyfiledialogs/portfile.cmake | 2 - .../vcpkg/ports/tinyfiledialogs/vcpkg.json | 2 +- .../vcpkg/ports/tmx/portfile.cmake | 2 - external_imported/vcpkg/ports/tmx/vcpkg.json | 1 + .../vcpkg/ports/tomlplusplus/portfile.cmake | 4 +- .../vcpkg/ports/tomlplusplus/vcpkg.json | 4 +- .../vcpkg/ports/tool-meson/vcpkg.json | 7 +- .../vcpkg/ports/tracy/add-install.patch | 48 - .../vcpkg/ports/tracy/portfile.cmake | 6 +- .../vcpkg/ports/tracy/vcpkg.json | 2 +- .../vcpkg/ports/trantor/portfile.cmake | 4 +- .../vcpkg/ports/trantor/vcpkg.json | 3 +- .../vcpkg/ports/triangle/portfile.cmake | 2 - .../vcpkg/ports/triangle/vcpkg.json | 4 +- .../ports/triton/001-fix-dependency-z3.patch | 42 + .../triton/002-fix-dependency-capstone.patch | 60 + .../ports/triton/003-fix-capstone-5.patch | 62 + .../vcpkg/ports/triton/004-fix-python.patch | 27 + .../vcpkg/ports/triton/portfile.cmake | 53 + .../vcpkg/ports/triton/vcpkg.json | 43 + .../vcpkg/ports/ttauri/portfile.cmake | 2 - .../vcpkg/ports/ttauri/vcpkg.json | 1 + .../vcpkg/ports/turbobase64/portfile.cmake | 2 - .../vcpkg/ports/turbobase64/vcpkg.json | 7 +- .../vcpkg/ports/tvision/portfile.cmake | 4 +- .../vcpkg/ports/tvision/vcpkg.json | 1 + .../vcpkg/ports/umock-c/portfile.cmake | 2 - .../vcpkg/ports/umock-c/vcpkg.json | 3 +- .../vcpkg/ports/unicorn-lib/CMakeLists.txt | 20 +- .../vcpkg/ports/unicorn-lib/portfile.cmake | 16 +- .../vcpkg/ports/unicorn-lib/vcpkg.json | 14 +- .../vcpkg/ports/unicorn/portfile.cmake | 4 +- .../vcpkg/ports/unicorn/vcpkg.json | 6 +- .../vcpkg/ports/unrar/Config.cmake.in | 22 + .../vcpkg/ports/unrar/portfile.cmake | 14 +- .../vcpkg/ports/unrar/vcpkg.json | 8 +- .../vcpkg/ports/usd/portfile.cmake | 2 - external_imported/vcpkg/ports/usd/vcpkg.json | 2 +- .../vcpkg/ports/utf8h/portfile.cmake | 4 +- .../vcpkg/ports/utf8h/vcpkg.json | 2 +- .../vcpkg/ports/uthenticode/openssl.patch | 72 + .../vcpkg/ports/uthenticode/portfile.cmake | 4 +- .../vcpkg/ports/uthenticode/vcpkg.json | 3 +- .../vcpkg/ports/uvatlas/portfile.cmake | 16 +- .../vcpkg/ports/uvatlas/vcpkg.json | 2 +- .../vcpkg/ports/uwebsockets/portfile.cmake | 4 +- .../vcpkg/ports/uwebsockets/vcpkg.json | 2 +- .../vcpkg/ports/v-hacd/portfile.cmake | 3 - .../vcpkg/ports/v-hacd/vcpkg.json | 4 +- external_imported/vcpkg/ports/v8/vcpkg.json | 6 +- .../vcpkg/ports/vamp-sdk/CMakeLists.txt | 6 + .../vcpkg/ports/vamp-sdk/portfile.cmake | 7 +- .../vcpkg/ports/vamp-sdk/vcpkg.json | 12 +- .../vcpkg/ports/vc/portfile.cmake | 4 +- external_imported/vcpkg/ports/vc/vcpkg.json | 4 +- .../vcpkg/ports/vcpkg-cmake-config/vcpkg.json | 2 +- .../vcpkg_cmake_config_fixup.cmake | 117 +- .../vcpkg-cmake/cmake_get_vars/CMakeLists.txt | 106 +- .../vcpkg/ports/vcpkg-cmake/vcpkg.json | 3 +- .../ports/vcpkg-cmake/vcpkg_cmake_build.cmake | 19 +- .../vcpkg-cmake/vcpkg_cmake_configure.cmake | 85 +- .../vcpkg-cmake/vcpkg_cmake_get_vars.cmake | 10 + .../vcpkg-cmake/vcpkg_cmake_install.cmake | 2 +- .../ports/vcpkg-get-python-packages/README.md | 6 + .../ports/vcpkg-get-python-packages/copyright | 23 + .../vcpkg-get-python-packages/portfile.cmake | 7 + .../vcpkg-port-config.cmake | 1 + .../vcpkg-get-python-packages/vcpkg.json | 6 + .../x_vcpkg_get_python_packages.cmake | 70 + .../vcpkg/ports/vcpkg-gfortran/portfile.cmake | 3 +- .../vcpkg/ports/vcpkg-gfortran/vcpkg.json | 4 +- .../vcpkg/ports/vcpkg-gn/vcpkg.json | 9 +- .../portfile.cmake | 3 +- .../vcpkg-pkgconfig-get-modules/vcpkg.json | 10 +- .../x_vcpkg_pkgconfig_get_modules.cmake | 22 +- .../vcpkg/ports/vcpkg-qmake/vcpkg.json | 3 +- .../vcpkg-qmake/vcpkg_qmake_configure.cmake | 12 +- .../ports/vcpkg-tool-gyp-nss/portfile.cmake | 21 + .../vcpkg/ports/vcpkg-tool-gyp-nss/vcpkg.json | 6 + .../ports/vcpkg-tool-lessmsi/portfile.cmake | 17 + .../vcpkg/ports/vcpkg-tool-lessmsi/vcpkg.json | 8 + .../ports/vcpkg-tool-meson/portfile.cmake | 3 +- .../vcpkg/ports/vcpkg-tool-meson/vcpkg.json | 2 +- .../ports/vcpkg-tool-mozbuild/portfile.cmake | 28 + .../ports/vcpkg-tool-mozbuild/vcpkg.json | 7 + .../ports/vcpkg-tool-python2/portfile.cmake | 60 + .../vcpkg/ports/vcpkg-tool-python2/vcpkg.json | 15 + .../vcpkg/ports/vectorclass/portfile.cmake | 2 - .../vcpkg/ports/vectorclass/vcpkg.json | 2 +- .../vcpkg/ports/vlpp/CMakeLists.txt | 4 + .../vcpkg/ports/vlpp/portfile.cmake | 15 +- external_imported/vcpkg/ports/vlpp/vcpkg.json | 10 +- .../vcpkg/ports/volk/portfile.cmake | 22 +- external_imported/vcpkg/ports/volk/vcpkg.json | 12 +- .../vcpkg/ports/vtk/FindLZ4.patch | 4 +- .../vcpkg/ports/vtk/FindLZMA.patch | 102 +- .../vcpkg/ports/vtk/portfile.cmake | 3 + external_imported/vcpkg/ports/vtk/vcpkg.json | 5 +- .../vulkan-memory-allocator/portfile.cmake | 8 +- .../ports/vulkan-memory-allocator/vcpkg.json | 7 +- .../vcpkg/ports/wampcc/portfile.cmake | 46 +- .../vcpkg/ports/wampcc/vcpkg.json | 15 +- .../vcpkg/ports/wangle/portfile.cmake | 29 +- .../vcpkg/ports/wangle/vcpkg.json | 13 +- .../vcpkg/ports/wavpack/portfile.cmake | 2 - .../vcpkg/ports/wavpack/vcpkg.json | 1 + .../vcpkg/ports/websocketpp/cxx20.patch | 66 + .../vcpkg/ports/websocketpp/portfile.cmake | 2 + .../vcpkg/ports/websocketpp/vcpkg.json | 2 +- .../vcpkg/ports/wincrypt/vcpkg.json | 7 +- .../vcpkg/ports/winpcap/portfile.cmake | 9 +- .../vcpkg/ports/winpcap/vcpkg.json | 5 +- .../vcpkg/ports/winreg/portfile.cmake | 9 +- .../vcpkg/ports/winreg/vcpkg.json | 3 +- .../vcpkg/ports/winsock2/vcpkg.json | 7 +- .../vcpkg/ports/winsparkle/portfile.cmake | 48 + .../vcpkg/ports/winsparkle/vcpkg.json | 9 + .../vcpkg/ports/wintoast/portfile.cmake | 17 +- .../vcpkg/ports/wintoast/vcpkg.json | 12 +- .../vcpkg/ports/wpilib/portfile.cmake | 2 - .../vcpkg/ports/wpilib/vcpkg.json | 2 +- .../vcpkg/ports/wt/0007-boost_1_77_0.patch | 15 - .../vcpkg/ports/wt/portfile.cmake | 24 +- external_imported/vcpkg/ports/wt/vcpkg.json | 3 +- .../ports/wxwidgets/fix-linux-configure.patch | 49 + .../vcpkg/ports/wxwidgets/portfile.cmake | 98 +- .../vcpkg/ports/wxwidgets/vcpkg.json | 3 +- .../vcpkg/ports/x-plane/portfile.cmake | 4 +- .../vcpkg/ports/x-plane/vcpkg.json | 3 +- .../vcpkg/ports/x264/portfile.cmake | 2 - external_imported/vcpkg/ports/x264/vcpkg.json | 2 +- .../xaudio2redist/Findxaudio2redist.cmake | 54 - .../vcpkg/ports/xaudio2redist/portfile.cmake | 5 +- .../xaudio2redist/vcpkg-cmake-wrapper.cmake | 11 - .../vcpkg/ports/xaudio2redist/vcpkg.json | 4 +- .../xaudio2redist-config.cmake.in | 35 + .../vcpkg/ports/xbyak/portfile.cmake | 2 - .../vcpkg/ports/xbyak/vcpkg.json | 1 + .../vcpkg/ports/xerces-c/portfile.cmake | 12 +- .../vcpkg/ports/xerces-c/vcpkg.json | 5 +- .../vcpkg/ports/xmlsec/portfile.cmake | 17 +- .../vcpkg/ports/xmlsec/vcpkg.json | 12 +- .../vcpkg/ports/xmsh/portfile.cmake | 37 - external_imported/vcpkg/ports/xmsh/vcpkg.json | 11 - .../vcpkg/ports/xnnpack/use-packages.patch | 4 +- .../vcpkg/ports/xnnpack/vcpkg.json | 3 +- .../vcpkg/ports/xqilla/CMakeLists.txt | 457 ++++ .../vcpkg/ports/xqilla/fix-compare.patch | 26 + .../vcpkg/ports/xqilla/portfile.cmake | 24 + .../vcpkg/ports/xqilla/vcpkg.json | 19 + .../vcpkg/ports/xtensor/portfile.cmake | 17 +- .../vcpkg/ports/xtensor/vcpkg.json | 11 +- .../vcpkg/ports/yajl/portfile.cmake | 41 +- external_imported/vcpkg/ports/yajl/vcpkg.json | 12 +- .../vcpkg/ports/yara/CMakeLists.txt | 3 + .../vcpkg/ports/yara/portfile.cmake | 15 +- external_imported/vcpkg/ports/yara/vcpkg.json | 9 +- .../vcpkg/ports/yasm-tool-helper/vcpkg.json | 12 +- .../yasm-tool-helper.cmake.in | 2 +- .../vcpkg/ports/yasm-tool/portfile.cmake | 48 +- .../vcpkg/ports/yasm-tool/vcpkg.json | 14 +- .../vcpkg/ports/yasm/portfile.cmake | 4 +- .../vcpkg-port-config.cmake.in | 6 +- external_imported/vcpkg/ports/yasm/vcpkg.json | 4 +- .../vcpkg/ports/yato/portfile.cmake | 25 +- external_imported/vcpkg/ports/yato/vcpkg.json | 13 +- .../vcpkg/ports/z3/portfile.cmake | 6 +- external_imported/vcpkg/ports/z3/vcpkg.json | 4 +- .../vcpkg/ports/zeromq/portfile.cmake | 13 +- .../vcpkg/ports/zeromq/vcpkg.json | 3 +- .../zeromq/zeromq-libzmq-4310-64e6d37ab8.diff | 55 + .../zeromq/zeromq-libzmq-4311-2b04e0ce47.diff | 18 + .../vcpkg/ports/zkpp/portfile.cmake | 2 - external_imported/vcpkg/ports/zkpp/vcpkg.json | 5 +- .../cmake_dont_build_more_than_needed.patch | 2 +- .../vcpkg/ports/zlib/portfile.cmake | 8 +- external_imported/vcpkg/ports/zlib/vcpkg.json | 3 +- .../vcpkg/ports/zpp-bits/portfile.cmake | 14 + .../vcpkg/ports/zpp-bits/vcpkg.json | 7 + .../vcpkg/ports/zstd/fix-c4703-error.patch | 15 - .../vcpkg/ports/zstd/no-static-suffix.patch | 13 + .../vcpkg/ports/zstd/portfile.cmake | 62 +- external_imported/vcpkg/ports/zstd/usage | 4 + external_imported/vcpkg/ports/zstd/vcpkg.json | 3 +- .../vcpkg/ports/ztd-text/portfile.cmake | 37 + external_imported/vcpkg/ports/ztd-text/usage | 4 + .../vcpkg/ports/ztd-text/vcpkg.json | 14 + .../ports/zxing-cpp/0001-opencv4-compat.patch | 43 - .../zxing-cpp/0002-improve-features.patch | 39 - .../0003-fix-dependency-bigint.patch | 53 - .../vcpkg/ports/zxing-cpp/portfile.cmake | 53 - .../vcpkg/ports/zxing-cpp/vcpkg.json | 28 - .../always-find-unixcommands-on-unix.patch | 13 - .../ports/zziplib/cmake-project-include.cmake | 3 + .../ports/zziplib/fix-export-define.patch | 13 - .../install-dll-to-proper-folder.patch | 27 - .../vcpkg/ports/zziplib/portfile.cmake | 62 +- .../vcpkg/ports/zziplib/vcpkg.json | 12 +- .../vcpkg/scripts/Get-Changelog.ps1 | 502 ++++ .../addPoshVcpkgToPowershellProfile.ps1 | 215 ++ .../azure-pipelines/analyze-test-results.ps1 | 453 ---- .../azure-pipelines/azure-pipelines-osx.yml | 10 - .../azure-pipelines/azure-pipelines.yml | 13 +- .../azure-pipelines/generate-skip-list.ps1 | 83 - .../azure-pipelines/linux/azure-pipelines.yml | 2 +- .../azure-pipelines/linux/create-image.ps1 | 18 +- .../azure-pipelines/linux/provision-image.sh | 32 +- .../osx/Get-InternalBaseBox.ps1 | 68 - .../osx/Install-Prerequisites.ps1 | 30 +- .../scripts/azure-pipelines/osx/README.md | 249 +- .../osx/Setup-VagrantMachines.ps1 | 14 +- .../azure-pipelines/osx/azure-pipelines.yml | 4 +- .../osx/configuration/Vagrantfile-vm.rb | 9 +- .../osx/configuration/installables.json | 31 +- .../configuration/installables.schema.json | 17 - .../vagrant-box-configuration.json | 4 +- .../azure-pipelines/test-modified-ports.ps1 | 51 +- .../azure-pipelines/windows-unstable/job.yml | 15 - .../rearrange-msvc-drop-layout.ps1 | 4 +- .../windows/azure-pipelines.yml | 4 +- .../azure-pipelines/windows/create-image.ps1 | 2 +- .../azure-pipelines/windows/deploy-cuda.ps1 | 16 +- .../windows/deploy-inteloneapi.ps1 | 4 +- .../azure-pipelines/windows/deploy-pwsh.ps1 | 2 +- .../windows/deploy-visual-studio.ps1 | 5 +- .../vcpkg/scripts/boost/generate-ports.ps1 | 3 +- external_imported/vcpkg/scripts/bootstrap.ps1 | 6 +- external_imported/vcpkg/scripts/bootstrap.sh | 12 +- .../scripts/buildsystems/msbuild/applocal.ps1 | 215 ++ .../vcpkg/scripts/buildsystems/vcpkg.cmake | 127 +- .../vcpkg/scripts/ci.baseline.txt | 415 +--- .../scripts/cmake/vcpkg_acquire_msys.cmake | 204 +- .../scripts/cmake/vcpkg_build_make.cmake | 42 +- .../scripts/cmake/vcpkg_check_features.cmake | 12 +- .../scripts/cmake/vcpkg_configure_cmake.cmake | 117 +- .../scripts/cmake/vcpkg_configure_make.cmake | 26 +- .../scripts/cmake/vcpkg_configure_meson.cmake | 48 +- .../cmake/vcpkg_download_distfile.cmake | 2 +- .../cmake/vcpkg_execute_build_process.cmake | 9 +- .../vcpkg_execute_required_process.cmake | 1 + .../cmake/vcpkg_extract_source_archive.cmake | 8 +- .../cmake/vcpkg_fail_port_install.cmake | 4 + .../cmake/vcpkg_find_acquire_program.cmake | 54 +- .../scripts/cmake/vcpkg_find_fortran.cmake | 114 +- .../vcpkg/scripts/cmake/vcpkg_from_git.cmake | 39 +- .../scripts/cmake/vcpkg_from_github.cmake | 66 +- .../scripts/cmake/z_vcpkg_apply_patches.cmake | 8 +- .../cmake/z_vcpkg_get_cmake_vars.cmake | 15 +- .../vcpkg/scripts/detect_compiler/CONTROL | 3 - .../vcpkg/scripts/detect_compiler/vcpkg.json | 5 + .../scripts/get_cmake_vars/CMakeLists.txt | 5 +- external_imported/vcpkg/scripts/ports.cmake | 3 + .../scripts/posh-vcpkg/0.0.1/posh-vcpkg.psm1 | 215 ++ .../vcpkg/scripts/templates/portfile.in.cmake | 21 +- .../vcpkg/scripts/templates/vcpkg.json.in | 7 +- .../test_ports/cmake-user/portfile.cmake | 95 +- .../cmake-user/project/CMakeLists.txt | 49 +- .../scripts/test_ports/cmake-user/vcpkg.json | 25 +- .../scripts/test_ports/cmake/portfile.cmake | 36 +- .../vcpkg/scripts/test_ports/cmake/vcpkg.json | 7 +- .../test_ports/llfio-run-tests/CONTROL | 5 - .../test_ports/llfio-run-tests/vcpkg.json | 22 + .../test_ports/outcome-run-tests/CONTROL | 5 - .../test_ports/outcome-run-tests/vcpkg.json | 15 + .../test_ports/unit-test-cmake/portfile.cmake | 3 + ...est-z_vcpkg_cmake_config_fixup_merge.cmake | 56 + .../test_ports/unit-test-cmake/vcpkg.json | 9 + .../vcpkg-acquire-msys-test/CONTROL | 4 - .../vcpkg-acquire-msys-test/vcpkg.json | 7 + .../test_ports/vcpkg-ci-ffmpeg/CONTROL | 5 - .../test_ports/vcpkg-ci-ffmpeg/vcpkg.json | 145 ++ .../test_ports/vcpkg-ci-llvm/vcpkg.json | 19 +- .../test_ports/vcpkg-ci-opencv/vcpkg.json | 10 +- .../test_ports/vcpkg-ci-paraview/CONTROL | 6 - .../test_ports/vcpkg-ci-paraview/vcpkg.json | 26 + .../vcpkg-find-acquire-program/CONTROL | 4 - .../vcpkg-find-acquire-program/vcpkg.json | 7 + .../vcpkg-from-git-test/portfile.cmake | 193 ++ .../test_ports/vcpkg-from-git-test/vcpkg.json | 4 + .../vcpkg/scripts/toolchains/android.cmake | 12 +- .../vcpkg/scripts/vcpkgTools.xml | 71 +- external_imported/vcpkg/versions/3-/3fd.json | 5 + external_imported/vcpkg/versions/7-/7zip.json | 15 + external_imported/vcpkg/versions/a-/ace.json | 25 + .../vcpkg/versions/a-/activemq-cpp.json | 5 + .../vcpkg/versions/a-/akali.json | 5 + .../vcpkg/versions/a-/alembic.json | 5 + external_imported/vcpkg/versions/a-/alsa.json | 5 + .../vcpkg/versions/a-/ampl-asl.json | 10 + .../vcpkg/versions/a-/ampl-mp.json | 5 + .../vcpkg/versions/a-/amqpcpp.json | 5 + external_imported/vcpkg/versions/a-/anax.json | 5 + .../vcpkg/versions/a-/antlr4.json | 15 + .../vcpkg/versions/a-/approval-tests-cpp.json | 5 + .../vcpkg/versions/a-/apr-util.json | 10 + external_imported/vcpkg/versions/a-/apr.json | 5 + external_imported/vcpkg/versions/a-/apsi.json | 10 + external_imported/vcpkg/versions/a-/arb.json | 5 + .../vcpkg/versions/a-/arcus.json | 5 + external_imported/vcpkg/versions/a-/args.json | 5 + .../vcpkg/versions/a-/argtable3.json | 10 + .../vcpkg/versions/a-/armadillo.json | 10 + .../vcpkg/versions/a-/arrow.json | 15 + .../vcpkg/versions/a-/ashes.json | 10 + .../vcpkg/versions/a-/asio-grpc.json | 10 + external_imported/vcpkg/versions/a-/asio.json | 5 + .../vcpkg/versions/a-/asiosdk.json | 5 + .../vcpkg/versions/a-/asmjit.json | 5 + .../vcpkg/versions/a-/audiofile.json | 5 + .../vcpkg/versions/a-/avisynthplus.json | 10 + .../vcpkg/versions/a-/avro-c.json | 10 + .../vcpkg/versions/a-/aws-c-auth.json | 5 + .../vcpkg/versions/a-/aws-c-cal.json | 5 + .../vcpkg/versions/a-/aws-c-common.json | 5 + .../vcpkg/versions/a-/aws-c-compression.json | 5 + .../vcpkg/versions/a-/aws-c-event-stream.json | 5 + .../vcpkg/versions/a-/aws-c-http.json | 5 + .../vcpkg/versions/a-/aws-c-io.json | 5 + .../vcpkg/versions/a-/aws-c-mqtt.json | 10 + .../vcpkg/versions/a-/aws-c-s3.json | 5 + .../vcpkg/versions/a-/aws-checksums.json | 5 + .../vcpkg/versions/a-/aws-crt-cpp.json | 5 + .../vcpkg/versions/a-/aws-lambda-cpp.json | 5 + .../vcpkg/versions/a-/aws-sdk-cpp.json | 15 + .../versions/a-/azure-c-shared-utility.json | 25 + .../vcpkg/versions/a-/azure-core-cpp.json | 10 + .../vcpkg/versions/a-/azure-identity-cpp.json | 10 + .../vcpkg/versions/a-/azure-iot-sdk-c.json | 15 + .../versions/a-/azure-kinect-sensor-sdk.json | 5 + .../versions/a-/azure-macro-utils-c.json | 5 + .../a-/azure-security-attestation-cpp.json | 9 + ...re-security-keyvault-certificates-cpp.json | 5 + .../azure-security-keyvault-secrets-cpp.json | 5 + .../versions/a-/azure-storage-blobs-cpp.json | 10 + .../versions/a-/azure-storage-common-cpp.json | 15 + .../vcpkg/versions/a-/azure-storage-cpp.json | 5 + .../a-/azure-storage-files-datalake-cpp.json | 10 + .../a-/azure-storage-files-shares-cpp.json | 5 + .../versions/a-/azure-storage-queues-cpp.json | 15 + .../vcpkg/versions/a-/azure-uamqp-c.json | 10 + .../vcpkg/versions/a-/azure-uhttp-c.json | 10 + .../vcpkg/versions/a-/azure-umqtt-c.json | 10 + .../vcpkg/versions/b-/bddisasm.json | 5 + external_imported/vcpkg/versions/b-/bde.json | 5 + .../vcpkg/versions/b-/bdwgc.json | 5 + .../vcpkg/versions/b-/behaviortree-cpp.json | 5 + .../vcpkg/versions/b-/benchmark.json | 10 + .../vcpkg/versions/b-/berkeleydb.json | 10 + .../vcpkg/versions/b-/bext-di.json | 5 + .../vcpkg/versions/b-/blend2d.json | 10 + .../vcpkg/versions/b-/blitz.json | 10 + .../vcpkg/versions/b-/blosc.json | 5 + .../vcpkg/versions/b-/boinc.json | 10 + .../vcpkg/versions/b-/boost-build.json | 5 + .../vcpkg/versions/b-/boost-iostreams.json | 10 + .../b-/boost-modular-build-helper.json | 15 + .../versions/b-/boost-vcpkg-helpers.json | 5 + .../vcpkg/versions/b-/boringssl.json | 5 + .../vcpkg/versions/b-/botan.json | 20 + .../vcpkg/versions/b-/box2d.json | 5 + .../vcpkg/versions/b-/braft.json | 9 + external_imported/vcpkg/versions/b-/brpc.json | 20 + .../vcpkg/versions/b-/brynet.json | 5 + .../b-/buck-yeh-bux-mariadb-client.json | 5 + .../vcpkg/versions/b-/buck-yeh-bux.json | 5 + .../vcpkg/versions/b-/bullet3.json | 15 + .../vcpkg/versions/baseline.json | 2070 +++++++++-------- .../vcpkg/versions/c-/c-ares.json | 10 + .../vcpkg/versions/c-/c-dbg-macro.json | 9 + .../vcpkg/versions/c-/c89stringutils.json | 9 + .../vcpkg/versions/c-/caffe2.json | 5 + .../vcpkg/versions/c-/cairo.json | 15 + .../vcpkg/versions/c-/cairomm.json | 5 + .../vcpkg/versions/c-/calceph.json | 10 + .../vcpkg/versions/c-/camport3.json | 5 + .../vcpkg/versions/c-/capnproto.json | 5 + .../vcpkg/versions/c-/capstone.json | 10 + .../vcpkg/versions/c-/cargs.json | 9 + .../vcpkg/versions/c-/catch2.json | 5 + .../vcpkg/versions/c-/cello.json | 5 + .../vcpkg/versions/c-/cereal.json | 5 + .../vcpkg/versions/c-/ceres.json | 5 + .../vcpkg/versions/c-/cfitsio.json | 5 + external_imported/vcpkg/versions/c-/cgal.json | 5 + .../vcpkg/versions/c-/chakracore.json | 10 + .../vcpkg/versions/c-/charls.json | 5 + .../vcpkg/versions/c-/chartdir.json | 10 + .../vcpkg/versions/c-/chromium-base.json | 5 + .../vcpkg/versions/c-/civetweb.json | 5 + .../vcpkg/versions/c-/clamav.json | 5 + .../vcpkg/versions/c-/clapack.json | 5 + .../vcpkg/versions/c-/clblast.json | 10 + .../vcpkg/versions/c-/clockutils.json | 5 + .../vcpkg/versions/c-/clrng.json | 5 + .../vcpkg/versions/c-/cnats.json | 9 + external_imported/vcpkg/versions/c-/co.json | 5 + .../vcpkg/versions/c-/cocoyaxi.json | 14 + external_imported/vcpkg/versions/c-/coin.json | 5 + .../vcpkg/versions/c-/colmap.json | 10 + .../vcpkg/versions/c-/color-console.json | 14 + .../vcpkg/versions/c-/comms.json | 5 + .../vcpkg/versions/c-/commsdsl.json | 5 + .../vcpkg/versions/c-/concurrencpp.json | 5 + .../vcpkg/versions/c-/coroutine.json | 10 + .../vcpkg/versions/c-/cpp-httplib.json | 5 + .../vcpkg/versions/c-/cpp-ipc.json | 5 + .../vcpkg/versions/c-/cpp-netlib.json | 5 + .../vcpkg/versions/c-/cpp-redis.json | 5 + .../vcpkg/versions/c-/cppad.json | 5 + .../vcpkg/versions/c-/cppcms.json | 5 + .../vcpkg/versions/c-/cppcoro.json | 5 + .../vcpkg/versions/c-/cppgraphqlgen.json | 10 + .../vcpkg/versions/c-/cppunit.json | 10 + .../vcpkg/versions/c-/cppxaml.json | 9 + external_imported/vcpkg/versions/c-/cpr.json | 5 + .../vcpkg/versions/c-/cpu-features.json | 5 + .../vcpkg/versions/c-/cpuid.json | 5 + .../vcpkg/versions/c-/cpuinfo.json | 5 + .../vcpkg/versions/c-/crashpad.json | 5 + .../vcpkg/versions/c-/crashrpt.json | 5 + .../vcpkg/versions/c-/crfsuite.json | 10 + .../vcpkg/versions/c-/croncpp.json | 5 + .../vcpkg/versions/c-/crossguid.json | 5 + external_imported/vcpkg/versions/c-/crow.json | 10 + .../vcpkg/versions/c-/cryptopp.json | 5 + .../vcpkg/versions/c-/cspice.json | 15 + .../vcpkg/versions/c-/ctemplate.json | 5 + external_imported/vcpkg/versions/c-/cub.json | 5 + external_imported/vcpkg/versions/c-/cuda.json | 10 + .../vcpkg/versions/c-/cudnn.json | 5 + external_imported/vcpkg/versions/c-/curl.json | 10 + .../vcpkg/versions/c-/curlpp.json | 5 + .../vcpkg/versions/d-/darknet.json | 5 + external_imported/vcpkg/versions/d-/date.json | 5 + .../vcpkg/versions/d-/dav1d.json | 5 + .../vcpkg/versions/d-/dbghelp.json | 5 + .../vcpkg/versions/d-/dcmtk.json | 5 + .../vcpkg/versions/d-/detours.json | 5 + .../vcpkg/versions/d-/devicenameresolver.json | 5 + .../vcpkg/versions/d-/dimcli.json | 5 + .../vcpkg/versions/d-/directx-headers.json | 5 + .../vcpkg/versions/d-/directxmath.json | 5 + .../vcpkg/versions/d-/directxmesh.json | 15 + .../vcpkg/versions/d-/directxsdk.json | 5 + .../vcpkg/versions/d-/directxtex.json | 15 + .../vcpkg/versions/d-/directxtk.json | 15 + .../vcpkg/versions/d-/directxtk12.json | 15 + .../vcpkg/versions/d-/discord-game-sdk.json | 5 + .../vcpkg/versions/d-/discordcoreapi.json | 9 + .../vcpkg/versions/d-/dlfcn-win32.json | 5 + external_imported/vcpkg/versions/d-/dlib.json | 5 + external_imported/vcpkg/versions/d-/dmlc.json | 5 + .../vcpkg/versions/d-/doctest.json | 5 + .../vcpkg/versions/d-/double-conversion.json | 5 + .../vcpkg/versions/d-/drlibs.json | 5 + .../vcpkg/versions/d-/drogon.json | 15 + .../vcpkg/versions/d-/dstorage.json | 9 + .../vcpkg/versions/d-/duilib.json | 5 + .../vcpkg/versions/d-/dxsdk-d3dx.json | 10 + external_imported/vcpkg/versions/d-/dxut.json | 5 + .../vcpkg/versions/e-/earcut-hpp.json | 9 + .../vcpkg/versions/e-/eastl.json | 5 + .../vcpkg/versions/e-/easyhook.json | 10 + .../vcpkg/versions/e-/eathread.json | 5 + external_imported/vcpkg/versions/e-/ebml.json | 5 + .../vcpkg/versions/e-/ecsutil.json | 5 + .../vcpkg/versions/e-/effects11.json | 5 + external_imported/vcpkg/versions/e-/efsw.json | 5 + .../vcpkg/versions/e-/eigen3.json | 15 + .../vcpkg/versions/e-/elfio.json | 5 + .../vcpkg/versions/e-/elfutils.json | 15 + .../vcpkg/versions/e-/embree2.json | 5 + .../vcpkg/versions/e-/eventpp.json | 9 + .../vcpkg/versions/e-/exiv2.json | 5 + .../vcpkg/versions/e-/expat.json | 10 + .../vcpkg/versions/e-/exprtk.json | 10 + .../vcpkg/versions/e-/ezc3d.json | 5 + .../vcpkg/versions/f-/faad2.json | 5 + .../vcpkg/versions/f-/faiss.json | 10 + .../vcpkg/versions/f-/fakeit.json | 5 + .../vcpkg/versions/f-/fastcgi.json | 10 + .../vcpkg/versions/f-/fbgemm.json | 10 + .../vcpkg/versions/f-/fbthrift.json | 25 + .../vcpkg/versions/f-/ffmpeg.json | 40 + .../vcpkg/versions/f-/ffnvcodec.json | 5 + .../vcpkg/versions/f-/fftw3.json | 5 + .../vcpkg/versions/f-/fftwpp.json | 5 + .../vcpkg/versions/f-/field3d.json | 5 + external_imported/vcpkg/versions/f-/fizz.json | 20 + .../vcpkg/versions/f-/flann.json | 10 + .../versions/f-/flash-runtime-extensions.json | 14 + .../vcpkg/versions/f-/flatbuffers.json | 5 + .../vcpkg/versions/f-/flint.json | 5 + external_imported/vcpkg/versions/f-/fltk.json | 10 + .../vcpkg/versions/f-/fluidsynth.json | 5 + external_imported/vcpkg/versions/f-/fmt.json | 10 + .../vcpkg/versions/f-/folly.json | 20 + .../vcpkg/versions/f-/fontconfig.json | 15 + .../vcpkg/versions/f-/freeglut.json | 5 + .../vcpkg/versions/f-/freeimage.json | 5 + .../vcpkg/versions/f-/freerdp.json | 5 + .../vcpkg/versions/f-/freetds.json | 5 + .../vcpkg/versions/f-/freetype.json | 10 + .../vcpkg/versions/f-/fribidi.json | 5 + .../vcpkg/versions/f-/ftxui.json | 10 + .../versions/f-/functions-framework-cpp.json | 5 + .../vcpkg/versions/f-/fuzzylite.json | 5 + .../vcpkg/versions/g-/g3log.json | 5 + .../vcpkg/versions/g-/gainput.json | 5 + .../vcpkg/versions/g-/gamedev-framework.json | 5 + .../versions/g-/gamenetworkingsockets.json | 5 + .../vcpkg/versions/g-/gasol.json | 5 + .../vcpkg/versions/g-/gazebo.json | 9 + external_imported/vcpkg/versions/g-/gdal.json | 30 + .../vcpkg/versions/g-/geogram.json | 5 + .../vcpkg/versions/g-/geographiclib.json | 5 + .../vcpkg/versions/g-/getdns.json | 15 + .../vcpkg/versions/g-/getopt-win32.json | 5 + .../vcpkg/versions/g-/gettext.json | 5 + .../vcpkg/versions/g-/gherkin-c.json | 5 + .../vcpkg/versions/g-/giflib.json | 5 + .../vcpkg/versions/g-/glfw3.json | 5 + external_imported/vcpkg/versions/g-/glib.json | 10 + .../vcpkg/versions/g-/glibmm.json | 10 + external_imported/vcpkg/versions/g-/glog.json | 5 + .../vcpkg/versions/g-/glslang.json | 10 + .../vcpkg/versions/g-/gmmlib.json | 5 + external_imported/vcpkg/versions/g-/gmp.json | 10 + .../versions/g-/gobject-introspection.json | 14 + .../vcpkg/versions/g-/google-cloud-cpp.json | 50 + .../vcpkg/versions/g-/gperf.json | 5 + .../vcpkg/versions/g-/gperftools.json | 5 + .../vcpkg/versions/g-/graphviz.json | 10 + external_imported/vcpkg/versions/g-/grpc.json | 5 + .../vcpkg/versions/g-/gsoap.json | 5 + .../vcpkg/versions/g-/gstreamer.json | 15 + .../vcpkg/versions/g-/gtest.json | 10 + external_imported/vcpkg/versions/g-/gtk.json | 5 + .../vcpkg/versions/g-/gtkmm.json | 10 + external_imported/vcpkg/versions/g-/gtl.json | 9 + .../vcpkg/versions/g-/guetzli.json | 5 + external_imported/vcpkg/versions/h-/h3.json | 5 + .../vcpkg/versions/h-/harfbuzz.json | 15 + external_imported/vcpkg/versions/h-/hdf5.json | 5 + external_imported/vcpkg/versions/h-/hexl.json | 5 + external_imported/vcpkg/versions/h-/hps.json | 9 + external_imported/vcpkg/versions/h-/hpx.json | 10 + .../vcpkg/versions/h-/hunspell.json | 10 + .../vcpkg/versions/h-/hwloc.json | 15 + external_imported/vcpkg/versions/i-/icu.json | 20 + .../vcpkg/versions/i-/idevicerestore.json | 10 + .../vcpkg/versions/i-/ignition-common3.json | 5 + .../vcpkg/versions/i-/ignition-msgs5.json | 5 + .../vcpkg/versions/i-/ignition-msgs6.json | 5 + .../versions/i-/ignition-transport4.json | 10 + .../versions/i-/ignition-transport8.json | 5 + .../versions/i-/ignition-transport9.json | 10 + .../vcpkg/versions/i-/igraph.json | 10 + external_imported/vcpkg/versions/i-/iir1.json | 5 + .../vcpkg/versions/i-/imath.json | 5 + .../vcpkg/versions/i-/imgui-sfml.json | 5 + .../vcpkg/versions/i-/imgui.json | 5 + .../vcpkg/versions/i-/immer.json | 5 + .../vcpkg/versions/i-/implot.json | 5 + .../vcpkg/versions/i-/infoware.json | 5 + .../vcpkg/versions/i-/intel-ipsec.json | 5 + .../vcpkg/versions/i-/intelrdfpmathlib.json | 5 + .../vcpkg/versions/i-/irrlicht.json | 5 + external_imported/vcpkg/versions/i-/itk.json | 10 + .../vcpkg/versions/i-/ixwebsocket.json | 5 + .../vcpkg/versions/j-/jack2.json | 5 + .../vcpkg/versions/j-/jaeger-client-cpp.json | 5 + .../vcpkg/versions/j-/jasper.json | 15 + .../vcpkg/versions/j-/json-dto.json | 5 + .../vcpkg/versions/j-/jsoncons.json | 5 + .../vcpkg/versions/k-/keystone.json | 5 + .../vcpkg/versions/k-/kf5archive.json | 5 + external_imported/vcpkg/versions/k-/kfr.json | 5 + .../vcpkg/versions/k-/kinectsdk1.json | 5 + external_imported/vcpkg/versions/k-/knet.json | 5 + .../vcpkg/versions/k-/krabsetw.json | 5 + external_imported/vcpkg/versions/k-/ktx.json | 10 + .../vcpkg/versions/k-/kubernetes.json | 10 + .../vcpkg/versions/k-/kwsys.json | 5 + .../vcpkg/versions/l-/lager.json | 5 + .../vcpkg/versions/l-/lapack-reference.json | 5 + .../vcpkg/versions/l-/lapack.json | 5 + .../vcpkg/versions/l-/lazy-importer.json | 5 + external_imported/vcpkg/versions/l-/lcms.json | 5 + .../vcpkg/versions/l-/leptonica.json | 10 + .../vcpkg/versions/l-/leveldb.json | 15 + .../vcpkg/versions/l-/levmar.json | 5 + .../vcpkg/versions/l-/libalkimia.json | 5 + .../vcpkg/versions/l-/libao.json | 19 + .../vcpkg/versions/l-/libarchive.json | 15 + .../vcpkg/versions/l-/libassuan.json | 5 + .../vcpkg/versions/l-/libb2.json | 5 + .../vcpkg/versions/l-/libbacktrace.json | 5 + .../vcpkg/versions/l-/libcanberra.json | 5 + .../vcpkg/versions/l-/libcpplocate.json | 9 + .../vcpkg/versions/l-/libcrafter.json | 5 + .../versions/l-/libcurl-simple-https.json | 9 + .../vcpkg/versions/l-/libdatachannel.json | 10 + .../vcpkg/versions/l-/libdatrie.json | 10 + .../vcpkg/versions/l-/libde265.json | 10 + .../vcpkg/versions/l-/libdshowcapture.json | 5 + .../vcpkg/versions/l-/libe57.json | 5 + .../vcpkg/versions/l-/libe57format.json | 9 + .../vcpkg/versions/l-/libevent.json | 5 + .../vcpkg/versions/l-/libevhtp.json | 5 + .../vcpkg/versions/l-/libexif.json | 5 + .../vcpkg/versions/l-/libfabric.json | 5 + .../vcpkg/versions/l-/libfido2.json | 10 + .../vcpkg/versions/l-/libgeotiff.json | 10 + .../vcpkg/versions/l-/libgit2.json | 5 + .../vcpkg/versions/l-/libgnutls.json | 5 + .../vcpkg/versions/l-/libgo.json | 5 + .../vcpkg/versions/l-/libgpiod.json | 9 + .../vcpkg/versions/l-/libgpod.json | 5 + .../vcpkg/versions/l-/libgwenhywfar.json | 5 + .../vcpkg/versions/l-/libhdfs3.json | 10 + .../vcpkg/versions/l-/libheif.json | 10 + .../vcpkg/versions/l-/libhsplasma.json | 5 + .../vcpkg/versions/l-/libhv.json | 15 + .../vcpkg/versions/l-/libiconv.json | 10 + .../vcpkg/versions/l-/libidn2.json | 10 + .../vcpkg/versions/l-/libigl.json | 5 + .../vcpkg/versions/l-/libjpeg-turbo.json | 15 + .../vcpkg/versions/l-/libjuice.json | 10 + .../vcpkg/versions/l-/liblinear.json | 5 + .../vcpkg/versions/l-/liblsl.json | 5 + .../vcpkg/versions/l-/liblzma.json | 5 + .../vcpkg/versions/l-/libmesh.json | 10 + .../vcpkg/versions/l-/libmicrohttpd.json | 5 + .../vcpkg/versions/l-/libmodbus.json | 5 + .../vcpkg/versions/l-/libmpeg2.json | 5 + .../vcpkg/versions/l-/libmt32emu.json | 5 + .../vcpkg/versions/l-/libmupdf.json | 5 + .../vcpkg/versions/l-/libmysql.json | 5 + .../vcpkg/versions/l-/libnice.json | 5 + .../vcpkg/versions/l-/libnoise.json | 5 + .../vcpkg/versions/l-/libosip2.json | 5 + .../vcpkg/versions/l-/libosmium.json | 5 + .../vcpkg/versions/l-/libp7client.json | 5 + .../vcpkg/versions/l-/libpff.json | 5 + .../vcpkg/versions/l-/libpq.json | 10 + .../vcpkg/versions/l-/libpqxx.json | 5 + .../vcpkg/versions/l-/libproxy.json | 5 + .../vcpkg/versions/l-/libqcow.json | 5 + .../vcpkg/versions/l-/librabbitmq.json | 10 + .../vcpkg/versions/l-/libraqm.json | 5 + .../vcpkg/versions/l-/librdkafka.json | 10 + .../vcpkg/versions/l-/libressl.json | 10 + .../vcpkg/versions/l-/librsync.json | 5 + .../vcpkg/versions/l-/librtmp.json | 5 + .../vcpkg/versions/l-/libsass.json | 5 + .../vcpkg/versions/l-/libsbml.json | 5 + .../vcpkg/versions/l-/libslirp.json | 14 + .../vcpkg/versions/l-/libsmb2.json | 5 + .../vcpkg/versions/l-/libsndfile.json | 5 + .../vcpkg/versions/l-/libsnoretoast.json | 5 + .../vcpkg/versions/l-/libsoundio.json | 10 + .../vcpkg/versions/l-/libspatialite.json | 10 + .../vcpkg/versions/l-/libspnav.json | 5 + .../vcpkg/versions/l-/libsquish.json | 5 + .../vcpkg/versions/l-/libsrt.json | 5 + .../vcpkg/versions/l-/libsrtp.json | 5 + .../vcpkg/versions/l-/libssh.json | 5 + .../vcpkg/versions/l-/libssh2.json | 20 + .../vcpkg/versions/l-/libtcod.json | 5 + .../vcpkg/versions/l-/libtins.json | 10 + .../vcpkg/versions/l-/libtorrent.json | 10 + .../vcpkg/versions/l-/libu2f-server.json | 5 + .../vcpkg/versions/l-/libudis86.json | 5 + .../vcpkg/versions/l-/libunistring.json | 5 + .../vcpkg/versions/l-/liburing.json | 15 + .../vcpkg/versions/l-/libusb-win32.json | 5 + .../vcpkg/versions/l-/libusbmuxd.json | 5 + .../vcpkg/versions/l-/libuuid.json | 10 + .../vcpkg/versions/l-/libuv.json | 5 + .../vcpkg/versions/l-/libvmdk.json | 5 + .../vcpkg/versions/l-/libvorbis.json | 5 + .../vcpkg/versions/l-/libwandio.json | 10 + .../vcpkg/versions/l-/libwebsockets.json | 15 + .../vcpkg/versions/l-/libxdiff.json | 5 + .../vcpkg/versions/l-/libxml2.json | 5 + .../vcpkg/versions/l-/libxmp-lite.json | 5 + .../vcpkg/versions/l-/libxslt.json | 5 + .../vcpkg/versions/l-/licensepp.json | 5 + external_imported/vcpkg/versions/l-/lilv.json | 5 + .../versions/l-/lionkor-commandline.json | 14 + .../vcpkg/versions/l-/llfio.json | 5 + external_imported/vcpkg/versions/l-/llvm.json | 10 + external_imported/vcpkg/versions/l-/lmdb.json | 10 + .../vcpkg/versions/l-/log4cplus.json | 5 + .../vcpkg/versions/l-/log4cpp.json | 5 + .../vcpkg/versions/l-/loguru.json | 5 + external_imported/vcpkg/versions/l-/lua.json | 10 + .../vcpkg/versions/l-/luajit.json | 5 + .../vcpkg/versions/l-/luasec.json | 5 + .../vcpkg/versions/l-/luasocket.json | 5 + .../vcpkg/versions/l-/lunasvg.json | 9 + .../vcpkg/versions/m-/mailio.json | 20 + .../vcpkg/versions/m-/mapnik.json | 15 + external_imported/vcpkg/versions/m-/marl.json | 10 + .../vcpkg/versions/m-/mbedtls.json | 10 + .../vcpkg/versions/m-/mdnsresponder.json | 5 + external_imported/vcpkg/versions/m-/mesa.json | 15 + .../vcpkg/versions/m-/mhook.json | 5 + .../versions/m-/milerius-sfml-imgui.json | 5 + .../vcpkg/versions/m-/mimalloc.json | 15 + .../vcpkg/versions/m-/minhook.json | 5 + .../vcpkg/versions/m-/minizip-ng.json | 5 + .../vcpkg/versions/m-/minizip.json | 5 + external_imported/vcpkg/versions/m-/mman.json | 5 + .../vcpkg/versions/m-/mmloader.json | 5 + external_imported/vcpkg/versions/m-/mnn.json | 5 + .../vcpkg/versions/m-/mongoose.json | 10 + .../vcpkg/versions/m-/monkeys-audio.json | 5 + external_imported/vcpkg/versions/m-/mpc.json | 5 + external_imported/vcpkg/versions/m-/mpfr.json | 10 + .../vcpkg/versions/m-/mpg123.json | 5 + external_imported/vcpkg/versions/m-/mpir.json | 10 + .../vcpkg/versions/m-/ms-gltf.json | 5 + .../vcpkg/versions/m-/ms-gsl.json | 5 + .../vcpkg/versions/m-/msmpi.json | 5 + .../vcpkg/versions/m-/munit.json | 5 + .../vcpkg/versions/m-/muparser.json | 15 + .../vcpkg/versions/m-/murmurhash.json | 5 + .../vcpkg/versions/m-/mvfst.json | 20 + .../vcpkg/versions/m-/mygui.json | 5 + .../vcpkg/versions/n-/nanobench.json | 5 + .../vcpkg/versions/n-/nanogui.json | 5 + .../vcpkg/versions/n-/nanorange.json | 5 + .../vcpkg/versions/n-/nanovg.json | 5 + .../vcpkg/versions/n-/nativefiledialog.json | 5 + .../versions/n-/nayuki-qr-code-generator.json | 9 + external_imported/vcpkg/versions/n-/nccl.json | 5 + .../vcpkg/versions/n-/ncurses.json | 5 + .../n-/ned14-internal-quickcpplib.json | 5 + .../vcpkg/versions/n-/netcdf-c.json | 5 + .../vcpkg/versions/n-/nethost.json | 5 + .../vcpkg/versions/n-/nettle.json | 10 + .../vcpkg/versions/n-/networkdirect-sdk.json | 5 + .../vcpkg/versions/n-/ngspice.json | 10 + .../vcpkg/versions/n-/nlohmann-json.json | 15 + .../vcpkg/versions/n-/nmslib.json | 5 + .../vcpkg/versions/n-/nnpack.json | 10 + external_imported/vcpkg/versions/n-/nspr.json | 9 + external_imported/vcpkg/versions/n-/nss.json | 24 + .../vcpkg/versions/n-/nsync.json | 5 + .../vcpkg/versions/n-/nu-book-zxing-cpp.json | 9 + external_imported/vcpkg/versions/n-/nvtt.json | 10 + .../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-mbedtls.json | 5 + .../vcpkg/versions/o-/oatpp-mongo.json | 5 + .../vcpkg/versions/o-/oatpp-openssl.json | 5 + .../vcpkg/versions/o-/oatpp-postgresql.json | 5 + .../vcpkg/versions/o-/oatpp-sqlite.json | 5 + .../vcpkg/versions/o-/oatpp-ssdp.json | 9 + .../vcpkg/versions/o-/oatpp-swagger.json | 5 + .../vcpkg/versions/o-/oatpp-websocket.json | 5 + .../vcpkg/versions/o-/oatpp-zlib.json | 5 + .../vcpkg/versions/o-/oatpp.json | 5 + .../vcpkg/versions/o-/ocilib.json | 10 + .../vcpkg/versions/o-/ogre-next.json | 5 + external_imported/vcpkg/versions/o-/ogre.json | 10 + external_imported/vcpkg/versions/o-/ois.json | 5 + .../vcpkg/versions/o-/onednn.json | 5 + external_imported/vcpkg/versions/o-/onnx.json | 5 + .../vcpkg/versions/o-/onnxruntime-gpu.json | 5 + .../vcpkg/versions/o-/open62541.json | 10 + .../vcpkg/versions/o-/openal-soft.json | 5 + .../vcpkg/versions/o-/openblas.json | 5 + .../vcpkg/versions/o-/opencc.json | 5 + .../vcpkg/versions/o-/opencolorio.json | 20 + .../vcpkg/versions/o-/opencv.json | 5 + .../vcpkg/versions/o-/opencv2.json | 10 + .../vcpkg/versions/o-/opencv3.json | 20 + .../vcpkg/versions/o-/opencv4.json | 20 + .../vcpkg/versions/o-/opendnp3.json | 5 + .../vcpkg/versions/o-/opengl.json | 5 + .../vcpkg/versions/o-/openimageio.json | 15 + .../vcpkg/versions/o-/openmpi.json | 5 + .../vcpkg/versions/o-/openmvg.json | 15 + .../vcpkg/versions/o-/openssl.json | 35 + .../vcpkg/versions/o-/opensubdiv.json | 5 + .../vcpkg/versions/o-/opentelemetry-cpp.json | 10 + .../vcpkg/versions/o-/opentracing.json | 5 + .../vcpkg/versions/o-/openvdb.json | 5 + .../vcpkg/versions/o-/openvr.json | 5 + .../vcpkg/versions/o-/openxr-loader.json | 20 + .../vcpkg/versions/o-/osgearth.json | 5 + external_imported/vcpkg/versions/o-/otl.json | 5 + .../vcpkg/versions/p-/pango.json | 5 + .../vcpkg/versions/p-/pangomm.json | 5 + .../vcpkg/versions/p-/parallel-hashmap.json | 5 + .../vcpkg/versions/p-/paraview.json | 5 + external_imported/vcpkg/versions/p-/pbc.json | 5 + .../vcpkg/versions/p-/pcapplusplus.json | 5 + external_imported/vcpkg/versions/p-/pcl.json | 20 + .../vcpkg/versions/p-/pdal-c.json | 5 + external_imported/vcpkg/versions/p-/pdal.json | 5 + .../vcpkg/versions/p-/pegtl.json | 5 + .../vcpkg/versions/p-/pfring.json | 5 + .../vcpkg/versions/p-/physx.json | 5 + external_imported/vcpkg/versions/p-/piex.json | 5 + .../vcpkg/versions/p-/pixel.json | 10 + .../vcpkg/versions/p-/pixman.json | 5 + .../vcpkg/versions/p-/pkgconf.json | 5 + .../vcpkg/versions/p-/plibsys.json | 5 + external_imported/vcpkg/versions/p-/pmdk.json | 5 + external_imported/vcpkg/versions/p-/poco.json | 5 + .../vcpkg/versions/p-/polyhook2.json | 25 + .../vcpkg/versions/p-/poppler.json | 15 + .../vcpkg/versions/p-/popsift.json | 5 + .../vcpkg/versions/p-/portaudio.json | 5 + .../vcpkg/versions/p-/portmidi.json | 5 + .../vcpkg/versions/p-/portsmf.json | 5 + .../vcpkg/versions/p-/presentmon.json | 5 + external_imported/vcpkg/versions/p-/proj.json | 5 + .../vcpkg/versions/p-/proj4.json | 15 + .../vcpkg/versions/p-/protobuf.json | 10 + .../vcpkg/versions/p-/protozero.json | 5 + .../vcpkg/versions/p-/proxygen.json | 20 + external_imported/vcpkg/versions/p-/ptex.json | 5 + .../vcpkg/versions/p-/pybind11.json | 20 + .../vcpkg/versions/p-/python2.json | 15 + .../vcpkg/versions/p-/python3.json | 30 + .../vcpkg/versions/q-/qhttpengine.json | 5 + .../vcpkg/versions/q-/qhull.json | 5 + .../vcpkg/versions/q-/qnnpack.json | 10 + .../vcpkg/versions/q-/qpid-proton.json | 10 + external_imported/vcpkg/versions/q-/qt.json | 10 + .../vcpkg/versions/q-/qt5-3d.json | 10 + .../vcpkg/versions/q-/qt5-activeqt.json | 5 + .../vcpkg/versions/q-/qt5-androidextras.json | 5 + .../vcpkg/versions/q-/qt5-base.json | 20 + .../vcpkg/versions/q-/qt5-charts.json | 5 + .../vcpkg/versions/q-/qt5-connectivity.json | 5 + .../vcpkg/versions/q-/qt5-datavis3d.json | 5 + .../vcpkg/versions/q-/qt5-declarative.json | 5 + .../vcpkg/versions/q-/qt5-doc.json | 5 + .../vcpkg/versions/q-/qt5-gamepad.json | 5 + .../versions/q-/qt5-graphicaleffects.json | 5 + .../vcpkg/versions/q-/qt5-imageformats.json | 10 + .../vcpkg/versions/q-/qt5-location.json | 5 + .../vcpkg/versions/q-/qt5-macextras.json | 5 + .../vcpkg/versions/q-/qt5-mqtt.json | 5 + .../vcpkg/versions/q-/qt5-multimedia.json | 5 + .../vcpkg/versions/q-/qt5-networkauth.json | 5 + .../vcpkg/versions/q-/qt5-purchasing.json | 5 + .../vcpkg/versions/q-/qt5-quickcontrols.json | 5 + .../vcpkg/versions/q-/qt5-quickcontrols2.json | 5 + .../vcpkg/versions/q-/qt5-remoteobjects.json | 5 + .../vcpkg/versions/q-/qt5-script.json | 5 + .../vcpkg/versions/q-/qt5-scxml.json | 5 + .../vcpkg/versions/q-/qt5-sensors.json | 5 + .../vcpkg/versions/q-/qt5-serialbus.json | 5 + .../vcpkg/versions/q-/qt5-serialport.json | 5 + .../vcpkg/versions/q-/qt5-speech.json | 5 + .../vcpkg/versions/q-/qt5-svg.json | 5 + .../vcpkg/versions/q-/qt5-tools.json | 5 + .../vcpkg/versions/q-/qt5-translations.json | 5 + .../versions/q-/qt5-virtualkeyboard.json | 5 + .../vcpkg/versions/q-/qt5-wayland.json | 5 + .../vcpkg/versions/q-/qt5-webchannel.json | 5 + .../vcpkg/versions/q-/qt5-webengine.json | 10 + .../vcpkg/versions/q-/qt5-webglplugin.json | 5 + .../vcpkg/versions/q-/qt5-websockets.json | 5 + .../vcpkg/versions/q-/qt5-webview.json | 5 + .../vcpkg/versions/q-/qt5-winextras.json | 10 + .../vcpkg/versions/q-/qt5-x11extras.json | 5 + .../vcpkg/versions/q-/qt5-xmlpatterns.json | 5 + external_imported/vcpkg/versions/q-/qt5.json | 10 + .../vcpkg/versions/q-/qt5compat.json | 10 + .../vcpkg/versions/q-/qtactiveqt.json | 10 + .../versions/q-/qtapplicationmanager.json | 15 + .../vcpkg/versions/q-/qtbase.json | 20 + .../vcpkg/versions/q-/qtcharts.json | 10 + .../vcpkg/versions/q-/qtcoap.json | 10 + .../vcpkg/versions/q-/qtconnectivity.json | 10 + .../vcpkg/versions/q-/qtdatavis3d.json | 10 + .../vcpkg/versions/q-/qtdeclarative.json | 10 + .../vcpkg/versions/q-/qtdeviceutilities.json | 10 + .../vcpkg/versions/q-/qtdoc.json | 10 + .../vcpkg/versions/q-/qtimageformats.json | 10 + .../versions/q-/qtinterfaceframework.json | 20 + .../vcpkg/versions/q-/qtlocation.json | 10 + .../vcpkg/versions/q-/qtlottie.json | 10 + .../vcpkg/versions/q-/qtmqtt.json | 10 + .../vcpkg/versions/q-/qtmultimedia.json | 10 + .../vcpkg/versions/q-/qtnetworkauth.json | 10 + .../vcpkg/versions/q-/qtopcua.json | 10 + .../vcpkg/versions/q-/qtpositioning.json | 10 + .../vcpkg/versions/q-/qtquick3d.json | 10 + .../vcpkg/versions/q-/qtquicktimeline.json | 10 + .../vcpkg/versions/q-/qtremoteobjects.json | 10 + .../vcpkg/versions/q-/qtscxml.json | 10 + .../vcpkg/versions/q-/qtsensors.json | 10 + .../vcpkg/versions/q-/qtserialbus.json | 10 + .../vcpkg/versions/q-/qtserialport.json | 10 + .../vcpkg/versions/q-/qtshadertools.json | 10 + .../vcpkg/versions/q-/qtsvg.json | 10 + .../vcpkg/versions/q-/qttools.json | 10 + .../vcpkg/versions/q-/qttranslations.json | 10 + .../vcpkg/versions/q-/qtvirtualkeyboard.json | 10 + .../vcpkg/versions/q-/qtwayland.json | 10 + .../vcpkg/versions/q-/qtwebchannel.json | 10 + .../vcpkg/versions/q-/qtwebengine.json | 15 + .../vcpkg/versions/q-/qtwebsockets.json | 10 + .../vcpkg/versions/q-/qtwebview.json | 10 + .../vcpkg/versions/q-/quantlib.json | 5 + .../vcpkg/versions/q-/quickfix.json | 10 + .../vcpkg/versions/q-/quill.json | 5 + external_imported/vcpkg/versions/q-/qwtw.json | 5 + .../vcpkg/versions/r-/randomstr.json | 9 + .../vcpkg/versions/r-/raylib.json | 15 + .../vcpkg/versions/r-/readline-unix.json | 5 + .../vcpkg/versions/r-/readline-win32.json | 5 + .../vcpkg/versions/r-/realsense2.json | 10 + .../vcpkg/versions/r-/redis-plus-plus.json | 5 + .../vcpkg/versions/r-/rendergraph.json | 9 + .../vcpkg/versions/r-/replxx.json | 5 + .../vcpkg/versions/r-/reproc.json | 5 + .../vcpkg/versions/r-/restclient-cpp.json | 5 + .../vcpkg/versions/r-/rhash.json | 5 + .../vcpkg/versions/r-/rhasheq.json | 9 + .../vcpkg/versions/r-/robin-hood-hashing.json | 5 + .../vcpkg/versions/r-/rsasynccpp.json | 7 +- .../vcpkg/versions/r-/rsm-binary-io.json | 5 + .../vcpkg/versions/r-/rsm-bsa.json | 15 + .../vcpkg/versions/r-/rsm-mmio.json | 5 + .../vcpkg/versions/r-/rsocket.json | 5 + .../vcpkg/versions/r-/rtabmap.json | 10 + .../vcpkg/versions/r-/rtlsdr.json | 5 + .../vcpkg/versions/r-/rtmidi.json | 5 + .../vcpkg/versions/r-/rxspencer.json | 5 + external_imported/vcpkg/versions/r-/ryu.json | 5 + .../vcpkg/versions/s-/s2geometry.json | 5 + external_imported/vcpkg/versions/s-/s2n.json | 10 + external_imported/vcpkg/versions/s-/sail.json | 10 + external_imported/vcpkg/versions/s-/sbp.json | 5 + .../vcpkg/versions/s-/scintilla.json | 5 + .../vcpkg/versions/s-/sciter-js.json | 23 +- .../vcpkg/versions/s-/sciter.json | 5 + .../vcpkg/versions/s-/scnlib.json | 5 + .../vcpkg/versions/s-/scylla-wrapper.json | 5 + .../vcpkg/versions/s-/sdformat10.json | 5 + .../vcpkg/versions/s-/sdformat6.json | 10 + .../vcpkg/versions/s-/sdformat9.json | 10 + external_imported/vcpkg/versions/s-/sdl1.json | 5 + .../vcpkg/versions/s-/sdl2-image.json | 5 + external_imported/vcpkg/versions/s-/sdl2.json | 10 + external_imported/vcpkg/versions/s-/seal.json | 10 + .../vcpkg/versions/s-/sentencepiece.json | 5 + .../vcpkg/versions/s-/sentry-native.json | 20 + .../vcpkg/versions/s-/serdepp.json | 9 + external_imported/vcpkg/versions/s-/sfml.json | 10 + .../vcpkg/versions/s-/shaderc.json | 5 + .../vcpkg/versions/s-/shaderwriter.json | 15 + .../vcpkg/versions/s-/shapelib.json | 5 + .../vcpkg/versions/s-/shiva.json | 5 + .../vcpkg/versions/s-/shogun.json | 5 + .../vcpkg/versions/s-/simage.json | 5 + .../vcpkg/versions/s-/simbody.json | 5 + .../vcpkg/versions/s-/simpleini.json | 5 + external_imported/vcpkg/versions/s-/skia.json | 10 + .../vcpkg/versions/s-/skyr-url.json | 5 + .../vcpkg/versions/s-/sleef.json | 10 + .../vcpkg/versions/s-/sleepy-discord.json | 5 + .../vcpkg/versions/s-/slikenet.json | 5 + .../vcpkg/versions/s-/sockpp.json | 15 + external_imported/vcpkg/versions/s-/soem.json | 5 + external_imported/vcpkg/versions/s-/soil.json | 5 + .../vcpkg/versions/s-/soil2.json | 5 + .../vcpkg/versions/s-/sophus.json | 5 + .../vcpkg/versions/s-/soundtouch.json | 5 + .../vcpkg/versions/s-/spdk-isal.json | 5 + .../vcpkg/versions/s-/spdlog.json | 5 + .../vcpkg/versions/s-/speex.json | 10 + .../vcpkg/versions/s-/speexdsp.json | 5 + .../vcpkg/versions/s-/spirv-headers.json | 5 + .../vcpkg/versions/s-/spirv-reflect.json | 14 + .../vcpkg/versions/s-/spirv-tools.json | 5 + .../vcpkg/versions/s-/sqlcipher.json | 10 + .../vcpkg/versions/s-/sqlite3.json | 10 + .../vcpkg/versions/s-/starlink-ast.json | 10 + .../vcpkg/versions/s-/superlu.json | 5 + .../vcpkg/versions/t-/taglib.json | 5 + .../vcpkg/versions/t-/taskflow.json | 5 + external_imported/vcpkg/versions/t-/tbb.json | 10 + .../vcpkg/versions/t-/tcb-span.json | 9 + .../vcpkg/versions/t-/teemo.json | 5 + .../vcpkg/versions/t-/tensorflow-cc.json | 5 + .../vcpkg/versions/t-/tensorflow.json | 5 + .../vcpkg/versions/t-/tensorpipe.json | 5 + .../vcpkg/versions/t-/tesseract.json | 5 + external_imported/vcpkg/versions/t-/tfhe.json | 5 + .../vcpkg/versions/t-/tgbot-cpp.json | 5 + external_imported/vcpkg/versions/t-/tgui.json | 5 + .../vcpkg/versions/t-/theia.json | 5 + .../vcpkg/versions/t-/tidy-html5.json | 5 + external_imported/vcpkg/versions/t-/tiff.json | 15 + .../vcpkg/versions/t-/tinkerforge.json | 5 + .../vcpkg/versions/t-/tinycbor.json | 14 + .../vcpkg/versions/t-/tinyexif.json | 5 + .../vcpkg/versions/t-/tinyfiledialogs.json | 5 + external_imported/vcpkg/versions/t-/tmx.json | 5 + .../vcpkg/versions/t-/tomlplusplus.json | 5 + .../vcpkg/versions/t-/tool-meson.json | 5 + .../vcpkg/versions/t-/tracy.json | 15 + .../vcpkg/versions/t-/trantor.json | 5 + .../vcpkg/versions/t-/triangle.json | 5 + .../vcpkg/versions/t-/triton.json | 19 + .../vcpkg/versions/t-/ttauri.json | 5 + .../vcpkg/versions/t-/turbobase64.json | 5 + .../vcpkg/versions/t-/tvision.json | 5 + .../vcpkg/versions/u-/umock-c.json | 5 + .../vcpkg/versions/u-/unicorn-lib.json | 5 + .../vcpkg/versions/u-/unicorn.json | 10 + .../vcpkg/versions/u-/unrar.json | 10 + external_imported/vcpkg/versions/u-/usd.json | 5 + .../vcpkg/versions/u-/utf8h.json | 5 + .../vcpkg/versions/u-/uthenticode.json | 10 + .../vcpkg/versions/u-/uvatlas.json | 15 + .../vcpkg/versions/u-/uwebsockets.json | 10 + .../vcpkg/versions/v-/v-hacd.json | 5 + external_imported/vcpkg/versions/v-/v8.json | 5 + .../vcpkg/versions/v-/vamp-sdk.json | 5 + external_imported/vcpkg/versions/v-/vc.json | 5 + .../vcpkg/versions/v-/vcpkg-cmake-config.json | 10 + .../vcpkg/versions/v-/vcpkg-cmake.json | 20 + .../v-/vcpkg-get-python-packages.json | 9 + .../vcpkg/versions/v-/vcpkg-gfortran.json | 5 + .../vcpkg/versions/v-/vcpkg-gn.json | 5 + .../v-/vcpkg-pkgconfig-get-modules.json | 10 + .../vcpkg/versions/v-/vcpkg-qmake.json | 5 + .../vcpkg/versions/v-/vcpkg-tool-gyp-nss.json | 9 + .../vcpkg/versions/v-/vcpkg-tool-lessmsi.json | 9 + .../vcpkg/versions/v-/vcpkg-tool-meson.json | 5 + .../versions/v-/vcpkg-tool-mozbuild.json | 9 + .../vcpkg/versions/v-/vcpkg-tool-python2.json | 9 + .../vcpkg/versions/v-/vectorclass.json | 5 + external_imported/vcpkg/versions/v-/vlpp.json | 5 + external_imported/vcpkg/versions/v-/volk.json | 5 + external_imported/vcpkg/versions/v-/vtk.json | 25 + .../versions/v-/vulkan-memory-allocator.json | 5 + .../vcpkg/versions/w-/wampcc.json | 5 + .../vcpkg/versions/w-/wangle.json | 10 + .../vcpkg/versions/w-/wavpack.json | 5 + .../vcpkg/versions/w-/websocketpp.json | 5 + .../vcpkg/versions/w-/wincrypt.json | 5 + .../vcpkg/versions/w-/winpcap.json | 10 + .../vcpkg/versions/w-/winreg.json | 20 + .../vcpkg/versions/w-/winsock2.json | 5 + .../vcpkg/versions/w-/winsparkle.json | 14 + .../vcpkg/versions/w-/wintoast.json | 5 + .../vcpkg/versions/w-/wpilib.json | 5 + external_imported/vcpkg/versions/w-/wt.json | 10 + .../vcpkg/versions/w-/wxwidgets.json | 15 + .../vcpkg/versions/x-/x-plane.json | 5 + external_imported/vcpkg/versions/x-/x264.json | 5 + .../vcpkg/versions/x-/xaudio2redist.json | 10 + .../vcpkg/versions/x-/xbyak.json | 5 + .../vcpkg/versions/x-/xerces-c.json | 5 + .../vcpkg/versions/x-/xmlsec.json | 5 + .../vcpkg/versions/x-/xnnpack.json | 5 + .../vcpkg/versions/x-/xqilla.json | 14 + .../vcpkg/versions/x-/xtensor.json | 5 + external_imported/vcpkg/versions/y-/yajl.json | 5 + external_imported/vcpkg/versions/y-/yara.json | 5 + .../vcpkg/versions/y-/yasm-tool-helper.json | 5 + .../vcpkg/versions/y-/yasm-tool.json | 10 + external_imported/vcpkg/versions/y-/yasm.json | 5 + external_imported/vcpkg/versions/y-/yato.json | 5 + external_imported/vcpkg/versions/z-/z3.json | 10 + .../vcpkg/versions/z-/zeromq.json | 15 + external_imported/vcpkg/versions/z-/zkpp.json | 5 + external_imported/vcpkg/versions/z-/zlib.json | 5 + .../vcpkg/versions/z-/zpp-bits.json | 9 + external_imported/vcpkg/versions/z-/zstd.json | 10 + .../vcpkg/versions/z-/ztd-text.json | 9 + .../vcpkg/versions/z-/zziplib.json | 5 + 3450 files changed, 47032 insertions(+), 20741 deletions(-) create mode 100644 external_imported/sentry-native/external/breakpad/src/tools/mac/upload_system_symbols/go.mod create mode 100644 external_imported/sentry-native/external/crashpad/.vpython3 create mode 100644 external_imported/sentry-native/external/crashpad/build/ios/xcodescheme-testable.template create mode 100644 external_imported/sentry-native/external/crashpad/build/ios/xcodescheme.template create mode 100644 external_imported/sentry-native/external/crashpad/snapshot/ios/memory_snapshot_ios_intermediate_dump_test.cc create mode 100644 external_imported/sentry-native/external/crashpad/test/ios/host/handler_forbidden_allocators.cc create mode 100644 external_imported/sentry-native/external/crashpad/test/ios/host/handler_forbidden_allocators.h create mode 100644 external_imported/sentry-native/external/crashpad/third_party/lss/lss/DIR_METADATA create mode 100644 external_imported/sentry-native/external/crashpad/third_party/lss/lss/LICENSE create mode 100644 external_imported/sentry-native/external/crashpad/third_party/lss/lss/OWNERS create mode 100644 external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/getrandom.c create mode 100644 external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/lstat.c create mode 100644 external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/sigaction.c create mode 100644 external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/stat.c create mode 100644 external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/.style.yapf delete mode 100644 external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/ignore_result.h create mode 100644 external_imported/sentry-native/external/crashpad/util/ios/scoped_background_task.h create mode 100644 external_imported/sentry-native/external/crashpad/util/ios/scoped_background_task.mm rename external_imported/sentry-native/external/crashpad/util/misc/{arm64_bti_note.S => arm64_pac_bti.S} (63%) create mode 100644 external_imported/sentry-native/external/crashpad/util/win/exception_codes.h create mode 100644 external_imported/sentry-native/src/sentry_tracing.c create mode 100644 external_imported/sentry-native/src/sentry_tracing.h create mode 100644 external_imported/sentry-native/tests/unit/test_sampling.c create mode 100644 external_imported/sentry-native/tests/unit/test_tracing.c create mode 100644 external_imported/vcpkg/CONTRIBUTING_zh.md create mode 100644 external_imported/vcpkg/docs/maintainers/authoring-script-ports.md create mode 100644 external_imported/vcpkg/ports/7zip/7zip-config.cmake.in delete mode 100644 external_imported/vcpkg/ports/7zip/License.txt delete mode 100644 external_imported/vcpkg/ports/7zip/unRarLicense.txt delete mode 100644 external_imported/vcpkg/ports/alsa/0001-control-empty-fix-the-static-build.patch create mode 100644 external_imported/vcpkg/ports/anax/osx-arm.patch delete mode 100644 external_imported/vcpkg/ports/ashes/fix-cast.patch delete mode 100644 external_imported/vcpkg/ports/aws-sdk-cpp/fix-config.patch create mode 100644 external_imported/vcpkg/ports/aws-sdk-cpp/fix-openssl3.patch create mode 100644 external_imported/vcpkg/ports/azure-c-shared-utility/fix-install-location-preview.patch create mode 100644 external_imported/vcpkg/ports/azure-c-shared-utility/fix-install-location.patch create mode 100644 external_imported/vcpkg/ports/azure-c-shared-utility/improve-dependencies-preview.patch create mode 100644 external_imported/vcpkg/ports/azure-c-shared-utility/improve-dependencies.patch create mode 100644 external_imported/vcpkg/ports/azure-c-shared-utility/openssl.patch rename external_imported/vcpkg/ports/azure-iot-sdk-c/{fix-cmake.patch => fix-install-location.patch} (83%) create mode 100644 external_imported/vcpkg/ports/azure-iot-sdk-c/fix-iothubclient-includes.patch create mode 100644 external_imported/vcpkg/ports/azure-iot-sdk-c/improve-external-deps-preview.patch delete mode 100644 external_imported/vcpkg/ports/azure-iot-sdk-c/remove-werror.patch create mode 100644 external_imported/vcpkg/ports/azure-kinect-sensor-sdk/fix-build-imgui.patch rename external_imported/vcpkg/ports/{azure-security-keyvault-common-cpp => azure-security-attestation-cpp}/portfile.cmake (52%) create mode 100644 external_imported/vcpkg/ports/azure-security-attestation-cpp/vcpkg.json delete mode 100644 external_imported/vcpkg/ports/azure-security-keyvault-common-cpp/vcpkg.json create mode 100644 external_imported/vcpkg/ports/azure-uhttp-c/package-location-fix-preview.patch create mode 100644 external_imported/vcpkg/ports/azure-umqtt-c/package-location-fix-preview.patch create mode 100644 external_imported/vcpkg/ports/boinc/001-add-openssl3-support.patch create mode 100644 external_imported/vcpkg/ports/boost-build/0002-fix-get-version.patch create mode 100644 external_imported/vcpkg/ports/botan/embed-debug-info.patch create mode 100644 external_imported/vcpkg/ports/braft/export-target.patch create mode 100644 external_imported/vcpkg/ports/braft/fix-build.patch create mode 100644 external_imported/vcpkg/ports/braft/fix-dependency.patch create mode 100644 external_imported/vcpkg/ports/braft/portfile.cmake create mode 100644 external_imported/vcpkg/ports/braft/vcpkg.json delete mode 100644 external_imported/vcpkg/ports/brpc/fix-protobuf-deprecated.patch create mode 100644 external_imported/vcpkg/ports/buck-yeh-bux/fix-errorC7595.patch create mode 100644 external_imported/vcpkg/ports/c-ares/avoid-docs.patch create mode 100644 external_imported/vcpkg/ports/c-dbg-macro/portfile.cmake create mode 100644 external_imported/vcpkg/ports/c-dbg-macro/vcpkg.json create mode 100644 external_imported/vcpkg/ports/c89stringutils/portfile.cmake create mode 100644 external_imported/vcpkg/ports/c89stringutils/vcpkg.json create mode 100644 external_imported/vcpkg/ports/caffe2/no-inout-macros.patch delete mode 100644 external_imported/vcpkg/ports/cairo/0001-meson-fix-macOS-build-and-add-macOS-ci.patch create mode 100644 external_imported/vcpkg/ports/cairo/disable-atomic-ops-check.patch create mode 100644 external_imported/vcpkg/ports/cairomm/build-support-msvc2022.diff delete mode 100644 external_imported/vcpkg/ports/cairomm/undef.win32.patch delete mode 100755 external_imported/vcpkg/ports/calceph/makefilevc.patch create mode 100644 external_imported/vcpkg/ports/capstone/001-silence-windows-crt-secure-warnings.patch create mode 100644 external_imported/vcpkg/ports/cargs/portfile.cmake create mode 100644 external_imported/vcpkg/ports/cargs/vcpkg.json create mode 100644 external_imported/vcpkg/ports/cnats/portfile.cmake create mode 100644 external_imported/vcpkg/ports/cnats/vcpkg.json rename external_imported/vcpkg/ports/{co => cocoyaxi}/fix-event-destruct.patch (100%) rename external_imported/vcpkg/ports/{co => cocoyaxi}/install-dll.patch (100%) create mode 100644 external_imported/vcpkg/ports/cocoyaxi/portfile.cmake create mode 100644 external_imported/vcpkg/ports/cocoyaxi/vcpkg.json rename external_imported/vcpkg/ports/colmap/{fix-dependency-freeimage.patch => fix-dependencies.patch} (59%) create mode 100644 external_imported/vcpkg/ports/color-console/portfile.cmake create mode 100644 external_imported/vcpkg/ports/color-console/usage create mode 100644 external_imported/vcpkg/ports/color-console/vcpkg.json create mode 100644 external_imported/vcpkg/ports/coroutine/gsl-4_0_0.patch create mode 100644 external_imported/vcpkg/ports/cpp-redis/fix-sleep_for.patch create mode 100644 external_imported/vcpkg/ports/cppxaml/portfile.cmake create mode 100644 external_imported/vcpkg/ports/cppxaml/vcpkg.json delete mode 100644 external_imported/vcpkg/ports/cpuinfo/fix-install.patch create mode 100644 external_imported/vcpkg/ports/croncpp/no-test.patch create mode 100644 external_imported/vcpkg/ports/crossguid/warnings.patch create mode 100644 external_imported/vcpkg/ports/cub/fix-usage.patch create mode 100644 external_imported/vcpkg/ports/cub/usage delete mode 100644 external_imported/vcpkg/ports/curl/0006_fix_tool_depends.patch delete mode 100644 external_imported/vcpkg/ports/curl/0007_disable_tool_export_curl_target.patch delete mode 100644 external_imported/vcpkg/ports/curl/0011_fix_static_build.patch delete mode 100644 external_imported/vcpkg/ports/curl/0023-fix-static-libs-export.patch create mode 100644 external_imported/vcpkg/ports/curl/cmake-project-include.cmake create mode 100644 external_imported/vcpkg/ports/curl/export-components.patch create mode 100644 external_imported/vcpkg/ports/curl/mbedtls-ws2_32.patch create mode 100644 external_imported/vcpkg/ports/date/fix-uninitialized-values.patch create mode 100644 external_imported/vcpkg/ports/dimcli/fix-build.patch create mode 100644 external_imported/vcpkg/ports/discordcoreapi/portfile.cmake create mode 100644 external_imported/vcpkg/ports/discordcoreapi/vcpkg.json delete mode 100644 external_imported/vcpkg/ports/drogon/fs.patch create mode 100644 external_imported/vcpkg/ports/drogon/usage create mode 100644 external_imported/vcpkg/ports/drogon/use-libmariadb.patch create mode 100644 external_imported/vcpkg/ports/dstorage/dstorage-config.cmake.in create mode 100644 external_imported/vcpkg/ports/dstorage/portfile.cmake create mode 100644 external_imported/vcpkg/ports/dstorage/vcpkg.json create mode 100644 external_imported/vcpkg/ports/dxsdk-d3dx/dxsdk-d3dx-config.cmake.in create mode 100644 external_imported/vcpkg/ports/earcut-hpp/portfile.cmake create mode 100644 external_imported/vcpkg/ports/earcut-hpp/vcpkg.json create mode 100644 external_imported/vcpkg/ports/eastl/Fix-error-C2338.patch create mode 100644 external_imported/vcpkg/ports/ebml/include-limits.patch delete mode 100644 external_imported/vcpkg/ports/eigen3/disable_pkgconfig_absolute_path_check.patch delete mode 100644 external_imported/vcpkg/ports/eigen3/fix-cuda-error.patch create mode 100644 external_imported/vcpkg/ports/eigen3/fix-vectorized-reductions-half.patch create mode 100644 external_imported/vcpkg/ports/eigen3/remove_configure_checks.patch create mode 100644 external_imported/vcpkg/ports/eventpp/portfile.cmake create mode 100644 external_imported/vcpkg/ports/eventpp/vcpkg.json delete mode 100644 external_imported/vcpkg/ports/expat/pkgconfig.patch delete mode 100644 external_imported/vcpkg/ports/fbthrift/fix-sodium-target.patch delete mode 100644 external_imported/vcpkg/ports/fbthrift/fix-zlib.patch delete mode 100644 external_imported/vcpkg/ports/field3d/0001_fix_build_errors.patch delete mode 100644 external_imported/vcpkg/ports/field3d/0002_improve_win_compatibility.patch delete mode 100644 external_imported/vcpkg/ports/field3d/0003_hdf5_api.patch delete mode 100644 external_imported/vcpkg/ports/field3d/portfile.cmake delete mode 100644 external_imported/vcpkg/ports/field3d/vcpkg.json create mode 100644 external_imported/vcpkg/ports/fizz/0001-fix-libsodium.patch create mode 100644 external_imported/vcpkg/ports/fizz/0002-fix-libevent.patch delete mode 100644 external_imported/vcpkg/ports/fizz/fix-zlib.patch create mode 100644 external_imported/vcpkg/ports/flash-runtime-extensions/README.md create mode 100644 external_imported/vcpkg/ports/flash-runtime-extensions/portfile.cmake create mode 100644 external_imported/vcpkg/ports/flash-runtime-extensions/vcpkg.json delete mode 100644 external_imported/vcpkg/ports/fltk/fltk_version.dat create mode 100644 external_imported/vcpkg/ports/fmt/fix-invalid-command.patch create mode 100644 external_imported/vcpkg/ports/fontconfig/no-etc-symlinks.patch delete mode 100644 external_imported/vcpkg/ports/freeglut/gcc10.patch delete mode 100644 external_imported/vcpkg/ports/freeglut/use_targets_to_export_x11_dependency.patch create mode 100644 external_imported/vcpkg/ports/freeglut/windows-static-output-name.patch create mode 100644 external_imported/vcpkg/ports/freeglut/x11-dependencies-export.patch delete mode 100644 external_imported/vcpkg/ports/freetype/fix-2.11-msvc-build.patch create mode 100644 external_imported/vcpkg/ports/fribidi/meson-crosscompile.patch create mode 100644 external_imported/vcpkg/ports/gainput/fix-build.patch create mode 100644 external_imported/vcpkg/ports/gazebo/0001-Fix-deps.patch create mode 100644 external_imported/vcpkg/ports/gazebo/portfile.cmake create mode 100644 external_imported/vcpkg/ports/gazebo/vcpkg.json create mode 100644 external_imported/vcpkg/ports/gdal/0009-atlbase.patch create mode 100644 external_imported/vcpkg/ports/gdal/0010-symprefix.patch create mode 100644 external_imported/vcpkg/ports/getdns/disable-docs.patch create mode 100644 external_imported/vcpkg/ports/getopt-win32/getopt.h.patch create mode 100644 external_imported/vcpkg/ports/gettext/0004-Fix-uwp-tools-build.patch create mode 100644 external_imported/vcpkg/ports/gherkin-c/fix-include-path.patch create mode 100644 external_imported/vcpkg/ports/gherkin-c/fix-install-error.patch delete mode 100644 external_imported/vcpkg/ports/giflib/vcpkg-cmake-wrapper.cmake create mode 100644 external_imported/vcpkg/ports/glibmm/build-support-vs2022-builds.patch create mode 100644 external_imported/vcpkg/ports/glog/fix_glog_CMAKE_MODULE_PATH.patch create mode 100644 external_imported/vcpkg/ports/glog/fix_log_every_n.patch create mode 100644 external_imported/vcpkg/ports/glog/nogdi-nominmax.patch delete mode 100644 external_imported/vcpkg/ports/gmp/adddef.patch create mode 100644 external_imported/vcpkg/ports/gmp/msvc_symbol.patch delete mode 100644 external_imported/vcpkg/ports/gmp/runtime.patch delete mode 100644 external_imported/vcpkg/ports/gmp/vs.build.patch create mode 100644 external_imported/vcpkg/ports/gmp/yasm.patch create mode 100644 external_imported/vcpkg/ports/gobject-introspection/0001-g-ir-tool-template.in.patch create mode 100644 external_imported/vcpkg/ports/gobject-introspection/0002-cross-build.patch create mode 100644 external_imported/vcpkg/ports/gobject-introspection/portfile.cmake create mode 100644 external_imported/vcpkg/ports/gobject-introspection/vcpkg.json create mode 100644 external_imported/vcpkg/ports/google-cloud-cpp/support_absl_cxx17.patch create mode 100644 external_imported/vcpkg/ports/grpc/00006-fix-uwp-error.patch create mode 100644 external_imported/vcpkg/ports/gstreamer/gstreamer-disable-hot-doc.patch create mode 100644 external_imported/vcpkg/ports/gstreamer/gstreamer-disable-no-unused.patch create mode 100644 external_imported/vcpkg/ports/gstreamer/plugin-base-disable-no-unused.patch create mode 100644 external_imported/vcpkg/ports/gstreamer/plugins-ugly-disable-doc.patch create mode 100644 external_imported/vcpkg/ports/gtest/clang-tidy-no-lint.patch create mode 100644 external_imported/vcpkg/ports/gtest/remove-werror.patch delete mode 100644 external_imported/vcpkg/ports/gtk/0003-vs2022-rc.patch create mode 100644 external_imported/vcpkg/ports/gtl/portfile.cmake create mode 100644 external_imported/vcpkg/ports/gtl/vcpkg.json create mode 100644 external_imported/vcpkg/ports/harfbuzz/fix-macos-build.diff create mode 100644 external_imported/vcpkg/ports/hps/portfile.cmake create mode 100644 external_imported/vcpkg/ports/hps/usage create mode 100644 external_imported/vcpkg/ports/hps/vcpkg.json create mode 100644 external_imported/vcpkg/ports/hpx/fix-cmakecache-paths.patch create mode 100644 external_imported/vcpkg/ports/hpx/fix-dependency-hwloc.patch create mode 100644 external_imported/vcpkg/ports/hunspell/0004-add-win-arm64.patch create mode 100644 external_imported/vcpkg/ports/icu/fix-win-build.patch rename external_imported/vcpkg/ports/idevicerestore/{libcurl_d.patch => fix-vcxproj.patch} (58%) create mode 100644 external_imported/vcpkg/ports/ignition-transport4/uuid-osx.patch create mode 100644 external_imported/vcpkg/ports/ignition-transport9/uuid-osx.patch delete mode 100644 external_imported/vcpkg/ports/imgui-sfml/005-fix-imtextureid-define.patch delete mode 100644 external_imported/vcpkg/ports/intel-ipsec/CMakeLists.txt create mode 100644 external_imported/vcpkg/ports/intel-ipsec/always-generate-pdb.patch create mode 100644 external_imported/vcpkg/ports/intel-ipsec/intel-ipsec-targets-implib.cmake.in create mode 100644 external_imported/vcpkg/ports/intel-ipsec/intel-ipsec-targets.cmake.in delete mode 100644 external_imported/vcpkg/ports/intel-ipsec/intel-ipsecConfig.cmake create mode 100644 external_imported/vcpkg/ports/intel-ipsec/intel-ipsecConfig.cmake.in delete mode 100644 external_imported/vcpkg/ports/itk/cufftw.patch delete mode 100644 external_imported/vcpkg/ports/itk/hdf5.patch delete mode 100644 external_imported/vcpkg/ports/itk/python_gpu_wrapping.patch create mode 100644 external_imported/vcpkg/ports/kf5archive/control-dependencies.patch delete mode 100644 external_imported/vcpkg/ports/kf5archive/use_cmake_to_find_zstd.patch delete mode 100644 external_imported/vcpkg/ports/leptonica/Modify-include-dir.patch delete mode 100644 external_imported/vcpkg/ports/leptonica/find-dependency.patch create mode 100644 external_imported/vcpkg/ports/leptonica/fix-CMakeDependency.patch delete mode 100644 external_imported/vcpkg/ports/leptonica/fix-cmakelists.patch delete mode 100644 external_imported/vcpkg/ports/leptonica/fix-find-libwebp.patch create mode 100644 external_imported/vcpkg/ports/leveldb/fix-dependencies.patch create mode 100644 external_imported/vcpkg/ports/libao/0001-windows-build-patch.patch create mode 100644 external_imported/vcpkg/ports/libao/portfile.cmake create mode 100644 external_imported/vcpkg/ports/libao/vcpkg.json create mode 100644 external_imported/vcpkg/ports/libcpplocate/fix-install-paths.patch create mode 100644 external_imported/vcpkg/ports/libcpplocate/portfile.cmake create mode 100644 external_imported/vcpkg/ports/libcpplocate/vcpkg.json create mode 100644 external_imported/vcpkg/ports/libcurl-simple-https/portfile.cmake create mode 100644 external_imported/vcpkg/ports/libcurl-simple-https/vcpkg.json create mode 100644 external_imported/vcpkg/ports/libdatachannel/uwp-warnings.patch delete mode 100644 external_imported/vcpkg/ports/libdatrie/fix-trietool.patch create mode 100644 external_imported/vcpkg/ports/libdatrie/usage create mode 100644 external_imported/vcpkg/ports/libe57format/portfile.cmake create mode 100644 external_imported/vcpkg/ports/libe57format/vcpkg.json delete mode 100644 external_imported/vcpkg/ports/libgeotiff/fix-staticbuild.patch delete mode 100644 external_imported/vcpkg/ports/libgeotiff/geotiff-config.patch create mode 100644 external_imported/vcpkg/ports/libgpiod/portfile.cmake create mode 100644 external_imported/vcpkg/ports/libgpiod/vcpkg.json create mode 100644 external_imported/vcpkg/ports/libhv/fix-find_package.patch create mode 100644 external_imported/vcpkg/ports/libiconv/usage create mode 100644 external_imported/vcpkg/ports/liblsl/use-find-package-asio.patch delete mode 100644 external_imported/vcpkg/ports/libmicrohttpd/fix-msvc-project.patch create mode 100644 external_imported/vcpkg/ports/libmysql/openssl.patch delete mode 100644 external_imported/vcpkg/ports/libnice/CMakeLists.txt create mode 100644 external_imported/vcpkg/ports/libpq/patches/fix-configure.patch delete mode 100644 external_imported/vcpkg/ports/libpq/patches/mingw/additional-zlib-names.patch create mode 100644 external_imported/vcpkg/ports/libpq/patches/windows/tcl_version.patch create mode 100644 external_imported/vcpkg/ports/libpqxx/fix_build_with_apple_clang_13.patch create mode 100644 external_imported/vcpkg/ports/librdkafka/lz4.patch create mode 100644 external_imported/vcpkg/ports/libslirp/portfile.cmake create mode 100644 external_imported/vcpkg/ports/libslirp/vcpkg.json create mode 100644 external_imported/vcpkg/ports/libsndfile/fix-mp3lame.patch create mode 100644 external_imported/vcpkg/ports/libsndfile/fix-uwp.patch create mode 100644 external_imported/vcpkg/ports/libssh2/0002-fix-macros.patch create mode 100644 external_imported/vcpkg/ports/libssh2/0003-fix-openssl3.patch delete mode 100644 external_imported/vcpkg/ports/libssh2/LICENSE create mode 100644 external_imported/vcpkg/ports/libudis86/fix-macbuild.patch create mode 100644 external_imported/vcpkg/ports/libvorbis/0003-def-mingw-compat.patch create mode 100644 external_imported/vcpkg/ports/libvorbis/usage create mode 100644 external_imported/vcpkg/ports/libwebsockets/fix-find-openssl.patch create mode 100644 external_imported/vcpkg/ports/lionkor-commandline/add-install.patch create mode 100644 external_imported/vcpkg/ports/lionkor-commandline/portfile.cmake create mode 100644 external_imported/vcpkg/ports/lionkor-commandline/vcpkg.json create mode 100644 external_imported/vcpkg/ports/llfio/issue-83-fix-backport.patch create mode 100644 external_imported/vcpkg/ports/lunasvg/fix-install.patch create mode 100644 external_imported/vcpkg/ports/lunasvg/portfile.cmake create mode 100644 external_imported/vcpkg/ports/lunasvg/vcpkg.json delete mode 100644 external_imported/vcpkg/ports/mapnik/proj-find-fix.patch create mode 100644 external_imported/vcpkg/ports/milerius-sfml-imgui/cpp11.patch delete mode 100644 external_imported/vcpkg/ports/mpc/gmpd.patch delete mode 100644 external_imported/vcpkg/ports/mpfr/gmpd.patch create mode 100644 external_imported/vcpkg/ports/mpfr/src-only.patch create mode 100644 external_imported/vcpkg/ports/nayuki-qr-code-generator/CMakeLists.txt create mode 100644 external_imported/vcpkg/ports/nayuki-qr-code-generator/portfile.cmake create mode 100644 external_imported/vcpkg/ports/nayuki-qr-code-generator/vcpkg.json create mode 100644 external_imported/vcpkg/ports/netcdf-c/fix-dependency-mpi.patch create mode 100644 external_imported/vcpkg/ports/nettle/compile.patch delete mode 100644 external_imported/vcpkg/ports/nettle/gmp.patch create mode 100644 external_imported/vcpkg/ports/nettle/hogweed-x64.def create mode 100644 external_imported/vcpkg/ports/nettle/hogweed-x86.def create mode 100644 external_imported/vcpkg/ports/nettle/libname-windows.patch delete mode 100644 external_imported/vcpkg/ports/nettle/name.dir.patch create mode 100644 external_imported/vcpkg/ports/nettle/nettle-x64.def create mode 100644 external_imported/vcpkg/ports/nettle/nettle-x86.def create mode 100644 external_imported/vcpkg/ports/nettle/remove_gmpd.patch delete mode 100644 external_imported/vcpkg/ports/nettle/runtime.patch create mode 100644 external_imported/vcpkg/ports/nettle/yasm.patch create mode 100644 external_imported/vcpkg/ports/ngspice/Fix-C2065.patch create mode 100644 external_imported/vcpkg/ports/nlohmann-json/usage create mode 100644 external_imported/vcpkg/ports/nspr/portfile.cmake create mode 100644 external_imported/vcpkg/ports/nspr/vcpkg.json create mode 100644 external_imported/vcpkg/ports/nss/01-nspr-no-lib-prefix.patch create mode 100644 external_imported/vcpkg/ports/nss/02-gen-debug-info-for-release.patch create mode 100644 external_imported/vcpkg/ports/nss/portfile.cmake create mode 100644 external_imported/vcpkg/ports/nss/vcpkg.json create mode 100644 external_imported/vcpkg/ports/nsync/export-targets.patch create mode 100644 external_imported/vcpkg/ports/nu-book-zxing-cpp/ignore-pdb-install-symbols-in-lib.patch create mode 100644 external_imported/vcpkg/ports/nu-book-zxing-cpp/portfile.cmake create mode 100644 external_imported/vcpkg/ports/nu-book-zxing-cpp/vcpkg.json create mode 100644 external_imported/vcpkg/ports/nvtt/fix-intrinsic-function.patch delete mode 100644 external_imported/vcpkg/ports/oatpp-postgresql/fix-windows-build.patch create mode 100644 external_imported/vcpkg/ports/oatpp-ssdp/fix_String_to_string.patch create mode 100644 external_imported/vcpkg/ports/oatpp-ssdp/fix_win_close.patch create mode 100644 external_imported/vcpkg/ports/oatpp-ssdp/portfile.cmake create mode 100644 external_imported/vcpkg/ports/oatpp-ssdp/vcpkg.json delete mode 100644 external_imported/vcpkg/ports/oatpp/fix-windows-build.patch create mode 100644 external_imported/vcpkg/ports/ocilib/fix-DisableWC4191.patch delete mode 100644 external_imported/vcpkg/ports/ogre-next/rename_config_cmake.patch create mode 100644 external_imported/vcpkg/ports/ois/0001_install_pkgconfig_win32.patch create mode 100644 external_imported/vcpkg/ports/onnx/fix-dependency-protobuf.patch create mode 100644 external_imported/vcpkg/ports/open62541/openssl.patch delete mode 100644 external_imported/vcpkg/ports/openblas/fix-marco-conflict.patch create mode 100644 external_imported/vcpkg/ports/opencolorio/fix-buildTools.patch create mode 100644 external_imported/vcpkg/ports/opencolorio/fix-dependency.patch create mode 100644 external_imported/vcpkg/ports/opencv3/0012-fix-zlib.patch create mode 100644 external_imported/vcpkg/ports/opencv4/0012-fix-zlib.patch create mode 100644 external_imported/vcpkg/ports/opencv4/0013-fix-opengl.patch create mode 100644 external_imported/vcpkg/ports/opencv4/0014-fix-gstreamer.patch create mode 100644 external_imported/vcpkg/ports/opencv4/0015-fix-freetype.patch create mode 100644 external_imported/vcpkg/ports/opencv4/0016-fix-freetype-contrib.patch create mode 100644 external_imported/vcpkg/ports/opendnp3/deps/asio.cmake create mode 100644 external_imported/vcpkg/ports/opengl/glu.pc.in create mode 100644 external_imported/vcpkg/ports/opengl/opengl.pc.in create mode 100644 external_imported/vcpkg/ports/openimageio/fix-openjpeg-linkage.patch create mode 100644 external_imported/vcpkg/ports/openmvg/0002-eigen-3.4.patch delete mode 100644 external_imported/vcpkg/ports/openssl/uwp/EnableUWPSupport.patch create mode 100644 external_imported/vcpkg/ports/openvdb/fix-Target-notfound.patch create mode 100644 external_imported/vcpkg/ports/openxr-loader/fix-jinja2.patch create mode 100644 external_imported/vcpkg/ports/osgearth/blend2d-fix.patch create mode 100644 external_imported/vcpkg/ports/pcapplusplus/CMakeLists.txt create mode 100644 external_imported/vcpkg/ports/pcl/Workaround-ICE-in-release.patch create mode 100644 external_imported/vcpkg/ports/pcl/fix-error-C3052.patch create mode 100644 external_imported/vcpkg/ports/pcl/fix-namespace-cub.patch create mode 100644 external_imported/vcpkg/ports/pcl/no-absolute.patch create mode 100644 external_imported/vcpkg/ports/pdal-c/cmake-project-include.cmake delete mode 100644 external_imported/vcpkg/ports/pdal-c/fix-docs-version.patch delete mode 100644 external_imported/vcpkg/ports/pdal-c/preserve-install-dir.patch delete mode 100644 external_imported/vcpkg/ports/pdal-c/remove-tests.patch delete mode 100644 external_imported/vcpkg/ports/pdal/0001-win32_compiler_options.cmake.patch delete mode 100644 external_imported/vcpkg/ports/pdal/0004-fix-const-overloaded.patch delete mode 100644 external_imported/vcpkg/ports/pdal/FindGEOS.cmake delete mode 100644 external_imported/vcpkg/ports/pdal/fix-CPL_DLL.patch create mode 100644 external_imported/vcpkg/ports/pdal/fix-find-library-suffix.patch create mode 100644 external_imported/vcpkg/ports/pdal/fix-unix-compiler-options.patch delete mode 100644 external_imported/vcpkg/ports/pdal/libpq.patch create mode 100644 external_imported/vcpkg/ports/pdal/no-pkgconfig-requires.patch create mode 100644 external_imported/vcpkg/ports/pdal/no-rpath.patch create mode 100644 external_imported/vcpkg/ports/pdal/usage create mode 100644 external_imported/vcpkg/ports/pdal/use-vcpkg-boost.patch create mode 100644 external_imported/vcpkg/ports/pixel/001-prevent-examples.patch create mode 100644 external_imported/vcpkg/ports/pixman/no-host-cpu-checks.patch delete mode 100644 external_imported/vcpkg/ports/poppler/0002-remove-test-subdirectory.patch delete mode 100644 external_imported/vcpkg/ports/poppler/0003-fix-gperf-not-recognized.patch delete mode 100644 external_imported/vcpkg/ports/poppler/0004-disable-clang-format.patch create mode 100644 external_imported/vcpkg/ports/poppler/cmake-project-include.cmake create mode 100644 external_imported/vcpkg/ports/poppler/export-unofficial-poppler.patch create mode 100644 external_imported/vcpkg/ports/poppler/unofficial-poppler-config.cmake create mode 100644 external_imported/vcpkg/ports/poppler/usage create mode 100644 external_imported/vcpkg/ports/popsift/fix_missing_thrust_include.patch rename external_imported/vcpkg/ports/{proj4 => proj}/fix-proj4-targets-cmake.patch (100%) rename external_imported/vcpkg/ports/{proj4 => proj}/fix-win-output-name.patch (100%) rename external_imported/vcpkg/ports/{proj4 => proj}/tools-cmake.patch (54%) rename external_imported/vcpkg/ports/{proj4 => proj}/usage (68%) delete mode 100644 external_imported/vcpkg/ports/proj4/pkgconfig.patch delete mode 100644 external_imported/vcpkg/ports/protobuf/fix-uwp-build.patch create mode 100644 external_imported/vcpkg/ports/protozero/fix-builderror.patch delete mode 100644 external_imported/vcpkg/ports/proxygen/fix-duplicated-target.patch create mode 100644 external_imported/vcpkg/ports/proxygen/fix-zstd-zlib-dependency.patch create mode 100644 external_imported/vcpkg/ports/python2/008-bz2d.patch delete mode 100644 external_imported/vcpkg/ports/python3/0008-fix-parallel-install.patch delete mode 100644 external_imported/vcpkg/ports/python3/0009-python-embed.pc.patch create mode 100644 external_imported/vcpkg/ports/python3/0009-python.pc.patch create mode 100644 external_imported/vcpkg/ports/python3/0010-bz2d.patch create mode 100644 external_imported/vcpkg/ports/qhull/usage create mode 100644 external_imported/vcpkg/ports/qpid-proton/fix-openssl3.patch create mode 100644 external_imported/vcpkg/ports/qpid-proton/qpid-protonConfig.cmake delete mode 100644 external_imported/vcpkg/ports/qt5-base/patches/zstdd.patch delete mode 100644 external_imported/vcpkg/ports/qt5-webengine/build_3.patch create mode 100644 external_imported/vcpkg/ports/qt5-winextras/patches/require_quick.patch create mode 100644 external_imported/vcpkg/ports/qt5-winextras/patches/unrequire_quick.patch create mode 100644 external_imported/vcpkg/ports/qtbase/env.patch create mode 100644 external_imported/vcpkg/ports/qttools/no_src_changes.patch create mode 100644 external_imported/vcpkg/ports/quantlib/usage create mode 100644 external_imported/vcpkg/ports/randomstr/portfile.cmake create mode 100644 external_imported/vcpkg/ports/randomstr/vcpkg.json create mode 100644 external_imported/vcpkg/ports/raylib/fix-linkGlfw.patch delete mode 100644 external_imported/vcpkg/ports/raylib/usage delete mode 100644 external_imported/vcpkg/ports/raylib/vcpkg-cmake-wrapper.cmake delete mode 100644 external_imported/vcpkg/ports/realsense2/fix-dependency-glfw3.patch create mode 100644 external_imported/vcpkg/ports/rendergraph/portfile.cmake create mode 100644 external_imported/vcpkg/ports/rendergraph/vcpkg.json create mode 100644 external_imported/vcpkg/ports/rhasheq/portfile.cmake create mode 100644 external_imported/vcpkg/ports/rhasheq/vcpkg.json delete mode 100644 external_imported/vcpkg/ports/rs-core-lib/portfile.cmake delete mode 100644 external_imported/vcpkg/ports/rs-core-lib/vcpkg.json create mode 100644 external_imported/vcpkg/ports/rsocket/fix-folly.patch create mode 100644 external_imported/vcpkg/ports/rtabmap/0001-add-bigobj-for-msvc.patch create mode 100644 external_imported/vcpkg/ports/s2n/remove-trycompile.patch create mode 100644 external_imported/vcpkg/ports/sdformat10/fix-quote.patch create mode 100644 external_imported/vcpkg/ports/sdformat10/no-absolute.patch create mode 100644 external_imported/vcpkg/ports/sdformat6/disable-test.patch create mode 100644 external_imported/vcpkg/ports/sdformat6/fix-dependency-urdfdom.patch create mode 100644 external_imported/vcpkg/ports/sdformat9/fix-quote.patch create mode 100644 external_imported/vcpkg/ports/sdformat9/no-absolute.patch create mode 100644 external_imported/vcpkg/ports/sdformat9/use-external-tinyxml-windows.patch create mode 100644 external_imported/vcpkg/ports/sdl2-image/0001-sdl2-image-potentially-uninitialized_local-pointer-variable-start.patch create mode 100644 external_imported/vcpkg/ports/sdl2/0004-Define-crt-macros.patch delete mode 100644 external_imported/vcpkg/ports/sdl2/0004-sdl2-alias-on-static-build.patch create mode 100644 external_imported/vcpkg/ports/sdl2/0005-Fix-uwp-joystick.patch delete mode 100644 external_imported/vcpkg/ports/sdl2/0005-sdl2-fix-mingw-checks.patch create mode 100644 external_imported/vcpkg/ports/sdl2/0006-Update-SDL_sysurl.cpp.patch create mode 100644 external_imported/vcpkg/ports/sdl2/0007-timer-Fix-Emscripten-declaration-after-statement-err.patch create mode 100644 external_imported/vcpkg/ports/seal/gsl.patch create mode 100644 external_imported/vcpkg/ports/seal/shared-zstd.patch create mode 100644 external_imported/vcpkg/ports/serdepp/portfile.cmake create mode 100644 external_imported/vcpkg/ports/serdepp/vcpkg.json create mode 100644 external_imported/vcpkg/ports/sfml/arm64.patch create mode 100644 external_imported/vcpkg/ports/shaderc/fix-export-cmakefiles.patch create mode 100644 external_imported/vcpkg/ports/shapelib/fix-usage.patch create mode 100644 external_imported/vcpkg/ports/shiva/no_copy_dll.patch create mode 100644 external_imported/vcpkg/ports/shogun/eigen-3.4.patch create mode 100644 external_imported/vcpkg/ports/soil2/Workaround-ICE-in-release.patch delete mode 100644 external_imported/vcpkg/ports/sophus/disable-werror.patch delete mode 100644 external_imported/vcpkg/ports/sophus/fix_cmakelists.patch delete mode 100644 external_imported/vcpkg/ports/spdk-isal/CMakeLists.txt delete mode 100644 external_imported/vcpkg/ports/spdlog/fix-mingw-build.patch create mode 100644 external_imported/vcpkg/ports/speexdsp/jitter_ctl.patch create mode 100644 external_imported/vcpkg/ports/spirv-reflect/CMakeLists.txt create mode 100644 external_imported/vcpkg/ports/spirv-reflect/portfile.cmake create mode 100644 external_imported/vcpkg/ports/spirv-reflect/vcpkg.json delete mode 100644 external_imported/vcpkg/ports/spirv-tools/0001-don-t-use-MP4.patch delete mode 100644 external_imported/vcpkg/ports/spirv-tools/cmake-install.patch delete mode 100644 external_imported/vcpkg/ports/spirv-tools/install-config-typo.patch create mode 100644 external_imported/vcpkg/ports/tcb-span/portfile.cmake create mode 100644 external_imported/vcpkg/ports/tcb-span/vcpkg.json create mode 100644 external_imported/vcpkg/ports/theia/eigen-3.4.patch create mode 100644 external_imported/vcpkg/ports/tinycbor/CMakeLists.txt create mode 100644 external_imported/vcpkg/ports/tinycbor/portfile.cmake create mode 100644 external_imported/vcpkg/ports/tinycbor/vcpkg.json delete mode 100644 external_imported/vcpkg/ports/tracy/add-install.patch create mode 100644 external_imported/vcpkg/ports/triton/001-fix-dependency-z3.patch create mode 100644 external_imported/vcpkg/ports/triton/002-fix-dependency-capstone.patch create mode 100644 external_imported/vcpkg/ports/triton/003-fix-capstone-5.patch create mode 100644 external_imported/vcpkg/ports/triton/004-fix-python.patch create mode 100644 external_imported/vcpkg/ports/triton/portfile.cmake create mode 100644 external_imported/vcpkg/ports/triton/vcpkg.json create mode 100644 external_imported/vcpkg/ports/unrar/Config.cmake.in create mode 100644 external_imported/vcpkg/ports/uthenticode/openssl.patch create mode 100644 external_imported/vcpkg/ports/vcpkg-get-python-packages/README.md create mode 100644 external_imported/vcpkg/ports/vcpkg-get-python-packages/copyright create mode 100644 external_imported/vcpkg/ports/vcpkg-get-python-packages/portfile.cmake create mode 100644 external_imported/vcpkg/ports/vcpkg-get-python-packages/vcpkg-port-config.cmake create mode 100644 external_imported/vcpkg/ports/vcpkg-get-python-packages/vcpkg.json create mode 100644 external_imported/vcpkg/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake create mode 100644 external_imported/vcpkg/ports/vcpkg-tool-gyp-nss/portfile.cmake create mode 100644 external_imported/vcpkg/ports/vcpkg-tool-gyp-nss/vcpkg.json create mode 100644 external_imported/vcpkg/ports/vcpkg-tool-lessmsi/portfile.cmake create mode 100644 external_imported/vcpkg/ports/vcpkg-tool-lessmsi/vcpkg.json create mode 100644 external_imported/vcpkg/ports/vcpkg-tool-mozbuild/portfile.cmake create mode 100644 external_imported/vcpkg/ports/vcpkg-tool-mozbuild/vcpkg.json create mode 100644 external_imported/vcpkg/ports/vcpkg-tool-python2/portfile.cmake create mode 100644 external_imported/vcpkg/ports/vcpkg-tool-python2/vcpkg.json create mode 100644 external_imported/vcpkg/ports/websocketpp/cxx20.patch create mode 100644 external_imported/vcpkg/ports/winsparkle/portfile.cmake create mode 100644 external_imported/vcpkg/ports/winsparkle/vcpkg.json delete mode 100644 external_imported/vcpkg/ports/wt/0007-boost_1_77_0.patch create mode 100644 external_imported/vcpkg/ports/wxwidgets/fix-linux-configure.patch delete mode 100644 external_imported/vcpkg/ports/xaudio2redist/Findxaudio2redist.cmake delete mode 100644 external_imported/vcpkg/ports/xaudio2redist/vcpkg-cmake-wrapper.cmake create mode 100644 external_imported/vcpkg/ports/xaudio2redist/xaudio2redist-config.cmake.in delete mode 100644 external_imported/vcpkg/ports/xmsh/portfile.cmake delete mode 100644 external_imported/vcpkg/ports/xmsh/vcpkg.json create mode 100644 external_imported/vcpkg/ports/xqilla/CMakeLists.txt create mode 100644 external_imported/vcpkg/ports/xqilla/fix-compare.patch create mode 100644 external_imported/vcpkg/ports/xqilla/portfile.cmake create mode 100644 external_imported/vcpkg/ports/xqilla/vcpkg.json rename external_imported/vcpkg/ports/{yasm-tool => yasm}/vcpkg-port-config.cmake.in (81%) create mode 100644 external_imported/vcpkg/ports/zeromq/zeromq-libzmq-4310-64e6d37ab8.diff create mode 100644 external_imported/vcpkg/ports/zeromq/zeromq-libzmq-4311-2b04e0ce47.diff create mode 100644 external_imported/vcpkg/ports/zpp-bits/portfile.cmake create mode 100644 external_imported/vcpkg/ports/zpp-bits/vcpkg.json delete mode 100644 external_imported/vcpkg/ports/zstd/fix-c4703-error.patch create mode 100644 external_imported/vcpkg/ports/zstd/no-static-suffix.patch create mode 100644 external_imported/vcpkg/ports/zstd/usage create mode 100644 external_imported/vcpkg/ports/ztd-text/portfile.cmake create mode 100644 external_imported/vcpkg/ports/ztd-text/usage create mode 100644 external_imported/vcpkg/ports/ztd-text/vcpkg.json delete mode 100644 external_imported/vcpkg/ports/zxing-cpp/0001-opencv4-compat.patch delete mode 100644 external_imported/vcpkg/ports/zxing-cpp/0002-improve-features.patch delete mode 100644 external_imported/vcpkg/ports/zxing-cpp/0003-fix-dependency-bigint.patch delete mode 100644 external_imported/vcpkg/ports/zxing-cpp/portfile.cmake delete mode 100644 external_imported/vcpkg/ports/zxing-cpp/vcpkg.json delete mode 100644 external_imported/vcpkg/ports/zziplib/always-find-unixcommands-on-unix.patch create mode 100644 external_imported/vcpkg/ports/zziplib/cmake-project-include.cmake delete mode 100644 external_imported/vcpkg/ports/zziplib/fix-export-define.patch delete mode 100644 external_imported/vcpkg/ports/zziplib/install-dll-to-proper-folder.patch create mode 100644 external_imported/vcpkg/scripts/Get-Changelog.ps1 delete mode 100755 external_imported/vcpkg/scripts/azure-pipelines/analyze-test-results.ps1 delete mode 100644 external_imported/vcpkg/scripts/azure-pipelines/azure-pipelines-osx.yml delete mode 100755 external_imported/vcpkg/scripts/azure-pipelines/generate-skip-list.ps1 delete mode 100755 external_imported/vcpkg/scripts/azure-pipelines/osx/Get-InternalBaseBox.ps1 delete mode 100644 external_imported/vcpkg/scripts/detect_compiler/CONTROL create mode 100644 external_imported/vcpkg/scripts/detect_compiler/vcpkg.json delete mode 100644 external_imported/vcpkg/scripts/test_ports/llfio-run-tests/CONTROL create mode 100644 external_imported/vcpkg/scripts/test_ports/llfio-run-tests/vcpkg.json delete mode 100644 external_imported/vcpkg/scripts/test_ports/outcome-run-tests/CONTROL create mode 100644 external_imported/vcpkg/scripts/test_ports/outcome-run-tests/vcpkg.json create mode 100644 external_imported/vcpkg/scripts/test_ports/unit-test-cmake/test-z_vcpkg_cmake_config_fixup_merge.cmake delete mode 100644 external_imported/vcpkg/scripts/test_ports/vcpkg-acquire-msys-test/CONTROL create mode 100644 external_imported/vcpkg/scripts/test_ports/vcpkg-acquire-msys-test/vcpkg.json delete mode 100644 external_imported/vcpkg/scripts/test_ports/vcpkg-ci-ffmpeg/CONTROL create mode 100644 external_imported/vcpkg/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json delete mode 100644 external_imported/vcpkg/scripts/test_ports/vcpkg-ci-paraview/CONTROL create mode 100644 external_imported/vcpkg/scripts/test_ports/vcpkg-ci-paraview/vcpkg.json delete mode 100644 external_imported/vcpkg/scripts/test_ports/vcpkg-find-acquire-program/CONTROL create mode 100644 external_imported/vcpkg/scripts/test_ports/vcpkg-find-acquire-program/vcpkg.json create mode 100644 external_imported/vcpkg/scripts/test_ports/vcpkg-from-git-test/portfile.cmake create mode 100644 external_imported/vcpkg/scripts/test_ports/vcpkg-from-git-test/vcpkg.json create mode 100644 external_imported/vcpkg/versions/a-/azure-security-attestation-cpp.json create mode 100644 external_imported/vcpkg/versions/b-/braft.json create mode 100644 external_imported/vcpkg/versions/c-/c-dbg-macro.json create mode 100644 external_imported/vcpkg/versions/c-/c89stringutils.json create mode 100644 external_imported/vcpkg/versions/c-/cargs.json create mode 100644 external_imported/vcpkg/versions/c-/cnats.json create mode 100644 external_imported/vcpkg/versions/c-/cocoyaxi.json create mode 100644 external_imported/vcpkg/versions/c-/color-console.json create mode 100644 external_imported/vcpkg/versions/c-/cppxaml.json create mode 100644 external_imported/vcpkg/versions/d-/discordcoreapi.json create mode 100644 external_imported/vcpkg/versions/d-/dstorage.json create mode 100644 external_imported/vcpkg/versions/e-/earcut-hpp.json create mode 100644 external_imported/vcpkg/versions/e-/eventpp.json create mode 100644 external_imported/vcpkg/versions/f-/flash-runtime-extensions.json create mode 100644 external_imported/vcpkg/versions/g-/gazebo.json create mode 100644 external_imported/vcpkg/versions/g-/gobject-introspection.json create mode 100644 external_imported/vcpkg/versions/g-/gtl.json create mode 100644 external_imported/vcpkg/versions/h-/hps.json create mode 100644 external_imported/vcpkg/versions/l-/libao.json create mode 100644 external_imported/vcpkg/versions/l-/libcpplocate.json create mode 100644 external_imported/vcpkg/versions/l-/libcurl-simple-https.json create mode 100644 external_imported/vcpkg/versions/l-/libe57format.json create mode 100644 external_imported/vcpkg/versions/l-/libgpiod.json create mode 100644 external_imported/vcpkg/versions/l-/libslirp.json create mode 100644 external_imported/vcpkg/versions/l-/lionkor-commandline.json create mode 100644 external_imported/vcpkg/versions/l-/lunasvg.json create mode 100644 external_imported/vcpkg/versions/n-/nayuki-qr-code-generator.json create mode 100644 external_imported/vcpkg/versions/n-/nspr.json create mode 100644 external_imported/vcpkg/versions/n-/nss.json create mode 100644 external_imported/vcpkg/versions/n-/nu-book-zxing-cpp.json create mode 100644 external_imported/vcpkg/versions/o-/oatpp-ssdp.json create mode 100644 external_imported/vcpkg/versions/r-/randomstr.json create mode 100644 external_imported/vcpkg/versions/r-/rendergraph.json create mode 100644 external_imported/vcpkg/versions/r-/rhasheq.json create mode 100644 external_imported/vcpkg/versions/s-/serdepp.json create mode 100644 external_imported/vcpkg/versions/s-/spirv-reflect.json create mode 100644 external_imported/vcpkg/versions/t-/tcb-span.json create mode 100644 external_imported/vcpkg/versions/t-/tinycbor.json create mode 100644 external_imported/vcpkg/versions/t-/triton.json create mode 100644 external_imported/vcpkg/versions/v-/vcpkg-get-python-packages.json create mode 100644 external_imported/vcpkg/versions/v-/vcpkg-tool-gyp-nss.json create mode 100644 external_imported/vcpkg/versions/v-/vcpkg-tool-lessmsi.json create mode 100644 external_imported/vcpkg/versions/v-/vcpkg-tool-mozbuild.json create mode 100644 external_imported/vcpkg/versions/v-/vcpkg-tool-python2.json create mode 100644 external_imported/vcpkg/versions/w-/winsparkle.json create mode 100644 external_imported/vcpkg/versions/x-/xqilla.json create mode 100644 external_imported/vcpkg/versions/z-/zpp-bits.json create mode 100644 external_imported/vcpkg/versions/z-/ztd-text.json diff --git a/external_imported/sentry-native/.github/workflows/ci.yml b/external_imported/sentry-native/.github/workflows/ci.yml index d6f676e65..30c190250 100644 --- a/external_imported/sentry-native/.github/workflows/ci.yml +++ b/external_imported/sentry-native/.github/workflows/ci.yml @@ -62,18 +62,21 @@ jobs: - name: macOS (xcode llvm) os: macOs-latest ERROR_ON_WARNINGS: 1 + SYSTEM_VERSION_COMPAT: 0 - name: macOS (xcode llvm + universal) os: macOs-latest ERROR_ON_WARNINGS: 1 + SYSTEM_VERSION_COMPAT: 0 CMAKE_DEFINES: -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64 - name: macOS (clang 11 + asan + llvm-cov) os: macOs-latest CC: clang CXX: clang++ ERROR_ON_WARNINGS: 1 + SYSTEM_VERSION_COMPAT: 0 RUN_ANALYZER: asan,llvm-cov - - name: Windows (VS2017, 32bit) - os: vs2017-win2016 + - name: Windows (VS2019) + os: windows-2019 TEST_X86: 1 - name: Windows (latest) os: windows-latest @@ -98,6 +101,7 @@ jobs: ANDROID_API: ${{ matrix.ANDROID_API }} ANDROID_NDK: ${{ matrix.ANDROID_NDK }} CMAKE_DEFINES: ${{ matrix.CMAKE_DEFINES }} + SYSTEM_VERSION_COMPAT: ${{ matrix.SYSTEM_VERSION_COMPAT }} steps: - uses: actions/checkout@v2 diff --git a/external_imported/sentry-native/.gitignore b/external_imported/sentry-native/.gitignore index f5c8ce904..f121c7d22 100644 --- a/external_imported/sentry-native/.gitignore +++ b/external_imported/sentry-native/.gitignore @@ -7,6 +7,7 @@ CMakeSettings.json /build /build* leak-build +unit-build # Run files .sentry-native diff --git a/external_imported/sentry-native/CHANGELOG.md b/external_imported/sentry-native/CHANGELOG.md index 66ffbe090..17d6a9383 100644 --- a/external_imported/sentry-native/CHANGELOG.md +++ b/external_imported/sentry-native/CHANGELOG.md @@ -1,14 +1,82 @@ # Changelog +## 0.4.17 + +**Fixes**: + +- sentry-native now successfully builds when examples aren't included. ([#702](https://github.com/getsentry/sentry-native/pull/702)) + +**Thank you**: + +Features, fixes and improvements in this release have been contributed by: + +- [@AenBleidd](https://github.com/AenBleidd) + +## 0.4.16 + +**Features**: + +- Removed the `SENTRY_PERFORMANCE_MONITORING` compile flag requirement to access performance monitoring in the Sentry SDK. Performance monitoring is now available to everybody who has opted into the experimental API. +- New API to check whether the application has crashed in the previous run: `sentry_get_crashed_last_run()` and `sentry_clear_crashed_last_run()` ([#685](https://github.com/getsentry/sentry-native/pull/685)). +- Allow overriding the SDK name at build time - set the `SENTRY_SDK_NAME` CMake cache variable. +- More aggressively prune the Crashpad database. ([#698](https://github.com/getsentry/sentry-native/pull/698)) + +**Internal**: + +- Project IDs are now treated as opaque strings instead of integer values. ([#690](https://github.com/getsentry/sentry-native/pull/690)) +- Updated Breakpad and Crashpad backends to 2022-04-12. ([#696](https://github.com/getsentry/sentry-native/pull/696)) + +**Fixes**: + +- Updated CI as well as list of supported platforms to reflect Windows Server 2016, and therefore MSVC 2017 losing active support. +- Correctly free Windows Mutexes in Crashpad backend. + +**Thank you**: + +Features, fixes and improvements in this release have been contributed by: + +- [@zhaowq32](https://github.com/zhaowq32) + +## 0.4.15 + +**Fixes**: + +- Fix contexts from the scope not being attached to events correctly. +- Improve performance of event serialization. + +## 0.4.14 + +**Features**: + +- The Sentry SDK now has experimental support for performance monitoring. + The performance monitoring API allows manually creating transactions and instrumenting spans, and offers APIs for distributed tracing. + The API is currently disabled by default and needs to be enabled via a compile-time `SENTRY_PERFORMANCE_MONITORING` flag. + For more information, take a look at the more detailed [documentation of performance monitoring](https://docs.sentry.io/platforms/native/performance/). +- Sentry now has an explicit `sentry_flush` method that blocks the calling thread for the given time, waiting for the transport queue to be flushed. Custom transports need to implement a new `flush_hook` for this to work. + +**Fixes**: + +- Fix Sentry API deadlocking when the SDK was not initialized (or `sentry_init` failed). +- The rate limit handling of the default transports was updated to match the expected behavior. +- The Windows OS version is now read from the Registry and is more accurate. +- The `SENTRY_LIBRARY_TYPE` CMake option is now correctly honored. +- The Linux Modulefinder was once again improved to increase its memory safety and reliability. + +**Thank you**: + +Features, fixes and improvements in this release have been contributed by: + +- [@Mixaill](https://github.com/Mixaill) + ## 0.4.13 -**Features** +**Features**: - Add client-side stackwalking on Linux, Windows, and macOS (disabled by default). - CMake: add ability to set solution folder name. - Add AIX support. -**Fixes** +**Fixes**: - CMake: check whether libcurl was already found. - Increment CXX standard version to 14 to allow crashpad to build. diff --git a/external_imported/sentry-native/CMakeLists.txt b/external_imported/sentry-native/CMakeLists.txt index 99b5b0668..31861875a 100644 --- a/external_imported/sentry-native/CMakeLists.txt +++ b/external_imported/sentry-native/CMakeLists.txt @@ -30,7 +30,7 @@ if(NOT CMAKE_C_STANDARD) endif() if(NOT CMAKE_CXX_STANDARD) - set(CMAKE_CXX_STANDARD 14) + set(CMAKE_CXX_STANDARD 17) endif() include(GNUInstallDirs) @@ -151,9 +151,12 @@ if(SENTRY_BACKEND_CRASHPAD AND ANDROID) message(FATAL_ERROR "The Crashpad backend is not currently supported on Android") endif() +set(SENTRY_SDK_NAME "" CACHE STRING "The SDK name to report when sending events.") + message(STATUS "SENTRY_TRANSPORT=${SENTRY_TRANSPORT}") message(STATUS "SENTRY_BACKEND=${SENTRY_BACKEND}") message(STATUS "SENTRY_LIBRARY_TYPE=${SENTRY_LIBRARY_TYPE}") +message(STATUS "SENTRY_SDK_NAME=${SENTRY_SDK_NAME}") if(ANDROID) set(SENTRY_WITH_LIBUNWINDSTACK TRUE) @@ -221,6 +224,10 @@ target_sources(sentry PRIVATE "${PROJECT_SOURCE_DIR}/include/sentry.h") add_library(sentry::sentry ALIAS sentry) add_subdirectory(src) +if (NOT SENTRY_SDK_NAME STREQUAL "") + target_compile_definitions(sentry PRIVATE SENTRY_SDK_NAME="${SENTRY_SDK_NAME}") +endif() + # we do not need this on android, only linux if(LINUX) target_sources(sentry PRIVATE @@ -233,7 +240,7 @@ set_target_properties(sentry PROPERTIES PUBLIC_HEADER "include/sentry.h") if(DEFINED SENTRY_FOLDER) set_target_properties(sentry PROPERTIES FOLDER ${SENTRY_FOLDER}) -endif() +endif() # check size type include(CheckTypeSize) @@ -384,7 +391,7 @@ if(SENTRY_LINK_PTHREAD) endif() # apply platform libraries to sentry library -if(SENTRY_LIBRARY_TYPE STREQUAL "static") +if(SENTRY_LIBRARY_TYPE STREQUAL "STATIC") target_link_libraries(sentry PUBLIC ${_SENTRY_PLATFORM_LIBS}) else() target_link_libraries(sentry PRIVATE ${_SENTRY_PLATFORM_LIBS}) @@ -457,7 +464,7 @@ if(SENTRY_BACKEND_CRASHPAD) set_target_properties(crashpad_util PROPERTIES FOLDER ${SENTRY_FOLDER}) set_target_properties(crashpad_zlib PROPERTIES FOLDER ${SENTRY_FOLDER}) set_target_properties(mini_chromium PROPERTIES FOLDER ${SENTRY_FOLDER}) - endif() + endif() target_link_libraries(sentry PRIVATE $ @@ -490,8 +497,8 @@ elseif(SENTRY_BACKEND_BREAKPAD) if(DEFINED SENTRY_FOLDER) set_target_properties(breakpad_client PROPERTIES FOLDER ${SENTRY_FOLDER}) - endif() - + endif() + if(NOT SENTRY_BUILD_SHARED_LIBS) sentry_install(TARGETS breakpad_client EXPORT sentry LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" @@ -570,7 +577,7 @@ if(SENTRY_BUILD_EXAMPLES) if(DEFINED SENTRY_FOLDER) set_target_properties(sentry_example PROPERTIES FOLDER ${SENTRY_FOLDER}) - endif() + endif() add_test(NAME sentry_example COMMAND sentry_example) endif() diff --git a/external_imported/sentry-native/CONTRIBUTING.md b/external_imported/sentry-native/CONTRIBUTING.md index 005c30435..655543465 100644 --- a/external_imported/sentry-native/CONTRIBUTING.md +++ b/external_imported/sentry-native/CONTRIBUTING.md @@ -12,6 +12,7 @@ Building and testing `sentry-native` currently requires the following tools: - **CMake** and a supported C/C++ compiler, to actually build the code. - **python** and **pytest**, to run integration tests. - **clang-format** and **black**, to format the C/C++ and python code respectively. +- **curl** and **zlib** libraries (e.g. on Ubuntu: libcurl4-openssl-dev, libz-dev) `pytest` and `black` are installed as virtualenv dependencies automatically. diff --git a/external_imported/sentry-native/Makefile b/external_imported/sentry-native/Makefile index 71e63094d..6925df596 100644 --- a/external_imported/sentry-native/Makefile +++ b/external_imported/sentry-native/Makefile @@ -12,14 +12,17 @@ build: build/Makefile @cmake --build build --parallel .PHONY: build -build/sentry_test_unit: build - @cmake --build build --target sentry_test_unit --parallel - test: update-test-discovery test-integration .PHONY: test -test-unit: update-test-discovery build/sentry_test_unit - ./build/sentry_test_unit +test-unit: update-test-discovery CMakeLists.txt + @mkdir -p unit-build + @cd unit-build; cmake \ + -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=$(PWD)/unit-build \ + -DSENTRY_BACKEND=none \ + .. + @cmake --build unit-build --target sentry_test_unit --parallel + ./unit-build/sentry_test_unit .PHONY: test-unit test-integration: setup-venv diff --git a/external_imported/sentry-native/README.md b/external_imported/sentry-native/README.md index 0261cb3aa..35071767b 100644 --- a/external_imported/sentry-native/README.md +++ b/external_imported/sentry-native/README.md @@ -58,8 +58,8 @@ The SDK currently supports and is tested on the following OS/Compiler variations - 64bit Linux with GCC 9 - 64bit Linux with clang 9 - 32bit Linux with GCC 7 (cross compiled from 64bit host) -- 64bit Windows with MSVC 2019 -- 32bit Windows with MSVC 2017 +- 32bit Windows with MSVC 2019 +- 64bit Windows with MSVC 2022 - macOS Catalina with most recent Compiler toolchain - Android API29 built by NDK21 toolchain - Android API16 built by NDK19 toolchain @@ -264,13 +264,17 @@ Legend: - `SENTRY_FOLDER` (Default: not defined): Sets the sentry-native projects folder name for generators which support project hierarchy (like Microsoft Visual Studio). - To use this feature you need to enable hierarchy via [`USE_FOLDERS` property](https://cmake.org/cmake/help/latest/prop_gbl/USE_FOLDERS.html) + To use this feature you need to enable hierarchy via [`USE_FOLDERS` property](https://cmake.org/cmake/help/latest/prop_gbl/USE_FOLDERS.html) - `CRASHPAD_ENABLE_STACKTRACE` (Default: OFF): This enables client-side stackwalking when using the crashpad backend. Stack unwinding will happen on the client's machine and the result will be submitted to Sentry attached to the generated minidump. Note that this feature is still experimental. +- `SENTRY_SDK_NAME` (Default: sentry.native or sentry.native.android): + Sets the SDK name that should be included in the reported events. If you're overriding this, make sure to also define + the same value using `target_compile_definitions()` on your own targets that include `sentry.h`. + ### Build Targets - `sentry`: This is the main library and the only default build target. diff --git a/external_imported/sentry-native/examples/example.c b/external_imported/sentry-native/examples/example.c index 0ace0324e..de086ea2e 100644 --- a/external_imported/sentry-native/examples/example.c +++ b/external_imported/sentry-native/examples/example.c @@ -93,6 +93,14 @@ main(int argc, char **argv) options, sentry_transport_new(print_envelope)); } + if (has_arg(argc, argv, "capture-transaction")) { + sentry_options_set_traces_sample_rate(options, 1.0); + } + + if (has_arg(argc, argv, "child-spans")) { + sentry_options_set_max_spans(options, 5); + } + sentry_init(options); if (!has_arg(argc, argv, "no-setup")) { @@ -208,6 +216,41 @@ main(int argc, char **argv) sentry_capture_event(event); } + if (has_arg(argc, argv, "capture-transaction")) { + sentry_transaction_context_t *tx_ctx + = sentry_transaction_context_new("little.teapot", + "Short and stout here is my handle and here is my spout"); + + if (has_arg(argc, argv, "unsample-tx")) { + sentry_transaction_context_set_sampled(tx_ctx, 0); + } + sentry_transaction_t *tx + = sentry_transaction_start(tx_ctx, sentry_value_new_null()); + + if (has_arg(argc, argv, "error-status")) { + sentry_transaction_set_status( + tx, SENTRY_SPAN_STATUS_INTERNAL_ERROR); + } + + if (has_arg(argc, argv, "child-spans")) { + sentry_span_t *child + = sentry_transaction_start_child(tx, "littler.teapot", NULL); + sentry_span_t *grandchild + = sentry_span_start_child(child, "littlest.teapot", NULL); + + if (has_arg(argc, argv, "error-status")) { + sentry_span_set_status(child, SENTRY_SPAN_STATUS_NOT_FOUND); + sentry_span_set_status( + grandchild, SENTRY_SPAN_STATUS_ALREADY_EXISTS); + } + + sentry_span_finish(grandchild); + sentry_span_finish(child); + } + + sentry_transaction_finish(tx); + } + // make sure everything flushes sentry_close(); diff --git a/external_imported/sentry-native/external/CMakeLists.txt b/external_imported/sentry-native/external/CMakeLists.txt index 569ccb18c..24bfe0186 100644 --- a/external_imported/sentry-native/external/CMakeLists.txt +++ b/external_imported/sentry-native/external/CMakeLists.txt @@ -91,13 +91,13 @@ set(BREAKPAD_SOURCES_CLIENT_APPLE breakpad/src/client/mac/handler/breakpad_nlist_64.h breakpad/src/client/mac/handler/dynamic_images.cc breakpad/src/client/mac/handler/dynamic_images.h - breakpad/src/client/mac/handler/exception_handler.cc - breakpad/src/client/mac/handler/exception_handler.h breakpad/src/client/mac/handler/minidump_generator.cc breakpad/src/client/mac/handler/minidump_generator.h ) set(BREAKPAD_SOURCES_CLIENT_MAC + breakpad/src/client/mac/handler/exception_handler.cc + breakpad/src/client/mac/handler/exception_handler.h breakpad/src/client/mac/crash_generation/crash_generation_client.cc breakpad/src/client/mac/crash_generation/crash_generation_client.h ) diff --git a/external_imported/sentry-native/external/breakpad/.github/workflows/coverity.yml b/external_imported/sentry-native/external/breakpad/.github/workflows/coverity.yml index cfa0f2ab5..06f8e2763 100644 --- a/external_imported/sentry-native/external/breakpad/.github/workflows/coverity.yml +++ b/external_imported/sentry-native/external/breakpad/.github/workflows/coverity.yml @@ -1,7 +1,7 @@ # GitHub actions workflow. # https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions -# https://scan.coverity.com/projects/gentoo-pax-utils +# https://scan.coverity.com/projects/google-breakpad name: Coverity Scan on: @@ -36,9 +36,8 @@ jobs: - run: ./configure --disable-silent-rules working-directory: src - - uses: vapier/coverity-scan-action@v0 + - uses: vapier/coverity-scan-action@v1 with: - project: google%2Fbreakpad command: make -C src -O -j$(getconf _NPROCESSORS_CONF) - email: google-breakpad-dev@googlegroups.com + email: ${{ secrets.COVERITY_SCAN_EMAIL }} token: ${{ secrets.COVERITY_SCAN_TOKEN }} diff --git a/external_imported/sentry-native/external/breakpad/docs/symbol_files.md b/external_imported/sentry-native/external/breakpad/docs/symbol_files.md index 237b6567f..e05b455bb 100644 --- a/external_imported/sentry-native/external/breakpad/docs/symbol_files.md +++ b/external_imported/sentry-native/external/breakpad/docs/symbol_files.md @@ -33,8 +33,15 @@ restrictions, these may appear in any order. * A `FILE` record gives a source file name, and assigns it a number by which other records can refer to it. +* An `INLINE_ORIGIN` record holds an inline function name for `INLINE` records + to refer to. + * A `FUNC` record describes a function present in the source code. +* An `INLINE` record describes the inline function's nest level, call site + line and call site source file to which the given ranges of machine code + should be attributed. + * A line record indicates to which source file and line a given range of machine code should be attributed. The line is attributed to the function defined by the most recent `FUNC` record. @@ -62,16 +69,25 @@ for _name_. * The _operatingsystem_ field names the operating system on which the executable or shared library was intended to run. This field should have one - of the following values: | **Value** | **Meaning** | - |:----------|:--------------------| | Linux | Linux | | mac | Macintosh OSX - | | windows | Microsoft Windows | + of the following values: + + | **Value** | **Meaning** | + |:----------|:--------------------| + | Linux | Linux | + | mac | Macintosh OSX | + | windows | Microsoft Windows | * The _architecture_ field indicates what processor architecture the executable or shared library contains machine code for. This field should - have one of the following values: | **Value** | **Instruction Set - Architecture** | |:----------|:---------------------------------| | x86 | - Intel IA-32 | | x86\_64 | AMD64/Intel 64 | | ppc | 32-bit PowerPC | | ppc64 - | 64-bit PowerPC | | unknown | unknown | + have one of the following values: + + | **Value** | **Instruction Set Architecture** | + |:----------|:---------------------------------| + | x86 | Intel IA-32 | + | x86\_64 | AMD64/Intel 64 | + | ppc | 32-bit PowerPC | + | ppc64 | 64-bit PowerPC | + | unknown | unknown | * The _id_ field is a sequence of hexadecimal digits that identifies the exact executable or library whose contents the symbol file describes. The way in @@ -96,6 +112,22 @@ which other records (line records, in particular) can use to refer to that file name. The _number_ field is a decimal number. The _name_ field is the name of the file; it may contain spaces. +# `INLINE_ORIGIN` records + +An `INLINE_ORIGIN` record holds an inline function name for `INLINE` records to +refer to. It has the form: + +> `INLINE_ORIGIN` _number_ _name_ + +For example: `INLINE_ORIGIN 2 nsQueryInterfaceWithError::operator()(nsID const&, +void**) const +` + +An `INLINE_ORIGIN` record provides the name of an inline function, and assigns +it a number which other records (`INLINE` records, in particular) can use to +refer to that function name. The _number_ field is a decimal number. The _name_ +field is the name of the inline function; it may contain spaces. + # `FUNC` records A `FUNC` record describes a source-language function. It has the form: @@ -127,6 +159,49 @@ The _name_ field is the name of the function. In languages that use linker symbol name mangling like C++, this should be the source language name (the "unmangled" form). This field may contain spaces. +# `INLINE` records + +An `INLINE` record describes the inline function's nest level, call site line +and call site source file to which the given ranges of machine code should be +attributed. It has the form: + +> `INLINE` _inline_nest_level_ _call_site_line_ _call_site_file_num_ +> _origin_num_ [_address_ _size_]+ + +For example: `INLINE 0 10 3 4 d30 2a fa1 b +` + +The _inline_nest_level_ field is a decimal number that means it's inlined at the +function described by a previous `INLINE` record which has _inline_nest_level_ +one less than its. In the example below, first and third `INLINE` records have +_inline_nest_level_ 0, which means they are inlined inside the function +described by the `FUNC` record. The second `INLINE` record has +_inline_nest_level_ 1 means that it's inlined at the inline function described +by first `INLINE` record. +``` +FUNC ... +INLINE 0 ... +INLINE 1 ... +INLINE 0 ... +``` + +The _call_site_line_ and _call_site_file_num_ fields are decimal numbers +indicating where this inline function being called at. + +The _origin_num_ field refers to an `INLINE_ORIGIN` record that has the name +of the inline function. + +The _address_ and _size_ fields are hexadecimal numbers indicating the start +address and length in bytes of the machine code. The address is relative to the +module's load address. There could be more than one [_address_ _size_] range +pair, since inline functions could have discontinuous address ranges. The ranges +of an `INLINE` record are always inside the ranges described by its parent +record (a `FUNC` record or an `INLINE` record). + +The `INLINE` record is assumed to belong to the function described by the last +preceding `FUNC` record. `INLINE` records may not appear before the first `FUNC` +record. + # Line records A line record describes the source file and line number to which a given range @@ -396,14 +471,14 @@ func+22: pc = *sp; sp += 4 ; pop return address and jump to it The following table would describe the function above: -**code address** | **.cfa** | **r0 (on Google Code)** | **r1 (on Google Code)** | ... | **.ra** -:--------------- | :------- | :---------------------- | :---------------------- | :-- | :------- -func+0 | sp | | | | `cfa[0]` -func+1 | sp+16 | | | | `cfa[0]` -func+2 | sp+16 | `cfa[-4]` | | | `cfa[0]` -func+11 | sp+20 | `cfa[-4]` | | | `cfa[0]` -func+21 | sp+20 | | | | `cfa[0]` -func+22 | sp | | | | `cfa[0]` +| **code address** | **.cfa** | **r0 (on Google Code)** | **r1 (on Google Code)** | ... | **.ra** | +|:-----------------|:---------|:------------------------|:------------------------|:----|:---------| +| func+0 | sp | | | | `cfa[0]` | +| func+1 | sp+16 | | | | `cfa[0]` | +| func+2 | sp+16 | `cfa[-4]` | | | `cfa[0]` | +| func+11 | sp+20 | `cfa[-4]` | | | `cfa[0]` | +| func+21 | sp+20 | | | | `cfa[0]` | +| func+22 | sp | | | | `cfa[0]` | Some things to note here: @@ -438,14 +513,14 @@ To save space, the most common type of CFI record only mentions the table entries at which changes take place. So for the above, the CFI data would only actually mention the non-blank entries here: -**insn** | **cfa** | **r0 (on Google Code)** | **r1 (on Google Code)** | ... | **ra** -:------- | :------ | :---------------------- | :---------------------- | :-- | :------- -func+0 | sp | | | | `cfa[0]` -func+1 | sp+16 | | | | -func+2 | | `cfa[-4]` | | | -func+11 | sp+20 | | | | -func+21 | | r0 (on Google Code) | | | -func+22 | sp | | | | +| **insn** | **cfa** | **r0 (on Google Code)** | **r1 (on Google Code)** | ... | **ra** | +|:---------|:--------|:------------------------|:------------------------|:----|:---------| +| func+0 | sp | | | | `cfa[0]` | +| func+1 | sp+16 | | | | | +| func+2 | | `cfa[-4]` | | | | +| func+11 | sp+20 | | | | | +| func+21 | | r0 (on Google Code) | | | | +| func+22 | sp | | | | | A `STACK CFI INIT` record indicates that, at the machine instruction at _address_, belonging to some function, the value that _registern_ had diff --git a/external_imported/sentry-native/external/breakpad/src/client/linux/handler/exception_handler.cc b/external_imported/sentry-native/external/breakpad/src/client/linux/handler/exception_handler.cc index d9760d198..499be0a98 100644 --- a/external_imported/sentry-native/external/breakpad/src/client/linux/handler/exception_handler.cc +++ b/external_imported/sentry-native/external/breakpad/src/client/linux/handler/exception_handler.cc @@ -138,7 +138,7 @@ void InstallAlternateStackLocked() { // SIGSTKSZ may be too small to prevent the signal handlers from overrunning // the alternative stack. Ensure that the size of the alternative stack is // large enough. - static const unsigned kSigStackSize = std::max(16384, (int)SIGSTKSZ); + const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); // Only set an alternative stack if there isn't already one, or if the current // one is too small. diff --git a/external_imported/sentry-native/external/breakpad/src/client/linux/microdump_writer/microdump_writer.cc b/external_imported/sentry-native/external/breakpad/src/client/linux/microdump_writer/microdump_writer.cc index fa3c1713a..22edb1b8d 100644 --- a/external_imported/sentry-native/external/breakpad/src/client/linux/microdump_writer/microdump_writer.cc +++ b/external_imported/sentry-native/external/breakpad/src/client/linux/microdump_writer/microdump_writer.cc @@ -49,8 +49,8 @@ namespace { using google_breakpad::auto_wasteful_vector; +using google_breakpad::elf::kDefaultBuildIdSize; using google_breakpad::ExceptionHandler; -using google_breakpad::kDefaultBuildIdSize; using google_breakpad::LinuxDumper; using google_breakpad::LinuxPtraceDumper; using google_breakpad::MappingInfo; diff --git a/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/linux_dumper.cc b/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/linux_dumper.cc index 7fd6532ad..44430c4e9 100644 --- a/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/linux_dumper.cc +++ b/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/linux_dumper.cc @@ -53,6 +53,8 @@ #include "google_breakpad/common/minidump_exception_linux.h" #include "third_party/lss/linux_syscall_support.h" +using google_breakpad::elf::FileID; + #if defined(__ANDROID__) // Android packed relocations definitions are not yet available from the diff --git a/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc b/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc index da71e15dc..11c392d83 100644 --- a/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc +++ b/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc @@ -63,6 +63,8 @@ #endif using namespace google_breakpad; +using google_breakpad::elf::FileID; +using google_breakpad::elf::kDefaultBuildIdSize; namespace { diff --git a/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/minidump_writer.cc b/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/minidump_writer.cc index 32634ef00..72a921664 100644 --- a/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/minidump_writer.cc +++ b/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/minidump_writer.cc @@ -83,9 +83,9 @@ namespace { using google_breakpad::AppMemoryList; using google_breakpad::auto_wasteful_vector; +using google_breakpad::elf::kDefaultBuildIdSize; using google_breakpad::ExceptionHandler; using google_breakpad::CpuSet; -using google_breakpad::kDefaultBuildIdSize; using google_breakpad::LineReader; using google_breakpad::LinuxDumper; using google_breakpad::LinuxPtraceDumper; diff --git a/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc b/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc index d192e5cbb..b7a2c61e1 100644 --- a/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc +++ b/external_imported/sentry-native/external/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc @@ -54,6 +54,8 @@ #include "google_breakpad/processor/minidump.h" using namespace google_breakpad; +using google_breakpad::elf::FileID; +using google_breakpad::elf::kDefaultBuildIdSize; namespace { diff --git a/external_imported/sentry-native/external/breakpad/src/client/mac/handler/minidump_generator.cc b/external_imported/sentry-native/external/breakpad/src/client/mac/handler/minidump_generator.cc index e0351c4bb..05d91b08e 100644 --- a/external_imported/sentry-native/external/breakpad/src/client/mac/handler/minidump_generator.cc +++ b/external_imported/sentry-native/external/breakpad/src/client/mac/handler/minidump_generator.cc @@ -62,6 +62,8 @@ using MacStringUtils::IntegerValueAtIndex; namespace google_breakpad { +using mach_o::FileID; + #if defined(__LP64__) && __LP64__ #define LC_SEGMENT_ARCH LC_SEGMENT_64 #else @@ -1449,7 +1451,7 @@ bool MinidumpGenerator::WriteCVRecord(MDRawModule* module, int cpu_type, unsigned char identifier[16]; bool result = false; if (in_memory) { - MacFileUtilities::MachoID macho(module_path, + MacFileUtilities::MachoID macho( reinterpret_cast(module->base_of_image), static_cast(module->size_of_image)); result = macho.UUIDCommand(cpu_type, CPU_SUBTYPE_MULTIPLE, identifier); diff --git a/external_imported/sentry-native/external/breakpad/src/client/solaris/handler/minidump_generator.cc b/external_imported/sentry-native/external/breakpad/src/client/solaris/handler/minidump_generator.cc index 567566655..81a535870 100644 --- a/external_imported/sentry-native/external/breakpad/src/client/solaris/handler/minidump_generator.cc +++ b/external_imported/sentry-native/external/breakpad/src/client/solaris/handler/minidump_generator.cc @@ -47,6 +47,7 @@ namespace { using namespace google_breakpad; +using namespace google_breakpad::elf::FileID; // Argument for the writer function. struct WriterArgument { diff --git a/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2reader.cc b/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2reader.cc index aa4ec2b67..bf6758d8a 100644 --- a/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2reader.cc +++ b/external_imported/sentry-native/external/breakpad/src/common/dwarf/dwarf2reader.cc @@ -1793,7 +1793,7 @@ bool RangeListReader::ReadRanges(enum DwarfForm form, uint64_t data) { } } else if (form == DW_FORM_rnglistx) { offset_array_ = cu_info_->ranges_base_; - uint64_t index_offset = reader_->AddressSize() * data; + uint64_t index_offset = reader_->OffsetSize() * data; uint64_t range_list_offset = reader_->ReadOffset(cu_info_->buffer_ + offset_array_ + index_offset); diff --git a/external_imported/sentry-native/external/breakpad/src/common/dwarf_cu_to_module.cc b/external_imported/sentry-native/external/breakpad/src/common/dwarf_cu_to_module.cc index 04d19479b..3435e5b1d 100644 --- a/external_imported/sentry-native/external/breakpad/src/common/dwarf_cu_to_module.cc +++ b/external_imported/sentry-native/external/breakpad/src/common/dwarf_cu_to_module.cc @@ -254,9 +254,6 @@ struct DwarfCUToModule::CUContext { // A map of function pointers to the its forward specification DIE's offset. map spec_function_offsets; - - // From file index to vector of subprogram's offset in this CU. - map> inline_origins; }; // Information about the context of a particular DIE. This is for @@ -561,7 +558,8 @@ class DwarfCUToModule::InlineHandler : public GenericDIEHandler { DwarfForm high_pc_form_; // DW_AT_high_pc can be length or address. DwarfForm ranges_form_; // DW_FORM_sec_offset or DW_FORM_rnglistx uint64_t ranges_data_; // DW_AT_ranges - int call_site_line_; + int call_site_line_; // DW_AT_call_line + int call_site_file_id_; // DW_AT_call_file int inline_nest_level_; // A vector of inlines in the same nest level. It's owned by its parent // function/inline. At Finish(), add this inline into the vector. @@ -589,6 +587,9 @@ void DwarfCUToModule::InlineHandler::ProcessAttributeUnsigned( case DW_AT_call_line: call_site_line_ = data; break; + case DW_AT_call_file: + call_site_file_id_ = data; + break; default: GenericDIEHandler::ProcessAttributeUnsigned(attr, form, data); break; @@ -652,6 +653,11 @@ void DwarfCUToModule::InlineHandler::Finish() { } } + // Ignore DW_TAG_inlined_subroutine with empty range. + if (ranges.empty()) { + return; + } + // Every DW_TAG_inlined_subroutine should have a DW_AT_abstract_origin. assert(specification_offset_ != 0); @@ -661,8 +667,8 @@ void DwarfCUToModule::InlineHandler::Finish() { cu_context_->file_context->module_->inline_origin_map .GetOrCreateInlineOrigin(specification_offset_, name_); unique_ptr in( - new Module::Inline(origin, ranges, call_site_line_, inline_nest_level_, - std::move(child_inlines_))); + new Module::Inline(origin, ranges, call_site_line_, call_site_file_id_, + inline_nest_level_, std::move(child_inlines_))); inlines_.push_back(std::move(in)); } @@ -679,7 +685,6 @@ class DwarfCUToModule::FuncHandler: public GenericDIEHandler { high_pc_form_(DW_FORM_addr), ranges_form_(DW_FORM_sec_offset), ranges_data_(0), - decl_file_data_(UINT64_MAX), inline_(false), handle_inline_(handle_inline) {} @@ -700,9 +705,7 @@ class DwarfCUToModule::FuncHandler: public GenericDIEHandler { uint64_t low_pc_, high_pc_; // DW_AT_low_pc, DW_AT_high_pc DwarfForm high_pc_form_; // DW_AT_high_pc can be length or address. DwarfForm ranges_form_; // DW_FORM_sec_offset or DW_FORM_rnglistx - uint64_t ranges_data_; // DW_AT_ranges - // DW_AT_decl_file, value of UINT64_MAX means undefined. - uint64_t decl_file_data_; + uint64_t ranges_data_; // DW_AT_ranges bool inline_; vector> child_inlines_; bool handle_inline_; @@ -727,9 +730,6 @@ void DwarfCUToModule::FuncHandler::ProcessAttributeUnsigned( ranges_data_ = data; ranges_form_ = form; break; - case DW_AT_decl_file: - decl_file_data_ = data; - break; default: GenericDIEHandler::ProcessAttributeUnsigned(attr, form, data); break; @@ -857,8 +857,7 @@ void DwarfCUToModule::FuncHandler::Finish() { // Only keep track of DW_TAG_subprogram which have the attributes we are // interested. - if (handle_inline_ && - (!empty_range || inline_ || decl_file_data_ != UINT64_MAX)) { + if (handle_inline_ && (!empty_range || inline_)) { StringView name = name_.empty() ? name_omitted : name_; uint64_t offset = specification_offset_ != 0 ? specification_offset_ : offset_; @@ -866,8 +865,6 @@ void DwarfCUToModule::FuncHandler::Finish() { offset); cu_context_->file_context->module_->inline_origin_map .GetOrCreateInlineOrigin(offset_, name); - if (decl_file_data_ != UINT64_MAX) - cu_context_->inline_origins[decl_file_data_].push_back(offset_); } } @@ -875,10 +872,12 @@ void DwarfCUToModule::FuncHandler::Finish() { // component to their names: namespaces, classes, etc. class DwarfCUToModule::NamedScopeHandler: public GenericDIEHandler { public: - NamedScopeHandler(CUContext* cu_context, DIEContext* parent_context, - uint64_t offset, bool handle_inline) - : GenericDIEHandler(cu_context, parent_context, offset), - handle_inline_(handle_inline) { } + NamedScopeHandler(CUContext* cu_context, + DIEContext* parent_context, + uint64_t offset, + bool handle_inline) + : GenericDIEHandler(cu_context, parent_context, offset), + handle_inline_(handle_inline) {} bool EndAttributes(); DIEHandler* FindChildHandler(uint64_t offset, enum DwarfTag tag); @@ -1450,10 +1449,12 @@ void DwarfCUToModule::AssignLinesToFunctions() { } void DwarfCUToModule::AssignFilesToInlines() { - for (auto iter : files_) { - cu_context_->file_context->module_->inline_origin_map - .AssignFilesToInlineOrigins(cu_context_->inline_origins[iter.first], - iter.second); + // Assign File* to Inlines inside this CU. + auto assignFile = [this](unique_ptr& in) { + in->call_site_file = files_[in->call_site_file_id]; + }; + for (auto func : cu_context_->functions) { + Module::Inline::InlineDFS(func->inlines, assignFile); } } diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/dump_symbols.cc b/external_imported/sentry-native/external/breakpad/src/common/linux/dump_symbols.cc index ac53ea286..75a4ceed2 100644 --- a/external_imported/sentry-native/external/breakpad/src/common/linux/dump_symbols.cc +++ b/external_imported/sentry-native/external/breakpad/src/common/linux/dump_symbols.cc @@ -87,11 +87,11 @@ using google_breakpad::DwarfRangeListHandler; using google_breakpad::ElfClass; using google_breakpad::ElfClass32; using google_breakpad::ElfClass64; -using google_breakpad::FileID; +using google_breakpad::elf::FileID; using google_breakpad::FindElfSectionByName; using google_breakpad::GetOffset; using google_breakpad::IsValidElf; -using google_breakpad::kDefaultBuildIdSize; +using google_breakpad::elf::kDefaultBuildIdSize; using google_breakpad::Module; using google_breakpad::PageAllocator; #ifndef NO_STABS_SUPPORT diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/file_id.cc b/external_imported/sentry-native/external/breakpad/src/common/linux/file_id.cc index 9944af7ae..b483eb5c0 100644 --- a/external_imported/sentry-native/external/breakpad/src/common/linux/file_id.cc +++ b/external_imported/sentry-native/external/breakpad/src/common/linux/file_id.cc @@ -49,6 +49,7 @@ #include "third_party/lss/linux_syscall_support.h" namespace google_breakpad { +namespace elf { // Used in a few places for backwards-compatibility. const size_t kMDGUIDSize = sizeof(MDGUID); @@ -198,4 +199,5 @@ string FileID::ConvertIdentifierToString( return bytes_to_hex_string(&identifier[0], identifier.size()); } +} // elf } // namespace google_breakpad diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/file_id.h b/external_imported/sentry-native/external/breakpad/src/common/linux/file_id.h index 4aff021de..8556a2e5a 100644 --- a/external_imported/sentry-native/external/breakpad/src/common/linux/file_id.h +++ b/external_imported/sentry-native/external/breakpad/src/common/linux/file_id.h @@ -41,6 +41,7 @@ #include "common/using_std_string.h" namespace google_breakpad { +namespace elf { // GNU binutils' ld defaults to 'sha1', which is 160 bits == 20 bytes, // so this is enough to fit that, which most binaries will use. @@ -83,6 +84,7 @@ class FileID { string path_; }; +} // namespace elf } // namespace google_breakpad #endif // COMMON_LINUX_FILE_ID_H__ diff --git a/external_imported/sentry-native/external/breakpad/src/common/linux/file_id_unittest.cc b/external_imported/sentry-native/external/breakpad/src/common/linux/file_id_unittest.cc index 8225e5ac8..43c9af7b5 100644 --- a/external_imported/sentry-native/external/breakpad/src/common/linux/file_id_unittest.cc +++ b/external_imported/sentry-native/external/breakpad/src/common/linux/file_id_unittest.cc @@ -50,6 +50,8 @@ #include "breakpad_googletest_includes.h" using namespace google_breakpad; +using google_breakpad::elf::FileID; +using google_breakpad::elf::kDefaultBuildIdSize; using google_breakpad::synth_elf::ELF; using google_breakpad::synth_elf::Notes; using google_breakpad::test_assembler::kLittleEndian; diff --git a/external_imported/sentry-native/external/breakpad/src/common/mac/SymbolCollectorClient.h b/external_imported/sentry-native/external/breakpad/src/common/mac/SymbolCollectorClient.h index 9e955c8e2..8848cca6a 100644 --- a/external_imported/sentry-native/external/breakpad/src/common/mac/SymbolCollectorClient.h +++ b/external_imported/sentry-native/external/breakpad/src/common/mac/SymbolCollectorClient.h @@ -96,7 +96,8 @@ typedef NS_ENUM(NSInteger, SymbolStatus) { withUploadKey:(NSString*)uploadKey withDebugFile:(NSString*)debugFile withDebugID:(NSString*)debugID - withType:(NSString*)type; + withType:(NSString*)type + withProductName:(NSString*)productName; @end diff --git a/external_imported/sentry-native/external/breakpad/src/common/mac/SymbolCollectorClient.m b/external_imported/sentry-native/external/breakpad/src/common/mac/SymbolCollectorClient.m index 5926d2ad2..5465056dd 100644 --- a/external_imported/sentry-native/external/breakpad/src/common/mac/SymbolCollectorClient.m +++ b/external_imported/sentry-native/external/breakpad/src/common/mac/SymbolCollectorClient.m @@ -190,18 +190,22 @@ + (CompleteUploadResult)completeUploadOnServer:(NSString*)APIURL withUploadKey:(NSString*)uploadKey withDebugFile:(NSString*)debugFile withDebugID:(NSString*)debugID - withType:(NSString*)type { + withType:(NSString*)type + withProductName:(NSString*)productName { NSURL* URL = [NSURL URLWithString:[NSString stringWithFormat:@"%@/v1/uploads/%@:complete?key=%@", APIURL, uploadKey, APIKey]]; - NSDictionary* symbolIdDictionary = - [NSDictionary dictionaryWithObjectsAndKeys:debugFile, @"debug_file", - debugID, @"debug_id", nil]; - NSDictionary* jsonDictionary = [NSDictionary - dictionaryWithObjectsAndKeys:symbolIdDictionary, @"symbol_id", type, - @"symbol_upload_type", nil]; + NSMutableDictionary* jsonDictionary = [@{ + @"symbol_id" : @{@"debug_file" : debugFile, @"debug_id" : debugID}, + @"symbol_upload_type" : type, @"use_async_processing" : @"true" + } mutableCopy]; + + if (productName != nil) { + jsonDictionary[@"metadata"] = @{@"product_name": productName}; + } + NSError* error = nil; NSData* jsonData = [NSJSONSerialization dataWithJSONObject:jsonDictionary diff --git a/external_imported/sentry-native/external/breakpad/src/common/mac/dump_syms.cc b/external_imported/sentry-native/external/breakpad/src/common/mac/dump_syms.cc index 6df32bc10..b1cb1a300 100644 --- a/external_imported/sentry-native/external/breakpad/src/common/mac/dump_syms.cc +++ b/external_imported/sentry-native/external/breakpad/src/common/mac/dump_syms.cc @@ -78,8 +78,8 @@ using google_breakpad::ByteReader; using google_breakpad::DwarfCUToModule; using google_breakpad::DwarfLineToModule; using google_breakpad::DwarfRangeListHandler; -using google_breakpad::FileID; using google_breakpad::mach_o::FatReader; +using google_breakpad::mach_o::FileID; using google_breakpad::mach_o::Section; using google_breakpad::mach_o::Segment; using google_breakpad::Module; @@ -128,10 +128,11 @@ bool DumpSymbols::Read(const string& filename) { return false; } - input_pathname_ = filename; + from_disk_ = true; // Does this filename refer to a dSYM bundle? - string contents_path = input_pathname_ + "/Contents/Resources/DWARF"; + string contents_path = filename + "/Contents/Resources/DWARF"; + string object_filename; if (S_ISDIR(st.st_mode) && access(contents_path.c_str(), F_OK) == 0) { // If there's one file under Contents/Resources/DWARF then use that, @@ -139,30 +140,31 @@ bool DumpSymbols::Read(const string& filename) { const vector entries = list_directory(contents_path); if (entries.size() == 0) { fprintf(stderr, "Unable to find DWARF-bearing file in bundle: %s\n", - input_pathname_.c_str()); + filename.c_str()); return false; } if (entries.size() > 1) { fprintf(stderr, "Too many DWARF files in bundle: %s\n", - input_pathname_.c_str()); + filename.c_str()); return false; } - object_filename_ = entries[0]; + object_filename = entries[0]; } else { - object_filename_ = input_pathname_; + object_filename = filename; } // Read the file's contents into memory. bool read_ok = true; string error; - if (stat(object_filename_.c_str(), &st) != -1) { - FILE* f = fopen(object_filename_.c_str(), "rb"); + scoped_array contents; + off_t total = 0; + if (stat(object_filename.c_str(), &st) != -1) { + FILE* f = fopen(object_filename.c_str(), "rb"); if (f) { - contents_.reset(new uint8_t[st.st_size]); - off_t total = 0; + contents.reset(new uint8_t[st.st_size]); while (total < st.st_size && !feof(f)) { - size_t read = fread(&contents_[0] + total, 1, st.st_size - total, f); + size_t read = fread(&contents[0] + total, 1, st.st_size - total, f); if (read == 0) { if (ferror(f)) { read_ok = false; @@ -180,16 +182,22 @@ bool DumpSymbols::Read(const string& filename) { if (!read_ok) { fprintf(stderr, "Error reading object file: %s: %s\n", - object_filename_.c_str(), - error.c_str()); + object_filename.c_str(), error.c_str()); return false; } + return ReadData(contents.release(), total, object_filename); +} + +bool DumpSymbols::ReadData(uint8_t* contents, size_t size, + const std::string& filename) { + contents_.reset(contents); + size_ = size; + object_filename_ = filename; // Get the list of object files present in the file. FatReader::Reporter fat_reporter(object_filename_); FatReader fat_reader(&fat_reporter); - if (!fat_reader.Read(&contents_[0], - st.st_size)) { + if (!fat_reader.Read(contents_.get(), size)) { return false; } @@ -283,7 +291,13 @@ SuperFatArch* DumpSymbols::FindBestMatchForArchitecture( } string DumpSymbols::Identifier() { - FileID file_id(object_filename_.c_str()); + scoped_ptr file_id; + + if (from_disk_) { + file_id.reset(new FileID(object_filename_.c_str())); + } else { + file_id.reset(new FileID(contents_.get(), size_)); + } unsigned char identifier_bytes[16]; scoped_ptr module; if (!selected_object_file_) { @@ -292,7 +306,7 @@ string DumpSymbols::Identifier() { } cpu_type_t cpu_type = selected_object_file_->cputype; cpu_subtype_t cpu_subtype = selected_object_file_->cpusubtype; - if (!file_id.MachoIdentifier(cpu_type, cpu_subtype, identifier_bytes)) { + if (!file_id->MachoIdentifier(cpu_type, cpu_subtype, identifier_bytes)) { fprintf(stderr, "Unable to calculate UUID of mach-o binary %s!\n", object_filename_.c_str()); return ""; diff --git a/external_imported/sentry-native/external/breakpad/src/common/mac/dump_syms.h b/external_imported/sentry-native/external/breakpad/src/common/mac/dump_syms.h index 4365e2944..34ba14bc0 100644 --- a/external_imported/sentry-native/external/breakpad/src/common/mac/dump_syms.h +++ b/external_imported/sentry-native/external/breakpad/src/common/mac/dump_syms.h @@ -57,21 +57,30 @@ class DumpSymbols { DumpSymbols(SymbolData symbol_data, bool handle_inter_cu_refs) : symbol_data_(symbol_data), handle_inter_cu_refs_(handle_inter_cu_refs), - input_pathname_(), object_filename_(), contents_(), + size_(0), + from_disk_(false), object_files_(), selected_object_file_(), - selected_object_name_() { } + selected_object_name_() {} ~DumpSymbols() { } // Prepare to read debugging information from |filename|. |filename| may be - // the name of a universal binary, a Mach-O file, or a dSYM bundle - // containing either of the above. On success, return true; if there is a - // problem reading |filename|, report it and return false. + // the name of a fat file, a Mach-O file, or a dSYM bundle containing either + // of the above. On success, return true; if there is a problem reading + // |filename|, report it and return false. bool Read(const std::string& filename); + // Prepare to read debugging information from |contents|. |contents| is + // expected to be the data obtained from reading a fat file, or a Mach-O file. + // |filename| is used to determine the object filename in the generated + // output; there will not be an attempt to open this file as the data + // is already expected to be in memory. On success, return true; if there is a + // problem reading |contents|, report it and return false. + bool ReadData(uint8_t* contents, size_t size, const std::string& filename); + // If this dumper's file includes an object file for |cpu_type| and // |cpu_subtype|, then select that object file for dumping, and return // true. Otherwise, return false, and leave this dumper's selected @@ -162,19 +171,22 @@ class DumpSymbols { // Whether to handle references between compilation units. const bool handle_inter_cu_refs_; - // The name of the file or bundle whose symbols this will dump. - // This is the path given to Read, for use in error messages. - std::string input_pathname_; - // The name of the file this DumpSymbols will actually read debugging - // information from. Normally, this is the same as input_pathname_, but if - // filename refers to a dSYM bundle, then this is the resource file - // within that bundle. + // information from. If the filename passed to Read refers to a dSYM bundle, + // then this is the resource file within that bundle. std::string object_filename_; // The complete contents of object_filename_, mapped into memory. scoped_array contents_; + // The size of contents_. + size_t size_; + + // Indicates which entry point to DumpSymbols was used, i.e. Read vs ReadData. + // This is used to indicate that downstream code paths can/should also read + // from disk or not. + bool from_disk_; + // A vector of SuperFatArch structures describing the object files // object_filename_ contains. If object_filename_ refers to a fat binary, // this may have more than one element; if it refers to a Mach-O file, this diff --git a/external_imported/sentry-native/external/breakpad/src/common/mac/file_id.cc b/external_imported/sentry-native/external/breakpad/src/common/mac/file_id.cc index 4661d5d62..9ed65e5c8 100644 --- a/external_imported/sentry-native/external/breakpad/src/common/mac/file_id.cc +++ b/external_imported/sentry-native/external/breakpad/src/common/mac/file_id.cc @@ -33,53 +33,41 @@ // // Author: Dan Waylonis +#include "common/mac/file_id.h" + #include #include #include -#include -#include "common/mac/file_id.h" #include "common/mac/macho_id.h" +#include "common/scoped_ptr.h" using MacFileUtilities::MachoID; namespace google_breakpad { - -FileID::FileID(const char *path) { +namespace mach_o { +// Constructs a FileID given a path to a file +FileID::FileID(const char* path) : memory_(nullptr), size_(0) { snprintf(path_, sizeof(path_), "%s", path); } -bool FileID::FileIdentifier(unsigned char identifier[16]) { - int fd = open(path_, O_RDONLY); - if (fd == -1) - return false; - - MD5Context md5; - MD5Init(&md5); - - // Read 4k x 2 bytes at a time. This is faster than just 4k bytes, but - // doesn't seem to be an unreasonable size for the stack. - unsigned char buffer[4096 * 2]; - size_t buffer_size = sizeof(buffer); - while ((buffer_size = read(fd, buffer, buffer_size) > 0)) { - MD5Update(&md5, buffer, static_cast(buffer_size)); - } - - close(fd); - MD5Final(identifier, &md5); - - return true; -} +// Constructs a FileID given the contents of a file and its size +FileID::FileID(void* memory, size_t size) + : path_(), memory_(memory), size_(size) {} bool FileID::MachoIdentifier(cpu_type_t cpu_type, cpu_subtype_t cpu_subtype, unsigned char identifier[16]) { - MachoID macho(path_); - - if (macho.UUIDCommand(cpu_type, cpu_subtype, identifier)) + scoped_ptr macho; + if (memory_) { + macho.reset(new MachoID(memory_, size_)); + } else { + macho.reset(new MachoID(path_)); + } + if (macho->UUIDCommand(cpu_type, cpu_subtype, identifier)) return true; - return macho.MD5(cpu_type, cpu_subtype, identifier); + return macho->MD5(cpu_type, cpu_subtype, identifier); } // static @@ -103,4 +91,5 @@ void FileID::ConvertIdentifierToString(const unsigned char identifier[16], buffer[(buffer_idx < buffer_length) ? buffer_idx : buffer_idx - 1] = 0; } +} // namespace mach_o } // namespace google_breakpad diff --git a/external_imported/sentry-native/external/breakpad/src/common/mac/file_id.h b/external_imported/sentry-native/external/breakpad/src/common/mac/file_id.h index 5d60e84c9..fc1821e7f 100644 --- a/external_imported/sentry-native/external/breakpad/src/common/mac/file_id.h +++ b/external_imported/sentry-native/external/breakpad/src/common/mac/file_id.h @@ -36,19 +36,19 @@ #include #include +#include namespace google_breakpad { +namespace mach_o { class FileID { public: - FileID(const char *path); - ~FileID() {} + // Constructs a FileID given a path to a file + FileID(const char* path); - // Load the identifier for the file path specified in the constructor into - // |identifier|. Return false if the identifier could not be created for the - // file. - // The current implementation will return the MD5 hash of the file's bytes. - bool FileIdentifier(unsigned char identifier[16]); + // Constructs a FileID given the contents of a file and its size. + FileID(void* memory, size_t size); + ~FileID() {} // Treat the file as a mach-o file that will contain one or more archicture. // Accepted values for |cpu_type| and |cpu_subtype| (e.g., CPU_TYPE_X86 or @@ -74,8 +74,19 @@ class FileID { private: // Storage for the path specified char path_[PATH_MAX]; + + // Storage for contents of a file if this instance is used to operate on in + // memory file data rather than directly from a filesystem. If memory_ is + // null, the file represented by path_ will be opened/read. If memory_ is + // non-null, it is assumed to contain valid data, and no file operations will + // occur. + void* memory_; + + // Size of memory_ + size_t size_; }; +} // namespace mach_o } // namespace google_breakpad #endif // COMMON_MAC_FILE_ID_H__ diff --git a/external_imported/sentry-native/external/breakpad/src/common/mac/macho_id.cc b/external_imported/sentry-native/external/breakpad/src/common/mac/macho_id.cc index 3cf1d4b5f..9b7ca24f3 100644 --- a/external_imported/sentry-native/external/breakpad/src/common/mac/macho_id.cc +++ b/external_imported/sentry-native/external/breakpad/src/common/mac/macho_id.cc @@ -37,11 +37,7 @@ #include #include #include -#include #include -#include -#include -#include #include "common/mac/macho_id.h" #include "common/mac/macho_walker.h" @@ -54,73 +50,18 @@ using google_breakpad::MD5Update; using google_breakpad::MD5Final; MachoID::MachoID(const char* path) - : memory_(0), - memory_size_(0), - crc_(0), - md5_context_(), - update_function_(NULL) { + : memory_(0), memory_size_(0), md5_context_(), update_function_(NULL) { snprintf(path_, sizeof(path_), "%s", path); } -MachoID::MachoID(const char* path, void* memory, size_t size) - : memory_(memory), - memory_size_(size), - crc_(0), - md5_context_(), - update_function_(NULL) { - snprintf(path_, sizeof(path_), "%s", path); -} - -MachoID::~MachoID() { -} +MachoID::MachoID(void* memory, size_t size) + : path_(), + memory_(memory), + memory_size_(size), + md5_context_(), + update_function_(NULL) {} -// The CRC info is from http://en.wikipedia.org/wiki/Adler-32 -// With optimizations from http://www.zlib.net/ - -// The largest prime smaller than 65536 -#define MOD_ADLER 65521 -// MAX_BLOCK is the largest n such that 255n(n+1)/2 + (n+1)(MAX_BLOCK-1) <= 2^32-1 -#define MAX_BLOCK 5552 - -void MachoID::UpdateCRC(unsigned char* bytes, size_t size) { -// Unrolled loops for summing -#define DO1(buf,i) {sum1 += (buf)[i]; sum2 += sum1;} -#define DO2(buf,i) DO1(buf,i); DO1(buf,i+1); -#define DO4(buf,i) DO2(buf,i); DO2(buf,i+2); -#define DO8(buf,i) DO4(buf,i); DO4(buf,i+4); -#define DO16(buf) DO8(buf,0); DO8(buf,8); - // Split up the crc - uint32_t sum1 = crc_ & 0xFFFF; - uint32_t sum2 = (crc_ >> 16) & 0xFFFF; - - // Do large blocks - while (size >= MAX_BLOCK) { - size -= MAX_BLOCK; - int block_count = MAX_BLOCK / 16; - do { - DO16(bytes); - bytes += 16; - } while (--block_count); - sum1 %= MOD_ADLER; - sum2 %= MOD_ADLER; - } - - // Do remaining bytes - if (size) { - while (size >= 16) { - size -= 16; - DO16(bytes); - bytes += 16; - } - while (size--) { - sum1 += *bytes++; - sum2 += sum1; - } - sum1 %= MOD_ADLER; - sum2 %= MOD_ADLER; - crc_ = (sum2 << 16) | sum1; - } -} +MachoID::~MachoID() {} void MachoID::UpdateMD5(unsigned char* bytes, size_t size) { MD5Update(&md5_context_, bytes, static_cast(size)); @@ -169,59 +110,6 @@ bool MachoID::UUIDCommand(cpu_type_t cpu_type, return false; } -bool MachoID::IDCommand(cpu_type_t cpu_type, - cpu_subtype_t cpu_subtype, - unsigned char identifier[16]) { - struct dylib_command dylib_cmd; - dylib_cmd.cmd = 0; - if (!WalkHeader(cpu_type, cpu_subtype, IDWalkerCB, &dylib_cmd)) - return false; - - // If we found the command, we'll have initialized the dylib_command - // structure - if (dylib_cmd.cmd == LC_ID_DYLIB) { - // Take the hashed filename, version, and compatability version bytes - // to form the first 12 bytes, pad the rest with zeros - - // create a crude hash of the filename to generate the first 4 bytes - identifier[0] = 0; - identifier[1] = 0; - identifier[2] = 0; - identifier[3] = 0; - - for (int j = 0, i = (int)strlen(path_)-1; i>=0 && path_[i]!='/'; ++j, --i) { - identifier[j%4] += path_[i]; - } - - identifier[4] = (dylib_cmd.dylib.current_version >> 24) & 0xFF; - identifier[5] = (dylib_cmd.dylib.current_version >> 16) & 0xFF; - identifier[6] = (dylib_cmd.dylib.current_version >> 8) & 0xFF; - identifier[7] = dylib_cmd.dylib.current_version & 0xFF; - identifier[8] = (dylib_cmd.dylib.compatibility_version >> 24) & 0xFF; - identifier[9] = (dylib_cmd.dylib.compatibility_version >> 16) & 0xFF; - identifier[10] = (dylib_cmd.dylib.compatibility_version >> 8) & 0xFF; - identifier[11] = dylib_cmd.dylib.compatibility_version & 0xFF; - identifier[12] = (cpu_type >> 24) & 0xFF; - identifier[13] = (cpu_type >> 16) & 0xFF; - identifier[14] = (cpu_type >> 8) & 0xFF; - identifier[15] = cpu_type & 0xFF; - - return true; - } - - return false; -} - -uint32_t MachoID::Adler32(cpu_type_t cpu_type, cpu_subtype_t cpu_subtype) { - update_function_ = &MachoID::UpdateCRC; - crc_ = 0; - - if (!WalkHeader(cpu_type, cpu_subtype, WalkerCB, this)) - return 0; - - return crc_; -} - bool MachoID::MD5(cpu_type_t cpu_type, cpu_subtype_t cpu_subtype, unsigned char identifier[16]) { update_function_ = &MachoID::UpdateMD5; @@ -346,24 +234,4 @@ bool MachoID::UUIDWalkerCB(MachoWalker* walker, load_command* cmd, off_t offset, // Continue processing return true; } - -// static -bool MachoID::IDWalkerCB(MachoWalker* walker, load_command* cmd, off_t offset, - bool swap, void* context) { - if (cmd->cmd == LC_ID_DYLIB) { - struct dylib_command* dylib_cmd = (struct dylib_command*)context; - - if (!walker->ReadBytes(dylib_cmd, sizeof(struct dylib_command), offset)) - return false; - - if (swap) - breakpad_swap_dylib_command(dylib_cmd); - - return false; - } - - // Continue processing - return true; -} - } // namespace MacFileUtilities diff --git a/external_imported/sentry-native/external/breakpad/src/common/mac/macho_id.h b/external_imported/sentry-native/external/breakpad/src/common/mac/macho_id.h index e8874c37c..0262697d4 100644 --- a/external_imported/sentry-native/external/breakpad/src/common/mac/macho_id.h +++ b/external_imported/sentry-native/external/breakpad/src/common/mac/macho_id.h @@ -46,7 +46,7 @@ namespace MacFileUtilities { class MachoID { public: MachoID(const char* path); - MachoID(const char* path, void* memory, size_t size); + MachoID(void* memory, size_t size); ~MachoID(); // For the given |cpu_type| and |cpu_subtype|, return a UUID from the LC_UUID @@ -56,19 +56,6 @@ class MachoID { cpu_subtype_t cpu_subtype, unsigned char identifier[16]); - // For the given |cpu_type| and |cpu_subtype|, return a UUID from the - // LC_ID_DYLIB command. - // Return false if there isn't a LC_ID_DYLIB command. - bool IDCommand(cpu_type_t cpu_type, - cpu_subtype_t cpu_subtype, - unsigned char identifier[16]); - - // For the given |cpu_type| and |cpu_subtype|, return the Adler32 CRC for the - // mach-o data segment(s). - // Return 0 on error (e.g., if the file is not a mach-o file) - uint32_t Adler32(cpu_type_t cpu_type, - cpu_subtype_t cpu_subtype); - // For the given |cpu_type|, and |cpu_subtype| return the MD5 for the mach-o // data segment(s). // Return true on success, false otherwise @@ -80,10 +67,6 @@ class MachoID { // Signature of class member function to be called with data read from file typedef void (MachoID::*UpdateFunction)(unsigned char* bytes, size_t size); - // Update the CRC value by examining |size| |bytes| and applying the algorithm - // to each byte. - void UpdateCRC(unsigned char* bytes, size_t size); - // Update the MD5 value by examining |size| |bytes| and applying the algorithm // to each byte. void UpdateMD5(unsigned char* bytes, size_t size); @@ -103,10 +86,6 @@ class MachoID { static bool UUIDWalkerCB(MachoWalker* walker, load_command* cmd, off_t offset, bool swap, void* context); - // The callback from the MachoWalker for LC_ID_DYLIB - static bool IDWalkerCB(MachoWalker* walker, load_command* cmd, off_t offset, - bool swap, void* context); - // File path char path_[PATH_MAX]; @@ -116,9 +95,6 @@ class MachoID { // Size of the memory region size_t memory_size_; - // The current crc value - uint32_t crc_; - // The MD5 context google_breakpad::MD5Context md5_context_; diff --git a/external_imported/sentry-native/external/breakpad/src/common/module.cc b/external_imported/sentry-native/external/breakpad/src/common/module.cc index 3945e2dd3..13c229eb4 100644 --- a/external_imported/sentry-native/external/breakpad/src/common/module.cc +++ b/external_imported/sentry-native/external/breakpad/src/common/module.cc @@ -97,17 +97,6 @@ void Module::InlineOriginMap::SetReference(uint64_t offset, references_[offset] = specification_offset; } -void Module::InlineOriginMap::AssignFilesToInlineOrigins( - const vector& inline_origin_offsets, - Module::File* file) { - for (uint64_t offset : inline_origin_offsets) - if (references_.find(offset) != references_.end()) { - auto origin = inline_origins_.find(references_[offset]); - if (origin != inline_origins_.end()) - origin->second->file = file; - } -} - Module::Module(const string& name, const string& os, const string& architecture, const string& id, const string& code_id /* = "" */) : @@ -276,13 +265,19 @@ void Module::AssignSourceIds( line_it != func->lines.end(); ++line_it) line_it->file->source_id = 0; } - // Also mark all files cited by inline functions by setting each one's source + + // Also mark all files cited by inline callsite by setting each one's source // id to zero. - for (InlineOrigin* origin : inline_origins) + auto markInlineFiles = [](unique_ptr& in) { // There are some artificial inline functions which don't belong to // any file. Those will have file id -1. - if (origin->file) - origin->file->source_id = 0; + if (in->call_site_file) { + in->call_site_file->source_id = 0; + } + }; + for (auto func : functions_) { + Inline::InlineDFS(func->inlines, markInlineFiles); + } // Finally, assign source ids to those files that have been marked. // We could have just assigned source id numbers while traversing @@ -296,15 +291,6 @@ void Module::AssignSourceIds( } } -static void InlineDFS( - vector>& inlines, - std::function&)> const& forEach) { - for (unique_ptr& in : inlines) { - forEach(in); - InlineDFS(in->child_inlines, forEach); - } -} - void Module::CreateInlineOrigins( set& inline_origins) { // Only add origins that have file and deduplicate origins with same name and @@ -317,7 +303,7 @@ void Module::CreateInlineOrigins( in->origin = *it; }; for (Function* func : functions_) - InlineDFS(func->inlines, addInlineOrigins); + Module::Inline::InlineDFS(func->inlines, addInlineOrigins); int next_id = 0; for (InlineOrigin* origin : inline_origins) { origin->id = next_id++; @@ -381,8 +367,7 @@ bool Module::Write(std::ostream& stream, SymbolData symbol_data) { } // Write out inline origins. for (InlineOrigin* origin : inline_origins) { - stream << "INLINE_ORIGIN " << origin->id << " " << origin->getFileID() - << " " << origin->name << "\n"; + stream << "INLINE_ORIGIN " << origin->id << " " << origin->name << "\n"; if (!stream.good()) return ReportError(); } @@ -407,12 +392,12 @@ bool Module::Write(std::ostream& stream, SymbolData symbol_data) { auto write_inline = [&](unique_ptr& in) { stream << "INLINE "; stream << in->inline_nest_level << " " << in->call_site_line << " " - << in->origin->id << hex; + << in->getCallSiteFileID() << " " << in->origin->id << hex; for (const Range& r : in->ranges) stream << " " << (r.address - load_address_) << " " << r.size; stream << dec << "\n"; }; - InlineDFS(func->inlines, write_inline); + Module::Inline::InlineDFS(func->inlines, write_inline); if (!stream.good()) return ReportError(); diff --git a/external_imported/sentry-native/external/breakpad/src/common/module.h b/external_imported/sentry-native/external/breakpad/src/common/module.h index c5e0abfc5..01ecfa8aa 100644 --- a/external_imported/sentry-native/external/breakpad/src/common/module.h +++ b/external_imported/sentry-native/external/breakpad/src/common/module.h @@ -38,6 +38,7 @@ #ifndef COMMON_LINUX_MODULE_H__ #define COMMON_LINUX_MODULE_H__ +#include #include #include #include @@ -131,7 +132,7 @@ class Module { }; struct InlineOrigin { - explicit InlineOrigin(StringView name): id(-1), name(name), file(nullptr) {} + explicit InlineOrigin(StringView name) : id(-1), name(name) {} // A unique id for each InlineOrigin object. INLINE records use the id to // refer to its INLINE_ORIGIN record. @@ -150,11 +151,14 @@ class Module { Inline(InlineOrigin* origin, const vector& ranges, int call_site_line, + int call_site_file_id, int inline_nest_level, vector> child_inlines) : origin(origin), ranges(ranges), call_site_line(call_site_line), + call_site_file_id(call_site_file_id), + call_site_file(nullptr), inline_nest_level(inline_nest_level), child_inlines(std::move(child_inlines)) {} @@ -165,10 +169,29 @@ class Module { int call_site_line; + // The id is only meanful inside a CU. It's only used for looking up real + // File* after scanning a CU. + int call_site_file_id; + + File* call_site_file; + int inline_nest_level; // A list of inlines which are children of this inline. vector> child_inlines; + + int getCallSiteFileID() const { + return call_site_file ? call_site_file->source_id : -1; + } + + static void InlineDFS( + vector>& inlines, + std::function&)> const& forEach) { + for (std::unique_ptr& in : inlines) { + forEach(in); + InlineDFS(in->child_inlines, forEach); + } + } }; typedef map InlineOriginByOffset; @@ -182,9 +205,7 @@ class Module { // value of its DW_AT_specification or equals to offset if // DW_AT_specification doesn't exist in that DIE. void SetReference(uint64_t offset, uint64_t specification_offset); - void AssignFilesToInlineOrigins( - const vector& inline_origin_offsets, - File* file); + ~InlineOriginMap() { for (const auto& iter : inline_origins_) { delete iter.second; @@ -261,10 +282,8 @@ class Module { }; struct InlineOriginCompare { - bool operator() (const InlineOrigin* lhs, const InlineOrigin* rhs) const { - if (lhs->getFileID() == rhs->getFileID()) - return lhs->name < rhs->name; - return lhs->getFileID() < rhs->getFileID(); + bool operator()(const InlineOrigin* lhs, const InlineOrigin* rhs) const { + return lhs->name < rhs->name; } }; diff --git a/external_imported/sentry-native/external/breakpad/src/common/solaris/dump_symbols.cc b/external_imported/sentry-native/external/breakpad/src/common/solaris/dump_symbols.cc index 9524a18b5..93aeed243 100644 --- a/external_imported/sentry-native/external/breakpad/src/common/solaris/dump_symbols.cc +++ b/external_imported/sentry-native/external/breakpad/src/common/solaris/dump_symbols.cc @@ -492,7 +492,7 @@ bool WriteModuleInfo(int fd, GElf_Half arch, const std::string& obj_file) { } unsigned char identifier[16]; - google_breakpad::FileID file_id(obj_file.c_str()); + google_breakpad::elf::FileID file_id(obj_file.c_str()); if (file_id.ElfFileIdentifier(identifier)) { char identifier_str[40]; file_id.ConvertIdentifierToString(identifier, diff --git a/external_imported/sentry-native/external/breakpad/src/common/solaris/file_id.cc b/external_imported/sentry-native/external/breakpad/src/common/solaris/file_id.cc index c32c73bb0..837793c86 100644 --- a/external_imported/sentry-native/external/breakpad/src/common/solaris/file_id.cc +++ b/external_imported/sentry-native/external/breakpad/src/common/solaris/file_id.cc @@ -128,10 +128,6 @@ static bool FindElfTextSection(int fd, const void* elf_base, return false; } -FileID::FileID(const char* path) { - strcpy(path_, path); -} - class AutoCloser { public: AutoCloser(int fd) : fd_(fd) {} @@ -140,6 +136,12 @@ class AutoCloser { int fd_; }; +namespace elf { + +FileID::FileID(const char* path) { + strcpy(path_, path); +} + bool FileID::ElfFileIdentifier(unsigned char identifier[16]) { int fd = 0; if ((fd = open(path_, O_RDONLY)) < 0) @@ -194,4 +196,5 @@ bool FileID::ConvertIdentifierToString(const unsigned char identifier[16], return true; } +} // elf } // namespace google_breakpad diff --git a/external_imported/sentry-native/external/breakpad/src/common/solaris/file_id.h b/external_imported/sentry-native/external/breakpad/src/common/solaris/file_id.h index 375e85751..cacf17a96 100644 --- a/external_imported/sentry-native/external/breakpad/src/common/solaris/file_id.h +++ b/external_imported/sentry-native/external/breakpad/src/common/solaris/file_id.h @@ -37,6 +37,7 @@ #include namespace google_breakpad { +namespace elf { class FileID { public: @@ -61,6 +62,7 @@ class FileID { char path_[PATH_MAX]; }; +} // elf } // namespace google_breakpad #endif // COMMON_SOLARIS_FILE_ID_H__ diff --git a/external_imported/sentry-native/external/breakpad/src/common/windows/pdb_source_line_writer.cc b/external_imported/sentry-native/external/breakpad/src/common/windows/pdb_source_line_writer.cc index 08d52635b..25a1ca053 100644 --- a/external_imported/sentry-native/external/breakpad/src/common/windows/pdb_source_line_writer.cc +++ b/external_imported/sentry-native/external/breakpad/src/common/windows/pdb_source_line_writer.cc @@ -40,6 +40,7 @@ #include #include #include +#include #include #include @@ -58,6 +59,8 @@ namespace google_breakpad { namespace { +using std::set; +using std::unique_ptr; using std::vector; // The symbol (among possibly many) selected to represent an rva. @@ -208,9 +211,162 @@ void StripLlvmSuffixAndUndecorate(BSTR* name) { } // namespace -PDBSourceLineWriter::PDBSourceLineWriter() : output_(NULL) { +PDBSourceLineWriter::Inline::Inline(int inline_nest_level) + : inline_nest_level_(inline_nest_level) {} + +void PDBSourceLineWriter::Inline::SetOriginId(int origin_id) { + origin_id_ = origin_id; +} + +void PDBSourceLineWriter::Inline::ExtendRanges(const Line& line) { + if (ranges_.empty()) { + ranges_[line.rva] = line.length; + return; + } + auto iter = ranges_.lower_bound(line.rva); + // There is no overlap if this function is called with inlinee lines from + // the same callsite. + if (iter == ranges_.begin()) { + return; + } + if (line.rva + line.length == iter->first) { + // If they are connected, merge their ranges into one. + DWORD length = line.length + iter->second; + ranges_.erase(iter); + ranges_[line.rva] = length; + } else { + --iter; + if (iter->first + iter->second == line.rva) { + ranges_[iter->first] = iter->second + line.length; + } else { + ranges_[line.rva] = line.length; + } + } +} + +void PDBSourceLineWriter::Inline::SetCallSiteLine(DWORD call_site_line) { + call_site_line_ = call_site_line; +} + +void PDBSourceLineWriter::Inline::SetCallSiteFileId(DWORD call_site_file_id) { + call_site_file_id_ = call_site_file_id; +} + +void PDBSourceLineWriter::Inline::SetChildInlines( + vector> child_inlines) { + child_inlines_ = std::move(child_inlines); +} + +void PDBSourceLineWriter::Inline::Print(FILE* output) const { + // Ignore INLINE record that doesn't have any range. + if (ranges_.empty()) + return; + fprintf(output, "INLINE %d %lu %lu %d", inline_nest_level_, call_site_line_, + call_site_file_id_, origin_id_); + for (const auto& r : ranges_) { + fprintf(output, " %lx %lx", r.first, r.second); + } + fprintf(output, "\n"); + for (const unique_ptr& in : child_inlines_) { + in->Print(output); + } +} + +const PDBSourceLineWriter::Line* PDBSourceLineWriter::Lines::GetLine( + DWORD rva) const { + auto iter = line_map_.find(rva); + if (iter == line_map_.end()) { + // If not found exact rva, check if it's within any range. + iter = line_map_.lower_bound(rva); + if (iter == line_map_.begin()) + return nullptr; + --iter; + auto l = iter->second; + // This happens when there is no top level lines cover this rva (e.g. empty + // lines found for the function). Then we don't know the call site line + // number for this inlined function. + if (rva >= l.rva + l.length) + return nullptr; + } + return &iter->second; } +DWORD PDBSourceLineWriter::Lines::GetLineNum(DWORD rva) const { + const Line* line = GetLine(rva); + return line ? line->line_num : 0; +} + +DWORD PDBSourceLineWriter::Lines::GetFileId(DWORD rva) const { + const Line* line = GetLine(rva); + return line ? line->file_id : 0; +} + +void PDBSourceLineWriter::Lines::AddLine(const Line& line) { + if (line_map_.empty()) { + line_map_[line.rva] = line; + return; + } + + // Given an existing line in line_map_, remove it from line_map_ if it + // overlaps with the line and add a new line for the non-overlap range. Return + // true if there is an overlap. + auto intercept = [&](Line old_line) { + DWORD end = old_line.rva + old_line.length; + // No overlap. + if (old_line.rva >= line.rva + line.length || line.rva >= end) + return false; + // old_line is within the line. + if (old_line.rva >= line.rva && end <= line.rva + line.length) { + line_map_.erase(old_line.rva); + return true; + } + // Then there is a overlap. + if (old_line.rva < line.rva) { + old_line.length -= end - line.rva; + if (end > line.rva + line.length) { + Line new_line = old_line; + new_line.rva = line.rva + line.length; + new_line.length = end - new_line.rva; + line_map_[new_line.rva] = new_line; + } + } else { + line_map_.erase(old_line.rva); + old_line.length -= line.rva + line.length - old_line.rva; + old_line.rva = line.rva + line.length; + } + line_map_[old_line.rva] = old_line; + return true; + }; + + bool is_intercept; + // Use a loop in cases that there are multiple lines within the given line. + do { + auto iter = line_map_.lower_bound(line.rva); + if (iter == line_map_.end()) { + if (!line_map_.empty()) { + --iter; + intercept(iter->second); + } + break; + } + is_intercept = false; + if (iter != line_map_.begin()) { + // Check if the given line overlaps a line with smaller in the map. + auto prev = line_map_.lower_bound(line.rva); + --prev; + is_intercept = intercept(prev->second); + } + // Check if the given line overlaps a line with greater or equal rva in the + // map. Using operator |= here since it's possible that there are multiple + // lines with greater rva in the map overlap with the given line. + is_intercept |= intercept(iter->second); + } while (is_intercept); + line_map_[line.rva] = line; +} + +PDBSourceLineWriter::PDBSourceLineWriter(bool handle_inline) + : output_(NULL), handle_inline_(handle_inline) {} + PDBSourceLineWriter::~PDBSourceLineWriter() { Close(); } @@ -280,48 +436,61 @@ bool PDBSourceLineWriter::Open(const wstring& file, FileFormat format) { return true; } -bool PDBSourceLineWriter::PrintLines(IDiaEnumLineNumbers* lines) { - // The line number format is: - // - CComPtr line; - ULONG count; +bool PDBSourceLineWriter::GetLine(IDiaLineNumber* dia_line, Line* line) const { + if (FAILED(dia_line->get_relativeVirtualAddress(&line->rva))) { + fprintf(stderr, "failed to get line rva\n"); + return false; + } - while (SUCCEEDED(lines->Next(1, &line, &count)) && count == 1) { - DWORD rva; - if (FAILED(line->get_relativeVirtualAddress(&rva))) { - fprintf(stderr, "failed to get line rva\n"); - return false; - } + if (FAILED(dia_line->get_length(&line->length))) { + fprintf(stderr, "failed to get line code length\n"); + return false; + } - DWORD length; - if (FAILED(line->get_length(&length))) { - fprintf(stderr, "failed to get line code length\n"); - return false; - } + DWORD dia_source_id; + if (FAILED(dia_line->get_sourceFileId(&dia_source_id))) { + fprintf(stderr, "failed to get line source file id\n"); + return false; + } + // duplicate file names are coalesced to share one ID + line->file_id = GetRealFileID(dia_source_id); - DWORD dia_source_id; - if (FAILED(line->get_sourceFileId(&dia_source_id))) { - fprintf(stderr, "failed to get line source file id\n"); - return false; - } - // duplicate file names are coalesced to share one ID - DWORD source_id = GetRealFileID(dia_source_id); + if (FAILED(dia_line->get_lineNumber(&line->line_num))) { + fprintf(stderr, "failed to get line number\n"); + return false; + } + return true; +} + +bool PDBSourceLineWriter::GetLines(IDiaEnumLineNumbers* lines, + Lines* line_list) const { + CComPtr line; + ULONG count; - DWORD line_num; - if (FAILED(line->get_lineNumber(&line_num))) { - fprintf(stderr, "failed to get line number\n"); + while (SUCCEEDED(lines->Next(1, &line, &count)) && count == 1) { + Line l; + if (!GetLine(line, &l)) return false; - } + // Silently ignore zero-length lines. + if (l.length != 0) + line_list->AddLine(l); + line.Release(); + } + return true; +} +void PDBSourceLineWriter::PrintLines(const Lines& lines) const { + // The line number format is: + // + for (const auto& kv : lines.GetLineMap()) { + const Line& l = kv.second; AddressRangeVector ranges; - MapAddressRange(image_map_, AddressRange(rva, length), &ranges); - for (size_t i = 0; i < ranges.size(); ++i) { - fprintf(output_, "%lx %lx %lu %lu\n", ranges[i].rva, ranges[i].length, - line_num, source_id); + MapAddressRange(image_map_, AddressRange(l.rva, l.length), &ranges); + for (auto& range : ranges) { + fprintf(output_, "%lx %lx %lu %lu\n", range.rva, range.length, l.line_num, + l.file_id); } - line.Release(); } - return true; } bool PDBSourceLineWriter::PrintFunction(IDiaSymbol* function, @@ -372,9 +541,20 @@ bool PDBSourceLineWriter::PrintFunction(IDiaSymbol* function, return false; } - if (!PrintLines(lines)) { + // Get top level lines first, which later may be split into multiple smaller + // lines if any inline exists in their ranges if we want to handle inline. + Lines line_list; + if (!GetLines(lines, &line_list)) { return false; } + if (handle_inline_) { + vector> inlines; + if (!GetInlines(block, &line_list, 0, &inlines)) { + return false; + } + PrintInlines(inlines); + } + PrintLines(line_list); return true; } @@ -392,6 +572,10 @@ bool PDBSourceLineWriter::PrintSourceFiles() { return false; } + // Print a dummy file with id equals 0 to represent unknown file, because + // inline records might have unknown call site. + fwprintf(output_, L"FILE %d unknown file\n", 0); + CComPtr compiland; ULONG count; while (SUCCEEDED(compilands->Next(1, &compiland, &count)) && count == 1) { @@ -555,6 +739,97 @@ bool PDBSourceLineWriter::PrintFunctions() { return true; } +void PDBSourceLineWriter::PrintInlineOrigins() const { + struct OriginCompare { + bool operator()(const InlineOrigin lhs, const InlineOrigin rhs) const { + return lhs.id < rhs.id; + } + }; + set origins; + // Sort by origin id. + for (auto const& origin : inline_origins_) + origins.insert(origin.second); + for (auto o : origins) { + fprintf(output_, "INLINE_ORIGIN %d %ls\n", o.id, o.name.c_str()); + } +} + +bool PDBSourceLineWriter::GetInlines(IDiaSymbol* block, + Lines* line_list, + int inline_nest_level, + vector>* inlines) { + CComPtr inline_callsites; + if (FAILED(block->findChildrenEx(SymTagInlineSite, nullptr, nsNone, + &inline_callsites))) { + return false; + } + ULONG count; + CComPtr callsite; + while (SUCCEEDED(inline_callsites->Next(1, &callsite, &count)) && + count == 1) { + unique_ptr new_inline(new Inline(inline_nest_level)); + CComPtr lines; + // All inlinee lines have the same file id. + DWORD file_id = 0; + DWORD call_site_line = 0; + if (FAILED(session_->findInlineeLines(callsite, &lines))) { + return false; + } + CComPtr dia_line; + while (SUCCEEDED(lines->Next(1, &dia_line, &count)) && count == 1) { + Line line; + if (!GetLine(dia_line, &line)) { + return false; + } + // Silently ignore zero-length lines. + if (line.length != 0) { + // Use the first line num and file id at rva as this inline's call site + // line number, because after adding lines it may be changed to inner + // line number and inner file id. + if (call_site_line == 0) + call_site_line = line_list->GetLineNum(line.rva); + if (file_id == 0) + file_id = line_list->GetFileId(line.rva); + line_list->AddLine(line); + new_inline->ExtendRanges(line); + } + dia_line.Release(); + } + BSTR name; + callsite->get_name(&name); + if (SysStringLen(name) == 0) { + name = SysAllocString(L""); + } + auto iter = inline_origins_.find(name); + if (iter == inline_origins_.end()) { + InlineOrigin origin; + origin.id = inline_origins_.size(); + origin.name = name; + inline_origins_[name] = origin; + } + new_inline->SetOriginId(inline_origins_[name].id); + new_inline->SetCallSiteLine(call_site_line); + new_inline->SetCallSiteFileId(file_id); + // Go to next level. + vector> child_inlines; + if (!GetInlines(callsite, line_list, inline_nest_level + 1, + &child_inlines)) { + return false; + } + new_inline->SetChildInlines(std::move(child_inlines)); + inlines->push_back(std::move(new_inline)); + callsite.Release(); + } + return true; +} + +void PDBSourceLineWriter::PrintInlines( + const vector>& inlines) const { + for (const unique_ptr& in : inlines) { + in->Print(output_); + } +} + #undef max bool PDBSourceLineWriter::PrintFrameDataUsingPDB() { @@ -1105,10 +1380,8 @@ bool PDBSourceLineWriter::WriteSymbols(FILE* symbol_file) { bool ret = PrintPDBInfo(); // This is not a critical piece of the symbol file. PrintPEInfo(); - ret = ret && - PrintSourceFiles() && - PrintFunctions() && - PrintFrameData(); + ret = ret && PrintSourceFiles() && PrintFunctions() && PrintFrameData(); + PrintInlineOrigins(); output_ = NULL; return ret; diff --git a/external_imported/sentry-native/external/breakpad/src/common/windows/pdb_source_line_writer.h b/external_imported/sentry-native/external/breakpad/src/common/windows/pdb_source_line_writer.h index 00f6e5929..42bd94d95 100644 --- a/external_imported/sentry-native/external/breakpad/src/common/windows/pdb_source_line_writer.h +++ b/external_imported/sentry-native/external/breakpad/src/common/windows/pdb_source_line_writer.h @@ -35,8 +35,11 @@ #include +#include +#include #include #include +#include #include "common/windows/module_info.h" #include "common/windows/omap.h" @@ -47,6 +50,8 @@ struct IDiaSymbol; namespace google_breakpad { +using std::map; +using std::vector; using std::wstring; using std::unordered_map; @@ -58,7 +63,7 @@ class PDBSourceLineWriter { ANY_FILE // try PDB_FILE and then EXE_FILE }; - explicit PDBSourceLineWriter(); + explicit PDBSourceLineWriter(bool handle_inline = false); ~PDBSourceLineWriter(); // Opens the given file. For executable files, the corresponding pdb @@ -99,9 +104,110 @@ class PDBSourceLineWriter { bool UsesGUID(bool *uses_guid); private: - // Outputs the line/address pairs for each line in the enumerator. + // InlineOrigin represents INLINE_ORIGIN record in a symbol file. It's an + // inlined function. + struct InlineOrigin { + // The unique id for an InlineOrigin. + int id; + // The name of the inlined function. + wstring name; + }; + + // Line represents LINE record in a symbol file. It represents a source code + // line. + struct Line { + // The relative address of a line. + DWORD rva; + // The number bytes this line has. + DWORD length; + // The source line number. + DWORD line_num; + // The source file id where the source line is located at. + DWORD file_id; + }; + + // Inline represents INLINE record in a symbol file. + class Inline { + public: + explicit Inline(int inline_nest_level); + + void SetOriginId(int origin_id); + + // Adding inlinee line's range into ranges. If line is adjacent with any + // existing lines, extend the range. Otherwise, add line as a new range. + void ExtendRanges(const Line& line); + + void SetCallSiteLine(DWORD call_site_line); + + void SetCallSiteFileId(DWORD call_site_file_id); + + void SetChildInlines(std::vector> child_inlines); + + void Print(FILE* output) const; + + private: + // The nest level of this inline record. + int inline_nest_level_; + // The source line number at where this inlined function is called. + DWORD call_site_line_ = 0; + // The call site file id at where this inlined function is called. + DWORD call_site_file_id_ = 0; + // The id used for referring to an InlineOrigin. + int origin_id_ = 0; + // A map from rva to length. This is the address ranges covered by this + // Inline. + map ranges_; + // The list of direct Inlines inlined inside this Inline. + vector> child_inlines_; + }; + + // Lines represents a map of lines inside a function with rva as the key. + // AddLine function adds a line into the map and ensures that there is no + // overlap between any two lines in the map. + class Lines { + public: + const map& GetLineMap() const { return line_map_; } + + // Finds the line from line_map_ that contains the given rva returns its + // line_num. If not found, return 0. + DWORD GetLineNum(DWORD rva) const; + + // Finds the line from line_map_ that contains the given rva returns its + // file_id. If not found, return 0. + DWORD GetFileId(DWORD rva) const; + + // Add the `line` into line_map_. If the `line` overlaps with existing + // lines, truncate the existing lines and add the given line. It ensures + // that all lines in line_map_ do not overlap with each other. For example, + // suppose there is a line A in the map and we call AddLine with Line B. + // Line A: rva: 100, length: 20, line_num: 10, file_id: 1 + // Line B: rva: 105, length: 10, line_num: 4, file_id: 2 + // After calling AddLine with Line B, we will have the following lines: + // Line 1: rva: 100, length: 5, line_num: 10, file_id: 1 + // Line 2: rva: 105, length: 10, line_num: 4, file_id: 2 + // Line 3: rva: 115, length: 5, line_num: 10, file_id: 1 + void AddLine(const Line& line); + + private: + // Finds the line from line_map_ that contains the given rva. If not found, + // return nullptr. + const Line* GetLine(DWORD rva) const; + // The key is rva. AddLine function ensures that any two lines in the map do + // not overlap. + map line_map_; + }; + + // Construct Line from IDiaLineNumber. The output Line is stored at line. + // Return true on success. + bool GetLine(IDiaLineNumber* dia_line, Line* line) const; + + // Construct Lines from IDiaEnumLineNumbers. The list of Lines are stored at + // line_list. // Returns true on success. - bool PrintLines(IDiaEnumLineNumbers *lines); + bool GetLines(IDiaEnumLineNumbers* lines, Lines* line_list) const; + + // Outputs the line/address pairs for each line in the enumerator. + void PrintLines(const Lines& lines) const; // Outputs a function address and name, followed by its source line list. // block can be the same object as function, or it can be a reference to a @@ -118,6 +224,25 @@ class PDBSourceLineWriter { // Returns true on success. bool PrintSourceFiles(); + // Output all inline origins. + void PrintInlineOrigins() const; + + // Retrieve inlines inside the given block. It also adds inlinee lines to + // `line_list` since inner lines are more precise source location. If the + // block has children wih SymTagInlineSite Tag, it will recursively (DFS) call + // itself with each child as first argument. Returns true on success. + // `block`: the IDiaSymbol that may have inline sites. + // `line_list`: the list of lines inside current function. + // `inline_nest_level`: the nest level of block's Inlines. + // `inlines`: the vector to store the list of inlines for the block. + bool GetInlines(IDiaSymbol* block, + Lines* line_list, + int inline_nest_level, + vector>* inlines); + + // Outputs all inlines. + void PrintInlines(const vector>& inlines) const; + // Outputs all of the frame information necessary to construct stack // backtraces in the absence of frame pointers. For x86 data stored in // .pdb files. Returns true on success. @@ -172,8 +297,8 @@ class PDBSourceLineWriter { // reference it. There may be multiple files with identical filenames // but different unique IDs. The cache attempts to coalesce these into // one ID per unique filename. - DWORD GetRealFileID(DWORD id) { - unordered_map::iterator iter = file_ids_.find(id); + DWORD GetRealFileID(DWORD id) const { + unordered_map::const_iterator iter = file_ids_.find(id); if (iter == file_ids_.end()) return id; return iter->second; @@ -213,9 +338,15 @@ class PDBSourceLineWriter { // This maps unique filenames to file IDs. unordered_map unique_files_; + // The INLINE_ORIGINS records. The key is the function name. + std::map inline_origins_; + // This is used for calculating post-transform symbol addresses and lengths. ImageMap image_map_; + // If we should output INLINE/INLINE_ORIGIN records + bool handle_inline_; + // Disallow copy ctor and operator= PDBSourceLineWriter(const PDBSourceLineWriter&); void operator=(const PDBSourceLineWriter&); diff --git a/external_imported/sentry-native/external/breakpad/src/common/windows/pe_util.cc b/external_imported/sentry-native/external/breakpad/src/common/windows/pe_util.cc index 9c94af05f..f8934d27e 100644 --- a/external_imported/sentry-native/external/breakpad/src/common/windows/pe_util.cc +++ b/external_imported/sentry-native/external/breakpad/src/common/windows/pe_util.cc @@ -35,6 +35,7 @@ #include #include +#include #include "common/windows/string_utils-inl.h" #include "common/windows/guid_string.h" @@ -42,15 +43,19 @@ namespace { /* - * Not defined in WinNT.h for some reason. Definitions taken from: - * http://uninformed.org/index.cgi?v=4&a=1&p=13 + * Not defined in WinNT.h prior to SDK 10.0.20348.0 for some reason. + * Definitions taken from: http://uninformed.org/index.cgi?v=4&a=1&p=13 * */ typedef unsigned char UBYTE; -#if !defined(_WIN64) +#if !defined(UNW_FLAG_EHANDLER) #define UNW_FLAG_EHANDLER 0x01 +#endif +#if !defined(UNW_FLAG_UHANDLER) #define UNW_FLAG_UHANDLER 0x02 +#endif +#if !defined(UNW_FLAG_CHAININFO) #define UNW_FLAG_CHAININFO 0x04 #endif diff --git a/external_imported/sentry-native/external/breakpad/src/common/windows/symbol_collector_client.cc b/external_imported/sentry-native/external/breakpad/src/common/windows/symbol_collector_client.cc index 30c663ed3..558a97b98 100644 --- a/external_imported/sentry-native/external/breakpad/src/common/windows/symbol_collector_client.cc +++ b/external_imported/sentry-native/external/breakpad/src/common/windows/symbol_collector_client.cc @@ -12,6 +12,7 @@ namespace google_breakpad { bool SymbolCollectorClient::CreateUploadUrl( wstring& api_url, wstring& api_key, + int* timeout_ms, UploadUrlResponse *uploadUrlResponse) { wstring url = api_url + L"/v1/uploads:create" @@ -23,7 +24,7 @@ namespace google_breakpad { url, L"", L"", - NULL, + timeout_ms, &response, &response_code)) { wprintf(L"Failed to create upload url.\n"); @@ -66,6 +67,7 @@ namespace google_breakpad { CompleteUploadResult SymbolCollectorClient::CompleteUpload( wstring& api_url, wstring& api_key, + int* timeout_ms, const wstring& upload_key, const wstring& debug_file, const wstring& debug_id) { @@ -76,7 +78,8 @@ namespace google_breakpad { L"{ symbol_id: {" L"debug_file: \"" + debug_file + L"\", " L"debug_id: \"" + debug_id + L"\" " - L"} }"; + L"}, " + L"use_async_processing: true }"; wstring response; int response_code; @@ -84,7 +87,7 @@ namespace google_breakpad { url, body, L"application/json", - NULL, + timeout_ms, &response, &response_code)) { wprintf(L"Failed to complete upload.\n"); @@ -116,6 +119,7 @@ namespace google_breakpad { SymbolStatus SymbolCollectorClient::CheckSymbolStatus( wstring& api_url, wstring& api_key, + int* timeout_ms, const wstring& debug_file, const wstring& debug_id) { wstring response; @@ -126,7 +130,7 @@ namespace google_breakpad { if (!HTTPUpload::SendGetRequest( url, - NULL, + timeout_ms, &response, &response_code)) { wprintf(L"Failed to check symbol status.\n"); diff --git a/external_imported/sentry-native/external/breakpad/src/common/windows/symbol_collector_client.h b/external_imported/sentry-native/external/breakpad/src/common/windows/symbol_collector_client.h index 30e0cb323..4a85c0529 100644 --- a/external_imported/sentry-native/external/breakpad/src/common/windows/symbol_collector_client.h +++ b/external_imported/sentry-native/external/breakpad/src/common/windows/symbol_collector_client.h @@ -64,6 +64,7 @@ namespace google_breakpad { static bool CreateUploadUrl( wstring& api_url, wstring& api_key, + int* timeout_ms, UploadUrlResponse *uploadUrlResponse); // Notify the API that symbol file upload is finished and its contents @@ -71,6 +72,7 @@ namespace google_breakpad { static CompleteUploadResult CompleteUpload( wstring& api_url, wstring& api_key, + int* timeout_ms, const wstring& upload_key, const wstring& debug_file, const wstring& debug_id); @@ -80,6 +82,7 @@ namespace google_breakpad { static SymbolStatus CheckSymbolStatus( wstring& api_url, wstring& api_key, + int* timeout_ms, const wstring& debug_file, const wstring& debug_id); }; diff --git a/external_imported/sentry-native/external/breakpad/src/google_breakpad/processor/stack_frame.h b/external_imported/sentry-native/external/breakpad/src/google_breakpad/processor/stack_frame.h index 5f3932b68..7d5682a7d 100644 --- a/external_imported/sentry-native/external/breakpad/src/google_breakpad/processor/stack_frame.h +++ b/external_imported/sentry-native/external/breakpad/src/google_breakpad/processor/stack_frame.h @@ -50,9 +50,12 @@ struct StackFrame { FRAME_TRUST_CFI_SCAN, // Found while scanning stack using call frame info FRAME_TRUST_FP, // Derived from frame pointer FRAME_TRUST_CFI, // Derived from call frame info - FRAME_TRUST_PREWALKED, // Explicitly provided by some external stack walker. + // Explicitly provided by some external stack walker. + FRAME_TRUST_PREWALKED, FRAME_TRUST_CONTEXT, // Given as instruction pointer in a context - FRAME_TRUST_INLINE // Found by inline records in symbol files. + FRAME_TRUST_INLINE, // Found by inline records in symbol files. + // Derived from leaf function by simulating a return. + FRAME_TRUST_LEAF, }; StackFrame() @@ -63,7 +66,8 @@ struct StackFrame { source_file_name(), source_line(0), source_line_base(), - trust(FRAME_TRUST_NONE){} + trust(FRAME_TRUST_NONE), + is_multiple(false) {} virtual ~StackFrame() {} // Return a string describing how this stack frame was found @@ -84,7 +88,9 @@ struct StackFrame { return "stack scanning"; case StackFrame::FRAME_TRUST_INLINE: return "inline record"; - default: + case StackFrame::FRAME_TRUST_LEAF: + return "simulating a return from leaf function"; + default: return "unknown"; } } @@ -140,6 +146,12 @@ struct StackFrame { // Amount of trust the stack walker has in the instruction pointer // of this frame. FrameTrust trust; + + // True if the frame corresponds to multiple functions, for example as the + // result of identical code folding by the linker. In that case the function + // name, filename, etc. information above represents the state of an arbitrary + // one of these functions. + bool is_multiple; }; } // namespace google_breakpad diff --git a/external_imported/sentry-native/external/breakpad/src/google_breakpad/processor/stack_frame_cpu.h b/external_imported/sentry-native/external/breakpad/src/google_breakpad/processor/stack_frame_cpu.h index dc5d8ae67..24e28ca12 100644 --- a/external_imported/sentry-native/external/breakpad/src/google_breakpad/processor/stack_frame_cpu.h +++ b/external_imported/sentry-native/external/breakpad/src/google_breakpad/processor/stack_frame_cpu.h @@ -251,7 +251,10 @@ struct StackFrameARM : public StackFrame { // Return the ContextValidity flag for register rN. static ContextValidity RegisterValidFlag(int n) { - return ContextValidity(1 << n); + if (0 <= n && n <= 15) { + return ContextValidity(1 << n); + } + return CONTEXT_VALID_NONE; } // Register state. This is only fully valid for the topmost frame in a diff --git a/external_imported/sentry-native/external/breakpad/src/processor/basic_source_line_resolver.cc b/external_imported/sentry-native/external/breakpad/src/processor/basic_source_line_resolver.cc index 4a565f11c..e525d4f9e 100644 --- a/external_imported/sentry-native/external/breakpad/src/processor/basic_source_line_resolver.cc +++ b/external_imported/sentry-native/external/breakpad/src/processor/basic_source_line_resolver.cc @@ -128,6 +128,7 @@ bool BasicSourceLineResolver::Module::LoadMapFromMemory( linked_ptr cur_func; int line_number = 0; int num_errors = 0; + int inline_num_errors = 0; char* save_ptr; // If the length is 0, we can still pretend we have a symbol file. This is @@ -208,12 +209,13 @@ bool BasicSourceLineResolver::Module::LoadMapFromMemory( } else if (strncmp(buffer, "INLINE ", 7) == 0) { linked_ptr in = ParseInline(buffer); if (!in.get()) - LogParseError("ParseInline failed", line_number, &num_errors); + LogParseError("ParseInline failed", line_number, &inline_num_errors); else cur_func->AppendInline(in); } else if (strncmp(buffer, "INLINE_ORIGIN ", 14) == 0) { if (!ParseInlineOrigin(buffer)) { - LogParseError("ParseInlineOrigin failed", line_number, &num_errors); + LogParseError("ParseInlineOrigin failed", line_number, + &inline_num_errors); } } else { if (!cur_func.get()) { @@ -317,6 +319,7 @@ void BasicSourceLineResolver::Module::LookupAddress( address >= function_base && address - function_base < function_size) { frame->function_name = func->name; frame->function_base = frame->module->base_address() + function_base; + frame->is_multiple = func->is_multiple; linked_ptr line; MemAddr line_base; @@ -339,6 +342,7 @@ void BasicSourceLineResolver::Module::LookupAddress( (!func.get() || public_address > function_base)) { frame->function_name = public_symbol->name; frame->function_base = frame->module->base_address() + public_address; + frame->is_multiple = public_symbol->is_multiple; } } diff --git a/external_imported/sentry-native/external/breakpad/src/processor/basic_source_line_resolver_unittest.cc b/external_imported/sentry-native/external/breakpad/src/processor/basic_source_line_resolver_unittest.cc index e608a5485..a9f1a886a 100644 --- a/external_imported/sentry-native/external/breakpad/src/processor/basic_source_line_resolver_unittest.cc +++ b/external_imported/sentry-native/external/breakpad/src/processor/basic_source_line_resolver_unittest.cc @@ -52,7 +52,6 @@ using google_breakpad::CodeModule; using google_breakpad::MemoryRegion; using google_breakpad::StackFrame; using google_breakpad::WindowsFrameInfo; -using google_breakpad::linked_ptr; using google_breakpad::scoped_ptr; using google_breakpad::SymbolParseHelper; @@ -93,12 +92,12 @@ class MockMemoryRegion: public MemoryRegion { } bool GetMemoryAtAddress(uint64_t address, uint32_t* value) const { switch (address) { - case 0x10008: *value = 0x98ecadc3; break; // saved %ebx - case 0x1000c: *value = 0x878f7524; break; // saved %esi - case 0x10010: *value = 0x6312f9a5; break; // saved %edi - case 0x10014: *value = 0x10038; break; // caller's %ebp - case 0x10018: *value = 0xf6438648; break; // return address - default: *value = 0xdeadbeef; break; // junk + case 0x10008: *value = 0x98ecadc3; break; // saved %ebx + case 0x1000c: *value = 0x878f7524; break; // saved %esi + case 0x10010: *value = 0x6312f9a5; break; // saved %edi + case 0x10014: *value = 0x10038; break; // caller's %ebp + case 0x10018: *value = 0xf6438648; break; // return address + default: *value = 0xdeadbeef; break; // junk } return true; } @@ -164,7 +163,7 @@ static void ClearSourceLineInfo(StackFrame* frame) { } class TestBasicSourceLineResolver : public ::testing::Test { -public: + public: void SetUp() { testdata_dir = string(getenv("srcdir") ? getenv("srcdir") : ".") + "/src/processor/testdata"; @@ -196,6 +195,7 @@ TEST_F(TestBasicSourceLineResolver, TestLoadAndResolve) ASSERT_TRUE(frame.source_file_name.empty()); ASSERT_EQ(frame.source_line, 0); ASSERT_EQ(frame.source_line_base, 0U); + EXPECT_EQ(frame.is_multiple, false); frame.module = &module1; resolver.FillSourceLineInfo(&frame, nullptr); @@ -206,6 +206,7 @@ TEST_F(TestBasicSourceLineResolver, TestLoadAndResolve) ASSERT_EQ(frame.source_file_name, "file1_1.cc"); ASSERT_EQ(frame.source_line, 44); ASSERT_EQ(frame.source_line_base, 0x1000U); + EXPECT_EQ(frame.is_multiple, true); windows_frame_info.reset(resolver.FindWindowsFrameInfo(&frame)); ASSERT_TRUE(windows_frame_info.get()); ASSERT_EQ(windows_frame_info->type_, WindowsFrameInfo::STACK_INFO_FRAME_DATA); @@ -344,6 +345,7 @@ TEST_F(TestBasicSourceLineResolver, TestLoadAndResolve) frame.module = &module1; resolver.FillSourceLineInfo(&frame, nullptr); ASSERT_EQ(frame.function_name, string("PublicSymbol")); + EXPECT_EQ(frame.is_multiple, true); frame.instruction = 0x4000; frame.module = &module1; @@ -360,6 +362,7 @@ TEST_F(TestBasicSourceLineResolver, TestLoadAndResolve) ASSERT_EQ(frame.source_file_name, "file2_2.cc"); ASSERT_EQ(frame.source_line, 21); ASSERT_EQ(frame.source_line_base, 0x2180U); + EXPECT_EQ(frame.is_multiple, false); windows_frame_info.reset(resolver.FindWindowsFrameInfo(&frame)); ASSERT_TRUE(windows_frame_info.get()); ASSERT_EQ(windows_frame_info->type_, WindowsFrameInfo::STACK_INFO_FRAME_DATA); @@ -368,6 +371,7 @@ TEST_F(TestBasicSourceLineResolver, TestLoadAndResolve) frame.instruction = 0x216f; resolver.FillSourceLineInfo(&frame, nullptr); ASSERT_EQ(frame.function_name, "Public2_1"); + EXPECT_EQ(frame.is_multiple, false); ClearSourceLineInfo(&frame); frame.instruction = 0x219f; @@ -431,6 +435,7 @@ TEST_F(TestBasicSourceLineResolver, TestLoadAndResolveOldInlines) { ASSERT_EQ(frame.source_file_name, "linux_inline.cpp"); ASSERT_EQ(frame.source_line, 42); ASSERT_EQ(frame.source_line_base, 0x161b6U); + EXPECT_EQ(frame.is_multiple, false); ASSERT_EQ(inlined_frames.size(), 3UL); @@ -475,6 +480,7 @@ TEST_F(TestBasicSourceLineResolver, TestLoadAndResolveNewInlines) { ASSERT_EQ(frame.source_file_name, "a.cpp"); ASSERT_EQ(frame.source_line, 42); ASSERT_EQ(frame.source_line_base, 0x161b6U); + EXPECT_EQ(frame.is_multiple, false); ASSERT_EQ(inlined_frames.size(), 3UL); diff --git a/external_imported/sentry-native/external/breakpad/src/processor/fast_source_line_resolver.cc b/external_imported/sentry-native/external/breakpad/src/processor/fast_source_line_resolver.cc index 374b06cfb..1fbe06fac 100644 --- a/external_imported/sentry-native/external/breakpad/src/processor/fast_source_line_resolver.cc +++ b/external_imported/sentry-native/external/breakpad/src/processor/fast_source_line_resolver.cc @@ -40,12 +40,14 @@ #include "google_breakpad/processor/fast_source_line_resolver.h" #include "processor/fast_source_line_resolver_types.h" +#include #include #include #include #include "common/scoped_ptr.h" #include "common/using_std_string.h" +#include "processor/logging.h" #include "processor/module_factory.h" #include "processor/simple_serializer-inl.h" @@ -83,15 +85,16 @@ void FastSourceLineResolver::Module::LookupAddress( if (functions_.RetrieveNearestRange(address, func_ptr, &function_base, &function_size) && address >= function_base && address - function_base < function_size) { - func.get()->CopyFrom(func_ptr); + func->CopyFrom(func_ptr); frame->function_name = func->name; frame->function_base = frame->module->base_address() + function_base; + frame->is_multiple = func->is_multiple; scoped_ptr line(new Line); const Line* line_ptr = 0; MemAddr line_base; if (func->lines.RetrieveRange(address, line_ptr, &line_base, NULL)) { - line.get()->CopyFrom(line_ptr); + line->CopyFrom(line_ptr); FileMap::iterator it = files_.find(line->source_file_id); if (it != files_.end()) { frame->source_file_name = @@ -107,9 +110,10 @@ void FastSourceLineResolver::Module::LookupAddress( } else if (public_symbols_.Retrieve(address, public_symbol_ptr, &public_address) && (!func_ptr || public_address > function_base)) { - public_symbol.get()->CopyFrom(public_symbol_ptr); + public_symbol->CopyFrom(public_symbol_ptr); frame->function_name = public_symbol->name; frame->function_base = frame->module->base_address() + public_address; + frame->is_multiple = public_symbol->is_multiple; } } @@ -125,13 +129,13 @@ void FastSourceLineResolver::Module::ConstructInlineFrames( for (const char* inline_ptr : inline_ptrs) { scoped_ptr in(new Inline); - in.get()->CopyFrom(inline_ptr); + in->CopyFrom(inline_ptr); unique_ptr new_frame = unique_ptr(new StackFrame(*frame)); auto origin_iter = inline_origins_.find(in->origin_id); if (origin_iter != inline_origins_.end()) { scoped_ptr origin(new InlineOrigin); - origin.get()->CopyFrom(origin_iter.GetValuePtr()); + origin->CopyFrom(origin_iter.GetValuePtr()); new_frame->function_name = origin->name; } else { new_frame->function_name = ""; @@ -234,6 +238,19 @@ bool FastSourceLineResolver::Module::LoadMapFromMemory( for (int i = 1; i < kNumberMaps_; ++i) { offsets[i] = offsets[i - 1] + map_sizes[i - 1]; } + unsigned int expected_size = sizeof(bool) + offsets[kNumberMaps_ - 1] + + map_sizes[kNumberMaps_ - 1] + 1; + if (expected_size != memory_buffer_size && + // Allow for having an extra null terminator. + expected_size != memory_buffer_size - 1) { + // This could either be a random corruption or the serialization format was + // changed without updating the version in kSerializedBreakpadFileExtension. + BPLOG(ERROR) << "Memory buffer is either corrupt or an unsupported version" + << ", expected size: " << expected_size + << ", actual size: " << memory_buffer_size; + return false; + } + BPLOG(INFO) << "Memory buffer size looks good, size: " << memory_buffer_size; // Use pointers to construct Static*Map data members in Module: int map_id = 0; @@ -242,9 +259,10 @@ bool FastSourceLineResolver::Module::LoadMapFromMemory( StaticRangeMap(mem_buffer + offsets[map_id++]); public_symbols_ = StaticAddressMap(mem_buffer + offsets[map_id++]); - for (int i = 0; i < WindowsFrameInfo::STACK_INFO_LAST; ++i) + for (int i = 0; i < WindowsFrameInfo::STACK_INFO_LAST; ++i) { windows_frame_info_[i] = StaticContainedRangeMap(mem_buffer + offsets[map_id++]); + } cfi_initial_rules_ = StaticRangeMap(mem_buffer + offsets[map_id++]); @@ -286,7 +304,7 @@ WindowsFrameInfo* FastSourceLineResolver::Module::FindWindowsFrameInfo( if (functions_.RetrieveNearestRange(address, function_ptr, &function_base, &function_size) && address >= function_base && address - function_base < function_size) { - function.get()->CopyFrom(function_ptr); + function->CopyFrom(function_ptr); result->parameter_size = function->parameter_size; result->valid |= WindowsFrameInfo::VALID_PARAMETER_SIZE; return result.release(); @@ -299,7 +317,7 @@ WindowsFrameInfo* FastSourceLineResolver::Module::FindWindowsFrameInfo( MemAddr public_address; if (public_symbols_.Retrieve(address, public_symbol_ptr, &public_address) && (!function_ptr || public_address > function_base)) { - public_symbol.get()->CopyFrom(public_symbol_ptr); + public_symbol->CopyFrom(public_symbol_ptr); result->parameter_size = public_symbol->parameter_size; } diff --git a/external_imported/sentry-native/external/breakpad/src/processor/fast_source_line_resolver_types.h b/external_imported/sentry-native/external/breakpad/src/processor/fast_source_line_resolver_types.h index 577b98e6e..718905dfe 100644 --- a/external_imported/sentry-native/external/breakpad/src/processor/fast_source_line_resolver_types.h +++ b/external_imported/sentry-native/external/breakpad/src/processor/fast_source_line_resolver_types.h @@ -37,15 +37,16 @@ #ifndef PROCESSOR_FAST_SOURCE_LINE_RESOLVER_TYPES_H__ #define PROCESSOR_FAST_SOURCE_LINE_RESOLVER_TYPES_H__ -#include "contained_range_map.h" -#include "google_breakpad/processor/fast_source_line_resolver.h" -#include "processor/source_line_resolver_base_types.h" - +#include #include #include +#include "google_breakpad/processor/fast_source_line_resolver.h" #include "google_breakpad/processor/stack_frame.h" #include "processor/cfi_frame_info.h" +#include "processor/contained_range_map.h" +#include "processor/simple_serializer-inl.h" +#include "processor/source_line_resolver_base_types.h" #include "processor/static_address_map-inl.h" #include "processor/static_contained_range_map-inl.h" #include "processor/static_map.h" @@ -88,7 +89,7 @@ public SourceLineResolverBase::Function { DESERIALIZE(raw, address); DESERIALIZE(raw, size); DESERIALIZE(raw, parameter_size); - DESERIALIZE(raw, is_multiple); + raw = SimpleSerializer::Read(raw, &is_multiple); int32_t inline_size; DESERIALIZE(raw, inline_size); inlines = StaticContainedRangeMap(raw); @@ -152,7 +153,7 @@ public SourceLineResolverBase::PublicSymbol { raw += name_size; DESERIALIZE(raw, address); DESERIALIZE(raw, parameter_size); - DESERIALIZE(raw, is_multiple); + raw = SimpleSerializer::Read(raw, &is_multiple); } }; diff --git a/external_imported/sentry-native/external/breakpad/src/processor/fast_source_line_resolver_unittest.cc b/external_imported/sentry-native/external/breakpad/src/processor/fast_source_line_resolver_unittest.cc index a8e224085..6ef443caa 100644 --- a/external_imported/sentry-native/external/breakpad/src/processor/fast_source_line_resolver_unittest.cc +++ b/external_imported/sentry-native/external/breakpad/src/processor/fast_source_line_resolver_unittest.cc @@ -64,7 +64,6 @@ using google_breakpad::CodeModule; using google_breakpad::MemoryRegion; using google_breakpad::StackFrame; using google_breakpad::WindowsFrameInfo; -using google_breakpad::linked_ptr; using google_breakpad::scoped_ptr; class TestCodeModule : public CodeModule { @@ -224,6 +223,7 @@ TEST_F(TestFastSourceLineResolver, TestLoadAndResolve) { ASSERT_TRUE(frame.source_file_name.empty()); ASSERT_EQ(frame.source_line, 0); ASSERT_EQ(frame.source_line_base, 0U); + ASSERT_EQ(frame.is_multiple, false); frame.module = &module1; fast_resolver.FillSourceLineInfo(&frame, nullptr); @@ -234,6 +234,7 @@ TEST_F(TestFastSourceLineResolver, TestLoadAndResolve) { ASSERT_EQ(frame.source_file_name, "file1_1.cc"); ASSERT_EQ(frame.source_line, 44); ASSERT_EQ(frame.source_line_base, 0x1000U); + ASSERT_EQ(frame.is_multiple, true); windows_frame_info.reset(fast_resolver.FindWindowsFrameInfo(&frame)); ASSERT_TRUE(windows_frame_info.get()); ASSERT_FALSE(windows_frame_info->allocates_base_pointer); @@ -371,6 +372,7 @@ TEST_F(TestFastSourceLineResolver, TestLoadAndResolve) { frame.module = &module1; fast_resolver.FillSourceLineInfo(&frame, nullptr); ASSERT_EQ(frame.function_name, string("PublicSymbol")); + EXPECT_EQ(frame.is_multiple, true); frame.instruction = 0x4000; frame.module = &module1; @@ -387,6 +389,7 @@ TEST_F(TestFastSourceLineResolver, TestLoadAndResolve) { ASSERT_EQ(frame.source_file_name, "file2_2.cc"); ASSERT_EQ(frame.source_line, 21); ASSERT_EQ(frame.source_line_base, 0x2180U); + ASSERT_EQ(frame.is_multiple, false); windows_frame_info.reset(fast_resolver.FindWindowsFrameInfo(&frame)); ASSERT_TRUE(windows_frame_info.get()); ASSERT_EQ(windows_frame_info->type_, WindowsFrameInfo::STACK_INFO_FRAME_DATA); @@ -395,6 +398,7 @@ TEST_F(TestFastSourceLineResolver, TestLoadAndResolve) { frame.instruction = 0x216f; fast_resolver.FillSourceLineInfo(&frame, nullptr); ASSERT_EQ(frame.function_name, "Public2_1"); + EXPECT_EQ(frame.is_multiple, false); ClearSourceLineInfo(&frame); frame.instruction = 0x219f; @@ -433,6 +437,7 @@ TEST_F(TestFastSourceLineResolver, TestLoadAndResolveOldInlines) { ASSERT_EQ(frame.source_file_name, "linux_inline.cpp"); ASSERT_EQ(frame.source_line, 42); ASSERT_EQ(frame.source_line_base, 0x161b6U); + ASSERT_EQ(frame.is_multiple, false); ASSERT_EQ(inlined_frames.size(), 3UL); @@ -484,6 +489,7 @@ TEST_F(TestFastSourceLineResolver, TestLoadAndResolveNewInlines) { ASSERT_EQ(frame.source_file_name, "a.cpp"); ASSERT_EQ(frame.source_line, 42); ASSERT_EQ(frame.source_line_base, 0x161b6U); + ASSERT_EQ(frame.is_multiple, false); ASSERT_EQ(inlined_frames.size(), 3UL); diff --git a/external_imported/sentry-native/external/breakpad/src/processor/simple_serializer-inl.h b/external_imported/sentry-native/external/breakpad/src/processor/simple_serializer-inl.h index 4b4200e4b..c8d3e3c29 100644 --- a/external_imported/sentry-native/external/breakpad/src/processor/simple_serializer-inl.h +++ b/external_imported/sentry-native/external/breakpad/src/processor/simple_serializer-inl.h @@ -38,14 +38,15 @@ #ifndef PROCESSOR_SIMPLE_SERIALIZER_INL_H__ #define PROCESSOR_SIMPLE_SERIALIZER_INL_H__ -#include - #include "processor/simple_serializer.h" -#include "map_serializers-inl.h" + +#include +#include #include "google_breakpad/processor/basic_source_line_resolver.h" #include "processor/basic_source_line_resolver_types.h" #include "processor/linked_ptr.h" +#include "processor/map_serializers-inl.h" #include "processor/windows_frame_info.h" namespace google_breakpad { @@ -140,12 +141,14 @@ class SimpleSerializer { static size_t SizeOf(const PublicSymbol& pubsymbol) { return SimpleSerializer::SizeOf(pubsymbol.name) + SimpleSerializer::SizeOf(pubsymbol.address) - + SimpleSerializer::SizeOf(pubsymbol.parameter_size); + + SimpleSerializer::SizeOf(pubsymbol.parameter_size) + + SimpleSerializer::SizeOf(pubsymbol.is_multiple); } static char* Write(const PublicSymbol& pubsymbol, char* dest) { dest = SimpleSerializer::Write(pubsymbol.name, dest); dest = SimpleSerializer::Write(pubsymbol.address, dest); dest = SimpleSerializer::Write(pubsymbol.parameter_size, dest); + dest = SimpleSerializer::Write(pubsymbol.is_multiple, dest); return dest; } }; diff --git a/external_imported/sentry-native/external/breakpad/src/processor/simple_serializer.h b/external_imported/sentry-native/external/breakpad/src/processor/simple_serializer.h index 9e51d8067..e1b1efd14 100644 --- a/external_imported/sentry-native/external/breakpad/src/processor/simple_serializer.h +++ b/external_imported/sentry-native/external/breakpad/src/processor/simple_serializer.h @@ -38,6 +38,8 @@ #ifndef PROCESSOR_SIMPLE_SERIALIZER_H__ #define PROCESSOR_SIMPLE_SERIALIZER_H__ +#include + #include "google_breakpad/common/breakpad_types.h" namespace google_breakpad { diff --git a/external_imported/sentry-native/external/breakpad/src/processor/source_line_resolver_base.cc b/external_imported/sentry-native/external/breakpad/src/processor/source_line_resolver_base.cc index cea1a46d1..463033482 100644 --- a/external_imported/sentry-native/external/breakpad/src/processor/source_line_resolver_base.cc +++ b/external_imported/sentry-native/external/breakpad/src/processor/source_line_resolver_base.cc @@ -42,10 +42,10 @@ #include #include "google_breakpad/processor/source_line_resolver_base.h" -#include "processor/source_line_resolver_base_types.h" +#include "processor/logging.h" #include "processor/module_factory.h" +#include "processor/source_line_resolver_base_types.h" -using std::map; using std::make_pair; namespace google_breakpad { @@ -168,7 +168,9 @@ bool SourceLineResolverBase::LoadModule(const CodeModule* module, if (!ReadSymbolFile(map_file, &memory_buffer, &memory_buffer_size)) return false; - BPLOG(INFO) << "Read symbol file " << map_file << " succeeded"; + BPLOG(INFO) << "Read symbol file " << map_file << " succeeded. " + << "module = " << module->code_file() + << ", memory_buffer_size = " << memory_buffer_size; bool load_result = LoadModuleUsingMemoryBuffer(module, memory_buffer, memory_buffer_size); @@ -185,6 +187,9 @@ bool SourceLineResolverBase::LoadModule(const CodeModule* module, bool SourceLineResolverBase::LoadModuleUsingMapBuffer( const CodeModule* module, const string& map_buffer) { + BPLOG(INFO) << "SourceLineResolverBase::LoadModuleUsingMapBuffer(module = " + << module->code_file() + << ", map_buffer.size() = " << map_buffer.size() << ")"; if (module == NULL) return false; @@ -234,7 +239,7 @@ bool SourceLineResolverBase::LoadModuleUsingMemoryBuffer( } BPLOG(INFO) << "Loading symbols for module " << module->code_file() - << " from memory buffer"; + << " from memory buffer, size: " << memory_buffer_size; Module* basic_module = module_factory_->CreateModule(module->code_file()); diff --git a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_amd64.cc b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_amd64.cc index f346a4eee..b7628ac38 100644 --- a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_amd64.cc +++ b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_amd64.cc @@ -221,6 +221,35 @@ StackFrameAMD64* StackwalkerAMD64::GetCallerByFramePointerRecovery( return NULL; } +StackFrameAMD64* StackwalkerAMD64::GetCallerBySimulatingReturn( + const vector& frames) { + assert(frames.back()->trust == StackFrame::FRAME_TRUST_CONTEXT); + StackFrameAMD64* last_frame = static_cast(frames.back()); + uint64_t last_rsp = last_frame->context.rsp; + uint64_t caller_rip_address, caller_rip; + int searchwords = 1; + if (!ScanForReturnAddress(last_rsp, &caller_rip_address, &caller_rip, + searchwords)) { + // No plausible return address at the top of the stack. Unable to simulate + // a return. + return NULL; + } + + // Create a new stack frame (ownership will be transferred to the caller) + // and fill it in. + StackFrameAMD64* frame = new StackFrameAMD64(); + + frame->trust = StackFrame::FRAME_TRUST_LEAF; + frame->context = last_frame->context; + frame->context.rip = caller_rip; + // The caller's %rsp is directly underneath the return address pushed by + // the call. + frame->context.rsp = caller_rip_address + 8; + frame->context_validity = last_frame->context_validity; + + return frame; +} + StackFrameAMD64* StackwalkerAMD64::GetCallerByStackScan( const vector& frames) { StackFrameAMD64* last_frame = static_cast(frames.back()); @@ -228,7 +257,8 @@ StackFrameAMD64* StackwalkerAMD64::GetCallerByStackScan( uint64_t caller_rip_address, caller_rip; if (!ScanForReturnAddress(last_rsp, &caller_rip_address, &caller_rip, - frames.size() == 1 /* is_context_frame */)) { + /*is_context_frame=*/last_frame->trust == + StackFrame::FRAME_TRUST_CONTEXT)) { // No plausible return address was found. return NULL; } @@ -282,14 +312,28 @@ StackFrame* StackwalkerAMD64::GetCallerFrame(const CallStack* stack, StackFrameAMD64* last_frame = static_cast(frames.back()); scoped_ptr new_frame; - // If we have DWARF CFI information, use it. + // If we have CFI information, use it. scoped_ptr cfi_frame_info( frame_symbolizer_->FindCFIFrameInfo(last_frame)); if (cfi_frame_info.get()) new_frame.reset(GetCallerByCFIFrameInfo(frames, cfi_frame_info.get())); + // If CFI was not available and this is a Windows x64 stack, check whether + // this is a leaf function which doesn't touch any callee-saved registers. + // According to https://reviews.llvm.org/D24748, LLVM doesn't generate unwind + // info for such functions. According to MSDN, leaf functions can be unwound + // simply by simulating a return. + if (!new_frame.get() && + last_frame->trust == StackFrame::FRAME_TRUST_CONTEXT && + system_info_->os_short == "windows") { + new_frame.reset(GetCallerBySimulatingReturn(frames)); + } + // If CFI was not available or failed, try using frame pointer recovery. - if (!new_frame.get()) { + // Never try to use frame pointer unwinding on Windows x64 stack. MSVC never + // generates code that works with frame pointer chasing, and LLVM does the + // same. Stack scanning would be better. + if (!new_frame.get() && system_info_->os_short != "windows") { new_frame.reset(GetCallerByFramePointerRecovery(frames)); } @@ -314,7 +358,9 @@ StackFrame* StackwalkerAMD64::GetCallerFrame(const CallStack* stack, // Should we terminate the stack walk? (end-of-stack or broken invariant) if (TerminateWalk(new_frame->context.rip, new_frame->context.rsp, - last_frame->context.rsp, frames.size() == 1)) { + last_frame->context.rsp, + /*first_unwind=*/last_frame->trust == + StackFrame::FRAME_TRUST_CONTEXT)) { return NULL; } diff --git a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_amd64.h b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_amd64.h index 5e1af6f13..784010388 100644 --- a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_amd64.h +++ b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_amd64.h @@ -90,6 +90,11 @@ class StackwalkerAMD64 : public Stackwalker { // of the returned frame. Return NULL on failure. StackFrameAMD64* GetCallerByStackScan(const vector& frames); + // Trying to simulate a return. The caller takes ownership of the returned + // frame. Return NULL on failure. + StackFrameAMD64* GetCallerBySimulatingReturn( + const vector& frames); + // Stores the CPU context corresponding to the innermost stack frame to // be returned by GetContextFrame. const MDRawContextAMD64* context_; diff --git a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_arm.cc b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_arm.cc index f6f2c9bf4..7890cbe3e 100644 --- a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_arm.cc +++ b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_arm.cc @@ -168,7 +168,8 @@ StackFrameARM* StackwalkerARM::GetCallerByStackScan( uint32_t caller_sp, caller_pc; if (!ScanForReturnAddress(last_sp, &caller_sp, &caller_pc, - frames.size() == 1 /* is_context_frame */)) { + /*is_context_frame=*/last_frame->trust == + StackFrame::FRAME_TRUST_CONTEXT)) { // No plausible return address was found. return NULL; } @@ -276,7 +277,8 @@ StackFrame* StackwalkerARM::GetCallerFrame(const CallStack* stack, if (TerminateWalk(frame->context.iregs[MD_CONTEXT_ARM_REG_PC], frame->context.iregs[MD_CONTEXT_ARM_REG_SP], last_frame->context.iregs[MD_CONTEXT_ARM_REG_SP], - frames.size() == 1)) { + /*first_unwind=*/last_frame->trust == + StackFrame::FRAME_TRUST_CONTEXT)) { return NULL; } diff --git a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_arm64.cc b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_arm64.cc index 9acf8188e..74410c9ab 100644 --- a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_arm64.cc +++ b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_arm64.cc @@ -181,7 +181,8 @@ StackFrameARM64* StackwalkerARM64::GetCallerByStackScan( uint64_t caller_sp, caller_pc; if (!ScanForReturnAddress(last_sp, &caller_sp, &caller_pc, - frames.size() == 1 /* is_context_frame */)) { + /*is_context_frame=*/last_frame->trust == + StackFrame::FRAME_TRUST_CONTEXT)) { // No plausible return address was found. return NULL; } @@ -320,7 +321,8 @@ StackFrame* StackwalkerARM64::GetCallerFrame(const CallStack* stack, if (TerminateWalk(frame->context.iregs[MD_CONTEXT_ARM64_REG_PC], frame->context.iregs[MD_CONTEXT_ARM64_REG_SP], last_frame->context.iregs[MD_CONTEXT_ARM64_REG_SP], - frames.size() == 1)) { + /*first_unwind=*/last_frame->trust == + StackFrame::FRAME_TRUST_CONTEXT)) { return NULL; } diff --git a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_mips.cc b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_mips.cc index c33ecdbe9..c4ee21f35 100644 --- a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_mips.cc +++ b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_mips.cc @@ -276,7 +276,8 @@ StackFrame* StackwalkerMIPS::GetCallerFrame(const CallStack* stack, if (TerminateWalk(new_frame->context.epc, new_frame->context.iregs[MD_CONTEXT_MIPS_REG_SP], last_frame->context.iregs[MD_CONTEXT_MIPS_REG_SP], - frames.size() == 1)) { + /*first_unwind=*/last_frame->trust == + StackFrame::FRAME_TRUST_CONTEXT)) { return NULL; } diff --git a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_ppc.cc b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_ppc.cc index 1e34c3833..b5dab8990 100644 --- a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_ppc.cc +++ b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_ppc.cc @@ -132,10 +132,9 @@ StackFrame* StackwalkerPPC::GetCallerFrame(const CallStack* stack, frame->trust = StackFrame::FRAME_TRUST_FP; // Should we terminate the stack walk? (end-of-stack or broken invariant) - if (TerminateWalk(instruction, - stack_pointer, - last_frame->context.gpr[1], - stack->frames()->size() == 1)) { + if (TerminateWalk(instruction, stack_pointer, last_frame->context.gpr[1], + /*first_unwind=*/last_frame->trust == + StackFrame::FRAME_TRUST_CONTEXT)) { return NULL; } diff --git a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_ppc64.cc b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_ppc64.cc index fb2bac3c4..f7b24a2b5 100644 --- a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_ppc64.cc +++ b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_ppc64.cc @@ -123,10 +123,9 @@ StackFrame* StackwalkerPPC64::GetCallerFrame(const CallStack* stack, frame->trust = StackFrame::FRAME_TRUST_FP; // Should we terminate the stack walk? (end-of-stack or broken invariant) - if (TerminateWalk(instruction, - stack_pointer, - last_frame->context.gpr[1], - stack->frames()->size() == 1)) { + if (TerminateWalk(instruction, stack_pointer, last_frame->context.gpr[1], + /*is_context_frame=*/last_frame->trust == + StackFrame::FRAME_TRUST_CONTEXT)) { return NULL; } diff --git a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_sparc.cc b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_sparc.cc index 4de838afe..df58570d2 100644 --- a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_sparc.cc +++ b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_sparc.cc @@ -112,10 +112,9 @@ StackFrame* StackwalkerSPARC::GetCallerFrame(const CallStack* stack, } // Should we terminate the stack walk? (end-of-stack or broken invariant) - if (TerminateWalk(instruction, - stack_pointer, - last_frame->context.g_r[14], - stack->frames()->size() == 1)) { + if (TerminateWalk(instruction, stack_pointer, last_frame->context.g_r[14], + /*is_context_frame=*/last_frame->trust == + StackFrame::FRAME_TRUST_CONTEXT)) { return NULL; } diff --git a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_x86.cc b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_x86.cc index b11e061d4..41acaae43 100644 --- a/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_x86.cc +++ b/external_imported/sentry-native/external/breakpad/src/processor/stackwalker_x86.cc @@ -141,6 +141,9 @@ StackFrameX86* StackwalkerX86::GetCallerByWindowsFrameInfo( bool stack_scan_allowed) { StackFrame::FrameTrust trust = StackFrame::FRAME_TRUST_NONE; + // The last frame can never be inline. A sequence of inline frames always + // finishes with a conventional frame. + assert(frames.back()->trust != StackFrame::FRAME_TRUST_INLINE); StackFrameX86* last_frame = static_cast(frames.back()); // Save the stack walking info we found, in case we need it later to @@ -187,9 +190,15 @@ StackFrameX86* StackwalkerX86::GetCallerByWindowsFrameInfo( uint32_t last_frame_callee_parameter_size = 0; int frames_already_walked = frames.size(); - if (frames_already_walked >= 2) { + for (int last_frame_callee_id = frames_already_walked - 2; + last_frame_callee_id >= 0; last_frame_callee_id--) { + // Searching for a real callee frame. Skipping inline frames since they + // cannot be downcasted to StackFrameX86. + if (frames[last_frame_callee_id]->trust == StackFrame::FRAME_TRUST_INLINE) { + continue; + } const StackFrameX86* last_frame_callee - = static_cast(frames[frames_already_walked - 2]); + = static_cast(frames[last_frame_callee_id]); WindowsFrameInfo* last_frame_callee_info = last_frame_callee->windows_frame_info; if (last_frame_callee_info && @@ -385,9 +394,10 @@ StackFrameX86* StackwalkerX86::GetCallerByWindowsFrameInfo( // frame pointer. uint32_t location_start = last_frame->context.esp; uint32_t location, eip; - if (!stack_scan_allowed - || !ScanForReturnAddress(location_start, &location, &eip, - frames.size() == 1 /* is_context_frame */)) { + if (!stack_scan_allowed || + !ScanForReturnAddress(location_start, &location, &eip, + /*is_context_frame=*/last_frame->trust == + StackFrame::FRAME_TRUST_CONTEXT)) { // if we can't find an instruction pointer even with stack scanning, // give up. return NULL; @@ -429,9 +439,10 @@ StackFrameX86* StackwalkerX86::GetCallerByWindowsFrameInfo( // looking one 32-bit word above that location. uint32_t location_start = dictionary[".raSearchStart"] + 4; uint32_t location; - if (stack_scan_allowed - && ScanForReturnAddress(location_start, &location, &eip, - frames.size() == 1 /* is_context_frame */)) { + if (stack_scan_allowed && + ScanForReturnAddress(location_start, &location, &eip, + /*is_context_frame=*/last_frame->trust == + StackFrame::FRAME_TRUST_CONTEXT)) { // This is a better return address that what program string // evaluation found. Use it, and set %esp to the location above the // one where the return address was found. @@ -516,6 +527,9 @@ StackFrameX86* StackwalkerX86::GetCallerByWindowsFrameInfo( StackFrameX86* StackwalkerX86::GetCallerByCFIFrameInfo( const vector& frames, CFIFrameInfo* cfi_frame_info) { + // The last frame can never be inline. A sequence of inline frames always + // finishes with a conventional frame. + assert(frames.back()->trust != StackFrame::FRAME_TRUST_INLINE); StackFrameX86* last_frame = static_cast(frames.back()); last_frame->cfi_frame_info = cfi_frame_info; @@ -542,6 +556,9 @@ StackFrameX86* StackwalkerX86::GetCallerByEBPAtBase( const vector& frames, bool stack_scan_allowed) { StackFrame::FrameTrust trust; + // The last frame can never be inline. A sequence of inline frames always + // finishes with a conventional frame. + assert(frames.back()->trust != StackFrame::FRAME_TRUST_INLINE); StackFrameX86* last_frame = static_cast(frames.back()); uint32_t last_esp = last_frame->context.esp; uint32_t last_ebp = last_frame->context.ebp; @@ -581,9 +598,10 @@ StackFrameX86* StackwalkerX86::GetCallerByEBPAtBase( // return address. This can happen if last_frame is executing code // for a module for which we don't have symbols, and that module // is compiled without a frame pointer. - if (!stack_scan_allowed - || !ScanForReturnAddress(last_esp, &caller_esp, &caller_eip, - frames.size() == 1 /* is_context_frame */)) { + if (!stack_scan_allowed || + !ScanForReturnAddress(last_esp, &caller_esp, &caller_eip, + /*is_context_frame=*/last_frame->trust == + StackFrame::FRAME_TRUST_CONTEXT)) { // if we can't find an instruction pointer even with stack scanning, // give up. return NULL; @@ -634,6 +652,9 @@ StackFrame* StackwalkerX86::GetCallerFrame(const CallStack* stack, const vector& frames = *stack->frames(); StackFrameX86* last_frame = static_cast(frames.back()); + // The last frame can never be inline. A sequence of inline frames always + // finishes with a conventional frame. + assert(last_frame->trust != StackFrame::FRAME_TRUST_INLINE); scoped_ptr new_frame; // If the resolver has Windows stack walking information, use that. @@ -660,10 +681,10 @@ StackFrame* StackwalkerX86::GetCallerFrame(const CallStack* stack, return NULL; // Should we terminate the stack walk? (end-of-stack or broken invariant) - if (TerminateWalk(new_frame->context.eip, - new_frame->context.esp, + if (TerminateWalk(new_frame->context.eip, new_frame->context.esp, last_frame->context.esp, - frames.size() == 1)) { + /*first_unwind=*/last_frame->trust == + StackFrame::FRAME_TRUST_CONTEXT)) { return NULL; } diff --git a/external_imported/sentry-native/external/breakpad/src/processor/testdata/module1.out b/external_imported/sentry-native/external/breakpad/src/processor/testdata/module1.out index cd6e18d10..6774e4f1e 100644 --- a/external_imported/sentry-native/external/breakpad/src/processor/testdata/module1.out +++ b/external_imported/sentry-native/external/breakpad/src/processor/testdata/module1.out @@ -3,7 +3,7 @@ INFO CODE_ID FFFFFFFF module1.exe FILE 1 file1_1.cc FILE 2 file1_2.cc FILE 3 file1_3.cc -FUNC 1000 c 0 Function1_1 +FUNC m 1000 c 0 Function1_1 1000 4 44 1 1004 4 45 1 1008 4 46 1 @@ -14,7 +14,7 @@ FUNC 1200 100 8 Function1_3 FUNC 1300 100 c Function1_4 FUNC 2000 0 0 Test_Zero_Size_Function_Is_Ignored 2000 4 88 2 -PUBLIC 2800 0 PublicSymbol +PUBLIC m 2800 0 PublicSymbol FUNC 3000 7000 42 LargeFunction 3000 7000 4098359 3 STACK WIN 4 1000 c 1 0 0 0 0 0 1 $eip 4 + ^ = $esp $ebp 8 + = $ebp $ebp ^ = diff --git a/external_imported/sentry-native/external/breakpad/src/tools/mac/symupload/symupload.mm b/external_imported/sentry-native/external/breakpad/src/tools/mac/symupload/symupload.mm index 248351171..727834ce5 100644 --- a/external_imported/sentry-native/external/breakpad/src/tools/mac/symupload/symupload.mm +++ b/external_imported/sentry-native/external/breakpad/src/tools/mac/symupload/symupload.mm @@ -73,6 +73,7 @@ NSString* type; NSString* codeFile; NSString* debugID; + NSString* productName; } Options; //============================================================================= @@ -212,7 +213,8 @@ static void StartSymUploadProtocolV2(Options* options, withUploadKey:[URLResponse uploadKey] withDebugFile:debugFile withDebugID:debugID - withType:options->type]; + withType:options->type + withProductName:options->productName]; [URLResponse release]; if (completeUploadResult == CompleteUploadResultError) { fprintf(stdout, "Failed to complete upload.\n"); @@ -271,18 +273,20 @@ static void Usage(int argc, const char* argv[]) { "[Only in sym-upload-v2 protocol mode]\n"); fprintf( stderr, - "-t:\t Explicitly set symbol upload type (" + "\t-t: Explicitly set symbol upload type (" "default is 'breakpad').\n" "\t One of ['breakpad', 'elf', 'pe', 'macho', 'debug_only', 'dwp', " "'dsym', 'pdb'].\n" "\t Note: When this flag is set to anything other than 'breakpad', then " "the '-c' and '-i' flags must also be set.\n"); - fprintf(stderr, "-c:\t Explicitly set 'code_file' for symbol " + fprintf(stderr, "\t-c: Explicitly set 'code_file' for symbol " "upload (basename of executable).\n"); - fprintf(stderr, "-i:\t Explicitly set 'debug_id' for symbol " + fprintf(stderr, "\t-i: Explicitly set 'debug_id' for symbol " "upload (typically build ID of executable). The debug-id for " "symbol-types 'dsym' and 'macho' will be determined " "automatically. \n"); + fprintf(stderr, "\t-n: Optionally set 'product_name' for " + "symbol upload\n"); fprintf(stderr, "\t-h: Usage\n"); fprintf(stderr, "\t-?: Usage\n"); fprintf(stderr, "\n"); @@ -329,11 +333,12 @@ static void SetupOptions(int argc, const char* argv[], Options* options) { options->codeFile = nil; options->debugID = nil; options->force = NO; + options->productName = nil; extern int optind; - char ch; + int ch; - while ((ch = getopt(argc, (char* const*)argv, "p:k:t:c:i:hf?")) != -1) { + while ((ch = getopt(argc, (char* const*)argv, "p:k:t:c:i:n:hf?")) != -1) { switch (ch) { case 'p': if (strcmp(optarg, "sym-upload-v2") == 0) { @@ -362,12 +367,15 @@ static void SetupOptions(int argc, const char* argv[], Options* options) { case 'c': options->codeFile = [NSString stringWithCString:optarg encoding:NSASCIIStringEncoding]; - ; break; case 'i': options->debugID = [NSString stringWithCString:optarg encoding:NSASCIIStringEncoding]; - ; + break; + case 'n': + options->productName = + [NSString stringWithCString:optarg + encoding:NSASCIIStringEncoding]; break; case 'f': options->force = YES; diff --git a/external_imported/sentry-native/external/breakpad/src/tools/mac/upload_system_symbols/go.mod b/external_imported/sentry-native/external/breakpad/src/tools/mac/upload_system_symbols/go.mod new file mode 100644 index 000000000..ff21bba9f --- /dev/null +++ b/external_imported/sentry-native/external/breakpad/src/tools/mac/upload_system_symbols/go.mod @@ -0,0 +1,3 @@ +module upload_system_symbols + +go 1.17 diff --git a/external_imported/sentry-native/external/breakpad/src/tools/windows/dump_syms/dump_syms.cc b/external_imported/sentry-native/external/breakpad/src/tools/windows/dump_syms/dump_syms.cc index 1b1797dc2..672e27d34 100644 --- a/external_imported/sentry-native/external/breakpad/src/tools/windows/dump_syms/dump_syms.cc +++ b/external_imported/sentry-native/external/breakpad/src/tools/windows/dump_syms/dump_syms.cc @@ -33,35 +33,61 @@ #include #include +#include #include #include "common/windows/pdb_source_line_writer.h" #include "common/windows/pe_source_line_writer.h" -using std::wstring; using google_breakpad::PDBSourceLineWriter; using google_breakpad::PESourceLineWriter; using std::unique_ptr; +using std::wstring; + +int usage(const wchar_t* self) { + fprintf(stderr, "Usage: %ws [--pe] [--i] \n", self); + fprintf(stderr, "Options:\n"); + fprintf(stderr, + "--pe:\tRead debugging information from PE file and do " + "not attempt to locate matching PDB file.\n" + "\tThis is only supported for PE32+ (64 bit) PE files.\n"); + fprintf(stderr, + "--i:\tOutput INLINE/INLINE_ORIGIN record\n" + "\tThis cannot be used with [--pe].\n"); + return 1; +} int wmain(int argc, wchar_t** argv) { - bool success; - if (argc == 2) { - PDBSourceLineWriter pdb_writer; - if (!pdb_writer.Open(wstring(argv[1]), PDBSourceLineWriter::ANY_FILE)) { + bool success = false; + bool pe = false; + bool handle_inline = false; + int arg_index = 1; + while (arg_index < argc && wcslen(argv[arg_index]) > 0 && + wcsncmp(L"--", argv[arg_index], 2) == 0) { + if (wcscmp(L"--pe", argv[arg_index]) == 0) { + pe = true; + } else if (wcscmp(L"--i", argv[arg_index]) == 0) { + handle_inline = true; + } + ++arg_index; + } + + if ((pe && handle_inline) || arg_index == argc) { + usage(argv[0]); + return 1; + } + + wchar_t* file_path = argv[arg_index]; + if (pe) { + PESourceLineWriter pe_writer(file_path); + success = pe_writer.WriteSymbols(stdout); + } else { + PDBSourceLineWriter pdb_writer(handle_inline); + if (!pdb_writer.Open(wstring(file_path), PDBSourceLineWriter::ANY_FILE)) { fprintf(stderr, "Open failed.\n"); return 1; } success = pdb_writer.WriteSymbols(stdout); - } else if (argc == 3 && wcscmp(argv[1], L"--pe") == 0) { - PESourceLineWriter pe_writer(argv[2]); - success = pe_writer.WriteSymbols(stdout); - } else { - fprintf(stderr, "Usage: %ws [--pe] \n", argv[0]); - fprintf(stderr, "Options:\n"); - fprintf(stderr, "--pe:\tRead debugging information from PE file and do " - "not attempt to locate matching PDB file.\n" - "\tThis is only supported for PE32+ (64 bit) PE files.\n"); - return 1; } if (!success) { diff --git a/external_imported/sentry-native/external/breakpad/src/tools/windows/symupload/symupload.cc b/external_imported/sentry-native/external/breakpad/src/tools/windows/symupload/symupload.cc index e6fa126fa..3a26ca89b 100644 --- a/external_imported/sentry-native/external/breakpad/src/tools/windows/symupload/symupload.cc +++ b/external_imported/sentry-native/external/breakpad/src/tools/windows/symupload/symupload.cc @@ -116,8 +116,9 @@ static bool GetFileVersionString(const wchar_t* filename, wstring* version) { // and information about the pdb in pdb_info. static bool DumpSymbolsToTempFile(const wchar_t* file, wstring* temp_file_path, - PDBModuleInfo* pdb_info) { - google_breakpad::PDBSourceLineWriter writer; + PDBModuleInfo* pdb_info, + bool handle_inline) { + google_breakpad::PDBSourceLineWriter writer(handle_inline); // Use EXE_FILE to get information out of the exe/dll in addition to the // pdb. The name and version number of the exe/dll are of value, and // there's no way to locate an exe/dll given a pdb. @@ -162,6 +163,7 @@ static bool DumpSymbolsToTempFile(const wchar_t* file, static bool DoSymUploadV2( const wchar_t* api_url, const wchar_t* api_key, + int* timeout_ms, const wstring& debug_file, const wstring& debug_id, const wstring& symbol_file, @@ -173,6 +175,7 @@ static bool DoSymUploadV2( SymbolStatus symbolStatus = SymbolCollectorClient::CheckSymbolStatus( url, key, + timeout_ms, debug_file, debug_id); if (symbolStatus == SymbolStatus::Found) { @@ -190,6 +193,7 @@ static bool DoSymUploadV2( if (!SymbolCollectorClient::CreateUploadUrl( url, key, + timeout_ms, &uploadUrlResponse)) { wprintf(L"Failed to create upload URL.\n"); return false; @@ -202,7 +206,7 @@ static bool DoSymUploadV2( bool success = HTTPUpload::SendPutRequest( signed_url, symbol_file, - /* timeout = */ NULL, + timeout_ms, &response, &response_code); if (!success) { @@ -227,6 +231,7 @@ static bool DoSymUploadV2( SymbolCollectorClient::CompleteUpload( url, key, + timeout_ms, upload_key, debug_file, debug_id); @@ -247,9 +252,10 @@ static bool DoSymUploadV2( __declspec(noreturn) void printUsageAndExit() { wprintf(L"Usage:\n\n" - L" symupload [--timeout NN] [--product product_name] ^\n" + L" symupload [--i] [--timeout NN] [--product product_name] ^\n" L" ^\n" L" [...]\n\n"); + wprintf(L" - i: Extract inline information from pdb.\n"); wprintf(L" - Timeout is in milliseconds, or can be 0 to be unlimited.\n"); wprintf(L" - product_name is an HTTP-friendly product name. It must only\n" L" contain an ascii subset: alphanumeric and punctuation.\n" @@ -273,6 +279,7 @@ __declspec(noreturn) void printUsageAndExit() { int wmain(int argc, wchar_t* argv[]) { const wchar_t* module; const wchar_t* product = nullptr; + bool handle_inline = false; int timeout = -1; int currentarg = 1; bool use_sym_upload_v2 = false; @@ -280,6 +287,11 @@ int wmain(int argc, wchar_t* argv[]) { const wchar_t* api_url = nullptr; const wchar_t* api_key = nullptr; while (argc > currentarg + 1) { + if (!wcscmp(L"--i", argv[currentarg])) { + handle_inline = true; + ++currentarg; + continue; + } if (!wcscmp(L"--timeout", argv[currentarg])) { timeout = _wtoi(argv[currentarg + 1]); currentarg += 2; @@ -310,7 +322,7 @@ int wmain(int argc, wchar_t* argv[]) { wstring symbol_file; PDBModuleInfo pdb_info; - if (!DumpSymbolsToTempFile(module, &symbol_file, &pdb_info)) { + if (!DumpSymbolsToTempFile(module, &symbol_file, &pdb_info, handle_inline)) { fwprintf(stderr, L"Could not get symbol data from %s\n", module); return 1; } @@ -331,12 +343,8 @@ int wmain(int argc, wchar_t* argv[]) { api_key = argv[currentarg++]; success = DoSymUploadV2( - api_url, - api_key, - pdb_info.debug_file, - pdb_info.debug_identifier, - symbol_file, - force); + api_url, api_key, timeout == -1 ? nullptr : &timeout, + pdb_info.debug_file, pdb_info.debug_identifier, symbol_file, force); } else { printUsageAndExit(); } diff --git a/external_imported/sentry-native/external/crashpad/.gn b/external_imported/sentry-native/external/crashpad/.gn index d447a5537..e4dc49c31 100644 --- a/external_imported/sentry-native/external/crashpad/.gn +++ b/external_imported/sentry-native/external/crashpad/.gn @@ -13,3 +13,4 @@ # limitations under the License. buildconfig = "//build/BUILDCONFIG.gn" +script_executable = "python3" diff --git a/external_imported/sentry-native/external/crashpad/.vpython3 b/external_imported/sentry-native/external/crashpad/.vpython3 new file mode 100644 index 000000000..0d7baf9ef --- /dev/null +++ b/external_imported/sentry-native/external/crashpad/.vpython3 @@ -0,0 +1,32 @@ +# Copyright 2022 The Crashpad Authors. All rights reserved. +# +# 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. + +# This is a vpython "spec" file. +# +# It describes patterns for python wheel dependencies of the python scripts. +# +# Read more about `vpython` and how to modify this file here: +# https://chromium.googlesource.com/infra/infra/+/master/doc/users/vpython.md + +# This is needed for snapshot/win/end_to_end_test.py. +wheel: < + name: "infra/python/wheels/pywin32/${vpython_platform}" + version: "version:300" + match_tag: < + platform: "win32" + > + match_tag: < + platform: "win_amd64" + > +> diff --git a/external_imported/sentry-native/external/crashpad/BUILD.gn b/external_imported/sentry-native/external/crashpad/BUILD.gn index c0f8bcbc0..61546be12 100644 --- a/external_imported/sentry-native/external/crashpad/BUILD.gn +++ b/external_imported/sentry-native/external/crashpad/BUILD.gn @@ -17,7 +17,10 @@ import("build/test.gni") import("util/net/tls.gni") config("crashpad_config") { - include_dirs = [ "." ] + include_dirs = [ + ".", + root_gen_dir, + ] } if (crashpad_is_in_chromium || crashpad_is_in_fuchsia) { diff --git a/external_imported/sentry-native/external/crashpad/CMakeLists.txt b/external_imported/sentry-native/external/crashpad/CMakeLists.txt index e22893350..b13b78fae 100644 --- a/external_imported/sentry-native/external/crashpad/CMakeLists.txt +++ b/external_imported/sentry-native/external/crashpad/CMakeLists.txt @@ -65,7 +65,7 @@ else() enable_language(ASM) endif() -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) add_library(crashpad_interface INTERFACE) diff --git a/external_imported/sentry-native/external/crashpad/DEPS b/external_imported/sentry-native/external/crashpad/DEPS index c1edb80c1..229922376 100644 --- a/external_imported/sentry-native/external/crashpad/DEPS +++ b/external_imported/sentry-native/external/crashpad/DEPS @@ -28,18 +28,18 @@ deps = { '9e121212d42be62a7cce38072f925f8398d11e49', 'crashpad/third_party/edo/edo': { 'url': Var('chromium_git') + '/external/github.com/google/eDistantObject.git@' + - '6ffbf833173f53fcd06ecf08670a95cc01c01f72', + '727e556705278598fce683522beedbb9946bfda0', 'condition': 'checkout_ios', }, 'crashpad/third_party/googletest/googletest': Var('chromium_git') + '/external/github.com/google/googletest@' + - '11da093e0477185dbd78abaaa9f99db15be498d0', + 'af29db7ec28d6df1c7f0f745186884091e602e07', 'crashpad/third_party/lss/lss': Var('chromium_git') + '/linux-syscall-support.git@' + - '7bde79cc274d06451bf65ae82c012a5d3e476b5a', + 'e1e7b0ad8ee99a875b272c8e33e308472e897660', 'crashpad/third_party/mini_chromium/mini_chromium': Var('chromium_git') + '/chromium/mini_chromium@' + - '0e22eed71eec97dacbe80822a14c5cd0b580d793', + '5654edb4225bcad13901155c819febb5748e502b', 'crashpad/third_party/libfuzzer/src': Var('chromium_git') + '/chromium/llvm-project/compiler-rt/lib/fuzzer.git@' + 'fda403cf93ecb8792cb1d061564d89a6553ca020', @@ -106,7 +106,7 @@ deps = { 'packages': [ { 'package': 'chrome_internal/third_party/sdk/windows', - 'version': 'uploaded:2018-06-13' + 'version': 'uploaded:2021-04-28' }, ], 'condition': 'checkout_win and pull_win_toolchain', @@ -169,7 +169,7 @@ hooks = [ 'pattern': '.', 'condition': 'run_setup_ios_gn and checkout_ios', 'action': [ - 'python', + 'python3', 'crashpad/build/ios/setup_ios_gn.py' ], }, diff --git a/external_imported/sentry-native/external/crashpad/build/ios/convert_gn_xcodeproj.py b/external_imported/sentry-native/external/crashpad/build/ios/convert_gn_xcodeproj.py index d546279ce..8c5c6d073 100755 --- a/external_imported/sentry-native/external/crashpad/build/ios/convert_gn_xcodeproj.py +++ b/external_imported/sentry-native/external/crashpad/build/ios/convert_gn_xcodeproj.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright 2020 The Crashpad Authors. All rights reserved. # @@ -26,14 +26,146 @@ import collections import copy import filecmp -import json +import functools import hashlib +import json import os import re import shutil +import string import subprocess import sys import tempfile +import xml.etree.ElementTree + + +LLDBINIT_PATH = '$(PROJECT_DIR)/.lldbinit' + +PYTHON_RE = re.compile('[ /]python[23]?$') + +XCTEST_PRODUCT_TYPES = frozenset(( + 'com.apple.product-type.bundle.unit-test', + 'com.apple.product-type.bundle.ui-testing', +)) + +SCHEME_PRODUCT_TYPES = frozenset(( + 'com.apple.product-type.app-extension', + 'com.apple.product-type.application', + 'com.apple.product-type.framework' +)) + + +class Template(string.Template): + + """A subclass of string.Template that changes delimiter.""" + + delimiter = '@' + + +@functools.lru_cache +def LoadSchemeTemplate(root, name): + """Return a string.Template object for scheme file loaded relative to root.""" + path = os.path.join(root, 'build', 'ios', name) + with open(path) as file: + return Template(file.read()) + + +def CreateIdentifier(str_id): + """Return a 24 characters string that can be used as an identifier.""" + return hashlib.sha1(str_id.encode("utf-8")).hexdigest()[:24].upper() + + +def GenerateSchemeForTarget(root, project, old_project, name, path, tests): + """Generates the .xcsheme file for target named |name|. + + The file is generated in the new project schemes directory from a template. + If there is an existing previous project, then the old scheme file is copied + and the lldbinit setting is set. If lldbinit setting is already correct, the + file is not modified, just copied. + """ + project_name = os.path.basename(project) + relative_path = os.path.join('xcshareddata', 'xcschemes', name + '.xcscheme') + identifier = CreateIdentifier('%s %s' % (name, path)) + + scheme_path = os.path.join(project, relative_path) + if not os.path.isdir(os.path.dirname(scheme_path)): + os.makedirs(os.path.dirname(scheme_path)) + + old_scheme_path = os.path.join(old_project, relative_path) + if os.path.exists(old_scheme_path): + made_changes = False + + tree = xml.etree.ElementTree.parse(old_scheme_path) + tree_root = tree.getroot() + + for reference in tree_root.findall('.//BuildableReference'): + for (attr, value) in ( + ('BuildableName', path), + ('BlueprintName', name), + ('BlueprintIdentifier', identifier)): + if reference.get(attr) != value: + reference.set(attr, value) + made_changes = True + + for child in tree_root: + if child.tag not in ('TestAction', 'LaunchAction'): + continue + + if child.get('customLLDBInitFile') != LLDBINIT_PATH: + child.set('customLLDBInitFile', LLDBINIT_PATH) + made_changes = True + + # Override the list of testables. + if child.tag == 'TestAction': + for subchild in child: + if subchild.tag != 'Testables': + continue + + for elt in list(subchild): + subchild.remove(elt) + + if tests: + template = LoadSchemeTemplate(root, 'xcodescheme-testable.template') + for (key, test_path, test_name) in sorted(tests): + testable = ''.join(template.substitute( + BLUEPRINT_IDENTIFIER=key, + BUILDABLE_NAME=test_path, + BLUEPRINT_NAME=test_name, + PROJECT_NAME=project_name)) + + testable_elt = xml.etree.ElementTree.fromstring(testable) + subchild.append(testable_elt) + + if made_changes: + tree.write(scheme_path, xml_declaration=True, encoding='UTF-8') + + else: + shutil.copyfile(old_scheme_path, scheme_path) + + else: + + testables = '' + if tests: + template = LoadSchemeTemplate(root, 'xcodescheme-testable.template') + testables = '\n' + ''.join( + template.substitute( + BLUEPRINT_IDENTIFIER=key, + BUILDABLE_NAME=test_path, + BLUEPRINT_NAME=test_name, + PROJECT_NAME=project_name) + for (key, test_path, test_name) in sorted(tests)).rstrip() + + template = LoadSchemeTemplate(root, 'xcodescheme.template') + + with open(scheme_path, 'w') as scheme_file: + scheme_file.write( + template.substitute( + TESTABLES=testables, + LLDBINIT_PATH=LLDBINIT_PATH, + BLUEPRINT_IDENTIFIER=identifier, + BUILDABLE_NAME=path, + BLUEPRINT_NAME=name, + PROJECT_NAME=project_name)) class XcodeProject(object): @@ -46,7 +178,7 @@ def AddObject(self, parent_name, obj): while True: self.counter += 1 str_id = "%s %s %d" % (parent_name, obj['isa'], self.counter) - new_id = hashlib.sha1(str_id.encode("utf-8")).hexdigest()[:24].upper() + new_id = CreateIdentifier(str_id) # Make sure ID is unique. It's possible there could be an id conflict # since this is run after GN runs. @@ -54,6 +186,93 @@ def AddObject(self, parent_name, obj): self.objects[new_id] = obj return new_id + def IterObjectsByIsa(self, isa): + """Iterates overs objects of the |isa| type.""" + for key, obj in self.objects.items(): + if obj['isa'] == isa: + yield (key, obj) + + def IterNativeTargetByProductType(self, product_types): + """Iterates over PBXNativeTarget objects of any |product_types| types.""" + for key, obj in self.IterObjectsByIsa('PBXNativeTarget'): + if obj['productType'] in product_types: + yield (key, obj) + + def UpdateBuildScripts(self): + """Update build scripts to respect configuration and platforms.""" + for key, obj in self.IterObjectsByIsa('PBXShellScriptBuildPhase'): + + shell_path = obj['shellPath'] + shell_code = obj['shellScript'] + if shell_path.endswith('/sh'): + shell_code = shell_code.replace( + 'ninja -C .', + 'ninja -C "../${CONFIGURATION}${EFFECTIVE_PLATFORM_NAME}"') + elif PYTHON_RE.search(shell_path): + shell_code = shell_code.replace( + '''ninja_params = [ '-C', '.' ]''', + '''ninja_params = [ '-C', '../' + os.environ['CONFIGURATION']''' + ''' + os.environ['EFFECTIVE_PLATFORM_NAME'] ]''') + + # Replace the build script in the object. + obj['shellScript'] = shell_code + + + def UpdateBuildConfigurations(self, configurations): + """Add new configurations, using the first one as default.""" + + # Create a list with all the objects of interest. This is needed + # because objects will be added to/removed from the project upon + # iterating this list and python dictionaries cannot be mutated + # during iteration. + for key, obj in list(self.IterObjectsByIsa('XCConfigurationList')): + # Use the first build configuration as template for creating all the + # new build configurations. + build_config_template = self.objects[obj['buildConfigurations'][0]] + build_config_template['buildSettings']['CONFIGURATION_BUILD_DIR'] = \ + '$(PROJECT_DIR)/../$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)' + + + # Remove the existing build configurations from the project before + # creating the new ones. + for build_config_id in obj['buildConfigurations']: + del self.objects[build_config_id] + obj['buildConfigurations'] = [] + + for configuration in configurations: + build_config = copy.copy(build_config_template) + build_config['name'] = configuration + build_config_id = self.AddObject('products', build_config) + obj['buildConfigurations'].append(build_config_id) + + def GetHostMappingForXCTests(self): + """Returns a dict from targets to the list of their xctests modules.""" + mapping = collections.defaultdict(list) + for key, obj in self.IterNativeTargetByProductType(XCTEST_PRODUCT_TYPES): + build_config_lists_id = obj['buildConfigurationList'] + build_configs = self.objects[build_config_lists_id]['buildConfigurations'] + + # Use the first build configuration to get the name of the host target. + # This is arbitrary, but since the build configuration are all identical + # after UpdateBuildConfiguration, except for their 'name', it is fine. + build_config = self.objects[build_configs[0]] + if obj['productType'] == 'com.apple.product-type.bundle.unit-test': + # The test_host value will look like this: + # `$(BUILD_PRODUCTS_DIR)/host_app_name.app/host_app_name` + # + # Extract the `host_app_name.app` part as key for the output. + test_host_path = build_config['buildSettings']['TEST_HOST'] + test_host_name = os.path.basename(os.path.dirname(test_host_path)) + else: + test_host_name = build_config['buildSettings']['TEST_TARGET_NAME'] + + test_name = obj['name'] + test_path = self.objects[obj['productReference']]['path'] + + mapping[test_host_name].append((key, test_name, test_path)) + + return dict(mapping) + def check_output(command): """Wrapper around subprocess.check_output that decode output as utf-8.""" @@ -100,7 +319,7 @@ def WriteXcodeProject(output_path, json_string): os.path.join(output_path, 'project.pbxproj')) -def UpdateXcodeProject(project_dir, configurations, root_dir): +def UpdateXcodeProject(project_dir, old_project_dir, configurations, root_dir): """Update inplace Xcode project to support multiple configurations. Args: @@ -113,41 +332,25 @@ def UpdateXcodeProject(project_dir, configurations, root_dir): json_data = json.loads(LoadXcodeProjectAsJSON(project_dir)) project = XcodeProject(json_data['objects']) - objects_to_remove = [] - for value in list(project.objects.values()): - isa = value['isa'] + project.UpdateBuildScripts() + project.UpdateBuildConfigurations(configurations) - # Teach build shell script to look for the configuration and platform. - if isa == 'PBXShellScriptBuildPhase': - shell_path = value['shellPath'] - if shell_path.endswith('/sh'): - value['shellScript'] = value['shellScript'].replace( - 'ninja -C .', - 'ninja -C "../${CONFIGURATION}${EFFECTIVE_PLATFORM_NAME}"') - elif re.search('[ /]python[23]?$', shell_path): - value['shellScript'] = value['shellScript'].replace( - 'ninja_params = [ \'-C\', \'.\' ]', - 'ninja_params = [ \'-C\', \'../\' + os.environ[\'CONFIGURATION\']' - ' + os.environ[\'EFFECTIVE_PLATFORM_NAME\'] ]') - - # Add new configuration, using the first one as default. - if isa == 'XCConfigurationList': - value['defaultConfigurationName'] = configurations[0] - objects_to_remove.extend(value['buildConfigurations']) - - build_config_template = project.objects[value['buildConfigurations'][0]] - build_config_template['buildSettings']['CONFIGURATION_BUILD_DIR'] = \ - '$(PROJECT_DIR)/../$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)' + mapping = project.GetHostMappingForXCTests() - value['buildConfigurations'] = [] - for configuration in configurations: - new_build_config = copy.copy(build_config_template) - new_build_config['name'] = configuration - value['buildConfigurations'].append( - project.AddObject('products', new_build_config)) + # Generate schemes for application, extensions and framework targets + for key, obj in project.IterNativeTargetByProductType(SCHEME_PRODUCT_TYPES): + product = project.objects[obj['productReference']] + product_path = product['path'] + + # For XCTests, the key is the product path, while for XCUITests, the key + # is the target name. Use a sum of both possible keys (there should not + # be overlaps since different hosts are used for XCTests and XCUITests + # but this make the code simpler). + tests = mapping.get(product_path, []) + mapping.get(obj['name'], []) + GenerateSchemeForTarget( + root_dir, project_dir, old_project_dir, + obj['name'], product_path, tests) - for object_id in objects_to_remove: - del project.objects[object_id] source = GetOrCreateRootGroup(project, json_data['rootObject'], 'Source') AddMarkdownToProject(project, root_dir, source) @@ -274,7 +477,7 @@ def GetFolderForPath(project, group_object, path): return group_object -def ConvertGnXcodeProject(root_dir, input_dir, output_dir, configurations): +def ConvertGnXcodeProject(root_dir, proj_name, input_dir, output_dir, configs): '''Tweak the Xcode project generated by gn to support multiple configurations. The Xcode projects generated by "gn gen --ide" only supports a single @@ -284,34 +487,22 @@ def ConvertGnXcodeProject(root_dir, input_dir, output_dir, configurations): to select them in Xcode). Args: + root_dir: directory that is the root of the project + proj_name: name of the Xcode project "file" (usually `all.xcodeproj`) input_dir: directory containing the XCode projects created by "gn gen --ide" output_dir: directory where the tweaked Xcode projects will be saved - configurations: list of string corresponding to the configurations that - need to be supported by the tweaked Xcode projects, must contains at - least one value. + configs: list of string corresponding to the configurations that need to be + supported by the tweaked Xcode projects, must contains at least one + value. ''' - # Update the project (supports legacy name "products.xcodeproj" or the new - # project name "all.xcodeproj"). - for project_name in ('all.xcodeproj', 'products.xcodeproj'): - if os.path.exists(os.path.join(input_dir, project_name)): - UpdateXcodeProject( - os.path.join(input_dir, project_name), - configurations, root_dir) + UpdateXcodeProject( + os.path.join(input_dir, proj_name), + os.path.join(output_dir, proj_name), + configs, root_dir) - CopyTreeIfChanged(os.path.join(input_dir, project_name), - os.path.join(output_dir, project_name)) - - else: - shutil.rmtree(os.path.join(output_dir, project_name), ignore_errors=True) - - # Copy all.xcworkspace if it exists (will be removed in a future gn version). - workspace_name = 'all.xcworkspace' - if os.path.exists(os.path.join(input_dir, workspace_name)): - CopyTreeIfChanged(os.path.join(input_dir, workspace_name), - os.path.join(output_dir, workspace_name)) - else: - shutil.rmtree(os.path.join(output_dir, workspace_name), ignore_errors=True) + CopyTreeIfChanged(os.path.join(input_dir, proj_name), + os.path.join(output_dir, proj_name)) def Main(args): @@ -329,33 +520,30 @@ def Main(args): parser.add_argument( '--root', type=os.path.abspath, required=True, help='root directory of the project') + parser.add_argument( + '--project-name', default='all.xcodeproj', dest='proj_name', + help='name of the Xcode project (default: %(default)s)') args = parser.parse_args(args) if not os.path.isdir(args.input): sys.stderr.write('Input directory does not exists.\n') return 1 - # Depending on the version of "gn", there should be either one project file - # named "all.xcodeproj" or a project file named "products.xcodeproj" and a - # workspace named "all.xcworkspace". - required_files_sets = [ - set(("all.xcodeproj",)), - set(("products.xcodeproj", "all.xcworkspace")), - ] - - for required_files in required_files_sets: - if required_files.issubset(os.listdir(args.input)): - break - else: + if args.proj_name not in os.listdir(args.input): sys.stderr.write( - 'Input directory does not contain all necessary Xcode projects.\n') + 'Input directory does not contain the Xcode project.\n') return 1 if not args.configurations: sys.stderr.write('At least one configuration required, see --add-config.\n') return 1 - ConvertGnXcodeProject(args.root, args.input, args.output, args.configurations) + ConvertGnXcodeProject( + args.root, + args.proj_name, + args.input, + args.output, + args.configurations) if __name__ == '__main__': sys.exit(Main(sys.argv[1:])) diff --git a/external_imported/sentry-native/external/crashpad/build/ios/setup_ios_gn.py b/external_imported/sentry-native/external/crashpad/build/ios/setup_ios_gn.py index 9522ce675..aacc8ec7b 100755 --- a/external_imported/sentry-native/external/crashpad/build/ios/setup_ios_gn.py +++ b/external_imported/sentry-native/external/crashpad/build/ios/setup_ios_gn.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright 2020 The Crashpad Authors. All rights reserved. # @@ -15,334 +15,391 @@ # limitations under the License. import argparse +import configparser import convert_gn_xcodeproj import errno +import io import os +import platform import re import shutil import subprocess import sys import tempfile -try: - import configparser -except ImportError: - import ConfigParser as configparser -try: - import StringIO as io -except ImportError: - import io +SUPPORTED_TARGETS = ('iphoneos', 'iphonesimulator', 'maccatalyst') +SUPPORTED_CONFIGS = ('Debug', 'Release', 'Profile', 'Official') -SUPPORTED_TARGETS = ('iphoneos', 'iphonesimulator') -SUPPORTED_CONFIGS = ('Debug', 'Release', 'Profile', 'Official', 'Coverage') +# Pattern matching lines from ~/.lldbinit that must not be copied to the +# generated .lldbinit file. They match what the user were told to add to +# their global ~/.lldbinit file before setup-gn.py was updated to generate +# a project specific file and thus must not be copied as they would cause +# the settings to be overwritten. +LLDBINIT_SKIP_PATTERNS = ( + re.compile('^script sys.path\\[:0\\] = \\[\'.*/src/tools/lldb\'\\]$'), + re.compile('^script import lldbinit$'), + re.compile('^settings append target.source-map .* /google/src/.*$'), +) -class ConfigParserWithStringInterpolation(configparser.SafeConfigParser): - '''A .ini file parser that supports strings and environment variables.''' +def HostCpuArch(): + '''Returns the arch of the host cpu for GN.''' + HOST_CPU_ARCH = { + 'arm64': '"arm64"', + 'x86_64': '"x64"', + } + return HOST_CPU_ARCH[platform.machine()] - ENV_VAR_PATTERN = re.compile(r'\$([A-Za-z0-9_]+)') - def values(self, section): - return map(lambda kv: self._UnquoteString(self._ExpandEnvVar(kv[1])), - configparser.ConfigParser.items(self, section)) +class ConfigParserWithStringInterpolation(configparser.ConfigParser): - def getstring(self, section, option): - return self._UnquoteString(self._ExpandEnvVar(self.get(section, - option))) + '''A .ini file parser that supports strings and environment variables.''' - def _UnquoteString(self, string): - if not string or string[0] != '"' or string[-1] != '"': - return string - return string[1:-1] + ENV_VAR_PATTERN = re.compile(r'\$([A-Za-z0-9_]+)') - def _ExpandEnvVar(self, value): - match = self.ENV_VAR_PATTERN.search(value) - if not match: - return value - name, (begin, end) = match.group(1), match.span(0) - prefix, suffix = value[:begin], self._ExpandEnvVar(value[end:]) - return prefix + os.environ.get(name, '') + suffix + def values(self, section): + return filter( + lambda val: val != '', + map(lambda kv: self._UnquoteString(self._ExpandEnvVar(kv[1])), + configparser.ConfigParser.items(self, section))) + + def getstring(self, section, option, fallback=''): + try: + raw_value = self.get(section, option) + except configparser.NoOptionError: + return fallback + return self._UnquoteString(self._ExpandEnvVar(raw_value)) + + def _UnquoteString(self, string): + if not string or string[0] != '"' or string[-1] != '"': + return string + return string[1:-1] + + def _ExpandEnvVar(self, value): + match = self.ENV_VAR_PATTERN.search(value) + if not match: + return value + name, (begin, end) = match.group(1), match.span(0) + prefix, suffix = value[:begin], self._ExpandEnvVar(value[end:]) + return prefix + os.environ.get(name, '') + suffix class GnGenerator(object): - '''Holds configuration for a build and method to generate gn default - files.''' - - FAT_BUILD_DEFAULT_ARCH = '64-bit' - - TARGET_CPU_VALUES = { - 'iphoneos': { - '32-bit': '"arm"', - '64-bit': '"arm64"', - }, - 'iphonesimulator': { - '32-bit': '"x86"', - '64-bit': '"x64"', - } - } - - def __init__(self, settings, config, target): - assert target in SUPPORTED_TARGETS - assert config in SUPPORTED_CONFIGS - self._settings = settings - self._config = config - self._target = target - - def _GetGnArgs(self): - """Build the list of arguments to pass to gn. - - Returns: - A list of tuple containing gn variable names and variable values (it - is not a dictionary as the order needs to be preserved). - """ - args = [] - - args.append(('is_debug', self._config in ('Debug', 'Coverage'))) - - if os.environ.get('FORCE_MAC_TOOLCHAIN', '0') == '1': - args.append(('use_system_xcode', False)) - - cpu_values = self.TARGET_CPU_VALUES[self._target] - build_arch = self._settings.getstring('build', 'arch') - if build_arch == 'fat': - target_cpu = cpu_values[self.FAT_BUILD_DEFAULT_ARCH] - args.append(('target_cpu', target_cpu)) - args.append( - ('additional_target_cpus', - [cpu for cpu in cpu_values.itervalues() if cpu != target_cpu])) - else: - args.append(('target_cpu', cpu_values[build_arch])) - - # Add user overrides after the other configurations so that they can - # refer to them and override them. - args.extend(self._settings.items('gn_args')) - return args - - def Generate(self, gn_path, root_path, out_path): - buf = io.StringIO() - self.WriteArgsGn(buf) - WriteToFileIfChanged(os.path.join(out_path, 'args.gn'), - buf.getvalue(), - overwrite=True) - - subprocess.check_call( - self.GetGnCommand(gn_path, root_path, out_path, True)) - - def CreateGnRules(self, gn_path, root_path, out_path): - buf = io.StringIO() - self.WriteArgsGn(buf) - WriteToFileIfChanged(os.path.join(out_path, 'args.gn'), - buf.getvalue(), - overwrite=True) - - buf = io.StringIO() - gn_command = self.GetGnCommand(gn_path, root_path, out_path, False) - self.WriteBuildNinja(buf, gn_command) - WriteToFileIfChanged(os.path.join(out_path, 'build.ninja'), - buf.getvalue(), - overwrite=False) - - buf = io.StringIO() - self.WriteBuildNinjaDeps(buf) - WriteToFileIfChanged(os.path.join(out_path, 'build.ninja.d'), - buf.getvalue(), - overwrite=False) - - def WriteArgsGn(self, stream): - stream.write('# This file was generated by setup-gn.py. Do not edit\n') - stream.write('# but instead use ~/.setup-gn or $repo/.setup-gn files\n') - stream.write('# to configure settings.\n') - stream.write('\n') + '''Holds configuration for a build and method to generate gn default files.''' + + FAT_BUILD_DEFAULT_ARCH = '64-bit' + + TARGET_CPU_VALUES = { + 'iphoneos': '"arm64"', + 'iphonesimulator': HostCpuArch(), + 'maccatalyst': HostCpuArch(), + } + + TARGET_ENVIRONMENT_VALUES = { + 'iphoneos': '"device"', + 'iphonesimulator': '"simulator"', + 'maccatalyst': '"catalyst"' + } + + def __init__(self, settings, config, target): + assert target in SUPPORTED_TARGETS + assert config in SUPPORTED_CONFIGS + self._settings = settings + self._config = config + self._target = target + + def _GetGnArgs(self, extra_args=None): + """Build the list of arguments to pass to gn. + + Returns: + A list of tuple containing gn variable names and variable values (it + is not a dictionary as the order needs to be preserved). + """ + args = [] + + is_debug = self._config == 'Debug' + official = self._config == 'Official' + is_optim = self._config in ('Profile', 'Official') + + args.append(('target_os', '"ios"')) + args.append(('is_debug', is_debug)) + + if os.environ.get('FORCE_MAC_TOOLCHAIN', '0') == '1': + args.append(('use_system_xcode', False)) + + args.append(('target_cpu', self.TARGET_CPU_VALUES[self._target])) + args.append(( + 'target_environment', + self.TARGET_ENVIRONMENT_VALUES[self._target])) + + # If extra arguments are passed to the function, pass them before the + # user overrides (if any). + if extra_args is not None: + args.extend(extra_args) + + # Add user overrides after the other configurations so that they can + # refer to them and override them. + args.extend(self._settings.items('gn_args')) + return args + + + def Generate(self, gn_path, proj_name, root_path, build_dir): + self.WriteArgsGn(build_dir, xcode_project_name=proj_name) + subprocess.check_call(self.GetGnCommand( + gn_path, root_path, build_dir, xcode_project_name=proj_name)) + + def CreateGnRules(self, gn_path, root_path, build_dir): + gn_command = self.GetGnCommand(gn_path, root_path, build_dir) + self.WriteArgsGn(build_dir) + self.WriteBuildNinja(gn_command, build_dir) + self.WriteBuildNinjaDeps(build_dir) + + def WriteArgsGn(self, build_dir, xcode_project_name=None): + with open(os.path.join(build_dir, 'args.gn'), 'w') as stream: + stream.write('# This file was generated by setup-gn.py. Do not edit\n') + stream.write('# but instead use ~/.setup-gn or $repo/.setup-gn files\n') + stream.write('# to configure settings.\n') + stream.write('\n') + + if self._target != 'maccatalyst': if self._settings.has_section('$imports$'): - for import_rule in self._settings.values('$imports$'): - stream.write('import("%s")\n' % import_rule) - stream.write('\n') - - gn_args = self._GetGnArgs() - for name, value in gn_args: - if isinstance(value, bool): - stream.write('%s = %s\n' % (name, str(value).lower())) - elif isinstance(value, list): - stream.write('%s = [%s' % - (name, '\n' if len(value) > 1 else '')) - if len(value) == 1: - prefix = ' ' - suffix = ' ' - else: - prefix = ' ' - suffix = ',\n' - for item in value: - if isinstance(item, bool): - stream.write('%s%s%s' % - (prefix, str(item).lower(), suffix)) - else: - stream.write('%s%s%s' % (prefix, item, suffix)) - stream.write(']\n') + for import_rule in self._settings.values('$imports$'): + stream.write('import("%s")\n' % import_rule) + stream.write('\n') + + gn_args = self._GetGnArgs() + + for name, value in gn_args: + if isinstance(value, bool): + stream.write('%s = %s\n' % (name, str(value).lower())) + elif isinstance(value, list): + stream.write('%s = [%s' % (name, '\n' if len(value) > 1 else '')) + if len(value) == 1: + prefix = ' ' + suffix = ' ' + else: + prefix = ' ' + suffix = ',\n' + for item in value: + if isinstance(item, bool): + stream.write('%s%s%s' % (prefix, str(item).lower(), suffix)) else: - stream.write('%s = %s\n' % (name, value)) - - def WriteBuildNinja(self, stream, gn_command): - stream.write('rule gn\n') - stream.write(' command = %s\n' % NinjaEscapeCommand(gn_command)) - stream.write(' description = Regenerating ninja files\n') - stream.write('\n') - stream.write('build build.ninja: gn\n') - stream.write(' generator = 1\n') - stream.write(' depfile = build.ninja.d\n') - - def WriteBuildNinjaDeps(self, stream): - stream.write('build.ninja: nonexistant_file.gn\n') - - def GetGnCommand(self, gn_path, src_path, out_path, generate_xcode_project): - gn_command = [gn_path, '--root=%s' % os.path.realpath(src_path), '-q'] - if generate_xcode_project: - gn_command.append('--ide=xcode') - gn_command.append('--ninja-executable=autoninja') - if self._settings.has_section('filters'): - target_filters = self._settings.values('filters') - if target_filters: - gn_command.append('--filters=%s' % ';'.join(target_filters)) + stream.write('%s%s%s' % (prefix, item, suffix)) + stream.write(']\n') else: - gn_command.append('--check') - gn_command.append('gen') - gn_command.append('//%s' % os.path.relpath(os.path.abspath(out_path), - os.path.abspath(src_path))) - return gn_command - - -def WriteToFileIfChanged(filename, content, overwrite): - '''Write |content| to |filename| if different. If |overwrite| is False - and the file already exists it is left untouched.''' - if os.path.exists(filename): - if not overwrite: - return - with open(filename) as file: - if file.read() == content: - return - if not os.path.isdir(os.path.dirname(filename)): - os.makedirs(os.path.dirname(filename)) - with open(filename, 'w') as file: - file.write(content) + # ConfigParser removes quote around empty string which confuse + # `gn gen` so restore them. + if not value: + value = '""' + stream.write('%s = %s\n' % (name, value)) + + def WriteBuildNinja(self, gn_command, build_dir): + with open(os.path.join(build_dir, 'build.ninja'), 'w') as stream: + stream.write('ninja_required_version = 1.7.2\n') + stream.write('\n') + stream.write('rule gn\n') + stream.write(' command = %s\n' % NinjaEscapeCommand(gn_command)) + stream.write(' description = Regenerating ninja files\n') + stream.write('\n') + stream.write('build build.ninja: gn\n') + stream.write(' generator = 1\n') + stream.write(' depfile = build.ninja.d\n') + + def WriteBuildNinjaDeps(self, build_dir): + with open(os.path.join(build_dir, 'build.ninja.d'), 'w') as stream: + stream.write('build.ninja: nonexistant_file.gn\n') + + def GetGnCommand(self, gn_path, src_path, out_path, xcode_project_name=None): + gn_command = [ gn_path, '--root=%s' % os.path.realpath(src_path), '-q' ] + if xcode_project_name is not None: + gn_command.append('--ide=xcode') + gn_command.append('--ninja-executable=autoninja') + gn_command.append('--xcode-build-system=new') + gn_command.append('--xcode-project=%s' % xcode_project_name) + if self._settings.has_section('filters'): + target_filters = self._settings.values('filters') + if target_filters: + gn_command.append('--filters=%s' % ';'.join(target_filters)) + else: + gn_command.append('--check') + gn_command.append('gen') + gn_command.append('//%s' % + os.path.relpath(os.path.abspath(out_path), os.path.abspath(src_path))) + return gn_command def NinjaNeedEscape(arg): - '''Returns True if |arg| needs to be escaped when written to .ninja file.''' - return ':' in arg or '*' in arg or ';' in arg + '''Returns True if |arg| needs to be escaped when written to .ninja file.''' + return ':' in arg or '*' in arg or ';' in arg def NinjaEscapeCommand(command): - '''Escapes |command| in order to write it to .ninja file.''' - result = [] - for arg in command: - if NinjaNeedEscape(arg): - arg = arg.replace(':', '$:') - arg = arg.replace(';', '\\;') - arg = arg.replace('*', '\\*') - else: - result.append(arg) - return ' '.join(result) + '''Escapes |command| in order to write it to .ninja file.''' + result = [] + for arg in command: + if NinjaNeedEscape(arg): + arg = arg.replace(':', '$:') + arg = arg.replace(';', '\\;') + arg = arg.replace('*', '\\*') + else: + result.append(arg) + return ' '.join(result) def FindGn(): - '''Returns absolute path to gn binary looking at the PATH env variable.''' - for path in os.environ['PATH'].split(os.path.pathsep): - gn_path = os.path.join(path, 'gn') - if os.path.isfile(gn_path) and os.access(gn_path, os.X_OK): - return gn_path - return None - - -def GenerateXcodeProject(gn_path, root_dir, out_dir, settings): - '''Convert GN generated Xcode project into multi-configuration Xcode - project.''' - - temp_path = tempfile.mkdtemp( - prefix=os.path.abspath(os.path.join(out_dir, '_temp'))) - try: - generator = GnGenerator(settings, 'Debug', 'iphonesimulator') - generator.Generate(gn_path, root_dir, temp_path) - convert_gn_xcodeproj.ConvertGnXcodeProject( - root_dir, os.path.join(temp_path), os.path.join(out_dir, 'build'), - SUPPORTED_CONFIGS) - finally: - if os.path.exists(temp_path): - shutil.rmtree(temp_path) + '''Returns absolute path to gn binary looking at the PATH env variable.''' + for path in os.environ['PATH'].split(os.path.pathsep): + gn_path = os.path.join(path, 'gn') + if os.path.isfile(gn_path) and os.access(gn_path, os.X_OK): + return gn_path + return None + + +def GenerateXcodeProject(gn_path, root_dir, proj_name, out_dir, settings): + '''Generate Xcode project with Xcode and convert to multi-configurations.''' + prefix = os.path.abspath(os.path.join(out_dir, '_temp')) + temp_path = tempfile.mkdtemp(prefix=prefix) + try: + generator = GnGenerator(settings, 'Debug', 'iphonesimulator') + generator.Generate(gn_path, proj_name, root_dir, temp_path) + convert_gn_xcodeproj.ConvertGnXcodeProject( + root_dir, + '%s.xcodeproj' % proj_name, + os.path.join(temp_path), + os.path.join(out_dir, 'build'), + SUPPORTED_CONFIGS) + finally: + if os.path.exists(temp_path): + shutil.rmtree(temp_path) + +def CreateLLDBInitFile(root_dir, out_dir, settings): + ''' + Generate an .lldbinit file for the project that load the script that fixes + the mapping of source files (see docs/ios/build_instructions.md#debugging). + ''' + with open(os.path.join(out_dir, 'build', '.lldbinit'), 'w') as lldbinit: + lldb_script_dir = os.path.join(os.path.abspath(root_dir), 'tools', 'lldb') + lldbinit.write('script sys.path[:0] = [\'%s\']\n' % lldb_script_dir) + lldbinit.write('script import lldbinit\n') + + workspace_name = settings.getstring( + 'gn_args', + 'ios_internal_citc_workspace_name') + + if workspace_name != '': + username = os.environ['USER'] + for shortname in ('googlemac', 'third_party', 'blaze-out'): + lldbinit.write('settings append target.source-map %s %s\n' % ( + shortname, + '/google/src/cloud/%s/%s/google3/%s' % ( + username, workspace_name, shortname))) + + # Append the content of //ios/build/tools/lldbinit.defaults if it exists. + tools_dir = os.path.join(root_dir, 'ios', 'build', 'tools') + defaults_lldbinit_path = os.path.join(tools_dir, 'lldbinit.defaults') + if os.path.isfile(defaults_lldbinit_path): + with open(defaults_lldbinit_path) as defaults_lldbinit: + for line in defaults_lldbinit: + lldbinit.write(line) + + # Append the content of ~/.lldbinit if it exists. Line that look like they + # are trying to configure source mapping are skipped as they probably date + # back from when setup-gn.py was not generating an .lldbinit file. + global_lldbinit_path = os.path.join(os.environ['HOME'], '.lldbinit') + if os.path.isfile(global_lldbinit_path): + with open(global_lldbinit_path) as global_lldbinit: + for line in global_lldbinit: + if any(pattern.match(line) for pattern in LLDBINIT_SKIP_PATTERNS): + continue + lldbinit.write(line) def GenerateGnBuildRules(gn_path, root_dir, out_dir, settings): - '''Generates all template configurations for gn.''' - for config in SUPPORTED_CONFIGS: - for target in SUPPORTED_TARGETS: - build_dir = os.path.join(out_dir, '%s-%s' % (config, target)) - generator = GnGenerator(settings, config, target) - generator.CreateGnRules(gn_path, root_dir, build_dir) + '''Generates all template configurations for gn.''' + for config in SUPPORTED_CONFIGS: + for target in SUPPORTED_TARGETS: + build_dir = os.path.join(out_dir, '%s-%s' % (config, target)) + if not os.path.isdir(build_dir): + os.makedirs(build_dir) + generator = GnGenerator(settings, config, target) + generator.CreateGnRules(gn_path, root_dir, build_dir) -def Main(args): - default_root = os.path.normpath( - os.path.join(os.path.dirname(__file__), os.pardir, os.pardir)) - - parser = argparse.ArgumentParser( - description='Generate build directories for use with gn.') - parser.add_argument( - 'root', - default=default_root, - nargs='?', - help='root directory where to generate multiple out configurations') - parser.add_argument('--import', - action='append', - dest='import_rules', - default=[], - help='path to file defining default gn variables') - parser.add_argument('--gn-path', - default=None, - help='path to gn binary (default: look up in $PATH)') - parser.add_argument( - '--build-dir', - default='out', - help='path where the build should be created (default: %(default)s)') - args = parser.parse_args(args) - - # Load configuration (first global and then any user overrides). - settings = ConfigParserWithStringInterpolation() - settings.read([ - os.path.splitext(__file__)[0] + '.config', - os.path.expanduser('~/.setup-gn'), - ]) - - # Add private sections corresponding to --import argument. - if args.import_rules: - settings.add_section('$imports$') - for i, import_rule in enumerate(args.import_rules): - if not import_rule.startswith('//'): - import_rule = '//%s' % os.path.relpath( - os.path.abspath(import_rule), os.path.abspath(args.root)) - settings.set('$imports$', '$rule%d$' % i, import_rule) - - # Validate settings. - if settings.getstring('build', 'arch') not in ('64-bit', '32-bit', 'fat'): - sys.stderr.write('ERROR: invalid value for build.arch: %s\n' % - settings.getstring('build', 'arch')) - sys.exit(1) - - # Find path to gn binary either from command-line or in PATH. - if args.gn_path: - gn_path = args.gn_path - else: - gn_path = FindGn() - if gn_path is None: - sys.stderr.write('ERROR: cannot find gn in PATH\n') - sys.exit(1) - out_dir = os.path.join(args.root, args.build_dir) - if not os.path.isdir(out_dir): - os.makedirs(out_dir) - - GenerateXcodeProject(gn_path, args.root, out_dir, settings) - GenerateGnBuildRules(gn_path, args.root, out_dir, settings) +def Main(args): + default_root = os.path.normpath(os.path.join( + os.path.dirname(__file__), os.pardir, os.pardir)) + + parser = argparse.ArgumentParser( + description='Generate build directories for use with gn.') + parser.add_argument( + 'root', default=default_root, nargs='?', + help='root directory where to generate multiple out configurations') + parser.add_argument( + '--import', action='append', dest='import_rules', default=[], + help='path to file defining default gn variables') + parser.add_argument( + '--gn-path', default=None, + help='path to gn binary (default: look up in $PATH)') + parser.add_argument( + '--build-dir', default='out', + help='path where the build should be created (default: %(default)s)') + parser.add_argument( + '--config-path', default=os.path.expanduser('~/.setup-gn'), + help='path to the user config file (default: %(default)s)') + parser.add_argument( + '--system-config-path', default=os.path.splitext(__file__)[0] + '.config', + help='path to the default config file (default: %(default)s)') + parser.add_argument( + '--project-name', default='all', dest='proj_name', + help='name of the generated Xcode project (default: %(default)s)') + parser.add_argument( + '--no-xcode-project', action='store_true', default=False, + help='do not generate the build directory with XCode project') + args = parser.parse_args(args) + + # Load configuration (first global and then any user overrides). + settings = ConfigParserWithStringInterpolation() + settings.read([ + args.system_config_path, + args.config_path, + ]) + + # Add private sections corresponding to --import argument. + if args.import_rules: + settings.add_section('$imports$') + for i, import_rule in enumerate(args.import_rules): + if not import_rule.startswith('//'): + import_rule = '//%s' % os.path.relpath( + os.path.abspath(import_rule), os.path.abspath(args.root)) + settings.set('$imports$', '$rule%d$' % i, import_rule) + + # Validate settings. + if settings.getstring('build', 'arch') not in ('64-bit', '32-bit', 'fat'): + sys.stderr.write('ERROR: invalid value for build.arch: %s\n' % + settings.getstring('build', 'arch')) + sys.exit(1) + + # Find path to gn binary either from command-line or in PATH. + if args.gn_path: + gn_path = args.gn_path + else: + gn_path = FindGn() + if gn_path is None: + sys.stderr.write('ERROR: cannot find gn in PATH\n') + sys.exit(1) + + out_dir = os.path.join(args.root, args.build_dir) + if not os.path.isdir(out_dir): + os.makedirs(out_dir) + + if not args.no_xcode_project: + GenerateXcodeProject(gn_path, args.root, args.proj_name, out_dir, settings) + CreateLLDBInitFile(args.root, out_dir, settings) + GenerateGnBuildRules(gn_path, args.root, out_dir, settings) if __name__ == '__main__': - sys.exit(Main(sys.argv[1:])) + sys.exit(Main(sys.argv[1:])) diff --git a/external_imported/sentry-native/external/crashpad/build/ios/xcodescheme-testable.template b/external_imported/sentry-native/external/crashpad/build/ios/xcodescheme-testable.template new file mode 100644 index 000000000..61b6f471b --- /dev/null +++ b/external_imported/sentry-native/external/crashpad/build/ios/xcodescheme-testable.template @@ -0,0 +1,10 @@ + + + + diff --git a/external_imported/sentry-native/external/crashpad/build/ios/xcodescheme.template b/external_imported/sentry-native/external/crashpad/build/ios/xcodescheme.template new file mode 100644 index 000000000..514bea4ef --- /dev/null +++ b/external_imported/sentry-native/external/crashpad/build/ios/xcodescheme.template @@ -0,0 +1,80 @@ + + + + + + + + + + + + @{TESTABLES} + + + + + + + + + + + + + + + + + + + diff --git a/external_imported/sentry-native/external/crashpad/build/run_tests.py b/external_imported/sentry-native/external/crashpad/build/run_tests.py index f48652ff7..71d1d9c34 100755 --- a/external_imported/sentry-native/external/crashpad/build/run_tests.py +++ b/external_imported/sentry-native/external/crashpad/build/run_tests.py @@ -1,5 +1,4 @@ -#!/usr/bin/env python -# coding: utf-8 +#!/usr/bin/env python3 # Copyright 2014 The Crashpad Authors. All rights reserved. # @@ -15,8 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import print_function - import argparse import os import pipes @@ -40,7 +37,7 @@ def _FindGNFromBinaryDir(binary_dir): build_ninja = os.path.join(binary_dir, 'build.ninja') if os.path.isfile(build_ninja): - with open(build_ninja, 'rb') as f: + with open(build_ninja, 'r') as f: # Look for the always-generated regeneration rule of the form: # # rule gn @@ -78,10 +75,11 @@ def _BinaryDirTargetOS(binary_dir): ], shell=IS_WINDOWS_HOST, stdout=subprocess.PIPE, - stderr=open(os.devnull)) + stderr=open(os.devnull), + text=True) value = popen.communicate()[0] if popen.returncode == 0: - match = re.match('target_os = "(.*)"$', value.decode('utf-8')) + match = re.match('target_os = "(.*)"$', value) if match: return match.group(1) @@ -196,13 +194,14 @@ def _adb_shell(command_args, env={}): child = subprocess.Popen(adb_command, shell=IS_WINDOWS_HOST, stdin=open(os.devnull), - stdout=subprocess.PIPE) + stdout=subprocess.PIPE, + text=True) FINAL_LINE_RE = re.compile('status=(\d+)$') final_line = None while True: # Use readline so that the test output appears “live” when running. - data = child.stdout.readline().decode('utf-8') + data = child.stdout.readline() if data == '': break if final_line is not None: @@ -369,10 +368,11 @@ def xcuitest(binary_dir, test): xctestrun_path = f.name print(xctestrun_path) - if is_xcuitest: - plistlib.writePlist(xcuitest(binary_dir, test), xctestrun_path) - else: - plistlib.writePlist(xctest(binary_dir, test), xctestrun_path) + with open(xctestrun_path, 'wb') as fp: + if is_xcuitest: + plistlib.dump(xcuitest(binary_dir, test), fp) + else: + plistlib.dump(xctest(binary_dir, test), fp) subprocess.check_call([ 'xcodebuild', 'test-without-building', '-xctestrun', xctestrun_path, @@ -421,10 +421,11 @@ def main(args): android_device = os.environ.get('ANDROID_DEVICE') if not android_device: adb_devices = subprocess.check_output(['adb', 'devices'], - shell=IS_WINDOWS_HOST) + shell=IS_WINDOWS_HOST, + text=True) devices = [] for line in adb_devices.splitlines(): - line = line.decode('utf-8') + line = line if (line == 'List of devices attached' or re.match('^\* daemon .+ \*$', line) or line == ''): continue diff --git a/external_imported/sentry-native/external/crashpad/client/annotation.h b/external_imported/sentry-native/external/crashpad/client/annotation.h index 8e7a3cbdc..aa110bd67 100644 --- a/external_imported/sentry-native/external/crashpad/client/annotation.h +++ b/external_imported/sentry-native/external/crashpad/client/annotation.h @@ -28,7 +28,7 @@ #include "build/build_config.h" namespace crashpad { -#if defined(OS_IOS) +#if BUILDFLAG(IS_IOS) namespace internal { class InProcessIntermediateDumpHandler; } // namespace internal @@ -106,7 +106,7 @@ class Annotation { // variables defined in a constexpr function, which is valid. Avoid them // and the also-problematic DCHECK until all the infrastructure is updated: // https://crbug.com/crashpad/201. -#if !defined(OS_WIN) || (defined(_MSC_VER) && _MSC_VER >= 1910) +#if !BUILDFLAG(IS_WIN) || (defined(_MSC_VER) && _MSC_VER >= 1910) const UnderlyingType start = static_cast(Type::kUserDefinedStart); const UnderlyingType user_type = start + value; @@ -173,7 +173,7 @@ class Annotation { protected: friend class AnnotationList; -#if defined(OS_IOS) +#if BUILDFLAG(IS_IOS) friend class internal::InProcessIntermediateDumpHandler; #endif diff --git a/external_imported/sentry-native/external/crashpad/client/annotation_list.h b/external_imported/sentry-native/external/crashpad/client/annotation_list.h index 02389530c..1c2141fe6 100644 --- a/external_imported/sentry-native/external/crashpad/client/annotation_list.h +++ b/external_imported/sentry-native/external/crashpad/client/annotation_list.h @@ -19,7 +19,7 @@ #include "client/annotation.h" namespace crashpad { -#if defined(OS_IOS) +#if BUILDFLAG(IS_IOS) namespace internal { class InProcessIntermediateDumpHandler; } // namespace internal @@ -87,7 +87,7 @@ class AnnotationList { Iterator end(); protected: -#if defined(OS_IOS) +#if BUILDFLAG(IS_IOS) friend class internal::InProcessIntermediateDumpHandler; #endif diff --git a/external_imported/sentry-native/external/crashpad/client/crash_report_database.cc b/external_imported/sentry-native/external/crashpad/client/crash_report_database.cc index 5c8156e01..7a3732b8d 100644 --- a/external_imported/sentry-native/external/crashpad/client/crash_report_database.cc +++ b/external_imported/sentry-native/external/crashpad/client/crash_report_database.cc @@ -68,7 +68,7 @@ bool CrashReportDatabase::NewReport::Initialize( return false; } -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) const std::wstring uuid_string = uuid_.ToWString(); #else const std::string uuid_string = uuid_.ToString(); @@ -103,7 +103,7 @@ FileWriter* CrashReportDatabase::NewReport::AddAttachment( report_attachments_dir, FilePermissions::kOwnerOnly, true)) { return nullptr; } -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) const std::wstring name_string = base::UTF8ToWide(name); #else const std::string name_string = name; @@ -137,7 +137,7 @@ void CrashReportDatabase::UploadReport::InitializeAttachments() { continue; } attachment_readers_.emplace_back(std::move(file_reader)); -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) const std::string name_string = base::WideToUTF8(filename.value()); #else const std::string name_string = filename.value(); @@ -177,7 +177,7 @@ CrashReportDatabase::OperationStatus CrashReportDatabase::RecordUploadComplete( } base::FilePath CrashReportDatabase::AttachmentsPath(const UUID& uuid) { -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) const std::wstring uuid_string = uuid.ToWString(); #else const std::string uuid_string = uuid.ToString(); diff --git a/external_imported/sentry-native/external/crashpad/client/crash_report_database_generic.cc b/external_imported/sentry-native/external/crashpad/client/crash_report_database_generic.cc index f5dfa891b..9d48b68be 100644 --- a/external_imported/sentry-native/external/crashpad/client/crash_report_database_generic.cc +++ b/external_imported/sentry-native/external/crashpad/client/crash_report_database_generic.cc @@ -18,9 +18,9 @@ #include #include +#include #include -#include "base/ignore_result.h" #include "base/logging.h" #include "build/build_config.h" #include "client/settings.h" @@ -356,14 +356,14 @@ OperationStatus CrashReportDatabaseGeneric::FinishedWritingCrashReport( return kFileSystemError; } // We've moved the report to pending, so it no longer needs to be removed. - ignore_result(report->file_remover_.release()); + std::ignore = report->file_remover_.release(); // Close all the attachments and disarm their removers too. for (auto& writer : report->attachment_writers_) { writer->Close(); } for (auto& remover : report->attachment_removers_) { - ignore_result(remover.release()); + std::ignore = remover.release(); } *uuid = report->ReportID(); @@ -600,7 +600,7 @@ base::FilePath CrashReportDatabaseGeneric::ReportPath(const UUID& uuid, DCHECK_NE(state, kUninitialized); DCHECK_NE(state, kSearchable); -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) const std::wstring uuid_string = uuid.ToWString(); #else const std::string uuid_string = uuid.ToString(); diff --git a/external_imported/sentry-native/external/crashpad/client/crash_report_database_mac.mm b/external_imported/sentry-native/external/crashpad/client/crash_report_database_mac.mm index d1c0a3ed2..e72838a03 100644 --- a/external_imported/sentry-native/external/crashpad/client/crash_report_database_mac.mm +++ b/external_imported/sentry-native/external/crashpad/client/crash_report_database_mac.mm @@ -14,9 +14,9 @@ #include "client/crash_report_database.h" +#import #include #include -#import #include #include #include @@ -25,8 +25,9 @@ #include #include -#include "base/cxx17_backports.h" -#include "base/ignore_result.h" +#include +#include + #include "base/logging.h" #include "base/mac/scoped_nsautorelease_pool.h" #include "base/posix/eintr_wrapper.h" @@ -42,6 +43,10 @@ #include "util/misc/initialization_state_dcheck.h" #include "util/misc/metrics.h" +#if BUILDFLAG(IS_IOS) +#include "util/ios/scoped_background_task.h" +#endif // BUILDFLAG(IS_IOS) + namespace crashpad { namespace { @@ -181,6 +186,10 @@ OperationStatus RecordUploadAttempt(UploadReport* report, //! \brief Stores the flock of the file for the duration of //! GetReportForUploading() and RecordUploadAttempt(). base::ScopedFD lock_fd; +#if BUILDFLAG(IS_IOS) + //! \brief Obtain a background task assertion while a flock is in use. + internal::ScopedBackgroundTask ios_background_task{"UploadReportMac"}; +#endif // BUILDFLAG(IS_IOS) }; //! \brief Locates a crash report in the database by UUID. @@ -281,7 +290,7 @@ OperationStatus ReportsInDirectory(const base::FilePath& path, } // Create the three processing directories for the database. - for (size_t i = 0; i < base::size(kReportDirectories); ++i) { + for (size_t i = 0; i < std::size(kReportDirectories); ++i) { if (!CreateOrEnsureDirectoryExists(base_dir_.Append(kReportDirectories[i]))) return false; } @@ -385,14 +394,14 @@ OperationStatus ReportsInDirectory(const base::FilePath& path, PLOG(ERROR) << "rename " << path.value() << " to " << new_path.value(); return kFileSystemError; } - ignore_result(report->file_remover_.release()); + std::ignore = report->file_remover_.release(); // Close all the attachments and disarm their removers too. for (auto& writer : report->attachment_writers_) { writer->Close(); } for (auto& remover : report->attachment_removers_) { - ignore_result(remover.release()); + std::ignore = remover.release(); } Metrics::CrashReportPending(Metrics::PendingReportReason::kNewlyCreated); diff --git a/external_imported/sentry-native/external/crashpad/client/crash_report_database_test.cc b/external_imported/sentry-native/external/crashpad/client/crash_report_database_test.cc index 357702b06..d75ab355b 100644 --- a/external_imported/sentry-native/external/crashpad/client/crash_report_database_test.cc +++ b/external_imported/sentry-native/external/crashpad/client/crash_report_database_test.cc @@ -737,7 +737,7 @@ TEST_F(CrashReportDatabaseTest, OrphanedAttachments) { ASSERT_TRUE(LoggingRemoveFile(report.file_path)); -#if !defined(OS_APPLE) && !defined(OS_WIN) +#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_WIN) // CrashReportDatabaseMac stores metadata in xattrs and does not have .meta // files. // CrashReportDatabaseWin stores metadata in a global metadata file and not @@ -749,7 +749,7 @@ TEST_F(CrashReportDatabaseTest, OrphanedAttachments) { ASSERT_EQ(db()->LookUpCrashReport(uuid, &report), CrashReportDatabase::kReportNotFound); -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) const std::wstring uuid_string = uuid.ToWString(); #else const std::string uuid_string = uuid.ToString(); @@ -763,7 +763,7 @@ TEST_F(CrashReportDatabaseTest, OrphanedAttachments) { EXPECT_TRUE(FileExists(file_path1)); EXPECT_TRUE(FileExists(file_path1)); -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) // On Windows, reports removed from metadata are counted, even if the file // is not on the disk. EXPECT_EQ(db()->CleanDatabase(0), 1); @@ -778,7 +778,7 @@ TEST_F(CrashReportDatabaseTest, OrphanedAttachments) { // This test uses knowledge of the database format to break it, so it only // applies to the unfified database implementation. -#if !defined(OS_APPLE) && !defined(OS_WIN) +#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_WIN) TEST_F(CrashReportDatabaseTest, CleanBrokenDatabase) { // Remove report files if metadata goes missing. CrashReportDatabase::Report report; @@ -843,7 +843,7 @@ TEST_F(CrashReportDatabaseTest, CleanBrokenDatabase) { EXPECT_FALSE(PathExists(report.file_path)); EXPECT_FALSE(PathExists(metadata3)); } -#endif // !OS_APPLE && !OS_WIN +#endif // !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_WIN) TEST_F(CrashReportDatabaseTest, TotalSize_MainReportOnly) { std::unique_ptr new_report; diff --git a/external_imported/sentry-native/external/crashpad/client/crash_report_database_win.cc b/external_imported/sentry-native/external/crashpad/client/crash_report_database_win.cc index 65feaa4cf..6331f6508 100644 --- a/external_imported/sentry-native/external/crashpad/client/crash_report_database_win.cc +++ b/external_imported/sentry-native/external/crashpad/client/crash_report_database_win.cc @@ -21,9 +21,9 @@ #include #include +#include #include -#include "base/ignore_result.h" #include "base/logging.h" #include "base/numerics/safe_math.h" #include "base/strings/utf_string_conversions.h" @@ -735,14 +735,14 @@ OperationStatus CrashReportDatabaseWin::FinishedWritingCrashReport( time(nullptr), ReportState::kPending)); - ignore_result(report->file_remover_.release()); + std::ignore = report->file_remover_.release(); // Close all the attachments and disarm their removers too. for (auto& writer : report->attachment_writers_) { writer->Close(); } for (auto& remover : report->attachment_removers_) { - ignore_result(remover.release()); + std::ignore = remover.release(); } *uuid = report->ReportID(); diff --git a/external_imported/sentry-native/external/crashpad/client/crashpad_client.h b/external_imported/sentry-native/external/crashpad/client/crashpad_client.h index 588802ce8..e8d6b06e1 100644 --- a/external_imported/sentry-native/external/crashpad/client/crashpad_client.h +++ b/external_imported/sentry-native/external/crashpad/client/crashpad_client.h @@ -28,12 +28,12 @@ #include "util/file/file_io.h" #include "util/misc/capture_context.h" -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) #include "base/mac/scoped_mach_port.h" -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) #include #include "util/win/scoped_handle.h" -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) #include #include #endif @@ -125,7 +125,8 @@ class CrashpadClient { bool asynchronous_start, const std::vector& attachments = {}); -#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || DOXYGEN +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ + DOXYGEN //! \brief Retrieve the socket and process ID for the handler. //! //! `StartHandler()` must have successfully been called before calling this @@ -170,9 +171,10 @@ class CrashpadClient { //! //! \return `true` on success. Otherwise `false` with a message logged. static bool InitializeSignalStackForThread(); -#endif // OS_ANDROID || OS_LINUX || OS_CHROMEOS || DOXYGEN +#endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) || DOXYGEN -#if defined(OS_ANDROID) || DOXYGEN +#if BUILDFLAG(IS_ANDROID) || DOXYGEN //! \brief Installs a signal handler to execute `/system/bin/app_process` and //! load a Java class in response to a crash. //! @@ -339,9 +341,10 @@ class CrashpadClient { const std::map& annotations, const std::vector& arguments, int socket); -#endif // OS_ANDROID || DOXYGEN +#endif // BUILDFLAG(IS_ANDROID) || DOXYGEN -#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_CHROMEOS) || DOXYGEN +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || \ + DOXYGEN //! \brief Installs a signal handler to launch a handler process in reponse to //! a crash. //! @@ -418,7 +421,7 @@ class CrashpadClient { //! CaptureContext() or similar. static void DumpWithoutCrash(NativeCPUContext* context); - //! \brief Disables any installed crash handler, including any + //! \brief Disables any installed crash handler, not including any //! FirstChanceHandler and crashes the current process. //! //! \param[in] message A message to be logged before crashing. @@ -454,9 +457,10 @@ class CrashpadClient { //! //! \param[in] unhandled_signals The set of unhandled signals void SetUnhandledSignals(const std::set& unhandled_signals); -#endif // OS_LINUX || OS_ANDROID || OS_CHROMEOS || DOXYGEN +#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || + // BUILDFLAG(IS_CHROMEOS) || DOXYGEN -#if defined(OS_IOS) || DOXYGEN +#if BUILDFLAG(IS_IOS) || DOXYGEN //! \brief Configures the process to direct its crashes to the iOS in-process //! Crashpad handler. //! @@ -554,9 +558,21 @@ class CrashpadClient { static void DumpWithoutCrashAndDeferProcessingAtPath( NativeCPUContext* context, const base::FilePath path); + + //! \brief Unregister the Crashpad client. Intended to be used by tests so + //! multiple Crashpad clients can be started and stopped. Not expected to + //! be used in a shipping application. + static void ResetForTesting(); + + //! \brief Inject a callback into Mach handling. Intended to be used by + //! tests to trigger a reentrant exception. + static void SetMachExceptionCallbackForTesting(void (*callback)()); + + //! \brief Returns the thread id of the Mach exception thread, used by tests. + static uint64_t GetThreadIdForTesting(); #endif -#if defined(OS_APPLE) || DOXYGEN +#if BUILDFLAG(IS_APPLE) || DOXYGEN //! \brief Sets the process’ crash handler to a Mach service registered with //! the bootstrap server. //! @@ -606,7 +622,7 @@ class CrashpadClient { base::mac::ScopedMachSendRight GetHandlerMachPort() const; #endif -#if defined(OS_WIN) || DOXYGEN +#if BUILDFLAG(IS_WIN) || DOXYGEN //! \brief The type for custom handlers installed by clients. using FirstChanceHandlerWin = bool (*)(EXCEPTION_POINTERS*); @@ -714,20 +730,9 @@ class CrashpadClient { static bool DumpAndCrashTargetProcess(HANDLE process, HANDLE blame_thread, DWORD exception_code); - - enum : uint32_t { - //! \brief The exception code (roughly "Client called") used when - //! DumpAndCrashTargetProcess() triggers an exception in a target - //! process. - //! - //! \note This value does not have any bits of the top nibble set, to avoid - //! confusion with real exception codes which tend to have those bits - //! set. - kTriggeredExceptionCode = 0xcca11ed, - }; #endif -#if defined(OS_APPLE) || DOXYGEN +#if BUILDFLAG(IS_APPLE) || DOXYGEN //! \brief Configures the process to direct its crashes to the default handler //! for the operating system. //! @@ -761,14 +766,14 @@ class CrashpadClient { #endif private: -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) base::mac::ScopedMachSendRight exception_port_; -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) std::wstring ipc_pipe_; ScopedKernelHANDLE handler_start_thread_; -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) std::set unhandled_signals_; -#endif // OS_APPLE +#endif // BUILDFLAG(IS_APPLE) }; } // namespace crashpad diff --git a/external_imported/sentry-native/external/crashpad/client/crashpad_client_ios.cc b/external_imported/sentry-native/external/crashpad/client/crashpad_client_ios.cc index 01d348457..2a737f3cc 100644 --- a/external_imported/sentry-native/external/crashpad/client/crashpad_client_ios.cc +++ b/external_imported/sentry-native/external/crashpad/client/crashpad_client_ios.cc @@ -14,17 +14,18 @@ #include "client/crashpad_client.h" +#include #include #include +#include -#include "base/cxx17_backports.h" #include "base/logging.h" #include "base/mac/mach_logging.h" #include "base/mac/scoped_mach_port.h" #include "client/ios_handler/exception_processor.h" #include "client/ios_handler/in_process_handler.h" -#include "util/ios/ios_system_data_collector.h" +#include "util/ios/raw_logging.h" #include "util/mach/exc_server_variants.h" #include "util/mach/exception_ports.h" #include "util/mach/mach_extensions.h" @@ -40,7 +41,7 @@ bool IsBeingDebugged() { kinfo_proc kern_proc_info; int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid()}; size_t len = sizeof(kern_proc_info); - if (sysctl(mib, base::size(mib), &kern_proc_info, &len, nullptr, 0) == 0) + if (sysctl(mib, std::size(mib), &kern_proc_info, &len, nullptr, 0) == 0) return kern_proc_info.kp_proc.p_flag & P_TRACED; return false; } @@ -60,21 +61,54 @@ class CrashHandler : public Thread, CrashHandler& operator=(const CrashHandler&) = delete; static CrashHandler* Get() { - static CrashHandler* instance = new CrashHandler(); - return instance; + if (!instance_) + instance_ = new CrashHandler(); + return instance_; + } + + static void ResetForTesting() { + delete instance_; + instance_ = nullptr; } bool Initialize(const base::FilePath& database, const std::string& url, const std::map& annotations) { INITIALIZATION_STATE_SET_INITIALIZING(initialized_); - if (!in_process_handler_.Initialize( - database, url, annotations, system_data_) || + if (!in_process_handler_.Initialize(database, url, annotations) || !InstallMachExceptionHandler() || - !Signals::InstallHandler(SIGABRT, CatchSignal, 0, &old_action_)) { + // xnu turns hardware faults into Mach exceptions, so the only signal + // left to register is SIGABRT, which never starts off as a hardware + // fault. Installing a handler for other signals would lead to + // recording exceptions twice. As a consequence, Crashpad will not + // generate intermediate dumps for anything manually calling + // raise(SIG*). In practice, this doesn’t actually happen for crash + // signals that originate as hardware faults. + !Signals::InstallHandler( + SIGABRT, CatchAndReraiseSignal, 0, &old_action_)) { LOG(ERROR) << "Unable to initialize Crashpad."; return false; } + + // For applications that haven't ignored or set a handler for SIGPIPE: + // It’s OK for an application to set its own SIGPIPE handler (including + // SIG_IGN) before initializing Crashpad, because Crashpad will discover the + // existing handler and not install its own. + // It’s OK for Crashpad to install its own SIGPIPE handler and for the + // application to subsequently install its own (including SIG_IGN) + // afterwards, because its handler will replace Crashpad’s. + // This is useful to cover the default situation where nobody installs a + // SIGPIPE handler and the disposition is at SIG_DFL, because SIGPIPE is a + // “kill” signal (bsd/sys/signalvar.h sigprop). In that case, without + // Crashpad, SIGPIPE results in a silent and unreported kill (and not even + // ReportCrash will record it), but developers probably want to be alerted + // to the conditon. + struct sigaction sa; + if (sigaction(SIGPIPE, nullptr, &sa) == 0 && sa.sa_handler == SIG_DFL) { + Signals::InstallHandler( + SIGPIPE, CatchAndReraiseSignalDefaultAction, 0, nullptr); + } + InstallObjcExceptionPreprocessor(this); INITIALIZATION_STATE_SET_VALID(initialized_); return true; @@ -91,37 +125,23 @@ class CrashHandler : public Thread, in_process_handler_.ProcessIntermediateDump(file, annotations); } - void DumpWithContext(NativeCPUContext* context) { - const mach_exception_data_type_t code[2] = {}; - static constexpr int kSimulatedException = -1; - HandleMachException(MACH_EXCEPTION_CODES, - mach_thread_self(), - kSimulatedException, - code, - base::size(code), - MACHINE_THREAD_STATE, - reinterpret_cast(context), - MACHINE_THREAD_STATE_COUNT); - } - void DumpWithoutCrash(NativeCPUContext* context, bool process_dump) { INITIALIZATION_STATE_DCHECK_VALID(initialized_); - internal::InProcessHandler::ScopedAlternateWriter scoper( - &in_process_handler_); - if (scoper.Open()) { - DumpWithContext(context); - if (process_dump) { - in_process_handler_.ProcessIntermediateDump(scoper.path()); - } + base::FilePath path; + if (!in_process_handler_.DumpExceptionFromSimulatedMachException( + context, kMachExceptionSimulated, &path)) { + return; + } + + if (process_dump) { + in_process_handler_.ProcessIntermediateDump(path); } } void DumpWithoutCrashAtPath(NativeCPUContext* context, const base::FilePath& path) { - internal::InProcessHandler::ScopedAlternateWriter scoper( - &in_process_handler_); - if (scoper.OpenAtPath(path)) - DumpWithContext(context); + in_process_handler_.DumpExceptionFromSimulatedMachExceptionAtPath( + context, kMachExceptionSimulated, path); } void StartProcessingPendingReports() { @@ -129,9 +149,21 @@ class CrashHandler : public Thread, in_process_handler_.StartProcessingPendingReports(); } + void SetMachExceptionCallbackForTesting(void (*callback)()) { + in_process_handler_.SetMachExceptionCallbackForTesting(callback); + } + + uint64_t GetThreadIdForTesting() { return Thread::GetThreadIdForTesting(); } + private: CrashHandler() = default; + ~CrashHandler() { + UninstallObjcExceptionPreprocessor(); + Signals::InstallDefaultHandler(SIGABRT); + UninstallMachExceptionHandler(); + } + bool InstallMachExceptionHandler() { exception_port_.reset(NewMachPort(MACH_PORT_RIGHT_RECEIVE)); if (!exception_port_.is_valid()) { @@ -164,15 +196,22 @@ class CrashHandler : public Thread, return false; } + mach_handler_running_ = true; Start(); return true; } + void UninstallMachExceptionHandler() { + mach_handler_running_ = false; + exception_port_.reset(); + Join(); + } + // Thread: void ThreadMain() override { UniversalMachExcServer universal_mach_exc_server(this); - while (true) { + while (mach_handler_running_) { mach_msg_return_t mr = MachMessageServer::Run(&universal_mach_exc_server, exception_port_.get(), @@ -180,7 +219,10 @@ class CrashHandler : public Thread, MachMessageServer::kPersistent, MachMessageServer::kReceiveLargeIgnore, kMachMessageTimeoutWaitIndefinitely); - MACH_CHECK(mr == MACH_SEND_INVALID_DEST, mr) << "MachMessageServer::Run"; + MACH_CHECK(mr == (mach_handler_running_ ? MACH_SEND_INVALID_DEST + : MACH_RCV_PORT_CHANGED), + mr) + << "MachMessageServer::Run"; } } @@ -209,8 +251,7 @@ class CrashHandler : public Thread, // inherit the task exception ports, and this process isn’t prepared to // handle them if (task != mach_task_self()) { - LOG(WARNING) << "task 0x" << std::hex << task << " != 0x" - << mach_task_self(); + CRASHPAD_RAW_LOG("MachException task != mach_task_self()"); return KERN_FAILURE; } @@ -224,7 +265,31 @@ class CrashHandler : public Thread, old_state_count); // Respond with KERN_FAILURE so the system will continue to handle this - // exception as a crash. + // exception. xnu will turn this Mach exception into a signal and take the + // default action to terminate the process. However, if sigprocmask is + // called before this Mach exception returns (such as by another thread + // calling abort, see: Libc-1506.40.4/stdlib/FreeBSD/abort.c), the Mach + // exception will be converted into a signal but delivery will be blocked. + // Since concurrent exceptions lead to the losing thread sleeping + // indefinitely, if the abort thread never returns, the thread that + // triggered this Mach exception will repeatedly trap and the process will + // never terminate. If the abort thread didn’t have a user-space signal + // handler that slept forever, the abort would terminate the process even if + // all other signals had been blocked. Instead, unblock all signals + // corresponding to all Mach exceptions Crashpad is registered for before + // returning KERN_FAILURE. There is still racy behavior possible with this + // call to sigprocmask, but the repeated calls to CatchMachException here + // will eventually lead to termination. + sigset_t unblock_set; + sigemptyset(&unblock_set); + sigaddset(&unblock_set, SIGILL); // EXC_BAD_INSTRUCTION + sigaddset(&unblock_set, SIGTRAP); // EXC_BREAKPOINT + sigaddset(&unblock_set, SIGFPE); // EXC_ARITHMETIC + sigaddset(&unblock_set, SIGBUS); // EXC_BAD_ACCESS + sigaddset(&unblock_set, SIGSEGV); // EXC_BAD_ACCESS + if (sigprocmask(SIG_UNBLOCK, &unblock_set, nullptr) != 0) { + CRASHPAD_RAW_LOG("sigprocmask"); + } return KERN_FAILURE; } @@ -236,8 +301,7 @@ class CrashHandler : public Thread, thread_state_flavor_t flavor, ConstThreadState old_state, mach_msg_type_number_t old_state_count) { - in_process_handler_.DumpExceptionFromMachException(system_data_, - behavior, + in_process_handler_.DumpExceptionFromMachException(behavior, thread, exception, code, @@ -249,8 +313,8 @@ class CrashHandler : public Thread, void HandleUncaughtNSException(const uint64_t* frames, const size_t num_frames) override { - in_process_handler_.DumpExceptionFromNSExceptionFrames( - system_data_, frames, num_frames); + in_process_handler_.DumpExceptionFromNSExceptionWithFrames(frames, + num_frames); // After uncaught exceptions are reported, the system immediately triggers a // call to std::terminate()/abort(). Remove the abort handler so a second // dump isn't generated. @@ -259,17 +323,9 @@ class CrashHandler : public Thread, void HandleUncaughtNSExceptionWithContext( NativeCPUContext* context) override { - const mach_exception_data_type_t code[2] = {0, 0}; - in_process_handler_.DumpExceptionFromMachException( - system_data_, - MACH_EXCEPTION_CODES, - mach_thread_self(), - kMachExceptionFromNSException, - code, - base::size(code), - MACHINE_THREAD_STATE, - reinterpret_cast(context), - MACHINE_THREAD_STATE_COUNT); + base::FilePath path; + in_process_handler_.DumpExceptionFromSimulatedMachException( + context, kMachExceptionFromNSException, &path); // After uncaught exceptions are reported, the system immediately triggers a // call to std::terminate()/abort(). Remove the abort handler so a second @@ -277,29 +333,63 @@ class CrashHandler : public Thread, CHECK(Signals::InstallDefaultHandler(SIGABRT)); } + void HandleUncaughtNSExceptionWithContextAtPath( + NativeCPUContext* context, + const base::FilePath& path) override { + in_process_handler_.DumpExceptionFromSimulatedMachExceptionAtPath( + context, kMachExceptionFromNSException, path); + } + + bool MoveIntermediateDumpAtPathToPending( + const base::FilePath& path) override { + if (in_process_handler_.MoveIntermediateDumpAtPathToPending(path)) { + // After uncaught exceptions are reported, the system immediately triggers + // a call to std::terminate()/abort(). Remove the abort handler so a + // second dump isn't generated. + CHECK(Signals::InstallDefaultHandler(SIGABRT)); + return true; + } + return false; + } + // The signal handler installed at OS-level. - static void CatchSignal(int signo, siginfo_t* siginfo, void* context) { + static void CatchAndReraiseSignal(int signo, + siginfo_t* siginfo, + void* context) { + Get()->HandleAndReraiseSignal(signo, + siginfo, + reinterpret_cast(context), + &(Get()->old_action_)); + } + + static void CatchAndReraiseSignalDefaultAction(int signo, + siginfo_t* siginfo, + void* context) { Get()->HandleAndReraiseSignal( - signo, siginfo, reinterpret_cast(context)); + signo, siginfo, reinterpret_cast(context), nullptr); } void HandleAndReraiseSignal(int signo, siginfo_t* siginfo, - ucontext_t* context) { - in_process_handler_.DumpExceptionFromSignal(system_data_, siginfo, context); + ucontext_t* context, + struct sigaction* old_action) { + in_process_handler_.DumpExceptionFromSignal(siginfo, context); // Always call system handler. - Signals::RestoreHandlerAndReraiseSignalOnReturn(siginfo, &old_action_); + Signals::RestoreHandlerAndReraiseSignalOnReturn(siginfo, old_action); } base::mac::ScopedMachReceiveRight exception_port_; ExceptionPorts::ExceptionHandlerVector original_handlers_; struct sigaction old_action_ = {}; internal::InProcessHandler in_process_handler_; - internal::IOSSystemDataCollector system_data_; + static CrashHandler* instance_; + bool mach_handler_running_ = false; InitializationStateDcheck initialized_; }; +CrashHandler* CrashHandler::instance_ = nullptr; + } // namespace CrashpadClient::CrashpadClient() {} @@ -364,4 +454,22 @@ void CrashpadClient::DumpWithoutCrashAndDeferProcessingAtPath( crash_handler->DumpWithoutCrashAtPath(context, path); } +void CrashpadClient::ResetForTesting() { + CrashHandler* crash_handler = CrashHandler::Get(); + DCHECK(crash_handler); + crash_handler->ResetForTesting(); +} + +void CrashpadClient::SetMachExceptionCallbackForTesting(void (*callback)()) { + CrashHandler* crash_handler = CrashHandler::Get(); + DCHECK(crash_handler); + crash_handler->SetMachExceptionCallbackForTesting(callback); +} + +uint64_t CrashpadClient::GetThreadIdForTesting() { + CrashHandler* crash_handler = CrashHandler::Get(); + DCHECK(crash_handler); + return crash_handler->GetThreadIdForTesting(); +} + } // namespace crashpad diff --git a/external_imported/sentry-native/external/crashpad/client/crashpad_client_ios_test.mm b/external_imported/sentry-native/external/crashpad/client/crashpad_client_ios_test.mm index 3c350e9fd..596f4b848 100644 --- a/external_imported/sentry-native/external/crashpad/client/crashpad_client_ios_test.mm +++ b/external_imported/sentry-native/external/crashpad/client/crashpad_client_ios_test.mm @@ -25,50 +25,67 @@ #include "gtest/gtest.h" #include "test/scoped_temp_dir.h" #include "testing/platform_test.h" +#include "util/thread/thread.h" namespace crashpad { namespace test { namespace { -using CrashpadIOSClient = PlatformTest; +class CrashpadIOSClient : public PlatformTest { + protected: + // testing::Test: -TEST_F(CrashpadIOSClient, DumpWithoutCrash) { - CrashpadClient client; + void SetUp() override { + ASSERT_TRUE(client_.StartCrashpadInProcessHandler( + base::FilePath(database_dir.path()), "", {})); + database_ = CrashReportDatabase::Initialize(database_dir.path()); + } + + void TearDown() override { client_.ResetForTesting(); } + + auto& Client() { return client_; } + auto& Database() { return database_; } + + private: + std::unique_ptr database_; + CrashpadClient client_; ScopedTempDir database_dir; - ASSERT_TRUE(client.StartCrashpadInProcessHandler( - base::FilePath(database_dir.path()), "", {})); - std::unique_ptr database = - CrashReportDatabase::Initialize(database_dir.path()); +}; + +TEST_F(CrashpadIOSClient, DumpWithoutCrash) { std::vector reports; - EXPECT_EQ(database->GetPendingReports(&reports), + EXPECT_EQ(Database()->GetPendingReports(&reports), CrashReportDatabase::kNoError); ASSERT_EQ(reports.size(), 0u); CRASHPAD_SIMULATE_CRASH(); - reports.clear(); - EXPECT_EQ(database->GetPendingReports(&reports), + + EXPECT_EQ(Database()->GetPendingReports(&reports), CrashReportDatabase::kNoError); ASSERT_EQ(reports.size(), 1u); +} +TEST_F(CrashpadIOSClient, DumpWithoutCrashAndDefer) { + std::vector reports; CRASHPAD_SIMULATE_CRASH_AND_DEFER_PROCESSING(); - reports.clear(); - EXPECT_EQ(database->GetPendingReports(&reports), + EXPECT_EQ(Database()->GetPendingReports(&reports), CrashReportDatabase::kNoError); - ASSERT_EQ(reports.size(), 1u); - client.ProcessIntermediateDumps(); - reports.clear(); - EXPECT_EQ(database->GetPendingReports(&reports), + ASSERT_EQ(reports.size(), 0u); + Client().ProcessIntermediateDumps(); + EXPECT_EQ(Database()->GetPendingReports(&reports), CrashReportDatabase::kNoError); - ASSERT_EQ(reports.size(), 2u); + ASSERT_EQ(reports.size(), 1u); +} +TEST_F(CrashpadIOSClient, DumpWithoutCrashAndDeferAtPath) { + std::vector reports; ScopedTempDir crash_dir; UUID uuid; uuid.InitializeWithNew(); CRASHPAD_SIMULATE_CRASH_AND_DEFER_PROCESSING_AT_PATH( crash_dir.path().Append(uuid.ToString())); - reports.clear(); - EXPECT_EQ(database->GetPendingReports(&reports), + EXPECT_EQ(Database()->GetPendingReports(&reports), CrashReportDatabase::kNoError); - ASSERT_EQ(reports.size(), 2u); + ASSERT_EQ(reports.size(), 0u); NSError* error = nil; NSArray* paths = [[NSFileManager defaultManager] @@ -76,12 +93,43 @@ crash_dir.path().value()) error:&error]; ASSERT_EQ([paths count], 1u); - client.ProcessIntermediateDump( + Client().ProcessIntermediateDump( crash_dir.path().Append([paths[0] fileSystemRepresentation])); reports.clear(); - EXPECT_EQ(database->GetPendingReports(&reports), + EXPECT_EQ(Database()->GetPendingReports(&reports), CrashReportDatabase::kNoError); - ASSERT_EQ(reports.size(), 3u); + ASSERT_EQ(reports.size(), 1u); +} + +class RaceThread : public Thread { + public: + explicit RaceThread() : Thread() {} + + private: + void ThreadMain() override { + for (int i = 0; i < 10; ++i) { + CRASHPAD_SIMULATE_CRASH(); + } + } +}; + +TEST_F(CrashpadIOSClient, MultipleThreadsSimulateCrash) { + RaceThread race_threads[2]; + for (RaceThread& race_thread : race_threads) { + race_thread.Start(); + } + + for (int i = 0; i < 10; ++i) { + CRASHPAD_SIMULATE_CRASH(); + } + for (RaceThread& race_thread : race_threads) { + race_thread.Join(); + } + + std::vector reports; + ASSERT_EQ(Database()->GetPendingReports(&reports), + CrashReportDatabase::kNoError); + EXPECT_EQ(reports.size(), 30u); } // This test is covered by a similar XCUITest, but for development purposes it's @@ -89,10 +137,6 @@ // to correctly run this in Google Test. Leave the test here, disabled, for use // during development only. TEST_F(CrashpadIOSClient, DISABLED_ThrowNSException) { - CrashpadClient client; - ScopedTempDir database_dir; - ASSERT_TRUE(client.StartCrashpadInProcessHandler( - base::FilePath(database_dir.path()), "", {})); [NSException raise:@"GoogleTestNSException" format:@"ThrowException"]; } @@ -101,10 +145,6 @@ // to correctly run this in Google Test. Leave the test here, disabled, for use // during development only. TEST_F(CrashpadIOSClient, DISABLED_ThrowException) { - CrashpadClient client; - ScopedTempDir database_dir; - ASSERT_TRUE(client.StartCrashpadInProcessHandler( - base::FilePath(database_dir.path()), "", {})); std::vector empty_vector; empty_vector.at(42); } diff --git a/external_imported/sentry-native/external/crashpad/client/crashpad_client_linux.cc b/external_imported/sentry-native/external/crashpad/client/crashpad_client_linux.cc index 641cf2174..5bb27c2ea 100644 --- a/external_imported/sentry-native/external/crashpad/client/crashpad_client_linux.cc +++ b/external_imported/sentry-native/external/crashpad/client/crashpad_client_linux.cc @@ -16,6 +16,8 @@ #include #include +#include +#include #include #include #include @@ -26,8 +28,11 @@ #include #include +#include + #include "base/logging.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "client/client_argv_handling.h" #include "third_party/lss/lss.h" @@ -56,7 +61,7 @@ std::string FormatArgumentAddress(const std::string& name, const void* addr) { return base::StringPrintf("--%s=%p", name.c_str(), addr); } -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) std::vector BuildAppProcessArgs( const std::string& class_name, @@ -124,7 +129,7 @@ std::vector BuildArgsToLaunchWithLinker( return argv; } -#endif // OS_ANDROID +#endif // BUILDFLAG(IS_ANDROID) // A base class for Crashpad signal handler implementations. class SignalHandler { @@ -136,10 +141,14 @@ class SignalHandler { // handler has been installed. static SignalHandler* Get() { return handler_; } - // Disables any installed Crashpad signal handler for the calling thread. If a - // crash signal is received, any previously installed (non-Crashpad) signal - // handler will be restored and the signal reraised. - static void DisableForThread() { disabled_for_thread_ = true; } + // Disables any installed Crashpad signal handler. If a crash signal is + // received, any previously installed (non-Crashpad) signal handler will be + // restored and the signal reraised. + static void Disable() { + if (!handler_->disabled_.test_and_set()) { + handler_->WakeThreads(); + } + } void SetFirstChanceHandler(CrashpadClient::FirstChanceHandlerLinux handler) { first_chance_handler_ = handler; @@ -147,17 +156,7 @@ class SignalHandler { // The base implementation for all signal handlers, suitable for calling // directly to simulate signal delivery. - bool HandleCrash(int signo, siginfo_t* siginfo, void* context) { - if (disabled_for_thread_) { - return false; - } - - if (first_chance_handler_ && - first_chance_handler_( - signo, siginfo, static_cast(context))) { - return true; - } - + void HandleCrash(int signo, siginfo_t* siginfo, void* context) { exception_information_.siginfo_address = FromPointerCast( siginfo); @@ -168,7 +167,6 @@ class SignalHandler { ScopedPrSetDumpable set_dumpable(false); HandleCrashImpl(); - return false; } protected: @@ -193,27 +191,73 @@ class SignalHandler { virtual void HandleCrashImpl() = 0; private: + static constexpr int32_t kDumpNotDone = 0; + static constexpr int32_t kDumpDone = 1; + // The signal handler installed at OS-level. static void HandleOrReraiseSignal(int signo, siginfo_t* siginfo, void* context) { - if (handler_->HandleCrash(signo, siginfo, context)) { + if (handler_->first_chance_handler_ && + handler_->first_chance_handler_( + signo, siginfo, static_cast(context))) { return; } + + // Only handle the first fatal signal observed. If another thread receives a + // crash signal, it waits for the first dump to complete instead of + // requesting another. + if (!handler_->disabled_.test_and_set()) { + handler_->HandleCrash(signo, siginfo, context); + handler_->WakeThreads(); + } else { + // Processes on Android normally have several chained signal handlers that + // co-operate to report crashes. e.g. WebView will have this signal + // handler installed, the app embedding WebView may have a signal handler + // installed, and Bionic will have a signal handler. Each signal handler + // runs in succession, possibly managed by libsigchain. This wait is + // intended to avoid ill-effects from multiple signal handlers from + // different layers (possibly all trying to use ptrace()) from running + // simultaneously. It does not block forever so that in most conditions, + // those signal handlers will still have a chance to run and ensures + // process termination in case the first crashing thread crashes again in + // its signal handler. Though less typical, this situation also occurs on + // other Linuxes, e.g. to produce in-process stack traces for debug + // builds. + handler_->WaitForDumpDone(); + } + Signals::RestoreHandlerAndReraiseSignalOnReturn( siginfo, handler_->old_actions_.ActionForSignal(signo)); } + void WaitForDumpDone() { + kernel_timespec timeout; + timeout.tv_sec = 5; + timeout.tv_nsec = 0; + sys_futex(&dump_done_futex_, + FUTEX_WAIT_PRIVATE, + kDumpNotDone, + &timeout, + nullptr, + 0); + } + + void WakeThreads() { + dump_done_futex_ = kDumpDone; + sys_futex( + &dump_done_futex_, FUTEX_WAKE_PRIVATE, INT_MAX, nullptr, nullptr, 0); + } + Signals::OldActions old_actions_ = {}; ExceptionInformation exception_information_ = {}; CrashpadClient::FirstChanceHandlerLinux first_chance_handler_ = nullptr; + int32_t dump_done_futex_ = kDumpNotDone; + std::atomic_flag disabled_ = ATOMIC_FLAG_INIT; static SignalHandler* handler_; - - static thread_local bool disabled_for_thread_; }; SignalHandler* SignalHandler::handler_ = nullptr; -thread_local bool SignalHandler::disabled_for_thread_ = false; // Launches a single use handler to snapshot this process. class LaunchAtCrashHandler : public SignalHandler { @@ -307,17 +351,11 @@ class RequestCrashDumpHandler : public SignalHandler { } pid = creds.pid; } - if (pid > 0 && prctl(PR_SET_PTRACER, pid, 0, 0, 0) != 0) { - PLOG(WARNING) << "prctl"; - // TODO(jperaza): If this call to set the ptracer failed, it might be - // possible to try again just before a dump request, in case the - // environment has changed. Revisit ExceptionHandlerClient::SetPtracer() - // and consider saving the result of this call in ExceptionHandlerClient - // or as a member in this signal handler. ExceptionHandlerClient hasn't - // been responsible for maintaining state and a new ExceptionHandlerClient - // has been constructed as a local whenever a client needs to communicate - // with the handler. ExceptionHandlerClient lifetimes and ownership will - // need to be reconsidered if it becomes responsible for state. + if (pid > 0) { + pthread_atfork(nullptr, nullptr, SetPtracerAtFork); + if (prctl(PR_SET_PTRACER, pid, 0, 0, 0) != 0) { + PLOG(WARNING) << "prctl"; + } } sock_to_handler_.reset(sock.release()); handler_pid_ = pid; @@ -338,6 +376,13 @@ class RequestCrashDumpHandler : public SignalHandler { } void HandleCrashImpl() override { + // Attempt to set the ptracer again, in case a crash occurs after a fork, + // before SetPtracerAtFork() has been called. Ignore errors because the + // system call may be disallowed if the sandbox is engaged. + if (handler_pid_ > 0) { + sys_prctl(PR_SET_PTRACER, handler_pid_, 0, 0, 0); + } + ExceptionHandlerProtocol::ClientInformation info = {}; info.exception_information_address = FromPointerCast(&GetExceptionInfo()); @@ -360,6 +405,14 @@ class RequestCrashDumpHandler : public SignalHandler { ~RequestCrashDumpHandler() = delete; + static void SetPtracerAtFork() { + auto handler = RequestCrashDumpHandler::Get(); + if (handler->handler_pid_ > 0 && + prctl(PR_SET_PTRACER, handler->handler_pid_, 0, 0, 0) != 0) { + PLOG(WARNING) << "prctl"; + } + } + ScopedFileHandle sock_to_handler_; pid_t handler_pid_ = -1; @@ -415,7 +468,7 @@ bool CrashpadClient::StartHandler( std::move(client_sock), handler_pid, &unhandled_signals_); } -#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) // static bool CrashpadClient::GetHandlerSocket(int* sock, pid_t* pid) { auto signal_handler = RequestCrashDumpHandler::Get(); @@ -519,9 +572,10 @@ bool CrashpadClient::InitializeSignalStackForThread() { } return true; } -#endif // OS_ANDROID || OS_LINUX || OS_CHROMEOS +#endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) bool CrashpadClient::StartJavaHandlerAtCrash( const std::string& class_name, @@ -666,7 +720,7 @@ void CrashpadClient::DumpWithoutCrash(NativeCPUContext* context) { // static void CrashpadClient::CrashWithoutDump(const std::string& message) { - SignalHandler::DisableForThread(); + SignalHandler::Disable(); LOG(FATAL) << message; } diff --git a/external_imported/sentry-native/external/crashpad/client/crashpad_client_linux_test.cc b/external_imported/sentry-native/external/crashpad/client/crashpad_client_linux_test.cc index a3ddc31c8..4a2bb4189 100644 --- a/external_imported/sentry-native/external/crashpad/client/crashpad_client_linux_test.cc +++ b/external_imported/sentry-native/external/crashpad/client/crashpad_client_linux_test.cc @@ -15,6 +15,7 @@ #include "client/crashpad_client.h" #include +#include #include #include #include @@ -23,9 +24,11 @@ #include "base/check_op.h" #include "base/notreached.h" +#include "build/build_config.h" #include "client/annotation.h" #include "client/annotation_list.h" #include "client/crash_report_database.h" +#include "client/crashpad_info.h" #include "client/simulate_crash.h" #include "gtest/gtest.h" #include "snapshot/annotation_snapshot.h" @@ -49,7 +52,7 @@ #include "util/posix/signals.h" #include "util/thread/thread.h" -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) #include #include "dlfcn_internal.h" @@ -73,12 +76,13 @@ struct StartHandlerForSelfTestOptions { bool set_first_chance_handler; bool crash_non_main_thread; bool client_uses_signals; + bool gather_indirectly_referenced_memory; CrashType crash_type; }; class StartHandlerForSelfTest : public testing::TestWithParam< - std::tuple> { + std::tuple> { public: StartHandlerForSelfTest() = default; @@ -88,10 +92,14 @@ class StartHandlerForSelfTest ~StartHandlerForSelfTest() = default; void SetUp() override { + // MSAN requires that padding bytes have been initialized for structs that + // are written to files. + memset(&options_, 0, sizeof(options_)); std::tie(options_.start_handler_at_crash, options_.set_first_chance_handler, options_.crash_non_main_thread, options_.client_uses_signals, + options_.gather_indirectly_referenced_memory, options_.crash_type) = GetParam(); } @@ -101,10 +109,6 @@ class StartHandlerForSelfTest StartHandlerForSelfTestOptions options_; }; -bool HandleCrashSuccessfully(int, siginfo_t*, ucontext_t*) { - return true; -} - bool InstallHandler(CrashpadClient* client, bool start_at_crash, const base::FilePath& handler_path, @@ -134,7 +138,7 @@ constexpr char kTestAnnotationValue[] = "value_of_annotation"; constexpr char kTestAttachmentName[] = "test_attachment"; constexpr char kTestAttachmentContent[] = "attachment_content"; -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) constexpr char kTestAbortMessage[] = "test abort message"; #endif @@ -147,7 +151,8 @@ void ValidateAttachment(const CrashReportDatabase::UploadReport* report) { 0); } -void ValidateExtraMemory(const ProcessSnapshotMinidump& minidump) { +void ValidateExtraMemory(const StartHandlerForSelfTestOptions& options, + const ProcessSnapshotMinidump& minidump) { // Verify that if we have an exception, then the code around the instruction // pointer is included in the extra memory. const ExceptionSnapshot* exception = minidump.Exception(); @@ -164,14 +169,15 @@ void ValidateExtraMemory(const ProcessSnapshotMinidump& minidump) { break; } } - EXPECT_TRUE(pc_found); + EXPECT_EQ(pc_found, options.gather_indirectly_referenced_memory); } -void ValidateDump(const CrashReportDatabase::UploadReport* report) { +void ValidateDump(const StartHandlerForSelfTestOptions& options, + const CrashReportDatabase::UploadReport* report) { ProcessSnapshotMinidump minidump_snapshot; ASSERT_TRUE(minidump_snapshot.Initialize(report->Reader())); -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) // This part of the test requires Q. The API level on Q devices will be 28 // until the API is finalized, so we can't check API level yet. For now, test // for the presence of a libc symbol which was introduced in Q. @@ -184,7 +190,7 @@ void ValidateDump(const CrashReportDatabase::UploadReport* report) { #endif ValidateAttachment(report); - ValidateExtraMemory(minidump_snapshot); + ValidateExtraMemory(options, minidump_snapshot); for (const ModuleSnapshot* module : minidump_snapshot.Modules()) { for (const AnnotationSnapshot& annotation : module->AnnotationObjects()) { @@ -213,13 +219,24 @@ int RecurseInfinitely(int* ptr) { } #pragma clang diagnostic pop +sigjmp_buf do_crash_sigjmp_env; + +bool HandleCrashSuccessfully(int, siginfo_t*, ucontext_t*) { + siglongjmp(do_crash_sigjmp_env, 1); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunreachable-code-return" + return true; +#pragma clang diagnostic pop +} + void DoCrash(const StartHandlerForSelfTestOptions& options, CrashpadClient* client) { + if (sigsetjmp(do_crash_sigjmp_env, 1) != 0) { + return; + } + switch (options.crash_type) { case CrashType::kSimulated: - if (options.set_first_chance_handler) { - client->SetFirstChanceExceptionHandler(HandleCrashSuccessfully); - } CRASHPAD_SIMULATE_CRASH(); break; @@ -330,6 +347,11 @@ CRASHPAD_CHILD_TEST_MAIN(StartHandlerForSelfTestChild) { client_handler, SA_ONSTACK, &old_actions)); } + if (options.gather_indirectly_referenced_memory) { + CrashpadInfo::GetCrashpadInfo()->set_gather_indirectly_referenced_memory( + TriState::kEnabled, 1024 * 1024 * 4); + } + base::FilePath handler_path = TestPaths::Executable().DirName().Append( FILE_PATH_LITERAL("crashpad_handler")); @@ -350,7 +372,11 @@ CRASHPAD_CHILD_TEST_MAIN(StartHandlerForSelfTestChild) { return EXIT_FAILURE; } -#if defined(OS_ANDROID) + if (options.set_first_chance_handler) { + client.SetFirstChanceExceptionHandler(HandleCrashSuccessfully); + } + +#if BUILDFLAG(IS_ANDROID) if (android_set_abort_message) { android_set_abort_message(kTestAbortMessage); } @@ -372,17 +398,19 @@ class StartHandlerForSelfInChildTest : public MultiprocessExec { StartHandlerForSelfInChildTest(const StartHandlerForSelfTestOptions& options) : MultiprocessExec(), options_(options) { SetChildTestMainFunction("StartHandlerForSelfTestChild"); - switch (options.crash_type) { - case CrashType::kSimulated: - // kTerminationNormal, EXIT_SUCCESS - break; - case CrashType::kBuiltinTrap: - SetExpectedChildTerminationBuiltinTrap(); - break; - case CrashType::kInfiniteRecursion: - SetExpectedChildTermination(TerminationReason::kTerminationSignal, - SIGSEGV); - break; + if (!options.set_first_chance_handler) { + switch (options.crash_type) { + case CrashType::kSimulated: + // kTerminationNormal, EXIT_SUCCESS + break; + case CrashType::kBuiltinTrap: + SetExpectedChildTerminationBuiltinTrap(); + break; + case CrashType::kInfiniteRecursion: + SetExpectedChildTermination(TerminationReason::kTerminationSignal, + SIGSEGV); + break; + } } } @@ -433,27 +461,25 @@ class StartHandlerForSelfInChildTest : public MultiprocessExec { reports.clear(); ASSERT_EQ(database->GetPendingReports(&reports), CrashReportDatabase::kNoError); - ASSERT_EQ(reports.size(), options_.set_first_chance_handler ? 0u : 1u); - if (options_.set_first_chance_handler) { + bool report_expected = !options_.set_first_chance_handler || + options_.crash_type == CrashType::kSimulated; + ASSERT_EQ(reports.size(), report_expected ? 1u : 0u); + + if (!report_expected) { return; } std::unique_ptr report; ASSERT_EQ(database->GetReportForUploading(reports[0].uuid, &report), CrashReportDatabase::kNoError); - ValidateDump(report.get()); + ValidateDump(options_, report.get()); } StartHandlerForSelfTestOptions options_; }; TEST_P(StartHandlerForSelfTest, StartHandlerInChild) { - if (Options().set_first_chance_handler && - Options().crash_type != CrashType::kSimulated) { - // TODO(jperaza): test first chance handlers with real crashes. - return; - } #if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER) || \ defined(UNDEFINED_SANITIZER) if (Options().crash_type == CrashType::kInfiniteRecursion) { @@ -471,6 +497,7 @@ INSTANTIATE_TEST_SUITE_P( testing::Bool(), testing::Bool(), testing::Bool(), + testing::Bool(), testing::Values(CrashType::kSimulated, CrashType::kBuiltinTrap, CrashType::kInfiniteRecursion))); diff --git a/external_imported/sentry-native/external/crashpad/client/crashpad_client_mac.cc b/external_imported/sentry-native/external/crashpad/client/crashpad_client_mac.cc index 44e3be559..0d174f5d2 100644 --- a/external_imported/sentry-native/external/crashpad/client/crashpad_client_mac.cc +++ b/external_imported/sentry-native/external/crashpad/client/crashpad_client_mac.cc @@ -21,9 +21,9 @@ #include #include +#include #include -#include "base/ignore_result.h" #include "base/logging.h" #include "base/mac/mach_logging.h" #include "base/strings/stringprintf.h" @@ -180,7 +180,7 @@ class HandlerStarter final : public NotifyServer::DefaultInterface { handler_restarter->StartRestartThread( handler, database, metrics_dir, url, annotations, arguments, attachments)) { // The thread owns the object now. - ignore_result(handler_restarter.release()); + std::ignore = handler_restarter.release(); } // If StartRestartThread() failed, proceed without the ability to restart. @@ -372,7 +372,7 @@ class HandlerStarter final : public NotifyServer::DefaultInterface { return false; } - ignore_result(receive_right.release()); + std::ignore = receive_right.release(); return true; } diff --git a/external_imported/sentry-native/external/crashpad/client/crashpad_client_win.cc b/external_imported/sentry-native/external/crashpad/client/crashpad_client_win.cc index 57696054d..bdf15797c 100644 --- a/external_imported/sentry-native/external/crashpad/client/crashpad_client_win.cc +++ b/external_imported/sentry-native/external/crashpad/client/crashpad_client_win.cc @@ -36,6 +36,7 @@ #include "util/win/command_line.h" #include "util/win/context_wrappers.h" #include "util/win/critical_section_with_debug_info.h" +#include "util/win/exception_codes.h" #include "util/win/get_function.h" #include "util/win/handle.h" #include "util/win/initial_client_data.h" @@ -69,7 +70,18 @@ HANDLE g_non_crash_dump_done = INVALID_HANDLE_VALUE; CrashpadClient::FirstChanceHandlerWin first_chance_handler_ = nullptr; // Guards multiple simultaneous calls to DumpWithoutCrash(). This is leaked. -base::Lock* g_non_crash_dump_lock; +base::Lock* g_non_crash_dump_lock = nullptr; + +class CrashDumpAutoReleaser { + public: + ~CrashDumpAutoReleaser() { + if (g_non_crash_dump_lock) { + delete g_non_crash_dump_lock; + g_non_crash_dump_lock = nullptr; + } + } +}; +static CrashDumpAutoReleaser gAutoReleaser; // Where we store a pointer to the context information when taking a non-crash // dump. @@ -394,8 +406,7 @@ bool StartHandlerProcess( } for (const base::FilePath& attachment : data->attachments) { AppendCommandLineArgument( - FormatArgumentString("attachment", attachment.value()), - &command_line); + FormatArgumentString("attachment", attachment.value()), &command_line); } ScopedKernelHANDLE this_process( @@ -932,7 +943,7 @@ bool CrashpadClient::DumpAndCrashTargetProcess(HANDLE process, // ecx = kTriggeredExceptionCode for dwExceptionCode. data_to_write.push_back(0xb9); - AddUint32(&data_to_write, kTriggeredExceptionCode); + AddUint32(&data_to_write, ExceptionCodes::kTriggeredExceptionCode); // jmp to RaiseException() via rax. data_to_write.push_back(0x48); // mov rax, imm. diff --git a/external_imported/sentry-native/external/crashpad/client/crashpad_info.cc b/external_imported/sentry-native/external/crashpad/client/crashpad_info.cc index 929c0df11..8f13276fd 100644 --- a/external_imported/sentry-native/external/crashpad/client/crashpad_info.cc +++ b/external_imported/sentry-native/external/crashpad/client/crashpad_info.cc @@ -16,10 +16,11 @@ #include +#include "build/build_config.h" #include "util/misc/address_sanitizer.h" #include "util/misc/from_pointer_cast.h" -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) #include #endif @@ -52,10 +53,10 @@ static_assert(std::is_standard_layout::value, // because it’s POD, no code should need to run to initialize this under // release-mode optimization. -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) __attribute__(( -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) // Put the structure in a well-known section name where it can be easily // found without having to consult the symbol table. section(SEG_DATA ",crashpad_info"), @@ -77,16 +78,16 @@ __attribute__(( // The “used” attribute prevents the structure from being dead-stripped. used)) -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) // Put the struct in a section name CPADinfo where it can be found without the // symbol table. #pragma section("CPADinfo", read, write) __declspec(allocate("CPADinfo")) -#else // !defined(OS_POSIX) && !defined(OS_WIN) +#else // !BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_WIN) #error Port -#endif // !defined(OS_POSIX) && !defined(OS_WIN) +#endif // !BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_WIN) CrashpadInfo g_crashpad_info; @@ -94,8 +95,8 @@ extern "C" int* CRASHPAD_NOTE_REFERENCE; // static CrashpadInfo* CrashpadInfo::GetCrashpadInfo() { -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ - defined(OS_FUCHSIA) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ + BUILDFLAG(IS_FUCHSIA) // This otherwise-unused reference is used so that any module that // references GetCrashpadInfo() will also include the note in the // .note.crashpad.info section. That note in turn contains the address of diff --git a/external_imported/sentry-native/external/crashpad/client/crashpad_info.h b/external_imported/sentry-native/external/crashpad/client/crashpad_info.h index cc05398e3..6c7ce3277 100644 --- a/external_imported/sentry-native/external/crashpad/client/crashpad_info.h +++ b/external_imported/sentry-native/external/crashpad/client/crashpad_info.h @@ -23,15 +23,15 @@ #include "client/simple_string_dictionary.h" #include "util/misc/tri_state.h" -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) #include -#endif // OS_WIN +#endif // BUILDFLAG(IS_WIN) namespace crashpad { namespace internal { -#if defined(OS_IOS) +#if BUILDFLAG(IS_IOS) class InProcessIntermediateDumpHandler; #endif @@ -230,7 +230,7 @@ struct CrashpadInfo { }; protected: -#if defined(OS_IOS) +#if BUILDFLAG(IS_IOS) friend class internal::InProcessIntermediateDumpHandler; #endif diff --git a/external_imported/sentry-native/external/crashpad/client/crashpad_info_note.S b/external_imported/sentry-native/external/crashpad/client/crashpad_info_note.S index ef3d68ccb..80de22d60 100644 --- a/external_imported/sentry-native/external/crashpad/client/crashpad_info_note.S +++ b/external_imported/sentry-native/external/crashpad/client/crashpad_info_note.S @@ -17,7 +17,7 @@ // that symbol to be in the dynamic symbol table. #include "util/misc/elf_note_types.h" -#include "util/misc/arm64_bti_note.S" +#include "util/misc/arm64_pac_bti.S" // namespace crashpad { // CrashpadInfo g_crashpad_info; diff --git a/external_imported/sentry-native/external/crashpad/client/ios_handler/exception_processor.h b/external_imported/sentry-native/external/crashpad/client/ios_handler/exception_processor.h index 7318e2144..233f7e45a 100644 --- a/external_imported/sentry-native/external/crashpad/client/ios_handler/exception_processor.h +++ b/external_imported/sentry-native/external/crashpad/client/ios_handler/exception_processor.h @@ -15,8 +15,7 @@ #ifndef CRASHPAD_UTIL_IOS_EXCEPTION_PROCESSOR_H_ #define CRASHPAD_UTIL_IOS_EXCEPTION_PROCESSOR_H_ -#include - +#include "base/files/file_path.h" #include "util/misc/capture_context.h" namespace crashpad { @@ -40,6 +39,28 @@ class ObjcExceptionDelegate { virtual void HandleUncaughtNSException(const uint64_t* frames, const size_t num_frames) = 0; + //! \brief Generate an intermediate dump from an NSException caught with its + //! associated CPU context. Because the method for intercepting + //! exceptions is imperfect, write the the intermediate dump to a + //! temporary location specified by \a path. If the NSException matches + //! the one used in the UncaughtExceptionHandler, call + //! MoveIntermediateDumpAtPathToPending to move to the proper Crashpad + //! database pending location. + //! + //! \param[in] context The cpu context of the thread throwing an exception. + //! \param[in] path Path to write the intermediate dump. + virtual void HandleUncaughtNSExceptionWithContextAtPath( + NativeCPUContext* context, + const base::FilePath& path) = 0; + + //! \brief Moves an intermediate dump to the pending directory. This is meant + //! to be used by the UncaughtExceptionHandler, when the NSException + //! caught by the preprocessor matches the UncaughtExceptionHandler. + //! + //! \param[in] path Path to the specific intermediate dump. + virtual bool MoveIntermediateDumpAtPathToPending( + const base::FilePath& path) = 0; + protected: ~ObjcExceptionDelegate() {} }; @@ -59,6 +80,10 @@ class ObjcExceptionDelegate { //! signal handler. It should only be installed once. void InstallObjcExceptionPreprocessor(ObjcExceptionDelegate* delegate); +//! \brief Uninstalls the Objective-C exception preprocessor. Expected to be +//! used by tests only. +void UninstallObjcExceptionPreprocessor(); + } // namespace crashpad #endif // CRASHPAD_UTIL_IOS_EXCEPTION_PROCESSOR_H_ diff --git a/external_imported/sentry-native/external/crashpad/client/ios_handler/exception_processor.mm b/external_imported/sentry-native/external/crashpad/client/ios_handler/exception_processor.mm index 33981326f..3211228c2 100644 --- a/external_imported/sentry-native/external/crashpad/client/ios_handler/exception_processor.mm +++ b/external_imported/sentry-native/external/crashpad/client/ios_handler/exception_processor.mm @@ -53,6 +53,8 @@ #include "client/annotation.h" #include "client/simulate_crash_ios.h" +namespace crashpad { + namespace { // From 10.15.0 objc4-779.1/runtime/objc-exception.mm. @@ -132,16 +134,12 @@ int LoggingUnwStep(unw_cursor_t* cursor) { return FormatStackTrace(addresses, 1024); } -crashpad::ObjcExceptionDelegate* g_exception_delegate; -objc_exception_preprocessor g_next_preprocessor; -NSUncaughtExceptionHandler* g_next_uncaught_exception_handler; - static void SetNSExceptionAnnotations(NSException* exception, std::string& name, std::string& reason) { @try { name = base::SysNSStringToUTF8(exception.name); - static crashpad::StringAnnotation<256> nameKey("exceptionName"); + static StringAnnotation<256> nameKey("exceptionName"); nameKey.Set(name); } @catch (id name_exception) { LOG(ERROR) << "Unable to read uncaught Objective-C exception name."; @@ -149,7 +147,7 @@ static void SetNSExceptionAnnotations(NSException* exception, @try { reason = base::SysNSStringToUTF8(exception.reason); - static crashpad::StringAnnotation<512> reasonKey("exceptionReason"); + static StringAnnotation<512> reasonKey("exceptionReason"); reasonKey.Set(reason); } @catch (id reason_exception) { LOG(ERROR) << "Unable to read uncaught Objective-C exception reason."; @@ -157,7 +155,7 @@ static void SetNSExceptionAnnotations(NSException* exception, @try { if (exception.userInfo) { - static crashpad::StringAnnotation<512> userInfoKey("exceptionUserInfo"); + static StringAnnotation<512> userInfoKey("exceptionUserInfo"); userInfoKey.Set(base::SysNSStringToUTF8( [NSString stringWithFormat:@"%@", exception.userInfo])); } @@ -166,26 +164,125 @@ static void SetNSExceptionAnnotations(NSException* exception, } } -static void ObjcUncaughtExceptionHandler(NSException* exception) { - std::string name, reason; - SetNSExceptionAnnotations(exception, name, reason); - NSArray* addressArray = [exception callStackReturnAddresses]; - if ([addressArray count] > 0) { - static crashpad::StringAnnotation<256> nameKey("UncaughtNSException"); - nameKey.Set("true"); - std::vector addresses; - for (NSNumber* address in addressArray) - addresses.push_back([address unsignedLongLongValue]); - g_exception_delegate->HandleUncaughtNSException(&addresses[0], - addresses.size()); - } else { - LOG(WARNING) << "Uncaught Objective-C exception name: " << name - << " reason: " << reason << " with no " - << " -callStackReturnAddresses."; - crashpad::NativeCPUContext cpu_context; - crashpad::CaptureContext(&cpu_context); - g_exception_delegate->HandleUncaughtNSExceptionWithContext(&cpu_context); +//! \brief Helper class to own the complex types used by the Objective-C +//! exception preprocessor. +class ExceptionPreprocessorState { + public: + ExceptionPreprocessorState(const ExceptionPreprocessorState&) = delete; + ExceptionPreprocessorState& operator=(const ExceptionPreprocessorState&) = + delete; + + static ExceptionPreprocessorState* Get() { + static ExceptionPreprocessorState* instance = []() { + return new ExceptionPreprocessorState(); + }(); + return instance; + } + + // Writes an intermediate dumps to a temporary location to be used by the + // final UncaughtExceptionHandler and notifies the preprocessor chain. + id HandleUncaughtException(NativeCPUContext* cpu_context, id exception) { + // If this isn't the first time the preprocessor has detected an uncaught + // NSException, note this in the second intermediate dump. + objc_exception_preprocessor next_preprocessor = next_preprocessor_; + static bool handled_first_exception; + if (handled_first_exception) { + static StringAnnotation<5> name_key("MultipleHandledUncaughtNSException"); + name_key.Set("true"); + + // Unregister so we stop getting in the way of the exception processor if + // we aren't correctly identifying sinkholes. The final uncaught exception + // handler is still active. + objc_setExceptionPreprocessor(next_preprocessor_); + next_preprocessor_ = nullptr; + } + handled_first_exception = true; + + // Use tmp/ for this intermediate dump path. Normally these dumps are + // written to the "pending-serialized-ios-dump" folder and are eligable for + // the next pass to convert pending intermediate dumps to minidump files. + // Since this intermediate dump isn't eligable until the uncaught handler, + // use tmp/. + base::FilePath path(base::SysNSStringToUTF8([NSTemporaryDirectory() + stringByAppendingPathComponent:[[NSUUID UUID] UUIDString]])); + exception_delegate_->HandleUncaughtNSExceptionWithContextAtPath(cpu_context, + path); + last_handled_intermediate_dump_ = path; + + return next_preprocessor ? next_preprocessor(exception) : exception; + } + + // If the PreprocessException already captured this exception via + // HANDLE_UNCAUGHT_NSEXCEPTION. Move last_handled_intermediate_dump_ to + // the pending intermediate dump directory and return true. Otherwise the + // preprocessor didn't catch anything, so pass the frames or just the context + // to the exception_delegate. + void FinalizeUncaughtNSException(id exception) { + if ([last_exception_ isEqual:exception] && + !last_handled_intermediate_dump_.empty() && + exception_delegate_->MoveIntermediateDumpAtPathToPending( + last_handled_intermediate_dump_)) { + last_handled_intermediate_dump_ = base::FilePath(); + return; + } + + std::string name, reason; + SetNSExceptionAnnotations(exception, name, reason); + NSArray* address_array = [exception callStackReturnAddresses]; + + if ([address_array count] > 0) { + static StringAnnotation<256> name_key("UncaughtNSException"); + name_key.Set("true"); + std::vector addresses; + for (NSNumber* address in address_array) + addresses.push_back([address unsignedLongLongValue]); + exception_delegate_->HandleUncaughtNSException(&addresses[0], + addresses.size()); + } else { + LOG(WARNING) << "Uncaught Objective-C exception name: " << name + << " reason: " << reason << " with no " + << " -callStackReturnAddresses."; + NativeCPUContext cpu_context; + CaptureContext(&cpu_context); + exception_delegate_->HandleUncaughtNSExceptionWithContext(&cpu_context); + } } + + id MaybeCallNextPreprocessor(id exception) { + return next_preprocessor_ ? next_preprocessor_(exception) : exception; + } + + // Register the objc_setExceptionPreprocessor and NSUncaughtExceptionHandler. + void Install(ObjcExceptionDelegate* delegate); + + // Restore the objc_setExceptionPreprocessor and NSUncaughtExceptionHandler. + void Uninstall(); + + NSException* last_exception() { return last_exception_; } + void set_last_exception(NSException* exception) { + [last_exception_ release]; + last_exception_ = [exception retain]; + } + + private: + ExceptionPreprocessorState() = default; + ~ExceptionPreprocessorState() = default; + + // Location of the intermediate dump generated after an exception triggered + // HANDLE_UNCAUGHT_NSEXCEPTION. + base::FilePath last_handled_intermediate_dump_; + + // Recorded last NSException in case the exception is caught and thrown again + // (without using objc_exception_rethrow.) + NSException* last_exception_ = nil; + + ObjcExceptionDelegate* exception_delegate_ = nullptr; + objc_exception_preprocessor next_preprocessor_ = nullptr; + NSUncaughtExceptionHandler* next_uncaught_exception_handler_ = nullptr; +}; + +static void ObjcUncaughtExceptionHandler(NSException* exception) { + ExceptionPreprocessorState::Get()->FinalizeUncaughtNSException(exception); } // This function is used to make it clear to the crash processor that an @@ -197,15 +294,12 @@ static __attribute__((noinline)) id HANDLE_UNCAUGHT_NSEXCEPTION( SetNSExceptionAnnotations(exception, name, reason); LOG(WARNING) << "Handling Objective-C exception name: " << name << " reason: " << reason << " with sinkhole: " << sinkhole; - crashpad::NativeCPUContext cpu_context; - crashpad::CaptureContext(&cpu_context); - g_exception_delegate->HandleUncaughtNSExceptionWithContext(&cpu_context); - - // Remove the uncaught exception handler so we don't record this twice. - NSSetUncaughtExceptionHandler(g_next_uncaught_exception_handler); - g_next_uncaught_exception_handler = nullptr; + NativeCPUContext cpu_context; + CaptureContext(&cpu_context); - return g_next_preprocessor ? g_next_preprocessor(exception) : exception; + ExceptionPreprocessorState* preprocessor_state = + ExceptionPreprocessorState::Get(); + return preprocessor_state->HandleUncaughtException(&cpu_context, exception); } // Returns true if |path| equals |sinkhole| on device. Simulator paths prepend @@ -226,13 +320,23 @@ bool ModulePathMatchesSinkhole(const char* path, const char* sinkhole) { } id ObjcExceptionPreprocessor(id exception) { + // Some sinkholes don't use objc_exception_rethrow when they should, which + // would otherwise prevent the exception_preprocessor from getting called + // again. Because of this, track the most recently seen exception and + // ignore it. + ExceptionPreprocessorState* preprocessor_state = + ExceptionPreprocessorState::Get(); + if ([preprocessor_state->last_exception() isEqual:exception]) { + return preprocessor_state->MaybeCallNextPreprocessor(exception); + } + preprocessor_state->set_last_exception(exception); + static bool seen_first_exception; - static crashpad::StringAnnotation<256> firstexception("firstexception"); - static crashpad::StringAnnotation<256> lastexception("lastexception"); - static crashpad::StringAnnotation<1024> firstexception_bt( - "firstexception_bt"); - static crashpad::StringAnnotation<1024> lastexception_bt("lastexception_bt"); + static StringAnnotation<256> firstexception("firstexception"); + static StringAnnotation<256> lastexception("lastexception"); + static StringAnnotation<1024> firstexception_bt("firstexception_bt"); + static StringAnnotation<1024> lastexception_bt("lastexception_bt"); auto* key = seen_first_exception ? &lastexception : &firstexception; auto* bt_key = seen_first_exception ? &lastexception_bt : &firstexception_bt; NSString* value = [NSString @@ -470,36 +574,41 @@ id ObjcExceptionPreprocessor(id exception) { } // Forward to the next preprocessor. - return g_next_preprocessor ? g_next_preprocessor(exception) : exception; + return preprocessor_state->MaybeCallNextPreprocessor(exception); } -} // namespace - -namespace crashpad { - -void InstallObjcExceptionPreprocessor(ObjcExceptionDelegate* delegate) { - DCHECK(!g_next_preprocessor); +void ExceptionPreprocessorState::Install(ObjcExceptionDelegate* delegate) { + DCHECK(!next_preprocessor_); + exception_delegate_ = delegate; // Preprocessor. - g_next_preprocessor = + next_preprocessor_ = objc_setExceptionPreprocessor(&ObjcExceptionPreprocessor); // Uncaught processor. - g_exception_delegate = delegate; - g_next_uncaught_exception_handler = NSGetUncaughtExceptionHandler(); + next_uncaught_exception_handler_ = NSGetUncaughtExceptionHandler(); NSSetUncaughtExceptionHandler(&ObjcUncaughtExceptionHandler); } -void UninstallObjcExceptionPreprocessor() { - DCHECK(g_next_preprocessor); +void ExceptionPreprocessorState::Uninstall() { + DCHECK(next_preprocessor_); + objc_setExceptionPreprocessor(next_preprocessor_); + next_preprocessor_ = nullptr; + + NSSetUncaughtExceptionHandler(next_uncaught_exception_handler_); + next_uncaught_exception_handler_ = nullptr; + + exception_delegate_ = nullptr; +} - objc_setExceptionPreprocessor(g_next_preprocessor); - g_exception_delegate = nullptr; +} // namespace - NSSetUncaughtExceptionHandler(g_next_uncaught_exception_handler); - g_next_uncaught_exception_handler = nullptr; +void InstallObjcExceptionPreprocessor(ObjcExceptionDelegate* delegate) { + ExceptionPreprocessorState::Get()->Install(delegate); +} - g_next_preprocessor = nullptr; +void UninstallObjcExceptionPreprocessor() { + ExceptionPreprocessorState::Get()->Uninstall(); } } // namespace crashpad diff --git a/external_imported/sentry-native/external/crashpad/client/ios_handler/in_process_handler.cc b/external_imported/sentry-native/external/crashpad/client/ios_handler/in_process_handler.cc index 6058e3b3f..abde07f60 100644 --- a/external_imported/sentry-native/external/crashpad/client/ios_handler/in_process_handler.cc +++ b/external_imported/sentry-native/external/crashpad/client/ios_handler/in_process_handler.cc @@ -17,6 +17,9 @@ #include #include +#include + +#include "base/cxx17_backports.h" #include "base/logging.h" #include "client/ios_handler/in_process_intermediate_dump_handler.h" #include "client/prune_crash_reports.h" @@ -24,6 +27,7 @@ #include "minidump/minidump_file_writer.h" #include "util/file/directory_reader.h" #include "util/file/filesystem.h" +#include "util/ios/raw_logging.h" namespace { @@ -46,6 +50,10 @@ constexpr char kLockedExtension[] = ".locked"; // uuid in the intermediate dump file name. constexpr char kBundleSeperator[] = "@"; +// Zero-ed codes used by kMachExceptionFromNSException and +// kMachExceptionSimulated. +constexpr mach_exception_data_type_t kEmulatedMachExceptionCodes[2] = {}; + } // namespace namespace crashpad { @@ -54,17 +62,13 @@ namespace internal { InProcessHandler::InProcessHandler() = default; InProcessHandler::~InProcessHandler() { - if (upload_thread_started_ && upload_thread_) { - upload_thread_->Stop(); - } - prune_thread_->Stop(); + UpdatePruneAndUploadThreads(false); } bool InProcessHandler::Initialize( const base::FilePath& database, const std::string& url, - const std::map& annotations, - const IOSSystemDataCollector& system_data) { + const std::map& annotations) { INITIALIZATION_STATE_SET_INITIALIZING(initialized_); annotations_ = annotations; database_ = CrashReportDatabase::Initialize(database); @@ -72,7 +76,7 @@ bool InProcessHandler::Initialize( return false; } bundle_identifier_and_seperator_ = - system_data.BundleIdentifier() + kBundleSeperator; + system_data_.BundleIdentifier() + kBundleSeperator; if (!url.empty()) { // TODO(scottmg): options.rate_limit should be removed when we have a @@ -96,36 +100,51 @@ bool InProcessHandler::Initialize( if (!CreateDirectory(base_dir_)) return false; + bool is_app_extension = system_data_.IsExtension(); prune_thread_.reset(new PruneIntermediateDumpsAndCrashReportsThread( database_.get(), PruneCondition::GetDefault(), base_dir_, bundle_identifier_and_seperator_, - system_data.IsExtension())); - prune_thread_->Start(); + is_app_extension)); + if (is_app_extension || system_data_.IsApplicationActive()) + prune_thread_->Start(); + + if (!is_app_extension) { + system_data_.SetActiveApplicationCallback( + [this](bool active) { UpdatePruneAndUploadThreads(active); }); + } - if (!OpenNewFile()) + base::FilePath cached_writer_path = NewLockedFilePath(); + cached_writer_ = CreateWriterWithPath(cached_writer_path); + if (!cached_writer_.get()) return false; + // Cache the locked and unlocked path here so no allocations are needed during + // any exceptions. + cached_writer_path_ = cached_writer_path.value(); + cached_writer_unlocked_path_ = + cached_writer_path.RemoveFinalExtension().value(); INITIALIZATION_STATE_SET_VALID(initialized_); return true; } -void InProcessHandler::DumpExceptionFromSignal( - const IOSSystemDataCollector& system_data, - siginfo_t* siginfo, - ucontext_t* context) { +void InProcessHandler::DumpExceptionFromSignal(siginfo_t* siginfo, + ucontext_t* context) { INITIALIZATION_STATE_DCHECK_VALID(initialized_); - { - ScopedReport report(writer_.get(), system_data, annotations_); - InProcessIntermediateDumpHandler::WriteExceptionFromSignal( - writer_.get(), system_data, siginfo, context); + ScopedLockedWriter writer(GetCachedWriter(), + cached_writer_path_.c_str(), + cached_writer_unlocked_path_.c_str()); + if (!writer.GetWriter()) { + CRASHPAD_RAW_LOG("Cannot DumpExceptionFromSignal without writer"); + return; } - PostReportCleanup(); + ScopedReport report(writer.GetWriter(), system_data_, annotations_); + InProcessIntermediateDumpHandler::WriteExceptionFromSignal( + writer.GetWriter(), system_data_, siginfo, context); } void InProcessHandler::DumpExceptionFromMachException( - const IOSSystemDataCollector& system_data, exception_behavior_t behavior, thread_t thread, exception_type_t exception, @@ -135,35 +154,97 @@ void InProcessHandler::DumpExceptionFromMachException( ConstThreadState old_state, mach_msg_type_number_t old_state_count) { INITIALIZATION_STATE_DCHECK_VALID(initialized_); - { - ScopedReport report(writer_.get(), system_data, annotations_); - InProcessIntermediateDumpHandler::WriteExceptionFromMachException( - writer_.get(), - behavior, - thread, - exception, - code, - code_count, - flavor, - old_state, - old_state_count); + ScopedLockedWriter writer(GetCachedWriter(), + cached_writer_path_.c_str(), + cached_writer_unlocked_path_.c_str()); + if (!writer.GetWriter()) { + CRASHPAD_RAW_LOG("Cannot DumpExceptionFromMachException without writer"); + return; + } + + if (mach_exception_callback_for_testing_) { + mach_exception_callback_for_testing_(); } - PostReportCleanup(); + + ScopedReport report(writer.GetWriter(), system_data_, annotations_); + InProcessIntermediateDumpHandler::WriteExceptionFromMachException( + writer.GetWriter(), + behavior, + thread, + exception, + code, + code_count, + flavor, + old_state, + old_state_count); } -void InProcessHandler::DumpExceptionFromNSExceptionFrames( - const IOSSystemDataCollector& system_data, +void InProcessHandler::DumpExceptionFromNSExceptionWithFrames( const uint64_t* frames, const size_t num_frames) { - { - ScopedReport report( - writer_.get(), system_data, annotations_, frames, num_frames); - InProcessIntermediateDumpHandler::WriteExceptionFromNSException( - writer_.get()); + INITIALIZATION_STATE_DCHECK_VALID(initialized_); + ScopedLockedWriter writer(GetCachedWriter(), + cached_writer_path_.c_str(), + cached_writer_unlocked_path_.c_str()); + if (!writer.GetWriter()) { + CRASHPAD_RAW_LOG( + "Cannot DumpExceptionFromNSExceptionWithFrames without writer"); + return; } - PostReportCleanup(); + ScopedReport report( + writer.GetWriter(), system_data_, annotations_, frames, num_frames); + InProcessIntermediateDumpHandler::WriteExceptionFromNSException( + writer.GetWriter()); } +bool InProcessHandler::DumpExceptionFromSimulatedMachException( + const NativeCPUContext* context, + exception_type_t exception, + base::FilePath* path) { + base::FilePath locked_path = NewLockedFilePath(); + *path = locked_path.RemoveFinalExtension(); + return DumpExceptionFromSimulatedMachExceptionAtPath( + context, exception, locked_path); +} + +bool InProcessHandler::DumpExceptionFromSimulatedMachExceptionAtPath( + const NativeCPUContext* context, + exception_type_t exception, + const base::FilePath& path) { + // This does not use the cached writer. It's expected that simulated + // exceptions can be called multiple times and there is no expectation that + // the application is in an unsafe state, or will be terminated after this + // call. + std::unique_ptr unsafe_writer = + CreateWriterWithPath(path); + base::FilePath writer_path_unlocked = path.RemoveFinalExtension(); + ScopedLockedWriter writer(unsafe_writer.get(), + path.value().c_str(), + writer_path_unlocked.value().c_str()); + if (!writer.GetWriter()) { + CRASHPAD_RAW_LOG( + "Cannot DumpExceptionFromSimulatedMachExceptionAtPath without writer"); + return false; + } + ScopedReport report(writer.GetWriter(), system_data_, annotations_); + InProcessIntermediateDumpHandler::WriteExceptionFromMachException( + writer.GetWriter(), + MACH_EXCEPTION_CODES, + mach_thread_self(), + exception, + kEmulatedMachExceptionCodes, + std::size(kEmulatedMachExceptionCodes), + MACHINE_THREAD_STATE, + reinterpret_cast(context), + MACHINE_THREAD_STATE_COUNT); + return true; +} + +bool InProcessHandler::MoveIntermediateDumpAtPathToPending( + const base::FilePath& path) { + base::FilePath new_path_unlocked = NewLockedFilePath().RemoveFinalExtension(); + return MoveFileOrDirectory(path, new_path_unlocked); +} void InProcessHandler::ProcessIntermediateDumps( const std::map& annotations) { INITIALIZATION_STATE_DCHECK_VALID(initialized_); @@ -184,9 +265,29 @@ void InProcessHandler::ProcessIntermediateDump( } void InProcessHandler::StartProcessingPendingReports() { - if (!upload_thread_started_ && upload_thread_) { - upload_thread_->Start(); - upload_thread_started_ = true; + if (!upload_thread_) + return; + + upload_thread_enabled_ = true; + UpdatePruneAndUploadThreads(true); +} + +void InProcessHandler::UpdatePruneAndUploadThreads(bool active) { + base::AutoLock lock_owner(prune_and_upload_lock_); + // TODO(crbug.com/crashpad/400): Consider moving prune and upload thread to + // BackgroundTasks and/or NSURLSession. This might allow uploads to continue + // in the background. + if (active) { + if (!prune_thread_->is_running()) + prune_thread_->Start(); + if (upload_thread_enabled_ && !upload_thread_->is_running()) { + upload_thread_->Start(); + } + } else { + if (prune_thread_->is_running()) + prune_thread_->Stop(); + if (upload_thread_enabled_ && upload_thread_->is_running()) + upload_thread_->Stop(); } } @@ -243,6 +344,7 @@ std::vector InProcessHandler::PendingFiles() { // intermediate dumps into never getting processed. std::vector other_files; + base::FilePath cached_writer_path(cached_writer_path_); while ((result = reader.NextFile(&file)) == DirectoryReader::Result::kSuccess) { // Don't try to process files marked as 'locked' from a different bundle id. @@ -254,9 +356,9 @@ std::vector InProcessHandler::PendingFiles() { continue; } - // Never process the current file. + // Never process the current cached writer path. file = base_dir_.Append(file); - if (file == current_file_) + if (file == cached_writer_path) continue; // Otherwise, include any other unlocked, or locked files matching @@ -277,35 +379,51 @@ std::vector InProcessHandler::PendingFiles() { return files; } -InProcessHandler::ScopedAlternateWriter::ScopedAlternateWriter( - InProcessHandler* handler) - : handler_(handler) {} +IOSIntermediateDumpWriter* InProcessHandler::GetCachedWriter() { + static_assert( + std::atomic::is_always_lock_free, + "std::atomic_compare_exchange_strong uint64_t may not be signal-safe"); + uint64_t thread_self; + // This is only safe when passing pthread_self(), otherwise this can lock. + pthread_threadid_np(pthread_self(), &thread_self); + uint64_t expected = 0; + if (!std::atomic_compare_exchange_strong( + &exception_thread_id_, &expected, thread_self)) { + if (expected == thread_self) { + // Another exception came in from this thread, which means it's likely + // that our own handler crashed. We could open up a new intermediate dump + // and try to save this dump, but we could end up endlessly writing dumps. + // Instead, give up. + } else { + // Another thread is handling a crash. Sleep forever. + while (1) { + sleep(std::numeric_limits::max()); + } + } + return nullptr; + } -bool InProcessHandler::ScopedAlternateWriter::Open() { - UUID uuid; - uuid.InitializeWithNew(); - const std::string uuid_string = uuid.ToString(); - return OpenAtPath(handler_->base_dir_.Append(uuid_string)); + return cached_writer_.get(); } -bool InProcessHandler::ScopedAlternateWriter::OpenAtPath( - const base::FilePath& path) { - path_ = path; - handler_->SetOpenNewFileAfterReport(false); - original_writer_ = handler_->GetWriter(); - auto writer = std::make_unique(); - if (!writer->Open(path_)) { - DLOG(ERROR) << "Unable to open alternate intermediate dump file: " - << path_.value(); - return false; +std::unique_ptr +InProcessHandler::CreateWriterWithPath(const base::FilePath& writer_path) { + std::unique_ptr writer = + std::make_unique(); + if (!writer->Open(writer_path)) { + DLOG(ERROR) << "Unable to open intermediate dump file: " + << writer_path.value(); + return nullptr; } - handler_->SetWriter(std::move(writer)); - return true; + return writer; } -InProcessHandler::ScopedAlternateWriter::~ScopedAlternateWriter() { - handler_->SetWriter(std::move(original_writer_)); - handler_->SetOpenNewFileAfterReport(true); +const base::FilePath InProcessHandler::NewLockedFilePath() { + UUID uuid; + uuid.InitializeWithNew(); + const std::string file_string = + bundle_identifier_and_seperator_ + uuid.ToString() + kLockedExtension; + return base_dir_.Append(file_string); } InProcessHandler::ScopedReport::ScopedReport( @@ -318,6 +436,7 @@ InProcessHandler::ScopedReport::ScopedReport( frames_(frames), num_frames_(num_frames), rootMap_(writer) { + DCHECK(writer); InProcessIntermediateDumpHandler::WriteHeader(writer); InProcessIntermediateDumpHandler::WriteProcessInfo(writer, annotations); InProcessIntermediateDumpHandler::WriteSystemInfo(writer, system_data); @@ -331,34 +450,24 @@ InProcessHandler::ScopedReport::~ScopedReport() { InProcessIntermediateDumpHandler::WriteModuleInfo(writer_); } -bool InProcessHandler::OpenNewFile() { - if (!current_file_.empty()) { - // Remove .lock extension so this dump can be processed on next run by this - // client, or a client with a different bundle id that can access this dump. - base::FilePath new_path = current_file_.RemoveFinalExtension(); - MoveFileOrDirectory(current_file_, new_path); - } - UUID uuid; - uuid.InitializeWithNew(); - const std::string file_string = - bundle_identifier_and_seperator_ + uuid.ToString() + kLockedExtension; - current_file_ = base_dir_.Append(file_string); - writer_ = std::make_unique(); - if (!writer_->Open(current_file_)) { - DLOG(ERROR) << "Unable to open intermediate dump file: " - << current_file_.value(); - return false; - } - return true; -} - -void InProcessHandler::PostReportCleanup() { - if (writer_) { - writer_->Close(); - writer_.reset(); +InProcessHandler::ScopedLockedWriter::ScopedLockedWriter( + IOSIntermediateDumpWriter* writer, + const char* writer_path, + const char* writer_unlocked_path) + : writer_path_(writer_path), + writer_unlocked_path_(writer_unlocked_path), + writer_(writer) {} + +InProcessHandler::ScopedLockedWriter::~ScopedLockedWriter() { + if (!writer_) + return; + + writer_->Close(); + if (rename(writer_path_, writer_unlocked_path_) != 0) { + CRASHPAD_RAW_LOG("Could not remove locked extension."); + CRASHPAD_RAW_LOG(writer_path_); + CRASHPAD_RAW_LOG(writer_unlocked_path_); } - if (open_new_file_after_report_) - OpenNewFile(); } } // namespace internal diff --git a/external_imported/sentry-native/external/crashpad/client/ios_handler/in_process_handler.h b/external_imported/sentry-native/external/crashpad/client/ios_handler/in_process_handler.h index d94f19e7e..0e6b70b3c 100644 --- a/external_imported/sentry-native/external/crashpad/client/ios_handler/in_process_handler.h +++ b/external_imported/sentry-native/external/crashpad/client/ios_handler/in_process_handler.h @@ -12,18 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include #include +#include #include #include #include #include "base/files/file_path.h" +#include "base/synchronization/lock.h" #include "client/ios_handler/prune_intermediate_dumps_and_crash_reports_thread.h" #include "handler/crash_report_upload_thread.h" #include "snapshot/ios/process_snapshot_ios_intermediate_dump.h" #include "util/ios/ios_intermediate_dump_writer.h" #include "util/ios/ios_system_data_collector.h" +#include "util/misc/capture_context.h" #include "util/misc/initialization_state_dcheck.h" namespace crashpad { @@ -46,28 +50,28 @@ class InProcessHandler { //! \param[in] database The path to a Crashpad database. //! \param[in] url The URL of an upload server. //! \param[in] annotations Process annotations to set in each crash report. - //! \param[in] system_data An object containing various system data points. //! \return `true` if a handler to a pending intermediate dump could be //! opened. bool Initialize(const base::FilePath& database, const std::string& url, - const std::map& annotations, - const IOSSystemDataCollector& system_data); + const std::map& annotations); //! \brief Generate an intermediate dump from a signal handler exception. + //! Writes the dump with the cached writer does not allow concurrent + //! exceptions to be written. It is expected the system will terminate + //! the application after this call. //! - //! \param[in] system_data An object containing various system data points. //! \param[in] siginfo A pointer to a `siginfo_t` object received by a signal //! handler. //! \param[in] context A pointer to a `ucontext_t` object received by a //! signal. - void DumpExceptionFromSignal(const IOSSystemDataCollector& system_data, - siginfo_t* siginfo, - ucontext_t* context); + void DumpExceptionFromSignal(siginfo_t* siginfo, ucontext_t* context); - //! \brief Generate an intermediate dump from a mach exception. + //! \brief Generate an intermediate dump from a mach exception. Writes the + //! dump with the cached writer does not allow concurrent exceptions to be + //! written. It is expected the system will terminate the application + //! after this call. //! - //! \param[in] system_data An object containing various system data points. //! \param[in] behavior //! \param[in] thread //! \param[in] exception @@ -76,8 +80,7 @@ class InProcessHandler { //! \param[in,out] flavor //! \param[in] old_state //! \param[in] old_state_count - void DumpExceptionFromMachException(const IOSSystemDataCollector& system_data, - exception_behavior_t behavior, + void DumpExceptionFromMachException(exception_behavior_t behavior, thread_t thread, exception_type_t exception, const mach_exception_data_type_t* code, @@ -91,15 +94,48 @@ class InProcessHandler { //! When the ObjcExceptionPreprocessor does not detect an NSException as it is //! thrown, the last-chance uncaught exception handler passes a list of call //! stack frame addresses. Record them in the intermediate dump so a minidump - //! with a 'fake' call stack is generated. + //! with a 'fake' call stack is generated. Writes the dump with the cached + //! writer does not allow concurrent exceptions to be written. It is expected + //! the system will terminate the application after this call. + //! - //! \param[in] system_data An object containing various system data points. //! \param[in] frames An array of call stack frame addresses. //! \param[in] num_frames The number of frames in |frames|. - void DumpExceptionFromNSExceptionFrames( - const IOSSystemDataCollector& system_data, - const uint64_t* frames, - const size_t num_frames); + void DumpExceptionFromNSExceptionWithFrames(const uint64_t* frames, + const size_t num_frames); + + //! \brief Generate a simulated intermediate dump similar to a Mach exception + //! in the same base directory as other exceptions. Does not use the + //! cached writer. + //! + //! \param[in] context A pointer to a NativeCPUContext object for this + //! simulated exception. + //! \param[in] exception + //! \param[out] path The path of the intermediate dump generated. + //! \return `true` if the pending intermediate dump could be written. + bool DumpExceptionFromSimulatedMachException(const NativeCPUContext* context, + exception_type_t exception, + base::FilePath* path); + + //! \brief Generate a simulated intermediate dump similar to a Mach exception + //! at a specific path. Does not use the cached writer. + //! + //! \param[in] context A pointer to a NativeCPUContext object for this + //! simulated exception. + //! \param[in] exception + //! \param[in] path Path to where the intermediate dump should be written. + //! \return `true` if the pending intermediate dump could be written. + bool DumpExceptionFromSimulatedMachExceptionAtPath( + const NativeCPUContext* context, + exception_type_t exception, + const base::FilePath& path); + + //! \brief Moves an intermediate dump to the pending directory. This is meant + //! to be used by the UncaughtExceptionHandler, when NSException caught + //! by the preprocessor matches the UncaughtExceptionHandler. + //! + //! \param[in] path Path to the specific intermediate dump. + bool MoveIntermediateDumpAtPathToPending(const base::FilePath& path); //! \brief Requests that the handler convert all intermediate dumps into //! minidumps and trigger an upload if possible. @@ -121,34 +157,11 @@ class InProcessHandler { //! pending reports. void StartProcessingPendingReports(); - //! \brief Helper that swaps out the InProcessHandler's |writer_| with an - //! alternate writer so DumpWithContext does not interfere with the - //! |writer_| created on startup. This is useful for -DumpWithoutCrash, - //! which may write to an alternate location. - class ScopedAlternateWriter { - public: - ScopedAlternateWriter(InProcessHandler* handler); - ~ScopedAlternateWriter(); - ScopedAlternateWriter(const ScopedAlternateWriter&) = delete; - ScopedAlternateWriter& operator=(const ScopedAlternateWriter&) = delete; - //! \brief Open's an alternate dump writer in the same directory as the - //! default InProcessHandler's dump writer, so the file will be - //! processed with -ProcessIntermediateDumps() - bool Open(); - - //! \brief Open's an alternate dump writer in the client provided |path|. - //! The file will only be processed by calling - //! ProcessIntermediateDump(path) - bool OpenAtPath(const base::FilePath& path); - - //! \brief The path of the alternate dump writer. - const base::FilePath& path() { return path_; } - - private: - InProcessHandler* handler_; - std::unique_ptr original_writer_; - base::FilePath path_; - }; + //! \brief Inject a callback into Mach handling. Intended to be used by + //! tests to trigger a reentrant exception. + void SetMachExceptionCallbackForTesting(void (*callback)()) { + mach_exception_callback_for_testing_ = callback; + } private: //! \brief Helper to start and end intermediate reports. @@ -170,38 +183,74 @@ class InProcessHandler { IOSIntermediateDumpWriter::ScopedRootMap rootMap_; }; - std::unique_ptr GetWriter() { - return std::move(writer_); - } + //! \brief Helper to manage closing the intermediate dump writer and unlocking + //! the dump file (renaming the file) after the report is written. + class ScopedLockedWriter { + public: + ScopedLockedWriter(IOSIntermediateDumpWriter* writer, + const char* writer_path, + const char* writer_unlocked_path); - void SetWriter(std::unique_ptr writer) { - writer_ = std::move(writer); - } + //! \brief Close the writer_ and rename to the file with path without the + //! .locked extension. + ~ScopedLockedWriter(); - void SetOpenNewFileAfterReport(bool open_new_file_after_report) { - open_new_file_after_report_ = open_new_file_after_report; - } + ScopedLockedWriter(const ScopedLockedWriter&) = delete; + ScopedLockedWriter& operator=(const ScopedLockedWriter&) = delete; + + IOSIntermediateDumpWriter* GetWriter() { return writer_; } + + private: + const char* writer_path_; + const char* writer_unlocked_path_; + IOSIntermediateDumpWriter* writer_; + }; + + //! \brief Manage the prune and upload thread when the active state changes. + void UpdatePruneAndUploadThreads(bool active); + //! \brief Writes a minidump to the Crashpad database from the + //! \a process_snapshot, and triggers the upload_thread_ if started. void SaveSnapshot(ProcessSnapshotIOSIntermediateDump& process_snapshot); - // Process a maximum of 20 pending intermediate dumps. Dumps named with our - // bundle id get first priority to prevent spamming. + //! \brief Process a maximum of 20 pending intermediate dumps. Dumps named + //! with our bundle id get first priority to prevent spamming. std::vector PendingFiles(); - bool OpenNewFile(); - void PostReportCleanup(); + //! \brief Lock access to the cached intermediate dump writer from + //! concurrent signal, Mach exception and uncaught NSExceptions so that + //! the first exception wins. If the same thread triggers another + //! reentrant exception, ignore it. If a different thread triggers a + //! concurrent exception, sleep indefinitely. + IOSIntermediateDumpWriter* GetCachedWriter(); + + //! \brief Open a new intermediate dump writer from \a writer_path. + std::unique_ptr CreateWriterWithPath( + const base::FilePath& writer_path); + + //! \brief Generates a new file path to be used by an intermediate dump + //! writer built from base_dir_,, bundle_identifier_and_seperator_, a new + //! UUID, with a .locked extension. + const base::FilePath NewLockedFilePath(); + + // Intended to be used by tests triggering a reentrant exception. Called + // in DumpExceptionFromMachException after aquiring the cached_writer_. + void (*mach_exception_callback_for_testing_)() = nullptr; - bool upload_thread_started_ = false; - bool open_new_file_after_report_ = true; + // Used to synchronize access to UpdatePruneAndUploadThreads(). + base::Lock prune_and_upload_lock_; + std::atomic_bool upload_thread_enabled_ = false; std::map annotations_; base::FilePath base_dir_; - base::FilePath current_file_; - std::unique_ptr writer_; - std::unique_ptr alternate_mach_writer_; + std::string cached_writer_path_; + std::string cached_writer_unlocked_path_; + std::unique_ptr cached_writer_; + std::atomic exception_thread_id_ = 0; std::unique_ptr upload_thread_; std::unique_ptr prune_thread_; std::unique_ptr database_; std::string bundle_identifier_and_seperator_; + IOSSystemDataCollector system_data_; InitializationStateDcheck initialized_; }; diff --git a/external_imported/sentry-native/external/crashpad/client/ios_handler/in_process_handler_test.cc b/external_imported/sentry-native/external/crashpad/client/ios_handler/in_process_handler_test.cc index d7dfc0530..110d86c75 100644 --- a/external_imported/sentry-native/external/crashpad/client/ios_handler/in_process_handler_test.cc +++ b/external_imported/sentry-native/external/crashpad/client/ios_handler/in_process_handler_test.cc @@ -36,8 +36,7 @@ class InProcessHandlerTest : public testing::Test { // testing::Test: void SetUp() override { - ASSERT_TRUE( - in_process_handler_.Initialize(temp_dir_.path(), "", {}, system_data_)); + ASSERT_TRUE(in_process_handler_.Initialize(temp_dir_.path(), "", {})); pending_dir_ = temp_dir_.path().Append("pending-serialized-ios-dump"); bundle_identifier_and_seperator_ = system_data_.BundleIdentifier() + "@"; } diff --git a/external_imported/sentry-native/external/crashpad/client/ios_handler/in_process_intermediate_dump_handler.cc b/external_imported/sentry-native/external/crashpad/client/ios_handler/in_process_intermediate_dump_handler.cc index 12dcf2b49..88d5eb0a6 100644 --- a/external_imported/sentry-native/external/crashpad/client/ios_handler/in_process_intermediate_dump_handler.cc +++ b/external_imported/sentry-native/external/crashpad/client/ios_handler/in_process_intermediate_dump_handler.cc @@ -21,7 +21,8 @@ #include #include -#include "base/cxx17_backports.h" +#include + #include "build/build_config.h" #include "snapshot/snapshot_constants.h" #include "util/ios/ios_intermediate_dump_writer.h" @@ -428,7 +429,7 @@ void CaptureMemoryPointedToByThreadState(IOSIntermediateDumpWriter* writer, MaybeCaptureMemoryAround(writer, thread_state.__rip); #elif defined(ARCH_CPU_ARM_FAMILY) MaybeCaptureMemoryAround(writer, thread_state.__pc); - for (size_t i = 0; i < base::size(thread_state.__x); ++i) { + for (size_t i = 0; i < std::size(thread_state.__x); ++i) { MaybeCaptureMemoryAround(writer, thread_state.__x[i]); } #endif @@ -598,7 +599,7 @@ void InProcessIntermediateDumpHandler::WriteProcessInfo( kinfo_proc kern_proc_info; int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid()}; size_t len = sizeof(kern_proc_info); - if (sysctl(mib, base::size(mib), &kern_proc_info, &len, nullptr, 0) == 0) { + if (sysctl(mib, std::size(mib), &kern_proc_info, &len, nullptr, 0) == 0) { WriteProperty( writer, IntermediateDumpKey::kPID, &kern_proc_info.kp_proc.p_pid); WriteProperty(writer, @@ -646,7 +647,7 @@ void InProcessIntermediateDumpHandler::WriteProcessInfo( IntermediateDumpKey::kSystemTime, &task_thread_times.system_time); } else { - CRASHPAD_RAW_LOG("task_info task_basic_info"); + CRASHPAD_RAW_LOG("task_info thread_times_info"); } if (!annotations.empty()) { diff --git a/external_imported/sentry-native/external/crashpad/client/ios_handler/in_process_intermediate_dump_handler_test.cc b/external_imported/sentry-native/external/crashpad/client/ios_handler/in_process_intermediate_dump_handler_test.cc index b79f93f67..e61a604d9 100644 --- a/external_imported/sentry-native/external/crashpad/client/ios_handler/in_process_intermediate_dump_handler_test.cc +++ b/external_imported/sentry-native/external/crashpad/client/ios_handler/in_process_intermediate_dump_handler_test.cc @@ -16,7 +16,8 @@ #include -#include "base/cxx17_backports.h" +#include + #include "base/files/file_path.h" #include "build/build_config.h" #include "client/annotation.h" @@ -74,7 +75,7 @@ class InProcessIntermediateDumpHandlerTest : public testing::Test { mach_thread_self(), kSimulatedException, code, - base::size(code), + std::size(code), MACHINE_THREAD_STATE, reinterpret_cast(&cpu_context), MACHINE_THREAD_STATE_COUNT); @@ -103,12 +104,18 @@ TEST_F(InProcessIntermediateDumpHandlerTest, TestSystem) { EXPECT_STREQ(system->CPUVendor().c_str(), "GenuineIntel"); #elif defined(ARCH_CPU_ARM64) EXPECT_EQ(system->GetCPUArchitecture(), kCPUArchitectureARM64); +#else +#error Port to your CPU architecture +#endif +#if TARGET_OS_SIMULATOR + EXPECT_EQ(system->MachineDescription().substr(0, 13), + std::string("iOS Simulator")); +#elif TARGET_OS_IPHONE utsname uts; ASSERT_EQ(uname(&uts), 0); EXPECT_STREQ(system->MachineDescription().c_str(), uts.machine); -#else -#error Port to your CPU architecture #endif + EXPECT_EQ(system->GetOperatingSystem(), SystemSnapshot::kOperatingSystemIOS); } diff --git a/external_imported/sentry-native/external/crashpad/client/ios_handler/prune_intermediate_dumps_and_crash_reports_thread.cc b/external_imported/sentry-native/external/crashpad/client/ios_handler/prune_intermediate_dumps_and_crash_reports_thread.cc index d6cfe885d..651b39077 100644 --- a/external_imported/sentry-native/external/crashpad/client/ios_handler/prune_intermediate_dumps_and_crash_reports_thread.cc +++ b/external_imported/sentry-native/external/crashpad/client/ios_handler/prune_intermediate_dumps_and_crash_reports_thread.cc @@ -19,6 +19,7 @@ #include "client/prune_crash_reports.h" #include "util/file/directory_reader.h" #include "util/file/filesystem.h" +#include "util/ios/scoped_background_task.h" namespace crashpad { @@ -27,6 +28,9 @@ namespace { // The file extension used to indicate a file is locked. constexpr char kLockedExtension[] = ".locked"; +// Prune onces a day. +constexpr time_t prune_interval = 60 * 60 * 24; + // If the client finds a locked file matching it's own bundle id, unlock it // after 24 hours. constexpr time_t matching_bundle_locked_ttl = 60 * 60 * 24; @@ -95,11 +99,12 @@ PruneIntermediateDumpsAndCrashReportsThread:: base::FilePath pending_path, std::string bundle_identifier_and_seperator, bool is_extension) - : thread_(60 * 60 * 24, this), + : thread_(prune_interval, this), condition_(std::move(condition)), pending_path_(pending_path), bundle_identifier_and_seperator_(bundle_identifier_and_seperator), initial_work_delay_(is_extension ? extension_delay : app_delay), + last_start_time_(0), database_(database) {} PruneIntermediateDumpsAndCrashReportsThread:: @@ -115,8 +120,25 @@ void PruneIntermediateDumpsAndCrashReportsThread::Stop() { void PruneIntermediateDumpsAndCrashReportsThread::DoWork( const WorkerThread* thread) { + // This thread may be stopped and started a number of times throughout the + // lifetime of the process to prevent 0xdead10cc kills (see + // crbug.com/crashpad/400), but it should only run once per prune_interval + // after initial_work_delay_. + time_t now = time(nullptr); + if (now - last_start_time_ < prune_interval) + return; + last_start_time_ = now; + + internal::ScopedBackgroundTask scoper("PruneThread"); database_->CleanDatabase(60 * 60 * 24 * 3); + + // Here and below, respect Stop() being called after each task. + if (!thread_.is_running()) + return; PruneCrashReportDatabase(database_, condition_.get()); + + if (!thread_.is_running()) + return; if (!clean_old_intermediate_dumps_) { clean_old_intermediate_dumps_ = true; UnlockOldIntermediateDumps(pending_path_, bundle_identifier_and_seperator_); diff --git a/external_imported/sentry-native/external/crashpad/client/ios_handler/prune_intermediate_dumps_and_crash_reports_thread.h b/external_imported/sentry-native/external/crashpad/client/ios_handler/prune_intermediate_dumps_and_crash_reports_thread.h index b2764234c..cc40980d5 100644 --- a/external_imported/sentry-native/external/crashpad/client/ios_handler/prune_intermediate_dumps_and_crash_reports_thread.h +++ b/external_imported/sentry-native/external/crashpad/client/ios_handler/prune_intermediate_dumps_and_crash_reports_thread.h @@ -84,6 +84,9 @@ class PruneIntermediateDumpsAndCrashReportsThread //! It is expected to only be called from the same thread that called Start(). void Stop() override; + //! \return `true` if the thread is running, `false` if it is not. + bool is_running() const { return thread_.is_running(); } + private: // WorkerThread::Delegate: void DoWork(const WorkerThread* thread) override; @@ -94,6 +97,7 @@ class PruneIntermediateDumpsAndCrashReportsThread std::string bundle_identifier_and_seperator_; bool clean_old_intermediate_dumps_; double initial_work_delay_; + time_t last_start_time_; CrashReportDatabase* database_; // weak }; diff --git a/external_imported/sentry-native/external/crashpad/client/settings.cc b/external_imported/sentry-native/external/crashpad/client/settings.cc index 3855b9b6a..8fe578f92 100644 --- a/external_imported/sentry-native/external/crashpad/client/settings.cc +++ b/external_imported/sentry-native/external/crashpad/client/settings.cc @@ -20,12 +20,13 @@ #include "base/logging.h" #include "base/posix/eintr_wrapper.h" +#include "build/build_config.h" #include "util/file/filesystem.h" #include "util/numeric/in_range_cast.h" namespace crashpad { -#if defined(OS_FUCHSIA) +#if BUILDFLAG(IS_FUCHSIA) Settings::ScopedLockedFileHandle::ScopedLockedFileHandle() : handle_(kInvalidFileHandle), lockfile_path_() { @@ -68,7 +69,31 @@ void Settings::ScopedLockedFileHandle::Destroy() { } } -#else // OS_FUCHSIA +#else // BUILDFLAG(IS_FUCHSIA) + +#if BUILDFLAG(IS_IOS) + +Settings::ScopedLockedFileHandle::ScopedLockedFileHandle( + const FileHandle& value) + : ScopedGeneric(value) { + ios_background_task_ = std::make_unique( + "ScopedLockedFileHandle"); +} + +Settings::ScopedLockedFileHandle::ScopedLockedFileHandle( + Settings::ScopedLockedFileHandle&& rvalue) { + ios_background_task_.reset(rvalue.ios_background_task_.release()); + reset(rvalue.release()); +} + +Settings::ScopedLockedFileHandle& Settings::ScopedLockedFileHandle::operator=( + Settings::ScopedLockedFileHandle&& rvalue) { + ios_background_task_.reset(rvalue.ios_background_task_.release()); + reset(rvalue.release()); + return *this; +} + +#endif // BUILDFLAG(IS_IOS) namespace internal { @@ -82,7 +107,7 @@ void ScopedLockedFileHandleTraits::Free(FileHandle handle) { } // namespace internal -#endif // OS_FUCHSIA +#endif // BUILDFLAG(IS_FUCHSIA) struct Settings::Data { static constexpr uint32_t kSettingsMagic = 'CPds'; @@ -193,7 +218,7 @@ Settings::ScopedLockedFileHandle Settings::MakeScopedLockedFileHandle( FileLocking locking, const base::FilePath& file_path) { ScopedFileHandle scoped(file); -#if defined(OS_FUCHSIA) +#if BUILDFLAG(IS_FUCHSIA) base::FilePath lockfile_path(file_path.value() + ".__lock__"); if (scoped.is_valid()) { ScopedFileHandle lockfile_scoped( @@ -206,6 +231,10 @@ Settings::ScopedLockedFileHandle Settings::MakeScopedLockedFileHandle( } return ScopedLockedFileHandle(scoped.release(), base::FilePath()); #else + // It's important to create the ScopedLockedFileHandle before calling + // LoggingLockFile on iOS, so a ScopedBackgroundTask is created *before* + // the LoggingLockFile call below. + ScopedLockedFileHandle handle(kInvalidFileHandle); if (scoped.is_valid()) { if (LoggingLockFile( scoped.get(), locking, FileLockingBlocking::kBlocking) != @@ -213,7 +242,8 @@ Settings::ScopedLockedFileHandle Settings::MakeScopedLockedFileHandle( scoped.reset(); } } - return ScopedLockedFileHandle(scoped.release()); + handle.reset(scoped.release()); + return handle; #endif } diff --git a/external_imported/sentry-native/external/crashpad/client/settings.h b/external_imported/sentry-native/external/crashpad/client/settings.h index d17f357ed..aedf30cd8 100644 --- a/external_imported/sentry-native/external/crashpad/client/settings.h +++ b/external_imported/sentry-native/external/crashpad/client/settings.h @@ -17,8 +17,6 @@ #include -#include - #include "base/files/file_path.h" #include "base/scoped_generic.h" #include "build/build_config.h" @@ -26,6 +24,10 @@ #include "util/misc/initialization_state.h" #include "util/misc/uuid.h" +#if BUILDFLAG(IS_IOS) +#include "util/ios/scoped_background_task.h" +#endif // BUILDFLAG(IS_IOS) + namespace crashpad { namespace internal { @@ -125,7 +127,7 @@ class Settings { // and closes the file on destruction. Note that on Fuchsia, this handle DOES // NOT offer correct operation, only an attempt to DCHECK if racy behavior is // detected. -#if defined(OS_FUCHSIA) +#if BUILDFLAG(IS_FUCHSIA) struct ScopedLockedFileHandle { public: ScopedLockedFileHandle(); @@ -155,10 +157,27 @@ class Settings { FileHandle handle_; base::FilePath lockfile_path_; }; -#else // OS_FUCHSIA +#elif BUILDFLAG(IS_IOS) + // iOS needs to use ScopedBackgroundTask anytime a file lock is used. + class ScopedLockedFileHandle + : public base::ScopedGeneric { + public: + using base::ScopedGeneric< + FileHandle, + internal::ScopedLockedFileHandleTraits>::ScopedGeneric; + + ScopedLockedFileHandle(const FileHandle& value); + ScopedLockedFileHandle(ScopedLockedFileHandle&& rvalue); + ScopedLockedFileHandle& operator=(ScopedLockedFileHandle&& rvalue); + + private: + std::unique_ptr ios_background_task_; + }; +#else using ScopedLockedFileHandle = base::ScopedGeneric; -#endif // OS_FUCHSIA +#endif // BUILDFLAG(IS_FUCHSIA) static ScopedLockedFileHandle MakeScopedLockedFileHandle( FileHandle file, FileLocking locking, diff --git a/external_imported/sentry-native/external/crashpad/client/settings_test.cc b/external_imported/sentry-native/external/crashpad/client/settings_test.cc index 5f13cfcca..74a201471 100644 --- a/external_imported/sentry-native/external/crashpad/client/settings_test.cc +++ b/external_imported/sentry-native/external/crashpad/client/settings_test.cc @@ -154,7 +154,7 @@ TEST_F(SettingsTest, UnlinkFile) { EXPECT_TRUE(settings()->SetUploadsEnabled(true)); EXPECT_TRUE(settings()->SetLastUploadAttemptTime(time(nullptr))); -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) EXPECT_EQ(_wunlink(settings_path().value().c_str()), 0) << ErrnoMessage("_wunlink"); #else diff --git a/external_imported/sentry-native/external/crashpad/client/simulate_crash.h b/external_imported/sentry-native/external/crashpad/client/simulate_crash.h index d01e1682d..62a2ff938 100644 --- a/external_imported/sentry-native/external/crashpad/client/simulate_crash.h +++ b/external_imported/sentry-native/external/crashpad/client/simulate_crash.h @@ -17,13 +17,13 @@ #include "build/build_config.h" -#if defined(OS_MAC) +#if BUILDFLAG(IS_MAC) #include "client/simulate_crash_mac.h" -#elif defined(OS_IOS) +#elif BUILDFLAG(IS_IOS) #include "client/simulate_crash_ios.h" -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) #include "client/simulate_crash_win.h" -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) #include "client/simulate_crash_linux.h" #endif diff --git a/external_imported/sentry-native/external/crashpad/client/simulate_crash_mac.cc b/external_imported/sentry-native/external/crashpad/client/simulate_crash_mac.cc index 48d81a0d9..86f4043d6 100644 --- a/external_imported/sentry-native/external/crashpad/client/simulate_crash_mac.cc +++ b/external_imported/sentry-native/external/crashpad/client/simulate_crash_mac.cc @@ -17,8 +17,9 @@ #include #include +#include + #include "base/check_op.h" -#include "base/cxx17_backports.h" #include "base/logging.h" #include "base/mac/mach_logging.h" #include "base/mac/scoped_mach_port.h" @@ -207,7 +208,7 @@ void SimulateCrash(const NativeCPUContext& cpu_context) { base::mac::ScopedMachSendRight thread(mach_thread_self()); exception_type_t exception = kMachExceptionSimulated; mach_exception_data_type_t codes[] = {0, 0}; - mach_msg_type_number_t code_count = base::size(codes); + mach_msg_type_number_t code_count = std::size(codes); // Look up the handler for EXC_CRASH exceptions in the same way that the // kernel would: try a thread handler, then a task handler, and finally a host @@ -229,7 +230,7 @@ void SimulateCrash(const NativeCPUContext& cpu_context) { bool success = false; for (size_t target_type_index = 0; - !success && target_type_index < base::size(kTargetTypes); + !success && target_type_index < std::size(kTargetTypes); ++target_type_index) { ExceptionPorts::ExceptionHandlerVector handlers; ExceptionPorts exception_ports(kTargetTypes[target_type_index], diff --git a/external_imported/sentry-native/external/crashpad/client/simulate_crash_mac_test.cc b/external_imported/sentry-native/external/crashpad/client/simulate_crash_mac_test.cc index f22b2a69d..ccd0267c3 100644 --- a/external_imported/sentry-native/external/crashpad/client/simulate_crash_mac_test.cc +++ b/external_imported/sentry-native/external/crashpad/client/simulate_crash_mac_test.cc @@ -18,7 +18,8 @@ #include #include -#include "base/cxx17_backports.h" +#include + #include "base/strings/stringprintf.h" #include "build/build_config.h" #include "gtest/gtest.h" @@ -370,13 +371,13 @@ TEST(SimulateCrash, SimulateCrash) { #endif }; - for (size_t target_index = 0; target_index < base::size(kTargets); + for (size_t target_index = 0; target_index < std::size(kTargets); ++target_index) { TestSimulateCrashMac::ExceptionPortsTarget target = kTargets[target_index]; SCOPED_TRACE(base::StringPrintf( "target_index %zu, target %d", target_index, target)); - for (size_t behavior_index = 0; behavior_index < base::size(kBehaviors); + for (size_t behavior_index = 0; behavior_index < std::size(kBehaviors); ++behavior_index) { exception_behavior_t behavior = kBehaviors[behavior_index]; SCOPED_TRACE(base::StringPrintf( @@ -390,7 +391,7 @@ TEST(SimulateCrash, SimulateCrash) { target, behavior, THREAD_STATE_NONE); test_simulate_crash_mac.Run(); } else { - for (size_t flavor_index = 0; flavor_index < base::size(kFlavors); + for (size_t flavor_index = 0; flavor_index < std::size(kFlavors); ++flavor_index) { thread_state_flavor_t flavor = kFlavors[flavor_index]; SCOPED_TRACE(base::StringPrintf( diff --git a/external_imported/sentry-native/external/crashpad/doc/developing.md b/external_imported/sentry-native/external/crashpad/doc/developing.md index 60c415536..a4017fb78 100644 --- a/external_imported/sentry-native/external/crashpad/doc/developing.md +++ b/external_imported/sentry-native/external/crashpad/doc/developing.md @@ -46,8 +46,9 @@ the `$PATH` environment variable: Windows](https://docs.microsoft.com/en-us/windows-hardware/drivers/debugger/). * On Linux, obtain appropriate tools for C++ development through any appropriate means including the system’s package manager. On Debian and - Debian-based distributions, the `build-essential` and `zlib1g-dev` - packages should suffice. + Debian-based distributions, the `build-essential`, `zlib1g-dev`, and any + one of the `libcurl4-*-dev` packages such as `libcurl4-openssl-dev` should + suffice. * Chromium’s [depot_tools](https://www.chromium.org/developers/how-tos/depottools). * [Git](https://git-scm.com/). This is provided by Xcode on macOS, by diff --git a/external_imported/sentry-native/external/crashpad/doc/support/generate_doxygen.py b/external_imported/sentry-native/external/crashpad/doc/support/generate_doxygen.py index 577b51e59..7b28aa93d 100755 --- a/external_imported/sentry-native/external/crashpad/doc/support/generate_doxygen.py +++ b/external_imported/sentry-native/external/crashpad/doc/support/generate_doxygen.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright 2017 The Crashpad Authors. All rights reserved. # diff --git a/external_imported/sentry-native/external/crashpad/handler/crash_report_upload_thread.cc b/external_imported/sentry-native/external/crashpad/handler/crash_report_upload_thread.cc index 3872e1142..efbeab780 100644 --- a/external_imported/sentry-native/external/crashpad/handler/crash_report_upload_thread.cc +++ b/external_imported/sentry-native/external/crashpad/handler/crash_report_upload_thread.cc @@ -40,9 +40,13 @@ #include "util/net/url.h" #include "util/stdlib/map_insert.h" -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) #include "handler/mac/file_limit_annotation.h" -#endif // OS_APPLE +#endif // BUILDFLAG(IS_APPLE) + +#if BUILDFLAG(IS_IOS) +#include "util/ios/scoped_background_task.h" +#endif // BUILDFLAG(IS_IOS) namespace crashpad { @@ -51,7 +55,7 @@ namespace { // The number of seconds to wait between checking for pending reports. const int kRetryWorkIntervalSeconds = 15 * 60; -#if defined(OS_IOS) +#if BUILDFLAG(IS_IOS) // The number of times to attempt to upload a pending report, repeated on // failure. Attempts will happen once per launch, once per call to // ReportPending(), and, if Options.watch_pending_reports is true, once every @@ -97,6 +101,10 @@ void CrashReportUploadThread::Stop() { } void CrashReportUploadThread::ProcessPendingReports() { +#if BUILDFLAG(IS_IOS) + internal::ScopedBackgroundTask scoper("CrashReportUploadThread"); +#endif // BUILDFLAG(IS_IOS) + std::vector known_report_uuids = known_pending_report_uuids_.Drain(); for (const UUID& report_uuid : known_report_uuids) { CrashReportDatabase::Report report; @@ -152,9 +160,9 @@ void CrashReportUploadThread::ProcessPendingReports() { void CrashReportUploadThread::ProcessPendingReport( const CrashReportDatabase::Report& report) { -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) RecordFileLimitAnnotation(); -#endif // OS_APPLE +#endif // BUILDFLAG(IS_APPLE) Settings* const settings = database_->GetSettings(); @@ -172,10 +180,10 @@ void CrashReportUploadThread::ProcessPendingReport( if (ShouldRateLimitUpload(report)) return; -#if defined(OS_IOS) +#if BUILDFLAG(IS_IOS) if (ShouldRateLimitRetry(report)) return; -#endif +#endif // BUILDFLAG(IS_IOS) std::unique_ptr upload_report; CrashReportDatabase::OperationStatus status = @@ -217,7 +225,7 @@ void CrashReportUploadThread::ProcessPendingReport( report.uuid, Metrics::CrashSkippedReason::kPrepareForUploadFailed); break; case UploadResult::kRetry: -#if defined(OS_IOS) +#if BUILDFLAG(IS_IOS) if (upload_report->upload_attempts > kRetryAttempts) { upload_report.reset(); database_->SkipReportUpload(report.uuid, @@ -377,7 +385,7 @@ bool CrashReportUploadThread::ShouldRateLimitUpload( return false; } -#if defined(OS_IOS) +#if BUILDFLAG(IS_IOS) bool CrashReportUploadThread::ShouldRateLimitRetry( const CrashReportDatabase::Report& report) { if (retry_uuid_time_map_.find(report.uuid) != retry_uuid_time_map_.end()) { diff --git a/external_imported/sentry-native/external/crashpad/handler/crash_report_upload_thread.h b/external_imported/sentry-native/external/crashpad/handler/crash_report_upload_thread.h index 7649ae0db..2af958d7d 100644 --- a/external_imported/sentry-native/external/crashpad/handler/crash_report_upload_thread.h +++ b/external_imported/sentry-native/external/crashpad/handler/crash_report_upload_thread.h @@ -19,6 +19,7 @@ #include #include +#include "build/build_config.h" #include "client/crash_report_database.h" #include "util/misc/uuid.h" #include "util/stdlib/thread_safe_vector.h" @@ -107,6 +108,9 @@ class CrashReportUploadThread : public WorkerThread::Delegate, //! It is expected to only be called from the same thread that called Start(). void Stop() override; + //! \return `true` if the thread is running, `false` if it is not. + bool is_running() const { return thread_.is_running(); } + private: //! \brief The result code from UploadReport(). enum class UploadResult { @@ -186,7 +190,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate, //! upload attempts to be retried. bool ShouldRateLimitUpload(const CrashReportDatabase::Report& report); -#if defined(OS_IOS) +#if BUILDFLAG(IS_IOS) //! \brief Rate-limit report retries. //! //! \param[in] report The crash report to process. @@ -206,7 +210,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate, const std::string url_; WorkerThread thread_; ThreadSafeVector known_pending_report_uuids_; -#if defined(OS_IOS) +#if BUILDFLAG(IS_IOS) // This is not thread-safe, and only used by the worker thread. std::map retry_uuid_time_map_; #endif diff --git a/external_imported/sentry-native/external/crashpad/handler/crashpad_handler_test_extended_handler.cc b/external_imported/sentry-native/external/crashpad/handler/crashpad_handler_test_extended_handler.cc index 4abcacd50..9901aba2a 100644 --- a/external_imported/sentry-native/external/crashpad/handler/crashpad_handler_test_extended_handler.cc +++ b/external_imported/sentry-native/external/crashpad/handler/crashpad_handler_test_extended_handler.cc @@ -19,7 +19,7 @@ #include "minidump/test/minidump_user_extension_stream_util.h" #include "tools/tool_support.h" -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) #include #endif @@ -55,16 +55,16 @@ int ExtendedHandlerMain(int argc, char* argv[]) { } // namespace -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) int main(int argc, char* argv[]) { return ExtendedHandlerMain(argc, argv); } -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) int wmain(int argc, wchar_t* argv[]) { return crashpad::ToolSupport::Wmain(argc, argv, &ExtendedHandlerMain); } -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) diff --git a/external_imported/sentry-native/external/crashpad/handler/handler_main.cc b/external_imported/sentry-native/external/crashpad/handler/handler_main.cc index f094e66c2..7cd2fc987 100644 --- a/external_imported/sentry-native/external/crashpad/handler/handler_main.cc +++ b/external_imported/sentry-native/external/crashpad/handler/handler_main.cc @@ -21,6 +21,7 @@ #include #include +#include #include #include #include @@ -28,7 +29,6 @@ #include #include "base/auto_reset.h" -#include "base/compiler_specific.h" #include "base/files/file_path.h" #include "base/files/scoped_file.h" #include "base/logging.h" @@ -61,13 +61,13 @@ #include "handler/linux/cros_crash_report_exception_handler.h" #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) #include #include "handler/linux/crash_report_exception_handler.h" #include "handler/linux/exception_handler_server.h" #include "util/posix/signals.h" -#elif defined(OS_APPLE) +#elif BUILDFLAG(IS_APPLE) #include #include @@ -79,7 +79,7 @@ #include "util/mach/child_port_handshake.h" #include "util/posix/close_stdio.h" #include "util/posix/signals.h" -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) #include #include "handler/win/crash_report_exception_handler.h" @@ -87,32 +87,42 @@ #include "util/win/handle.h" #include "util/win/initial_client_data.h" #include "util/win/session_end_watcher.h" -#endif // OS_APPLE +#endif // BUILDFLAG(IS_APPLE) namespace crashpad { namespace { -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ - defined(OS_ANDROID) || defined(OS_APPLE) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ + BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) #define ATTACHMENTS_SUPPORTED 1 -#endif // OS_WIN || OS_LINUX || OS_CHROMEOS || OS_ANDROID || OS_APPLE +#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || + // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) void Usage(const base::FilePath& me) { + // clang-format off fprintf(stderr, "Usage: %" PRFilePath " [OPTION]...\n" "Crashpad's exception handler server.\n" "\n" " --annotation=KEY=VALUE set a process annotation in each crash report\n" + // clang-format on #if defined(ATTACHMENTS_SUPPORTED) + // clang-format off " --attachment=FILE_PATH attach specified file to each crash report\n" " at the time of the crash\n" + // clang-format on #endif // ATTACHMENTS_SUPPORTED + // clang-format off " --database=PATH store the crash report database at PATH\n" -#if defined(OS_APPLE) + // clang-format on +#if BUILDFLAG(IS_APPLE) + // clang-format off " --handshake-fd=FD establish communication with the client over FD\n" -#endif // OS_APPLE -#if defined(OS_WIN) + // clang-format on +#endif // BUILDFLAG(IS_APPLE) +#if BUILDFLAG(IS_WIN) + // clang-format off " --initial-client-data=HANDLE_request_crash_dump,\n" " HANDLE_request_non_crash_dump,\n" " HANDLE_non_crash_dump_completed,\n" @@ -122,13 +132,20 @@ void Usage(const base::FilePath& me) { " Address_non_crash_exception_information,\n" " Address_debug_critical_section\n" " use precreated data to register initial client\n" -#endif // OS_WIN -#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) + // clang-format on +#endif // BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + // clang-format off " --initial-client-fd=FD a socket connected to a client.\n" -#endif // OS_ANDROID || OS_LINUX || OS_CHROMEOS -#if defined(OS_APPLE) + // clang-format on +#endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_APPLE) + // clang-format off " --mach-service=SERVICE register SERVICE with the bootstrap server\n" -#endif // OS_APPLE + // clang-format on +#endif // BUILDFLAG(IS_APPLE) + // clang-format off " --metrics-dir=DIR store metrics files in DIR (only in Chromium)\n" " --monitor-self run a second handler to catch crashes in the first\n" " --monitor-self-annotation=KEY=VALUE\n" @@ -141,18 +158,26 @@ void Usage(const base::FilePath& me) { " --no-periodic-tasks don't scan for new reports or prune the database\n" " --no-rate-limit don't rate limit crash uploads\n" " --no-upload-gzip don't use gzip compression when uploading\n" -#if defined(OS_ANDROID) + // clang-format on +#if BUILDFLAG(IS_ANDROID) + // clang-format off " --no-write-minidump-to-database\n" " don't write minidump to database\n" -#endif // OS_ANDROID -#if defined(OS_WIN) + // clang-format on +#endif // BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_WIN) + // clang-format off " --pipe-name=PIPE communicate with the client over PIPE\n" -#endif // OS_WIN -#if defined(OS_APPLE) + // clang-format on +#endif // BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_APPLE) + // clang-format off " --reset-own-crash-exception-port-to-system-default\n" " reset the server's exception handler to default\n" -#endif // OS_APPLE -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) + // clang-format on +#endif // BUILDFLAG(IS_APPLE) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) + // clang-format off " --sanitization-information=SANITIZATION_INFORMATION_ADDRESS\n" " the address of a SanitizationInformation struct.\n" " --shared-client-connection the file descriptor provided by\n" @@ -160,10 +185,15 @@ void Usage(const base::FilePath& me) { " clients\n" " --trace-parent-with-exception=EXCEPTION_INFORMATION_ADDRESS\n" " request a dump for the handler's parent process\n" -#endif // OS_LINUX || OS_CHROMEOS || OS_ANDROID + // clang-format on +#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || + // BUILDFLAG(IS_ANDROID) + // clang-format off " --url=URL send crash reports to this Breakpad server URL,\n" " only if uploads are enabled for the database\n" + // clang-format on #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) + // clang-format off " --use-cros-crash-reporter\n" " pass crash reports to /sbin/crash_reporter\n" " instead of storing them in the database\n" @@ -174,13 +204,18 @@ void Usage(const base::FilePath& me) { " pass the --always_allow_feedback flag to\n" " crash_reporter, thus skipping metrics consent\n" " checks\n" + // clang-format on #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) + // clang-format off " --write-minidump-to-log write minidump to log\n" -#endif // OS_ANDROID + // clang-format on +#endif // BUILDFLAG(IS_ANDROID) + // clang-format off " --help display this help and exit\n" " --version output version information and exit\n", me.value().c_str()); + // clang-format on ToolSupport::UsageTail(me); } @@ -191,23 +226,23 @@ struct Options { base::FilePath database; base::FilePath metrics_dir; std::vector monitor_self_arguments; -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) std::string mach_service; int handshake_fd; bool reset_own_crash_exception_port_to_system_default; -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) VMAddress exception_information_address; VMAddress sanitization_information_address; int initial_client_fd; bool shared_client_connection; -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) bool write_minidump_to_log; bool write_minidump_to_database; -#endif // OS_ANDROID -#elif defined(OS_WIN) +#endif // BUILDFLAG(IS_ANDROID) +#elif BUILDFLAG(IS_WIN) std::string pipe_name; InitialClientData initial_client_data; -#endif // OS_APPLE +#endif // BUILDFLAG(IS_APPLE) bool identify_client_via_url; bool monitor_self; bool periodic_tasks; @@ -252,11 +287,10 @@ bool AddKeyValueToMap(std::map* map, // a normal exit, or if a CallMetricsRecordNormalExit object is destroyed after // something else logs an exit event. void MetricsRecordExit(Metrics::LifetimeMilestone milestone) { - static bool once = [](Metrics::LifetimeMilestone milestone) { + static std::atomic_flag metrics_exit_recorded = ATOMIC_FLAG_INIT; + if (!metrics_exit_recorded.test_and_set()) { Metrics::HandlerLifetimeMilestone(milestone); - return true; - }(milestone); - ALLOW_UNUSED_LOCAL(once); + } } // Calls MetricsRecordExit() to record a failure, and returns EXIT_FAILURE for @@ -280,8 +314,8 @@ class CallMetricsRecordNormalExit { } }; -#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ - defined(OS_ANDROID) +#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ + BUILDFLAG(IS_ANDROID) void HandleCrashSignal(int sig, siginfo_t* siginfo, void* context) { MetricsRecordExit(Metrics::LifetimeMilestone::kCrashed); @@ -341,7 +375,7 @@ void InstallCrashHandler() { Signals::InstallTerminateHandlers(HandleTerminateSignal, 0, nullptr); } -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) struct ResetSIGTERMTraits { static struct sigaction* InvalidValue() { @@ -367,9 +401,9 @@ void HandleSIGTERM(int sig, siginfo_t* siginfo, void* context) { g_exception_handler_server->Stop(); } -#endif // OS_APPLE +#endif // BUILDFLAG(IS_APPLE) -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) LONG(WINAPI* g_original_exception_filter)(EXCEPTION_POINTERS*) = nullptr; @@ -422,11 +456,11 @@ void InstallCrashHandler() { // enough. Note that destroying the TerminateHandler would wait for its thread // to exit, which isn’t necessary or desirable. SetConsoleCtrlHandler(ConsoleHandler, true); - static TerminateHandler* terminate_handler = new TerminateHandler(); - ALLOW_UNUSED_LOCAL(terminate_handler); + [[maybe_unused]] static TerminateHandler* terminate_handler = + new TerminateHandler(); } -#endif // OS_APPLE +#endif // BUILDFLAG(IS_APPLE) void MonitorSelf(const Options& options) { base::FilePath executable_path; @@ -462,7 +496,7 @@ void MonitorSelf(const Options& options) { // instance of crashpad_handler to be writing metrics at a time, and it should // be the primary instance. CrashpadClient crashpad_client; -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) if (!crashpad_client.StartHandlerAtCrash(executable_path, options.database, base::FilePath(), @@ -515,7 +549,7 @@ void InitCrashpadLogging() { #if BUILDFLAG(IS_CHROMEOS_ASH) settings.logging_dest = logging::LOG_TO_FILE; settings.log_file_path = "/var/log/chrome/chrome"; -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; #else settings.logging_dest = @@ -546,18 +580,19 @@ int HandlerMain(int argc, kOptionAttachment, #endif // ATTACHMENTS_SUPPORTED kOptionDatabase, -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) kOptionHandshakeFD, -#endif // OS_APPLE -#if defined(OS_WIN) +#endif // BUILDFLAG(IS_APPLE) +#if BUILDFLAG(IS_WIN) kOptionInitialClientData, -#endif // OS_WIN -#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) kOptionInitialClientFD, -#endif // OS_ANDROID || OS_LINUX || OS_CHROMEOS -#if defined(OS_APPLE) +#endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_APPLE) kOptionMachService, -#endif // OS_APPLE +#endif // BUILDFLAG(IS_APPLE) kOptionMetrics, kOptionMonitorSelf, kOptionMonitorSelfAnnotation, @@ -566,16 +601,16 @@ int HandlerMain(int argc, kOptionNoPeriodicTasks, kOptionNoRateLimit, kOptionNoUploadGzip, -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) kOptionNoWriteMinidumpToDatabase, -#endif // OS_ANDROID -#if defined(OS_WIN) +#endif // BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_WIN) kOptionPipeName, -#endif // OS_WIN -#if defined(OS_APPLE) +#endif // BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_APPLE) kOptionResetOwnCrashExceptionPortToSystemDefault, -#endif // OS_APPLE -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#endif // BUILDFLAG(IS_APPLE) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) kOptionSanitizationInformation, kOptionSharedClientConnection, kOptionTraceParentWithException, @@ -586,9 +621,9 @@ int HandlerMain(int argc, kOptionMinidumpDirForTests, kOptionAlwaysAllowFeedback, #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) kOptionWriteMinidumpToLog, -#endif // OS_ANDROID +#endif // BUILDFLAG(IS_ANDROID) // Standard options. kOptionHelp = -2, @@ -601,21 +636,22 @@ int HandlerMain(int argc, {"attachment", required_argument, nullptr, kOptionAttachment}, #endif // ATTACHMENTS_SUPPORTED {"database", required_argument, nullptr, kOptionDatabase}, -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) {"handshake-fd", required_argument, nullptr, kOptionHandshakeFD}, -#endif // OS_APPLE -#if defined(OS_WIN) +#endif // BUILDFLAG(IS_APPLE) +#if BUILDFLAG(IS_WIN) {"initial-client-data", required_argument, nullptr, kOptionInitialClientData}, -#endif // OS_APPLE -#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // BUILDFLAG(IS_APPLE) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) {"initial-client-fd", required_argument, nullptr, kOptionInitialClientFD}, -#endif // OS_ANDROID || OS_LINUX || OS_CHROMEOS -#if defined(OS_APPLE) +#endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_APPLE) {"mach-service", required_argument, nullptr, kOptionMachService}, -#endif // OS_APPLE +#endif // BUILDFLAG(IS_APPLE) {"metrics-dir", required_argument, nullptr, kOptionMetrics}, {"monitor-self", no_argument, nullptr, kOptionMonitorSelf}, {"monitor-self-annotation", @@ -633,22 +669,22 @@ int HandlerMain(int argc, {"no-periodic-tasks", no_argument, nullptr, kOptionNoPeriodicTasks}, {"no-rate-limit", no_argument, nullptr, kOptionNoRateLimit}, {"no-upload-gzip", no_argument, nullptr, kOptionNoUploadGzip}, -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) {"no-write-minidump-to-database", no_argument, nullptr, kOptionNoWriteMinidumpToDatabase}, -#endif // OS_ANDROID -#if defined(OS_WIN) +#endif // BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_WIN) {"pipe-name", required_argument, nullptr, kOptionPipeName}, -#endif // OS_WIN -#if defined(OS_APPLE) +#endif // BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_APPLE) {"reset-own-crash-exception-port-to-system-default", no_argument, nullptr, kOptionResetOwnCrashExceptionPortToSystemDefault}, -#endif // OS_APPLE -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#endif // BUILDFLAG(IS_APPLE) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) {"sanitization-information", required_argument, nullptr, @@ -661,42 +697,40 @@ int HandlerMain(int argc, required_argument, nullptr, kOptionTraceParentWithException}, -#endif // OS_LINUX || OS_CHROMEOS || OS_ANDROID +#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || + // BUILDFLAG(IS_ANDROID) {"url", required_argument, nullptr, kOptionURL}, #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) {"use-cros-crash-reporter", - no_argument, - nullptr, - kOptionUseCrosCrashReporter}, + no_argument, + nullptr, + kOptionUseCrosCrashReporter}, {"minidump-dir-for-tests", - required_argument, - nullptr, - kOptionMinidumpDirForTests}, - {"always-allow-feedback", - no_argument, - nullptr, - kOptionAlwaysAllowFeedback}, + required_argument, + nullptr, + kOptionMinidumpDirForTests}, + {"always-allow-feedback", no_argument, nullptr, kOptionAlwaysAllowFeedback}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) {"write-minidump-to-log", no_argument, nullptr, kOptionWriteMinidumpToLog}, -#endif // OS_ANDROID +#endif // BUILDFLAG(IS_ANDROID) {"help", no_argument, nullptr, kOptionHelp}, {"version", no_argument, nullptr, kOptionVersion}, {nullptr, 0, nullptr, 0}, }; Options options = {}; -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) options.handshake_fd = -1; #endif options.identify_client_via_url = true; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) options.initial_client_fd = kInvalidFileHandle; #endif options.periodic_tasks = true; options.rate_limit = true; options.upload_gzip = true; -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) options.write_minidump_to_database = true; #endif @@ -721,7 +755,7 @@ int HandlerMain(int argc, ToolSupport::CommandLineArgumentToFilePathStringType(optarg)); break; } -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) case kOptionHandshakeFD: { if (!StringToNumber(optarg, &options.handshake_fd) || options.handshake_fd < 0) { @@ -735,8 +769,8 @@ int HandlerMain(int argc, options.mach_service = optarg; break; } -#endif // OS_APPLE -#if defined(OS_WIN) +#endif // BUILDFLAG(IS_APPLE) +#if BUILDFLAG(IS_WIN) case kOptionInitialClientData: { if (!options.initial_client_data.InitializeFromString(optarg)) { ToolSupport::UsageHint( @@ -745,8 +779,8 @@ int HandlerMain(int argc, } break; } -#endif // OS_WIN -#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) case kOptionInitialClientFD: { if (!base::StringToInt(optarg, &options.initial_client_fd)) { ToolSupport::UsageHint(me, "failed to parse --initial-client-fd"); @@ -754,7 +788,8 @@ int HandlerMain(int argc, } break; } -#endif // OS_ANDROID || OS_LINUX || OS_CHROMEOS +#endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) case kOptionMetrics: { options.metrics_dir = base::FilePath( ToolSupport::CommandLineArgumentToFilePathStringType(optarg)); @@ -792,25 +827,25 @@ int HandlerMain(int argc, options.upload_gzip = false; break; } -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) case kOptionNoWriteMinidumpToDatabase: { options.write_minidump_to_database = false; break; } -#endif // OS_ANDROID -#if defined(OS_WIN) +#endif // BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_WIN) case kOptionPipeName: { options.pipe_name = optarg; break; } -#endif // OS_WIN -#if defined(OS_APPLE) +#endif // BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_APPLE) case kOptionResetOwnCrashExceptionPortToSystemDefault: { options.reset_own_crash_exception_port_to_system_default = true; break; } -#endif // OS_APPLE -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#endif // BUILDFLAG(IS_APPLE) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) case kOptionSanitizationInformation: { if (!StringToNumber(optarg, &options.sanitization_information_address)) { @@ -832,7 +867,8 @@ int HandlerMain(int argc, } break; } -#endif // OS_LINUX || OS_CHROMEOS || OS_ANDROID +#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || + // BUILDFLAG(IS_ANDROID) case kOptionURL: { options.url = optarg; break; @@ -852,12 +888,12 @@ int HandlerMain(int argc, break; } #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) case kOptionWriteMinidumpToLog: { options.write_minidump_to_log = true; break; } -#endif // OS_ANDROID +#endif // BUILDFLAG(IS_ANDROID) case kOptionHelp: { Usage(me); MetricsRecordExit(Metrics::LifetimeMilestone::kExitedEarly); @@ -877,7 +913,7 @@ int HandlerMain(int argc, argc -= optind; argv += optind; -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) if (options.handshake_fd < 0 && options.mach_service.empty()) { ToolSupport::UsageHint(me, "--handshake-fd or --mach-service is required"); return ExitFailure(); @@ -887,7 +923,7 @@ int HandlerMain(int argc, me, "--handshake-fd and --mach-service are incompatible"); return ExitFailure(); } -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) if (!options.initial_client_data.IsValid() && options.pipe_name.empty()) { ToolSupport::UsageHint(me, "--initial-client-data or --pipe-name is required"); @@ -898,7 +934,7 @@ int HandlerMain(int argc, me, "--initial-client-data and --pipe-name are incompatible"); return ExitFailure(); } -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) if (!options.exception_information_address && options.initial_client_fd == kInvalidFileHandle) { ToolSupport::UsageHint( @@ -918,15 +954,15 @@ int HandlerMain(int argc, me, "--shared-client-connection requires --initial-client-fd"); return ExitFailure(); } -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) if (!options.write_minidump_to_log && !options.write_minidump_to_database) { ToolSupport::UsageHint(me, "--no_write_minidump_to_database is required to use " "with --write_minidump_to_log."); ExitFailure(); } -#endif // OS_ANDROID -#endif // OS_APPLE +#endif // BUILDFLAG(IS_ANDROID) +#endif // BUILDFLAG(IS_APPLE) if (options.database.empty()) { ToolSupport::UsageHint(me, "--database is required"); @@ -938,11 +974,11 @@ int HandlerMain(int argc, return ExitFailure(); } -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) if (options.reset_own_crash_exception_port_to_system_default) { CrashpadClient::UseSystemDefaultHandler(); } -#endif // OS_APPLE +#endif // BUILDFLAG(IS_APPLE) if (options.monitor_self) { MonitorSelf(options); @@ -991,7 +1027,7 @@ int HandlerMain(int argc, upload_thread.Get()->Start(); } -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) std::unique_ptr exception_handler; #else std::unique_ptr exception_handler; @@ -1031,18 +1067,18 @@ int HandlerMain(int argc, #if defined(ATTACHMENTS_SUPPORTED) &options.attachments, #endif // ATTACHMENTS_SUPPORTED -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) options.write_minidump_to_database, options.write_minidump_to_log, -#endif // OS_ANDROID -#if defined(OS_LINUX) +#endif // BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_LINUX) true, false, -#endif // OS_LINUX +#endif // BUILDFLAG(IS_LINUX) user_stream_sources); #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) if (options.exception_information_address) { ExceptionHandlerProtocol::ClientInformation info; info.exception_information_address = options.exception_information_address; @@ -1052,7 +1088,8 @@ int HandlerMain(int argc, ? EXIT_SUCCESS : ExitFailure(); } -#endif // OS_LINUX || OS_CHROMEOS || OS_ANDROID +#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || + // BUILDFLAG(IS_ANDROID) ScopedStoppable prune_thread; if (options.periodic_tasks) { @@ -1061,7 +1098,7 @@ int HandlerMain(int argc, prune_thread.Get()->Start(); } -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) if (options.mach_service.empty()) { // Don’t do this when being run by launchd. See launchd.plist(5). CloseStdinAndStdout(); @@ -1104,7 +1141,7 @@ int HandlerMain(int argc, } RecordFileLimitAnnotation(); -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) // Shut down as late as possible relative to programs we're watching. if (!SetProcessShutdownParameters(0x100, SHUTDOWN_NORETRY)) PLOG(ERROR) << "SetProcessShutdownParameters"; @@ -1114,9 +1151,9 @@ int HandlerMain(int argc, if (!options.pipe_name.empty()) { exception_handler_server.SetPipeName(base::UTF8ToWide(options.pipe_name)); } -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ExceptionHandlerServer exception_handler_server; -#endif // OS_APPLE +#endif // BUILDFLAG(IS_APPLE) base::GlobalHistogramAllocator* histogram_allocator = nullptr; if (!options.metrics_dir.empty()) { @@ -1131,19 +1168,19 @@ int HandlerMain(int argc, Metrics::HandlerLifetimeMilestone(Metrics::LifetimeMilestone::kStarted); -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) if (options.initial_client_data.IsValid()) { exception_handler_server.InitializeWithInheritedDataForInitialClient( options.initial_client_data, exception_handler.get()); } -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) if (options.initial_client_fd == kInvalidFileHandle || !exception_handler_server.InitializeWithClient( ScopedFileHandle(options.initial_client_fd), options.shared_client_connection)) { return ExitFailure(); } -#endif // OS_WIN +#endif // BUILDFLAG(IS_WIN) exception_handler_server.Run(exception_handler.get()); diff --git a/external_imported/sentry-native/external/crashpad/handler/handler_main.h b/external_imported/sentry-native/external/crashpad/handler/handler_main.h index 252654118..b6cc467cd 100644 --- a/external_imported/sentry-native/external/crashpad/handler/handler_main.h +++ b/external_imported/sentry-native/external/crashpad/handler/handler_main.h @@ -35,7 +35,7 @@ int HandlerMain(int argc, char* argv[], const UserStreamDataSources* user_stream_sources); -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) //! \brief The `main()` entry point for Android libraries. //! //! This symbol is the entry point for crashpad when it is dynamically loaded diff --git a/external_imported/sentry-native/external/crashpad/handler/linux/crash_report_exception_handler.cc b/external_imported/sentry-native/external/crashpad/handler/linux/crash_report_exception_handler.cc index 84f9534fe..88378a9fa 100644 --- a/external_imported/sentry-native/external/crashpad/handler/linux/crash_report_exception_handler.cc +++ b/external_imported/sentry-native/external/crashpad/handler/linux/crash_report_exception_handler.cc @@ -36,7 +36,7 @@ #include "util/stream/log_output_stream.h" #include "util/stream/zlib_output_stream.h" -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) #include #endif @@ -52,7 +52,7 @@ class Logger final : public LogOutputStream::Delegate { ~Logger() override = default; -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) int Log(const char* buf) override { return __android_log_buf_write( LOG_ID_CRASH, ANDROID_LOG_FATAL, "crashpad", buf); diff --git a/external_imported/sentry-native/external/crashpad/handler/linux/exception_handler_server.cc b/external_imported/sentry-native/external/crashpad/handler/linux/exception_handler_server.cc index c9fbb0add..aef252fa4 100644 --- a/external_imported/sentry-native/external/crashpad/handler/linux/exception_handler_server.cc +++ b/external_imported/sentry-native/external/crashpad/handler/linux/exception_handler_server.cc @@ -198,7 +198,7 @@ class PtraceStrategyDeciderImpl : public PtraceStrategyDecider { if (HaveCapSysPtrace()) { return Strategy::kDirectPtrace; } - FALLTHROUGH; + [[fallthrough]]; case PtraceScope::kNoAttach: LOG(WARNING) << "no ptrace"; return Strategy::kNoPtrace; diff --git a/external_imported/sentry-native/external/crashpad/handler/linux/exception_handler_server_test.cc b/external_imported/sentry-native/external/crashpad/handler/linux/exception_handler_server_test.cc index 786bab1ba..c7fa90d89 100644 --- a/external_imported/sentry-native/external/crashpad/handler/linux/exception_handler_server_test.cc +++ b/external_imported/sentry-native/external/crashpad/handler/linux/exception_handler_server_test.cc @@ -30,7 +30,7 @@ #include "util/synchronization/semaphore.h" #include "util/thread/thread.h" -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) #include #endif diff --git a/external_imported/sentry-native/external/crashpad/handler/mac/file_limit_annotation.cc b/external_imported/sentry-native/external/crashpad/handler/mac/file_limit_annotation.cc index 0813b9502..063345343 100644 --- a/external_imported/sentry-native/external/crashpad/handler/mac/file_limit_annotation.cc +++ b/external_imported/sentry-native/external/crashpad/handler/mac/file_limit_annotation.cc @@ -21,9 +21,9 @@ #include #include +#include #include -#include "base/cxx17_backports.h" #include "base/format_macros.h" #include "base/strings/stringprintf.h" #include "client/crashpad_info.h" @@ -108,7 +108,7 @@ void RecordFileLimitAnnotation() { int mib[] = {CTL_KERN, KERN_MAXFILES}; size = sizeof(value); std::string max_files = FormatFromSysctl( - sysctl(mib, base::size(mib), &value, &size, nullptr, 0), &value, &size); + sysctl(mib, std::size(mib), &value, &size, nullptr, 0), &value, &size); std::string open_files = CountOpenFileDescriptors(); diff --git a/external_imported/sentry-native/external/crashpad/handler/main.cc b/external_imported/sentry-native/external/crashpad/handler/main.cc index 3ae73ecdd..855a5a7de 100644 --- a/external_imported/sentry-native/external/crashpad/handler/main.cc +++ b/external_imported/sentry-native/external/crashpad/handler/main.cc @@ -17,17 +17,17 @@ #include "build/build_config.h" #include "tools/tool_support.h" -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) #include #endif -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) int main(int argc, char* argv[]) { return crashpad::HandlerMain(argc, argv, nullptr); } -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) namespace { @@ -50,4 +50,4 @@ int wmain(int argc, wchar_t* argv[]) { return crashpad::ToolSupport::Wmain(argc, argv, HandlerMainAdaptor); } -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) diff --git a/external_imported/sentry-native/external/crashpad/handler/win/crash_other_program.cc b/external_imported/sentry-native/external/crashpad/handler/win/crash_other_program.cc index bbd25af5d..3020f6621 100644 --- a/external_imported/sentry-native/external/crashpad/handler/win/crash_other_program.cc +++ b/external_imported/sentry-native/external/crashpad/handler/win/crash_other_program.cc @@ -24,6 +24,7 @@ #include "test/test_paths.h" #include "test/win/child_launcher.h" #include "util/file/file_io.h" +#include "util/win/exception_codes.h" #include "util/win/scoped_handle.h" #include "util/win/xp_compat.h" @@ -108,7 +109,7 @@ int CrashOtherProgram(int argc, wchar_t* argv[]) { DWORD expect_exit_code; if (argc == 3 && wcscmp(argv[2], L"noexception") == 0) { - expect_exit_code = CrashpadClient::kTriggeredExceptionCode; + expect_exit_code = ExceptionCodes::kTriggeredExceptionCode; if (!CrashpadClient::DumpAndCrashTargetProcess( child.process_handle(), 0, 0)) return EXIT_FAILURE; diff --git a/external_imported/sentry-native/external/crashpad/handler/win/crashy_test_program.cc b/external_imported/sentry-native/external/crashpad/handler/win/crashy_test_program.cc index 4fb255477..f5cf04877 100644 --- a/external_imported/sentry-native/external/crashpad/handler/win/crashy_test_program.cc +++ b/external_imported/sentry-native/external/crashpad/handler/win/crashy_test_program.cc @@ -19,12 +19,12 @@ #include #include +#include #include #include #include #include -#include "base/cxx17_backports.h" #include "base/files/file_path.h" #include "base/logging.h" #include "build/build_config.h" @@ -83,11 +83,11 @@ void AllocateMemoryOfVariousProtections() { // All of these allocations are leaked, we want to view them in windbg via // !vprot. void* reserve = VirtualAlloc( - nullptr, base::size(kPageTypes) * kPageSize, MEM_RESERVE, PAGE_READWRITE); + nullptr, std::size(kPageTypes) * kPageSize, MEM_RESERVE, PAGE_READWRITE); PCHECK(reserve) << "VirtualAlloc MEM_RESERVE"; uintptr_t reserve_as_int = reinterpret_cast(reserve); - for (size_t i = 0; i < base::size(kPageTypes); ++i) { + for (size_t i = 0; i < std::size(kPageTypes); ++i) { void* result = VirtualAlloc(reinterpret_cast(reserve_as_int + (kPageSize * i)), kPageSize, diff --git a/external_imported/sentry-native/external/crashpad/handler/win/hanging_program.cc b/external_imported/sentry-native/external/crashpad/handler/win/hanging_program.cc index b65d46db8..aff3ae28e 100644 --- a/external_imported/sentry-native/external/crashpad/handler/win/hanging_program.cc +++ b/external_imported/sentry-native/external/crashpad/handler/win/hanging_program.cc @@ -15,7 +15,8 @@ #include #include -#include "base/cxx17_backports.h" +#include + #include "base/debug/alias.h" #include "base/logging.h" #include "base/notreached.h" @@ -125,7 +126,7 @@ int wmain(int argc, wchar_t* argv[]) { // This is not expected to return. DWORD count = WaitForMultipleObjects( - static_cast(base::size(threads)), threads, true, INFINITE); + static_cast(std::size(threads)), threads, true, INFINITE); if (count == WAIT_FAILED) { PLOG(ERROR) << "WaitForMultipleObjects"; } else { diff --git a/external_imported/sentry-native/external/crashpad/infra/config/generated/cr-buildbucket.cfg b/external_imported/sentry-native/external/crashpad/infra/config/generated/cr-buildbucket.cfg index d34621cdf..a79e5cfa4 100644 --- a/external_imported/sentry-native/external/crashpad/infra/config/generated/cr-buildbucket.cfg +++ b/external_imported/sentry-native/external/crashpad/infra/config/generated/cr-buildbucket.cfg @@ -23,7 +23,7 @@ buckets { swarming_host: "chromium-swarm.appspot.com" dimensions: "cores:8" dimensions: "cpu:x86-64" - dimensions: "os:Ubuntu-16.04" + dimensions: "os:Ubuntu-18.04" dimensions: "pool:luci.flex.ci" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -57,7 +57,7 @@ buckets { swarming_host: "chromium-swarm.appspot.com" dimensions: "cores:8" dimensions: "cpu:x86-64" - dimensions: "os:Ubuntu-16.04" + dimensions: "os:Ubuntu-18.04" dimensions: "pool:luci.flex.ci" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -91,7 +91,7 @@ buckets { swarming_host: "chromium-swarm.appspot.com" dimensions: "cores:8" dimensions: "cpu:x86-64" - dimensions: "os:Ubuntu-16.04" + dimensions: "os:Ubuntu-18.04" dimensions: "pool:luci.flex.ci" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -124,7 +124,7 @@ buckets { swarming_host: "chromium-swarm.appspot.com" dimensions: "cores:8" dimensions: "cpu:x86-64" - dimensions: "os:Ubuntu-16.04" + dimensions: "os:Ubuntu-18.04" dimensions: "pool:luci.flex.ci" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -156,7 +156,7 @@ buckets { name: "crashpad_ios_arm64_dbg" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15" + dimensions: "os:Mac-11" dimensions: "pool:luci.flex.ci" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -193,7 +193,7 @@ buckets { name: "crashpad_ios_arm64_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15" + dimensions: "os:Mac-11" dimensions: "pool:luci.flex.ci" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -230,7 +230,7 @@ buckets { name: "crashpad_ios_x64_dbg" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15" + dimensions: "os:Mac-11" dimensions: "pool:luci.flex.ci" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -266,7 +266,7 @@ buckets { name: "crashpad_ios_x64_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15" + dimensions: "os:Mac-11" dimensions: "pool:luci.flex.ci" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -303,7 +303,7 @@ buckets { swarming_host: "chromium-swarm.appspot.com" dimensions: "cores:8" dimensions: "cpu:x86-64" - dimensions: "os:Ubuntu-16.04" + dimensions: "os:Ubuntu-18.04" dimensions: "pool:luci.flex.ci" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -336,7 +336,7 @@ buckets { swarming_host: "chromium-swarm.appspot.com" dimensions: "cores:8" dimensions: "cpu:x86-64" - dimensions: "os:Ubuntu-16.04" + dimensions: "os:Ubuntu-18.04" dimensions: "pool:luci.flex.ci" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -368,7 +368,7 @@ buckets { name: "crashpad_mac_x64_dbg" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15" + dimensions: "os:Mac-11" dimensions: "pool:luci.flex.ci" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -404,7 +404,7 @@ buckets { name: "crashpad_mac_x64_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15" + dimensions: "os:Mac-11" dimensions: "pool:luci.flex.ci" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -450,6 +450,9 @@ buckets { } properties: '{' + ' "$depot_tools/windows_sdk": {' + ' "version": "uploaded:2021-04-28"' + ' },' ' "$gatekeeper": {' ' "group": "client.crashpad"' ' },' @@ -483,6 +486,9 @@ buckets { } properties: '{' + ' "$depot_tools/windows_sdk": {' + ' "version": "uploaded:2021-04-28"' + ' },' ' "$gatekeeper": {' ' "group": "client.crashpad"' ' },' @@ -531,7 +537,7 @@ buckets { swarming_host: "chromium-swarm.appspot.com" dimensions: "cores:8" dimensions: "cpu:x86-64" - dimensions: "os:Ubuntu-16.04" + dimensions: "os:Ubuntu-18.04" dimensions: "pool:luci.flex.try" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -562,7 +568,7 @@ buckets { swarming_host: "chromium-swarm.appspot.com" dimensions: "cores:8" dimensions: "cpu:x86-64" - dimensions: "os:Ubuntu-16.04" + dimensions: "os:Ubuntu-18.04" dimensions: "pool:luci.flex.try" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -593,7 +599,7 @@ buckets { swarming_host: "chromium-swarm.appspot.com" dimensions: "cores:8" dimensions: "cpu:x86-64" - dimensions: "os:Ubuntu-16.04" + dimensions: "os:Ubuntu-18.04" dimensions: "pool:luci.flex.try" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -623,7 +629,7 @@ buckets { swarming_host: "chromium-swarm.appspot.com" dimensions: "cores:8" dimensions: "cpu:x86-64" - dimensions: "os:Ubuntu-16.04" + dimensions: "os:Ubuntu-18.04" dimensions: "pool:luci.flex.try" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -652,7 +658,7 @@ buckets { name: "crashpad_ios_arm64_dbg" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15" + dimensions: "os:Mac-11" dimensions: "pool:luci.flex.try" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -686,7 +692,7 @@ buckets { name: "crashpad_ios_arm64_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15" + dimensions: "os:Mac-11" dimensions: "pool:luci.flex.try" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -720,7 +726,7 @@ buckets { name: "crashpad_ios_x64_dbg" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15" + dimensions: "os:Mac-11" dimensions: "pool:luci.flex.try" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -753,7 +759,7 @@ buckets { name: "crashpad_ios_x64_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15" + dimensions: "os:Mac-11" dimensions: "pool:luci.flex.try" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -787,7 +793,7 @@ buckets { swarming_host: "chromium-swarm.appspot.com" dimensions: "cores:8" dimensions: "cpu:x86-64" - dimensions: "os:Ubuntu-16.04" + dimensions: "os:Ubuntu-18.04" dimensions: "pool:luci.flex.try" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -817,7 +823,7 @@ buckets { swarming_host: "chromium-swarm.appspot.com" dimensions: "cores:8" dimensions: "cpu:x86-64" - dimensions: "os:Ubuntu-16.04" + dimensions: "os:Ubuntu-18.04" dimensions: "pool:luci.flex.try" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -846,7 +852,7 @@ buckets { name: "crashpad_mac_x64_dbg" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15" + dimensions: "os:Mac-11" dimensions: "pool:luci.flex.try" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -879,7 +885,7 @@ buckets { name: "crashpad_mac_x64_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15" + dimensions: "os:Mac-11" dimensions: "pool:luci.flex.try" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -922,6 +928,9 @@ buckets { } properties: '{' + ' "$depot_tools/windows_sdk": {' + ' "version": "uploaded:2021-04-28"' + ' },' ' "$kitchen": {' ' "devshell": true,' ' "git_auth": true' @@ -952,6 +961,9 @@ buckets { } properties: '{' + ' "$depot_tools/windows_sdk": {' + ' "version": "uploaded:2021-04-28"' + ' },' ' "$kitchen": {' ' "devshell": true,' ' "git_auth": true' diff --git a/external_imported/sentry-native/external/crashpad/infra/config/generated/luci-scheduler.cfg b/external_imported/sentry-native/external/crashpad/infra/config/generated/luci-scheduler.cfg index 6b3d04d1b..a2251eb89 100644 --- a/external_imported/sentry-native/external/crashpad/infra/config/generated/luci-scheduler.cfg +++ b/external_imported/sentry-native/external/crashpad/infra/config/generated/luci-scheduler.cfg @@ -10,7 +10,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.crashpad.ci" + bucket: "ci" builder: "crashpad_fuchsia_arm64_dbg" } } @@ -20,7 +20,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.crashpad.ci" + bucket: "ci" builder: "crashpad_fuchsia_arm64_rel" } } @@ -30,7 +30,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.crashpad.ci" + bucket: "ci" builder: "crashpad_fuchsia_x64_dbg" } } @@ -40,7 +40,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.crashpad.ci" + bucket: "ci" builder: "crashpad_fuchsia_x64_rel" } } @@ -50,7 +50,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.crashpad.ci" + bucket: "ci" builder: "crashpad_ios_arm64_dbg" } } @@ -60,7 +60,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.crashpad.ci" + bucket: "ci" builder: "crashpad_ios_arm64_rel" } } @@ -70,7 +70,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.crashpad.ci" + bucket: "ci" builder: "crashpad_ios_x64_dbg" } } @@ -80,7 +80,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.crashpad.ci" + bucket: "ci" builder: "crashpad_ios_x64_rel" } } @@ -90,7 +90,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.crashpad.ci" + bucket: "ci" builder: "crashpad_linux_x64_dbg" } } @@ -100,7 +100,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.crashpad.ci" + bucket: "ci" builder: "crashpad_linux_x64_rel" } } @@ -110,7 +110,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.crashpad.ci" + bucket: "ci" builder: "crashpad_mac_x64_dbg" } } @@ -120,7 +120,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.crashpad.ci" + bucket: "ci" builder: "crashpad_mac_x64_rel" } } @@ -130,7 +130,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.crashpad.ci" + bucket: "ci" builder: "crashpad_win_x64_dbg" } } @@ -140,7 +140,7 @@ job { acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" - bucket: "luci.crashpad.ci" + bucket: "ci" builder: "crashpad_win_x64_rel" } } diff --git a/external_imported/sentry-native/external/crashpad/infra/config/generated/project.cfg b/external_imported/sentry-native/external/crashpad/infra/config/generated/project.cfg index 9dcccbfab..28e9f2e62 100644 --- a/external_imported/sentry-native/external/crashpad/infra/config/generated/project.cfg +++ b/external_imported/sentry-native/external/crashpad/infra/config/generated/project.cfg @@ -7,8 +7,9 @@ name: "crashpad" access: "group:all" lucicfg { - version: "1.30.1" + version: "1.30.9" package_dir: ".." config_dir: "generated" entry_point: "main.star" + experiments: "crbug.com/1182002" } diff --git a/external_imported/sentry-native/external/crashpad/infra/config/main.star b/external_imported/sentry-native/external/crashpad/infra/config/main.star index f51ef23e1..fade25230 100644 --- a/external_imported/sentry-native/external/crashpad/infra/config/main.star +++ b/external_imported/sentry-native/external/crashpad/infra/config/main.star @@ -13,15 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -lucicfg.check_version("1.28.0", "Please update depot_tools") - -# Enable LUCI Realms support and Launch 100% of Swarming tasks for builds in -# "realms-aware mode". -lucicfg.enable_experiment("crbug.com/1085650") +lucicfg.check_version("1.30.9", "Please update depot_tools") REPO_URL = "https://chromium.googlesource.com/crashpad/crashpad" REVIEW_URL = "https://chromium-review.googlesource.com/crashpad/crashpad" +# Use LUCI Scheduler BBv2 names and add Scheduler realms configs. +lucicfg.enable_experiment("crbug.com/1182002") + luci.project( name = "crashpad", buildbucket = "cr-buildbucket.appspot.com", @@ -157,13 +156,13 @@ def crashpad_dimensions(platform, bucket): dimensions["pool"] = "luci.flex." + bucket if platform == "fuchsia": - dimensions["os"] = "Ubuntu-16.04" + dimensions["os"] = "Ubuntu-18.04" elif platform == "ios": - dimensions["os"] = "Mac-10.15" + dimensions["os"] = "Mac-11" elif platform == "linux": - dimensions["os"] = "Ubuntu-16.04" + dimensions["os"] = "Ubuntu-18.04" elif platform == "mac": - dimensions["os"] = "Mac-10.15" + dimensions["os"] = "Mac-11" elif platform == "win": dimensions["os"] = "Windows-10" @@ -183,6 +182,11 @@ def crashpad_properties(platform, cpu, config, bucket): if cpu != "x64": properties["target_cpu"] = cpu + if platform == "win": + properties["$depot_tools/windows_sdk"] = { + "version": "uploaded:2021-04-28", + } + if bucket == "ci": properties["$gatekeeper"] = { "group": "client.crashpad", diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_annotation_writer_test.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_annotation_writer_test.cc index c862f023e..ff3c2a8e3 100644 --- a/external_imported/sentry-native/external/crashpad/minidump/minidump_annotation_writer_test.cc +++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_annotation_writer_test.cc @@ -14,9 +14,9 @@ #include "minidump/minidump_annotation_writer.h" +#include #include -#include "base/cxx17_backports.h" #include "gtest/gtest.h" #include "minidump/minidump_extensions.h" #include "minidump/test/minidump_byte_array_writer_test_util.h" @@ -107,7 +107,7 @@ TEST(MinidumpAnnotationWriter, ThreeItems) { MinidumpAnnotationListWriter list_writer; - for (size_t i = 0; i < base::size(kNames); ++i) { + for (size_t i = 0; i < std::size(kNames); ++i) { auto annotation = std::make_unique(); annotation->InitializeWithData(kNames[i], kTypes[i], kValues[i]); list_writer.AddObject(std::move(annotation)); diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_byte_array_writer_test.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_byte_array_writer_test.cc index 526e38bad..8742ea448 100644 --- a/external_imported/sentry-native/external/crashpad/minidump/minidump_byte_array_writer_test.cc +++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_byte_array_writer_test.cc @@ -14,9 +14,9 @@ #include "minidump/minidump_byte_array_writer.h" +#include #include -#include "base/cxx17_backports.h" #include "base/format_macros.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" @@ -35,7 +35,7 @@ TEST(MinidumpByteArrayWriter, Write) { {}, }; - for (size_t i = 0; i < base::size(kTests); ++i) { + for (size_t i = 0; i < std::size(kTests); ++i) { SCOPED_TRACE(base::StringPrintf("index %" PRIuS, i)); StringFile string_file; @@ -67,7 +67,7 @@ TEST(MinidumpByteArrayWriter, SetData) { {}, }; - for (size_t i = 0; i < base::size(kTests); ++i) { + for (size_t i = 0; i < std::size(kTests); ++i) { SCOPED_TRACE(base::StringPrintf("index %" PRIuS, i)); crashpad::MinidumpByteArrayWriter writer; diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_context_writer.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_context_writer.cc index d7e53a493..2f2d90ba4 100644 --- a/external_imported/sentry-native/external/crashpad/minidump/minidump_context_writer.cc +++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_context_writer.cc @@ -21,6 +21,7 @@ #include "base/compiler_specific.h" #include "base/logging.h" +#include "build/build_config.h" #include "snapshot/cpu_context.h" #include "util/file/file_writer.h" #include "util/stdlib/aligned_allocator.h" @@ -35,7 +36,7 @@ static_assert(sizeof(MinidumpContextAMD64) == 1232, "MinidumpContextAMD64 size"); // These structures can also be checked against definitions in the Windows SDK. -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) #if defined(ARCH_CPU_X86_FAMILY) static_assert(sizeof(MinidumpContextX86) == sizeof(WOW64_CONTEXT), "WOW64_CONTEXT size"); @@ -45,7 +46,7 @@ static_assert(sizeof(MinidumpContextX86) == sizeof(CONTEXT), "CONTEXT size"); static_assert(sizeof(MinidumpContextAMD64) == sizeof(CONTEXT), "CONTEXT size"); #endif #endif // ARCH_CPU_X86_FAMILY -#endif // OS_WIN +#endif // BUILDFLAG(IS_WIN) } // namespace diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_exception_writer_test.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_exception_writer_test.cc index 0243c175d..e09232fe7 100644 --- a/external_imported/sentry-native/external/crashpad/minidump/minidump_exception_writer_test.cc +++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_exception_writer_test.cc @@ -14,10 +14,10 @@ #include "minidump/minidump_exception_writer.h" +#include #include #include -#include "base/cxx17_backports.h" #include "gtest/gtest.h" #include "minidump/minidump_context.h" #include "minidump/minidump_context_writer.h" @@ -86,7 +86,7 @@ void ExpectExceptionStream(const MINIDUMP_EXCEPTION_STREAM* expected, expected_exception.NumberParameters); EXPECT_EQ(observed->ExceptionRecord.__unusedAlignment, 0u); for (size_t index = 0; - index < base::size(observed_exception.ExceptionInformation); + index < std::size(observed_exception.ExceptionInformation); ++index) { EXPECT_EQ(observed_exception.ExceptionInformation[index], expected_exception.ExceptionInformation[index]); diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_file_writer_test.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_file_writer_test.cc index efeaeab4c..75c8525c8 100644 --- a/external_imported/sentry-native/external/crashpad/minidump/minidump_file_writer_test.cc +++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_file_writer_test.cc @@ -17,10 +17,10 @@ #include #include +#include #include #include -#include "base/cxx17_backports.h" #include "build/build_config.h" #include "gtest/gtest.h" #include "minidump/minidump_stream_writer.h" @@ -156,7 +156,7 @@ TEST(MinidumpFileWriter, AddUserExtensionStream) { minidump_file.SetTimestamp(kTimestamp); static constexpr uint8_t kStreamData[] = "Hello World!"; - constexpr size_t kStreamSize = base::size(kStreamData); + constexpr size_t kStreamSize = std::size(kStreamData); constexpr MinidumpStreamType kStreamType = static_cast(0x4d); @@ -418,12 +418,13 @@ TEST(MinidumpFileWriter, InitializeFromSnapshot_Exception) { // but the test should complete without failure. constexpr uint32_t kSnapshotTime = 0xfd469ab8; constexpr timeval kSnapshotTimeval = { -#ifdef OS_WIN - static_cast(kSnapshotTime), +#if BUILDFLAG(IS_WIN) + static_cast(kSnapshotTime), #else - static_cast(kSnapshotTime), + static_cast(kSnapshotTime), #endif - 0}; + 0 + }; TestProcessSnapshot process_snapshot; process_snapshot.SetSnapshotTime(kSnapshotTimeval); diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_memory_writer_test.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_memory_writer_test.cc index 02a352fce..0ca0652d0 100644 --- a/external_imported/sentry-native/external/crashpad/minidump/minidump_memory_writer_test.cc +++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_memory_writer_test.cc @@ -14,9 +14,9 @@ #include "minidump/minidump_memory_writer.h" +#include #include -#include "base/cxx17_backports.h" #include "base/format_macros.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" @@ -342,7 +342,7 @@ TEST(MinidumpMemoryWriter, ExtraMemory) { TEST(MinidumpMemoryWriter, AddFromSnapshot) { MINIDUMP_MEMORY_DESCRIPTOR expect_memory_descriptors[3] = {}; - uint8_t values[base::size(expect_memory_descriptors)] = {}; + uint8_t values[std::size(expect_memory_descriptors)] = {}; expect_memory_descriptors[0].StartOfMemoryRange = 0; expect_memory_descriptors[0].Memory.DataSize = 0x1000; @@ -358,7 +358,7 @@ TEST(MinidumpMemoryWriter, AddFromSnapshot) { std::vector> memory_snapshots_owner; std::vector memory_snapshots; - for (size_t index = 0; index < base::size(expect_memory_descriptors); + for (size_t index = 0; index < std::size(expect_memory_descriptors); ++index) { memory_snapshots_owner.push_back(std::make_unique()); TestMemorySnapshot* memory_snapshot = memory_snapshots_owner.back().get(); @@ -397,7 +397,7 @@ TEST(MinidumpMemoryWriter, AddFromSnapshot) { TEST(MinidumpMemoryWriter, CoalesceExplicitMultiple) { MINIDUMP_MEMORY_DESCRIPTOR expect_memory_descriptors[4] = {}; - uint8_t values[base::size(expect_memory_descriptors)] = {}; + uint8_t values[std::size(expect_memory_descriptors)] = {}; expect_memory_descriptors[0].StartOfMemoryRange = 0; expect_memory_descriptors[0].Memory.DataSize = 1000; diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_misc_info_writer.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_misc_info_writer.cc index 64c3c2371..78847c119 100644 --- a/external_imported/sentry-native/external/crashpad/minidump/minidump_misc_info_writer.cc +++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_misc_info_writer.cc @@ -14,10 +14,10 @@ #include "minidump/minidump_misc_info_writer.h" +#include #include #include "base/check_op.h" -#include "base/cxx17_backports.h" #include "base/logging.h" #include "base/numerics/safe_conversions.h" #include "base/strings/stringprintf.h" @@ -31,9 +31,9 @@ #include "util/numeric/in_range_cast.h" #include "util/numeric/safe_assignment.h" -#if defined(OS_MAC) +#if BUILDFLAG(IS_MAC) #include -#elif defined(OS_ANDROID) +#elif BUILDFLAG(IS_ANDROID) #include #endif @@ -67,7 +67,7 @@ std::string BuildString(const SystemSnapshot* system_snapshot) { return machine_description; } -#if defined(OS_MAC) +#if BUILDFLAG(IS_MAC) // Converts the value of the __MAC_OS_X_VERSION_MIN_REQUIRED or // __MAC_OS_X_VERSION_MAX_ALLOWED macro from to a number // identifying the macOS version that it represents, in the same format used by @@ -93,7 +93,7 @@ int AvailabilityVersionToMacOSVersionNumber(int availability) { return availability; } -#endif // OS_MAC +#endif // BUILDFLAG(IS_MAC) } // namespace @@ -107,17 +107,17 @@ std::string MinidumpMiscInfoDebugBuildString() { // Caution: the minidump file format only has room for 39 UTF-16 code units // plus a UTF-16 NUL terminator. Don’t let strings get longer than this, or // they will be truncated and a message will be logged. -#if defined(OS_MAC) +#if BUILDFLAG(IS_MAC) static constexpr char kOS[] = "mac"; -#elif defined(OS_IOS) +#elif BUILDFLAG(IS_IOS) static constexpr char kOS[] = "ios"; -#elif defined(OS_ANDROID) +#elif BUILDFLAG(IS_ANDROID) static constexpr char kOS[] = "android"; -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) static constexpr char kOS[] = "linux"; -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) static constexpr char kOS[] = "win"; -#elif defined(OS_FUCHSIA) +#elif BUILDFLAG(IS_FUCHSIA) static constexpr char kOS[] = "fuchsia"; #else #error define kOS for this operating system @@ -145,12 +145,12 @@ std::string MinidumpMiscInfoDebugBuildString() { PACKAGE_VERSION, kOS); -#if defined(OS_MAC) +#if BUILDFLAG(IS_MAC) debug_build_string += base::StringPrintf( ",%d,%d", AvailabilityVersionToMacOSVersionNumber(__MAC_OS_X_VERSION_MIN_REQUIRED), AvailabilityVersionToMacOSVersionNumber(__MAC_OS_X_VERSION_MAX_ALLOWED)); -#elif defined(OS_ANDROID) +#elif BUILDFLAG(IS_ANDROID) debug_build_string += base::StringPrintf(",%d", __ANDROID_API__); #endif @@ -311,7 +311,7 @@ void MinidumpMiscInfoWriter::SetTimeZone(uint32_t time_zone_id, internal::MinidumpWriterUtil::AssignUTF8ToUTF16( AsU16CStr(misc_info_.TimeZone.StandardName), - base::size(misc_info_.TimeZone.StandardName), + std::size(misc_info_.TimeZone.StandardName), standard_name); misc_info_.TimeZone.StandardDate = standard_date; @@ -319,7 +319,7 @@ void MinidumpMiscInfoWriter::SetTimeZone(uint32_t time_zone_id, internal::MinidumpWriterUtil::AssignUTF8ToUTF16( AsU16CStr(misc_info_.TimeZone.DaylightName), - base::size(misc_info_.TimeZone.DaylightName), + std::size(misc_info_.TimeZone.DaylightName), daylight_name); misc_info_.TimeZone.DaylightDate = daylight_date; @@ -337,11 +337,11 @@ void MinidumpMiscInfoWriter::SetBuildString( internal::MinidumpWriterUtil::AssignUTF8ToUTF16( AsU16CStr(misc_info_.BuildString), - base::size(misc_info_.BuildString), + std::size(misc_info_.BuildString), build_string); internal::MinidumpWriterUtil::AssignUTF8ToUTF16( AsU16CStr(misc_info_.DbgBldStr), - base::size(misc_info_.DbgBldStr), + std::size(misc_info_.DbgBldStr), debug_build_string); } diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_misc_info_writer_test.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_misc_info_writer_test.cc index 18ac2966b..c98341418 100644 --- a/external_imported/sentry-native/external/crashpad/minidump/minidump_misc_info_writer_test.cc +++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_misc_info_writer_test.cc @@ -16,11 +16,10 @@ #include +#include #include #include -#include "base/compiler_specific.h" -#include "base/cxx17_backports.h" #include "base/format_macros.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" @@ -126,7 +125,7 @@ void ExpectMiscInfoEqual( SCOPED_TRACE("Standard"); ExpectNULPaddedString16Equal(AsU16CStr(expected->TimeZone.StandardName), AsU16CStr(observed->TimeZone.StandardName), - base::size(expected->TimeZone.StandardName)); + std::size(expected->TimeZone.StandardName)); ExpectSystemTimeEqual(&expected->TimeZone.StandardDate, &observed->TimeZone.StandardDate); EXPECT_EQ(observed->TimeZone.StandardBias, expected->TimeZone.StandardBias); @@ -135,7 +134,7 @@ void ExpectMiscInfoEqual( SCOPED_TRACE("Daylight"); ExpectNULPaddedString16Equal(AsU16CStr(expected->TimeZone.DaylightName), AsU16CStr(observed->TimeZone.DaylightName), - base::size(expected->TimeZone.DaylightName)); + std::size(expected->TimeZone.DaylightName)); ExpectSystemTimeEqual(&expected->TimeZone.DaylightDate, &observed->TimeZone.DaylightDate); EXPECT_EQ(observed->TimeZone.DaylightBias, expected->TimeZone.DaylightBias); @@ -153,13 +152,13 @@ void ExpectMiscInfoEqual( SCOPED_TRACE("BuildString"); ExpectNULPaddedString16Equal(AsU16CStr(expected->BuildString), AsU16CStr(observed->BuildString), - base::size(expected->BuildString)); + std::size(expected->BuildString)); } { SCOPED_TRACE("DbgBldStr"); ExpectNULPaddedString16Equal(AsU16CStr(expected->DbgBldStr), AsU16CStr(observed->DbgBldStr), - base::size(expected->DbgBldStr)); + std::size(expected->DbgBldStr)); } } @@ -182,7 +181,7 @@ void ExpectMiscInfoEqual( EXPECT_EQ(observed_misc_info.XStateData.EnabledFeatures, expected_misc_info.XStateData.EnabledFeatures); for (size_t feature_index = 0; - feature_index < base::size(observed_misc_info.XStateData.Features); + feature_index < std::size(observed_misc_info.XStateData.Features); ++feature_index) { SCOPED_TRACE(base::StringPrintf("feature_index %" PRIuS, feature_index)); EXPECT_EQ(observed_misc_info.XStateData.Features[feature_index].Offset, @@ -409,7 +408,7 @@ TEST(MinidumpMiscInfoWriter, TimeZone) { base::UTF8ToUTF16(Crbug1189439Cast(kStandardName)); c16lcpy(AsU16CStr(expected.TimeZone.StandardName), standard_name_utf16.c_str(), - base::size(expected.TimeZone.StandardName)); + std::size(expected.TimeZone.StandardName)); memcpy(&expected.TimeZone.StandardDate, &kStandardDate, sizeof(expected.TimeZone.StandardDate)); @@ -418,7 +417,7 @@ TEST(MinidumpMiscInfoWriter, TimeZone) { base::UTF8ToUTF16(Crbug1189439Cast(kDaylightName)); c16lcpy(AsU16CStr(expected.TimeZone.DaylightName), daylight_name_utf16.c_str(), - base::size(expected.TimeZone.DaylightName)); + std::size(expected.TimeZone.DaylightName)); memcpy(&expected.TimeZone.DaylightDate, &kDaylightDate, sizeof(expected.TimeZone.DaylightDate)); @@ -436,11 +435,10 @@ TEST(MinidumpMiscInfoWriter, TimeZoneStringsOverflow) { constexpr uint32_t kTimeZoneId = 2; constexpr int32_t kBias = 300; - MINIDUMP_MISC_INFO_N tmp; - ALLOW_UNUSED_LOCAL(tmp); - std::string standard_name(base::size(tmp.TimeZone.StandardName) + 1, 's'); + [[maybe_unused]] MINIDUMP_MISC_INFO_N tmp; + std::string standard_name(std::size(tmp.TimeZone.StandardName) + 1, 's'); constexpr int32_t kStandardBias = 0; - std::string daylight_name(base::size(tmp.TimeZone.DaylightName), 'd'); + std::string daylight_name(std::size(tmp.TimeZone.DaylightName), 'd'); constexpr int32_t kDaylightBias = -60; // Test using kSystemTimeZero, because not all platforms will be able to @@ -471,7 +469,7 @@ TEST(MinidumpMiscInfoWriter, TimeZoneStringsOverflow) { std::u16string standard_name_utf16 = base::UTF8ToUTF16(standard_name); c16lcpy(AsU16CStr(expected.TimeZone.StandardName), standard_name_utf16.c_str(), - base::size(expected.TimeZone.StandardName)); + std::size(expected.TimeZone.StandardName)); memcpy(&expected.TimeZone.StandardDate, &kSystemTimeZero, sizeof(expected.TimeZone.StandardDate)); @@ -479,7 +477,7 @@ TEST(MinidumpMiscInfoWriter, TimeZoneStringsOverflow) { std::u16string daylight_name_utf16 = base::UTF8ToUTF16(daylight_name); c16lcpy(AsU16CStr(expected.TimeZone.DaylightName), daylight_name_utf16.c_str(), - base::size(expected.TimeZone.DaylightName)); + std::size(expected.TimeZone.DaylightName)); memcpy(&expected.TimeZone.DaylightDate, &kSystemTimeZero, sizeof(expected.TimeZone.DaylightDate)); @@ -511,12 +509,12 @@ TEST(MinidumpMiscInfoWriter, BuildStrings) { base::UTF8ToUTF16(Crbug1189439Cast(kBuildString)); c16lcpy(AsU16CStr(expected.BuildString), build_string_utf16.c_str(), - base::size(expected.BuildString)); + std::size(expected.BuildString)); std::u16string debug_build_string_utf16 = base::UTF8ToUTF16(Crbug1189439Cast(kDebugBuildString)); c16lcpy(AsU16CStr(expected.DbgBldStr), debug_build_string_utf16.c_str(), - base::size(expected.DbgBldStr)); + std::size(expected.DbgBldStr)); ExpectMiscInfoEqual(&expected, observed); } @@ -528,10 +526,9 @@ TEST(MinidumpMiscInfoWriter, BuildStringsOverflow) { MinidumpFileWriter minidump_file_writer; auto misc_info_writer = std::make_unique(); - MINIDUMP_MISC_INFO_N tmp; - ALLOW_UNUSED_LOCAL(tmp); - std::string build_string(base::size(tmp.BuildString) + 1, 'B'); - std::string debug_build_string(base::size(tmp.DbgBldStr), 'D'); + [[maybe_unused]] MINIDUMP_MISC_INFO_N tmp; + std::string build_string(std::size(tmp.BuildString) + 1, 'B'); + std::string debug_build_string(std::size(tmp.DbgBldStr), 'D'); misc_info_writer->SetBuildString(build_string, debug_build_string); @@ -548,12 +545,12 @@ TEST(MinidumpMiscInfoWriter, BuildStringsOverflow) { std::u16string build_string_utf16 = base::UTF8ToUTF16(build_string); c16lcpy(AsU16CStr(expected.BuildString), build_string_utf16.c_str(), - base::size(expected.BuildString)); + std::size(expected.BuildString)); std::u16string debug_build_string_utf16 = base::UTF8ToUTF16(debug_build_string); c16lcpy(AsU16CStr(expected.DbgBldStr), debug_build_string_utf16.c_str(), - base::size(expected.DbgBldStr)); + std::size(expected.DbgBldStr)); ExpectMiscInfoEqual(&expected, observed); } @@ -694,7 +691,7 @@ TEST(MinidumpMiscInfoWriter, Everything) { base::UTF8ToUTF16(Crbug1189439Cast(kStandardName)); c16lcpy(AsU16CStr(expected.TimeZone.StandardName), standard_name_utf16.c_str(), - base::size(expected.TimeZone.StandardName)); + std::size(expected.TimeZone.StandardName)); memcpy(&expected.TimeZone.StandardDate, &kSystemTimeZero, sizeof(expected.TimeZone.StandardDate)); @@ -703,7 +700,7 @@ TEST(MinidumpMiscInfoWriter, Everything) { base::UTF8ToUTF16(Crbug1189439Cast(kDaylightName)); c16lcpy(AsU16CStr(expected.TimeZone.DaylightName), daylight_name_utf16.c_str(), - base::size(expected.TimeZone.DaylightName)); + std::size(expected.TimeZone.DaylightName)); memcpy(&expected.TimeZone.DaylightDate, &kSystemTimeZero, sizeof(expected.TimeZone.DaylightDate)); @@ -712,12 +709,12 @@ TEST(MinidumpMiscInfoWriter, Everything) { base::UTF8ToUTF16(Crbug1189439Cast(kBuildString)); c16lcpy(AsU16CStr(expected.BuildString), build_string_utf16.c_str(), - base::size(expected.BuildString)); + std::size(expected.BuildString)); std::u16string debug_build_string_utf16 = base::UTF8ToUTF16(Crbug1189439Cast(kDebugBuildString)); c16lcpy(AsU16CStr(expected.DbgBldStr), debug_build_string_utf16.c_str(), - base::size(expected.DbgBldStr)); + std::size(expected.DbgBldStr)); ExpectMiscInfoEqual(&expected, observed); } @@ -761,18 +758,18 @@ TEST(MinidumpMiscInfoWriter, InitializeFromSnapshot) { expect_misc_info.TimeZone.Bias = 300; c16lcpy(AsU16CStr(expect_misc_info.TimeZone.StandardName), standard_time_name_utf16.c_str(), - base::size(expect_misc_info.TimeZone.StandardName)); + std::size(expect_misc_info.TimeZone.StandardName)); expect_misc_info.TimeZone.StandardBias = 0; c16lcpy(AsU16CStr(expect_misc_info.TimeZone.DaylightName), daylight_time_name_utf16.c_str(), - base::size(expect_misc_info.TimeZone.DaylightName)); + std::size(expect_misc_info.TimeZone.DaylightName)); expect_misc_info.TimeZone.DaylightBias = -60; c16lcpy(AsU16CStr(expect_misc_info.BuildString), build_string_utf16.c_str(), - base::size(expect_misc_info.BuildString)); + std::size(expect_misc_info.BuildString)); c16lcpy(AsU16CStr(expect_misc_info.DbgBldStr), debug_build_string_utf16.c_str(), - base::size(expect_misc_info.DbgBldStr)); + std::size(expect_misc_info.DbgBldStr)); const timeval kStartTime = { static_cast(expect_misc_info.ProcessCreateTime), 0}; diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_module_crashpad_info_writer_test.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_module_crashpad_info_writer_test.cc index 613314b3f..ba5c5f223 100644 --- a/external_imported/sentry-native/external/crashpad/minidump/minidump_module_crashpad_info_writer_test.cc +++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_module_crashpad_info_writer_test.cc @@ -17,9 +17,9 @@ #include #include +#include #include -#include "base/cxx17_backports.h" #include "gtest/gtest.h" #include "minidump/minidump_annotation_writer.h" #include "minidump/minidump_simple_string_dictionary_writer.h" @@ -155,9 +155,9 @@ TEST(MinidumpModuleCrashpadInfoWriter, FullModule) { sizeof(MinidumpSimpleStringDictionaryEntry) + sizeof(MinidumpAnnotationList) + 2 + // padding sizeof(MinidumpAnnotation) + sizeof(MinidumpUTF8String) + - base::size(kEntry) + 2 + // padding - sizeof(MinidumpUTF8String) + base::size(kKey) + - sizeof(MinidumpUTF8String) + base::size(kValue) + + std::size(kEntry) + 2 + // padding + sizeof(MinidumpUTF8String) + std::size(kKey) + + sizeof(MinidumpUTF8String) + std::size(kValue) + sizeof(MinidumpUTF8String) + annotation.name.size() + 1 + sizeof(MinidumpByteArray) + annotation.value.size()); diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_module_writer_test.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_module_writer_test.cc index 131575fab..e189d77e8 100644 --- a/external_imported/sentry-native/external/crashpad/minidump/minidump_module_writer_test.cc +++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_module_writer_test.cc @@ -17,9 +17,9 @@ #include #include +#include #include -#include "base/cxx17_backports.h" #include "base/format_macros.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" @@ -793,10 +793,10 @@ void InitializeTestModuleSnapshotFromMinidumpModule( TEST(MinidumpModuleWriter, InitializeFromSnapshot) { MINIDUMP_MODULE expect_modules[3] = {}; - const char* module_paths[base::size(expect_modules)] = {}; - const char* module_pdbs[base::size(expect_modules)] = {}; - UUID uuids[base::size(expect_modules)] = {}; - uint32_t ages[base::size(expect_modules)] = {}; + const char* module_paths[std::size(expect_modules)] = {}; + const char* module_pdbs[std::size(expect_modules)] = {}; + UUID uuids[std::size(expect_modules)] = {}; + uint32_t ages[std::size(expect_modules)] = {}; expect_modules[0].BaseOfImage = 0x100101000; expect_modules[0].SizeOfImage = 0xf000; @@ -887,7 +887,7 @@ TEST(MinidumpModuleWriter, InitializeFromSnapshot) { std::vector> module_snapshots_owner; std::vector module_snapshots; - for (size_t index = 0; index < base::size(expect_modules); ++index) { + for (size_t index = 0; index < std::size(expect_modules); ++index) { module_snapshots_owner.push_back(std::make_unique()); TestModuleSnapshot* module_snapshot = module_snapshots_owner.back().get(); InitializeTestModuleSnapshotFromMinidumpModule(module_snapshot, diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_rva_list_writer_test.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_rva_list_writer_test.cc index f99d9435c..adfed1128 100644 --- a/external_imported/sentry-native/external/crashpad/minidump/minidump_rva_list_writer_test.cc +++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_rva_list_writer_test.cc @@ -14,9 +14,9 @@ #include "minidump/minidump_rva_list_writer.h" +#include #include -#include "base/cxx17_backports.h" #include "base/format_macros.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" @@ -89,10 +89,10 @@ TEST(MinidumpRVAListWriter, ThreeChildren) { ASSERT_TRUE(list_writer.WriteEverything(&string_file)); const MinidumpRVAList* list = - MinidumpRVAListAtStart(string_file.string(), base::size(kValues)); + MinidumpRVAListAtStart(string_file.string(), std::size(kValues)); ASSERT_TRUE(list); - for (size_t index = 0; index < base::size(kValues); ++index) { + for (size_t index = 0; index < std::size(kValues); ++index) { SCOPED_TRACE(base::StringPrintf("index %" PRIuS, index)); const uint32_t* child = MinidumpWritableAtRVA( diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_string_writer_test.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_string_writer_test.cc index bfaf3a9ae..f0cdb827f 100644 --- a/external_imported/sentry-native/external/crashpad/minidump/minidump_string_writer_test.cc +++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_string_writer_test.cc @@ -14,10 +14,9 @@ #include "minidump/minidump_string_writer.h" +#include #include -#include "base/compiler_specific.h" -#include "base/cxx17_backports.h" #include "base/format_macros.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" @@ -67,16 +66,15 @@ TEST(MinidumpStringWriter, MinidumpUTF16StringWriter) { {4, "\360\220\204\202", 2, {0xd800, 0xdd02}}, // 𐄂 (non-BMP) }; - for (size_t index = 0; index < base::size(kTestData); ++index) { + for (size_t index = 0; index < std::size(kTestData); ++index) { SCOPED_TRACE(base::StringPrintf( "index %" PRIuS ", input %s", index, kTestData[index].input_string)); // Make sure that the expected output string with its NUL terminator fits in // the space provided. - ASSERT_EQ( - kTestData[index] - .output_string[base::size(kTestData[index].output_string) - 1], - 0); + ASSERT_EQ(kTestData[index] + .output_string[std::size(kTestData[index].output_string) - 1], + 0); string_file.Reset(); crashpad::internal::MinidumpUTF16StringWriter string_writer; @@ -86,8 +84,7 @@ TEST(MinidumpStringWriter, MinidumpUTF16StringWriter) { const size_t expected_utf16_units_with_nul = kTestData[index].output_length + 1; - MINIDUMP_STRING* tmp; - ALLOW_UNUSED_LOCAL(tmp); + [[maybe_unused]] MINIDUMP_STRING* tmp; const size_t expected_utf16_bytes = expected_utf16_units_with_nul * sizeof(tmp->Buffer[0]); ASSERT_EQ(string_file.string().size(), sizeof(*tmp) + expected_utf16_bytes); @@ -114,7 +111,7 @@ TEST(MinidumpStringWriter, ConvertInvalidUTF8ToUTF16) { "\303\0\251", // NUL in middle of valid sequence }; - for (size_t index = 0; index < base::size(kTestData); ++index) { + for (size_t index = 0; index < std::size(kTestData); ++index) { SCOPED_TRACE(base::StringPrintf( "index %" PRIuS ", input %s", index, kTestData[index])); string_file.Reset(); @@ -130,8 +127,7 @@ TEST(MinidumpStringWriter, ConvertInvalidUTF8ToUTF16) { const MINIDUMP_STRING* minidump_string = MinidumpStringAtRVA(string_file.string(), 0); EXPECT_TRUE(minidump_string); - MINIDUMP_STRING* tmp; - ALLOW_UNUSED_LOCAL(tmp); + [[maybe_unused]] MINIDUMP_STRING* tmp; EXPECT_EQ( minidump_string->Length, string_file.string().size() - sizeof(*tmp) - sizeof(tmp->Buffer[0])); @@ -176,7 +172,7 @@ TEST(MinidumpStringWriter, MinidumpUTF8StringWriter) { {4, "\360\220\204\202"}, // 𐄂 (non-BMP) }; - for (size_t index = 0; index < base::size(kTestData); ++index) { + for (size_t index = 0; index < std::size(kTestData); ++index) { SCOPED_TRACE(base::StringPrintf( "index %" PRIuS ", input %s", index, kTestData[index].string)); diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_system_info_writer.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_system_info_writer.cc index 135010103..bc9a5d65d 100644 --- a/external_imported/sentry-native/external/crashpad/minidump/minidump_system_info_writer.cc +++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_system_info_writer.cc @@ -16,8 +16,9 @@ #include +#include + #include "base/check_op.h" -#include "base/cxx17_backports.h" #include "base/notreached.h" #include "minidump/minidump_string_writer.h" #include "snapshot/system_snapshot.h" @@ -235,7 +236,7 @@ void MinidumpSystemInfoWriter::SetCPUX86VendorString( sizeof(registers) == sizeof(system_info_.Cpu.X86CpuInfo.VendorId), "VendorId sizes must be equal"); - for (size_t index = 0; index < base::size(registers); ++index) { + for (size_t index = 0; index < std::size(registers); ++index) { memcpy(®isters[index], &vendor[index * sizeof(*registers)], sizeof(*registers)); diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_system_info_writer_test.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_system_info_writer_test.cc index 206a8e41c..81de730bd 100644 --- a/external_imported/sentry-native/external/crashpad/minidump/minidump_system_info_writer_test.cc +++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_system_info_writer_test.cc @@ -20,7 +20,6 @@ #include #include -#include "base/compiler_specific.h" #include "gtest/gtest.h" #include "minidump/minidump_file_writer.h" #include "minidump/test/minidump_file_writer_test_util.h" @@ -39,8 +38,7 @@ void GetSystemInfoStream(const std::string& file_contents, const MINIDUMP_SYSTEM_INFO** system_info, const MINIDUMP_STRING** csd_version) { // The expected number of bytes for the CSD version’s MINIDUMP_STRING::Buffer. - MINIDUMP_STRING* tmp; - ALLOW_UNUSED_LOCAL(tmp); + [[maybe_unused]] MINIDUMP_STRING* tmp; const size_t kCSDVersionBytes = csd_version_length * sizeof(tmp->Buffer[0]); const size_t kCSDVersionBytesWithNUL = kCSDVersionBytes + sizeof(tmp->Buffer[0]); diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_thread_id_map_test.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_thread_id_map_test.cc index e972aebc9..0883d9a55 100644 --- a/external_imported/sentry-native/external/crashpad/minidump/minidump_thread_id_map_test.cc +++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_thread_id_map_test.cc @@ -16,9 +16,9 @@ #include +#include #include -#include "base/cxx17_backports.h" #include "gtest/gtest.h" #include "snapshot/test/test_thread_snapshot.h" @@ -41,8 +41,7 @@ class MinidumpThreadIDMapTest : public testing::Test { // testing::Test: void SetUp() override { - for (size_t index = 0; index < base::size(test_thread_snapshots_); - ++index) { + for (size_t index = 0; index < std::size(test_thread_snapshots_); ++index) { thread_snapshots_.push_back(&test_thread_snapshots_[index]); } } @@ -63,7 +62,7 @@ class MinidumpThreadIDMapTest : public testing::Test { } void SetThreadID(size_t index, uint64_t thread_id) { - ASSERT_LT(index, base::size(test_thread_snapshots_)); + ASSERT_LT(index, std::size(test_thread_snapshots_)); test_thread_snapshots_[index].SetThreadID(thread_id); } diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_thread_writer_test.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_thread_writer_test.cc index 924c5c11e..9b0e064ca 100644 --- a/external_imported/sentry-native/external/crashpad/minidump/minidump_thread_writer_test.cc +++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_thread_writer_test.cc @@ -14,11 +14,11 @@ #include "minidump/minidump_thread_writer.h" +#include #include #include #include "base/compiler_specific.h" -#include "base/cxx17_backports.h" #include "base/format_macros.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" @@ -531,10 +531,10 @@ template void RunInitializeFromSnapshotTest(bool thread_id_collision) { using MinidumpContextType = typename Traits::MinidumpContextType; MINIDUMP_THREAD expect_threads[3] = {}; - uint64_t thread_ids[base::size(expect_threads)] = {}; - uint8_t memory_values[base::size(expect_threads)] = {}; - uint32_t context_seeds[base::size(expect_threads)] = {}; - MINIDUMP_MEMORY_DESCRIPTOR tebs[base::size(expect_threads)] = {}; + uint64_t thread_ids[std::size(expect_threads)] = {}; + uint8_t memory_values[std::size(expect_threads)] = {}; + uint32_t context_seeds[std::size(expect_threads)] = {}; + MINIDUMP_MEMORY_DESCRIPTOR tebs[std::size(expect_threads)] = {}; constexpr size_t kTebSize = 1024; @@ -590,7 +590,7 @@ void RunInitializeFromSnapshotTest(bool thread_id_collision) { std::vector> thread_snapshots_owner; std::vector thread_snapshots; - for (size_t index = 0; index < base::size(expect_threads); ++index) { + for (size_t index = 0; index < std::size(expect_threads); ++index) { thread_snapshots_owner.push_back(std::make_unique()); TestThreadSnapshot* thread_snapshot = thread_snapshots_owner.back().get(); diff --git a/external_imported/sentry-native/external/crashpad/minidump/minidump_writable.cc b/external_imported/sentry-native/external/crashpad/minidump/minidump_writable.cc index 8f69c9c16..9bfba52e0 100644 --- a/external_imported/sentry-native/external/crashpad/minidump/minidump_writable.cc +++ b/external_imported/sentry-native/external/crashpad/minidump/minidump_writable.cc @@ -16,7 +16,8 @@ #include -#include "base/cxx17_backports.h" +#include + #include "base/logging.h" #include "util/file/file_writer.h" #include "util/numeric/safe_assignment.h" @@ -245,7 +246,7 @@ bool MinidumpWritable::WritePaddingAndObject(FileWriterInterface* file_writer) { // The number of elements in kZeroes must be at least one less than the // maximum Alignment() ever encountered. static constexpr uint8_t kZeroes[kMaximumAlignment - 1] = {}; - DCHECK_LE(leading_pad_bytes_, base::size(kZeroes)); + DCHECK_LE(leading_pad_bytes_, std::size(kZeroes)); if (leading_pad_bytes_) { if (!file_writer->Write(&kZeroes, leading_pad_bytes_)) { diff --git a/external_imported/sentry-native/external/crashpad/minidump/test/minidump_context_test_util.cc b/external_imported/sentry-native/external/crashpad/minidump/test/minidump_context_test_util.cc index 446e5a152..3836640c0 100644 --- a/external_imported/sentry-native/external/crashpad/minidump/test/minidump_context_test_util.cc +++ b/external_imported/sentry-native/external/crashpad/minidump/test/minidump_context_test_util.cc @@ -17,7 +17,8 @@ #include #include -#include "base/cxx17_backports.h" +#include + #include "base/format_macros.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" @@ -128,8 +129,7 @@ void InitializeMinidumpContextAMD64(MinidumpContextAMD64* context, context->ds = static_cast(value++); context->es = static_cast(value++); context->ss = static_cast(value++); - for (size_t index = 0; index < base::size(context->vector_register); - ++index) { + for (size_t index = 0; index < std::size(context->vector_register); ++index) { context->vector_register[index].lo = value++; context->vector_register[index].hi = value++; } @@ -152,7 +152,7 @@ void InitializeMinidumpContextARM(MinidumpContextARM* context, uint32_t seed) { uint32_t value = seed; - for (size_t index = 0; index < base::size(context->regs); ++index) { + for (size_t index = 0; index < std::size(context->regs); ++index) { context->regs[index] = value++; } context->fp = value++; @@ -163,7 +163,7 @@ void InitializeMinidumpContextARM(MinidumpContextARM* context, uint32_t seed) { context->pc = value++; context->cpsr = value++; - for (size_t index = 0; index < base::size(context->vfp); ++index) { + for (size_t index = 0; index < std::size(context->vfp); ++index) { context->vfp[index] = value++; } context->fpscr = value++; @@ -181,7 +181,7 @@ void InitializeMinidumpContextARM64(MinidumpContextARM64* context, uint32_t value = seed; - for (size_t index = 0; index < base::size(context->regs); ++index) { + for (size_t index = 0; index < std::size(context->regs); ++index) { context->regs[index] = value++; } context->fp = value++; @@ -190,7 +190,7 @@ void InitializeMinidumpContextARM64(MinidumpContextARM64* context, context->pc = value++; context->cpsr = value++; - for (size_t index = 0; index < base::size(context->fpsimd); ++index) { + for (size_t index = 0; index < std::size(context->fpsimd); ++index) { context->fpsimd[index].lo = value++; context->fpsimd[index].hi = value++; } @@ -210,7 +210,7 @@ void InitializeMinidumpContextMIPS(MinidumpContextMIPS* context, uint32_t value = seed; - for (size_t index = 0; index < base::size(context->regs); ++index) { + for (size_t index = 0; index < std::size(context->regs); ++index) { context->regs[index] = value++; } @@ -221,7 +221,7 @@ void InitializeMinidumpContextMIPS(MinidumpContextMIPS* context, context->status = value++; context->cause = value++; - for (size_t index = 0; index < base::size(context->fpregs.fregs); ++index) { + for (size_t index = 0; index < std::size(context->fpregs.fregs); ++index) { context->fpregs.fregs[index]._fp_fregs = static_cast(value++); } @@ -248,7 +248,7 @@ void InitializeMinidumpContextMIPS64(MinidumpContextMIPS64* context, uint64_t value = seed; - for (size_t index = 0; index < base::size(context->regs); ++index) { + for (size_t index = 0; index < std::size(context->regs); ++index) { context->regs[index] = value++; } @@ -259,7 +259,7 @@ void InitializeMinidumpContextMIPS64(MinidumpContextMIPS64* context, context->status = value++; context->cause = value++; - for (size_t index = 0; index < base::size(context->fpregs.dregs); ++index) { + for (size_t index = 0; index < std::size(context->fpregs.dregs); ++index) { context->fpregs.dregs[index] = static_cast(value++); } context->fpcsr = value++; @@ -294,33 +294,33 @@ void ExpectMinidumpContextFxsave(const FxsaveType* expected, EXPECT_EQ(observed->reserved_3, expected->reserved_3); EXPECT_EQ(observed->mxcsr, expected->mxcsr); EXPECT_EQ(observed->mxcsr_mask, expected->mxcsr_mask); - for (size_t st_mm_index = 0; st_mm_index < base::size(expected->st_mm); + for (size_t st_mm_index = 0; st_mm_index < std::size(expected->st_mm); ++st_mm_index) { SCOPED_TRACE(base::StringPrintf("st_mm_index %" PRIuS, st_mm_index)); EXPECT_EQ(BytesToHexString(observed->st_mm[st_mm_index].st, - base::size(observed->st_mm[st_mm_index].st)), + std::size(observed->st_mm[st_mm_index].st)), BytesToHexString(expected->st_mm[st_mm_index].st, - base::size(expected->st_mm[st_mm_index].st))); + std::size(expected->st_mm[st_mm_index].st))); EXPECT_EQ( BytesToHexString(observed->st_mm[st_mm_index].st_reserved, - base::size(observed->st_mm[st_mm_index].st_reserved)), + std::size(observed->st_mm[st_mm_index].st_reserved)), BytesToHexString(expected->st_mm[st_mm_index].st_reserved, - base::size(expected->st_mm[st_mm_index].st_reserved))); + std::size(expected->st_mm[st_mm_index].st_reserved))); } - for (size_t xmm_index = 0; xmm_index < base::size(expected->xmm); + for (size_t xmm_index = 0; xmm_index < std::size(expected->xmm); ++xmm_index) { EXPECT_EQ(BytesToHexString(observed->xmm[xmm_index], - base::size(observed->xmm[xmm_index])), + std::size(observed->xmm[xmm_index])), BytesToHexString(expected->xmm[xmm_index], - base::size(expected->xmm[xmm_index]))) + std::size(expected->xmm[xmm_index]))) << "xmm_index " << xmm_index; } EXPECT_EQ( - BytesToHexString(observed->reserved_4, base::size(observed->reserved_4)), - BytesToHexString(expected->reserved_4, base::size(expected->reserved_4))); + BytesToHexString(observed->reserved_4, std::size(observed->reserved_4)), + BytesToHexString(expected->reserved_4, std::size(expected->reserved_4))); EXPECT_EQ( - BytesToHexString(observed->available, base::size(observed->available)), - BytesToHexString(expected->available, base::size(expected->available))); + BytesToHexString(observed->available, std::size(observed->available)), + BytesToHexString(expected->available, std::size(expected->available))); } } // namespace @@ -345,11 +345,11 @@ void ExpectMinidumpContextX86( EXPECT_EQ(observed->fsave.fpu_cs, expected.fsave.fpu_cs); EXPECT_EQ(observed->fsave.fpu_dp, expected.fsave.fpu_dp); EXPECT_EQ(observed->fsave.fpu_ds, expected.fsave.fpu_ds); - for (size_t index = 0; index < base::size(expected.fsave.st); ++index) { + for (size_t index = 0; index < std::size(expected.fsave.st); ++index) { EXPECT_EQ(BytesToHexString(observed->fsave.st[index], - base::size(observed->fsave.st[index])), + std::size(observed->fsave.st[index])), BytesToHexString(expected.fsave.st[index], - base::size(expected.fsave.st[index]))) + std::size(expected.fsave.st[index]))) << "index " << index; } if (snapshot) { @@ -448,8 +448,7 @@ void ExpectMinidumpContextAMD64( ExpectMinidumpContextFxsave(&expected.fxsave, &observed->fxsave); - for (size_t index = 0; index < base::size(expected.vector_register); - ++index) { + for (size_t index = 0; index < std::size(expected.vector_register); ++index) { if (snapshot) { EXPECT_EQ(observed->vector_register[index].lo, 0u) << "index " << index; EXPECT_EQ(observed->vector_register[index].hi, 0u) << "index " << index; @@ -489,7 +488,7 @@ void ExpectMinidumpContextARM(uint32_t expect_seed, EXPECT_EQ(observed->context_flags, expected.context_flags); - for (size_t index = 0; index < base::size(expected.regs); ++index) { + for (size_t index = 0; index < std::size(expected.regs); ++index) { EXPECT_EQ(observed->regs[index], expected.regs[index]); } EXPECT_EQ(observed->fp, expected.fp); @@ -500,10 +499,10 @@ void ExpectMinidumpContextARM(uint32_t expect_seed, EXPECT_EQ(observed->cpsr, expected.cpsr); EXPECT_EQ(observed->fpscr, expected.fpscr); - for (size_t index = 0; index < base::size(expected.vfp); ++index) { + for (size_t index = 0; index < std::size(expected.vfp); ++index) { EXPECT_EQ(observed->vfp[index], expected.vfp[index]); } - for (size_t index = 0; index < base::size(expected.extra); ++index) { + for (size_t index = 0; index < std::size(expected.extra); ++index) { EXPECT_EQ(observed->extra[index], snapshot ? 0 : expected.extra[index]); } } @@ -516,14 +515,14 @@ void ExpectMinidumpContextARM64(uint32_t expect_seed, EXPECT_EQ(observed->context_flags, expected.context_flags); - for (size_t index = 0; index < base::size(expected.regs); ++index) { + for (size_t index = 0; index < std::size(expected.regs); ++index) { EXPECT_EQ(observed->regs[index], expected.regs[index]); } EXPECT_EQ(observed->cpsr, expected.cpsr); EXPECT_EQ(observed->fpsr, expected.fpsr); EXPECT_EQ(observed->fpcr, expected.fpcr); - for (size_t index = 0; index < base::size(expected.fpsimd); ++index) { + for (size_t index = 0; index < std::size(expected.fpsimd); ++index) { EXPECT_EQ(observed->fpsimd[index].lo, expected.fpsimd[index].lo); EXPECT_EQ(observed->fpsimd[index].hi, expected.fpsimd[index].hi); } @@ -537,7 +536,7 @@ void ExpectMinidumpContextMIPS(uint32_t expect_seed, EXPECT_EQ(observed->context_flags, expected.context_flags); - for (size_t index = 0; index < base::size(expected.regs); ++index) { + for (size_t index = 0; index < std::size(expected.regs); ++index) { EXPECT_EQ(observed->regs[index], expected.regs[index]); } @@ -548,7 +547,7 @@ void ExpectMinidumpContextMIPS(uint32_t expect_seed, EXPECT_EQ(observed->status, expected.status); EXPECT_EQ(observed->cause, expected.cause); - for (size_t index = 0; index < base::size(expected.fpregs.fregs); ++index) { + for (size_t index = 0; index < std::size(expected.fpregs.fregs); ++index) { EXPECT_EQ(observed->fpregs.fregs[index]._fp_fregs, expected.fpregs.fregs[index]._fp_fregs); } @@ -570,7 +569,7 @@ void ExpectMinidumpContextMIPS64(uint32_t expect_seed, EXPECT_EQ(observed->context_flags, expected.context_flags); - for (size_t index = 0; index < base::size(expected.regs); ++index) { + for (size_t index = 0; index < std::size(expected.regs); ++index) { EXPECT_EQ(observed->regs[index], expected.regs[index]); } @@ -581,7 +580,7 @@ void ExpectMinidumpContextMIPS64(uint32_t expect_seed, EXPECT_EQ(observed->status, expected.status); EXPECT_EQ(observed->cause, expected.cause); - for (size_t index = 0; index < base::size(expected.fpregs.dregs); ++index) { + for (size_t index = 0; index < std::size(expected.fpregs.dregs); ++index) { EXPECT_EQ(observed->fpregs.dregs[index], expected.fpregs.dregs[index]); } EXPECT_EQ(observed->fpcsr, expected.fpcsr); diff --git a/external_imported/sentry-native/external/crashpad/snapshot/BUILD.gn b/external_imported/sentry-native/external/crashpad/snapshot/BUILD.gn index e3ad7f67e..ea2412a0b 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/BUILD.gn +++ b/external_imported/sentry-native/external/crashpad/snapshot/BUILD.gn @@ -254,7 +254,6 @@ crashpad_static_library("snapshot") { ] if (crashpad_is_win) { - deps += [ "../client" ] cflags = [ "/wd4201" ] # nonstandard extension used : nameless struct/union libs = [ "powrprof.lib" ] } @@ -364,6 +363,7 @@ source_set("snapshot_test") { if (crashpad_is_ios) { sources += [ + "ios/memory_snapshot_ios_intermediate_dump_test.cc", "ios/process_snapshot_ios_intermediate_dump_test.cc", "mac/cpu_context_mac_test.cc", ] @@ -441,10 +441,6 @@ source_set("snapshot_test") { "../util", ] - if (crashpad_is_win) { - deps += [ "../client" ] - } - if (crashpad_is_ios) { deps += [ ":snapshot_test_ios_data", diff --git a/external_imported/sentry-native/external/crashpad/snapshot/capture_memory.cc b/external_imported/sentry-native/external/crashpad/snapshot/capture_memory.cc index 5c7ded46b..06d925813 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/capture_memory.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/capture_memory.cc @@ -16,10 +16,10 @@ #include +#include #include #include -#include "base/cxx17_backports.h" #include "base/logging.h" #include "snapshot/memory_snapshot.h" @@ -99,17 +99,17 @@ void CaptureMemory::PointedToByContext(const CPUContext& context, #elif defined(ARCH_CPU_ARM_FAMILY) if (context.architecture == kCPUArchitectureARM64) { MaybeCaptureMemoryAround(delegate, context.arm64->pc); - for (size_t i = 0; i < base::size(context.arm64->regs); ++i) { + for (size_t i = 0; i < std::size(context.arm64->regs); ++i) { MaybeCaptureMemoryAround(delegate, context.arm64->regs[i]); } } else { MaybeCaptureMemoryAround(delegate, context.arm->pc); - for (size_t i = 0; i < base::size(context.arm->regs); ++i) { + for (size_t i = 0; i < std::size(context.arm->regs); ++i) { MaybeCaptureMemoryAround(delegate, context.arm->regs[i]); } } #elif defined(ARCH_CPU_MIPS_FAMILY) - for (size_t i = 0; i < base::size(context.mipsel->regs); ++i) { + for (size_t i = 0; i < std::size(context.mipsel->regs); ++i) { MaybeCaptureMemoryAround(delegate, context.mipsel->regs[i]); } #else diff --git a/external_imported/sentry-native/external/crashpad/snapshot/cpu_context.cc b/external_imported/sentry-native/external/crashpad/snapshot/cpu_context.cc index 643ad80f0..2e29f7039 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/cpu_context.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/cpu_context.cc @@ -17,7 +17,8 @@ #include #include -#include "base/cxx17_backports.h" +#include + #include "base/notreached.h" #include "util/misc/arraysize.h" #include "util/misc/implicit_cast.h" @@ -58,7 +59,7 @@ void CPUContextX86::FxsaveToFsave(const Fxsave& fxsave, Fsave* fsave) { fsave->reserved_4 = 0; static_assert(ArraySize(fsave->st) == ArraySize(fxsave.st_mm), "FPU stack registers must be equivalent"); - for (size_t index = 0; index < base::size(fsave->st); ++index) { + for (size_t index = 0; index < std::size(fsave->st); ++index) { memcpy(fsave->st[index], fxsave.st_mm[index].st, sizeof(fsave->st[index])); } } @@ -80,7 +81,7 @@ void CPUContextX86::FsaveToFxsave(const Fsave& fsave, Fxsave* fxsave) { fxsave->mxcsr_mask = 0; static_assert(ArraySize(fxsave->st_mm) == ArraySize(fsave.st), "FPU stack registers must be equivalent"); - for (size_t index = 0; index < base::size(fsave.st); ++index) { + for (size_t index = 0; index < std::size(fsave.st); ++index) { memcpy(fxsave->st_mm[index].st, fsave.st[index], sizeof(fsave.st[index])); memset(fxsave->st_mm[index].st_reserved, 0, diff --git a/external_imported/sentry-native/external/crashpad/snapshot/cpu_context_test.cc b/external_imported/sentry-native/external/crashpad/snapshot/cpu_context_test.cc index b1340d6ee..019c7694f 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/cpu_context_test.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/cpu_context_test.cc @@ -18,7 +18,8 @@ #include #include -#include "base/cxx17_backports.h" +#include + #include "gtest/gtest.h" #include "test/hex_string.h" @@ -124,7 +125,7 @@ TEST(CPUContextX86, FxsaveToFsave) { &fxsave.st_mm[6].st, kExponentAllZero, false, kFractionAllZero); SetX87Register( &fxsave.st_mm[7].st, kExponentNormal, true, kFractionNormal); // valid - for (size_t index = 0; index < base::size(fxsave.st_mm); ++index) { + for (size_t index = 0; index < std::size(fxsave.st_mm); ++index) { memset(&fxsave.st_mm[index].st_reserved, 0x5a, sizeof(fxsave.st_mm[index].st_reserved)); @@ -148,10 +149,10 @@ TEST(CPUContextX86, FxsaveToFsave) { EXPECT_EQ(fsave.fpu_dp, fxsave.fpu_dp); EXPECT_EQ(fsave.fpu_ds, fxsave.fpu_ds); EXPECT_EQ(fsave.reserved_4, 0); - for (size_t index = 0; index < base::size(fsave.st); ++index) { - EXPECT_EQ(BytesToHexString(fsave.st[index], base::size(fsave.st[index])), + for (size_t index = 0; index < std::size(fsave.st); ++index) { + EXPECT_EQ(BytesToHexString(fsave.st[index], std::size(fsave.st[index])), BytesToHexString(fxsave.st_mm[index].st, - base::size(fxsave.st_mm[index].st))) + std::size(fxsave.st_mm[index].st))) << "index " << index; } } @@ -204,14 +205,14 @@ TEST(CPUContextX86, FsaveToFxsave) { EXPECT_EQ(fxsave.reserved_3, 0); EXPECT_EQ(fxsave.mxcsr, 0u); EXPECT_EQ(fxsave.mxcsr_mask, 0u); - for (size_t index = 0; index < base::size(fxsave.st_mm); ++index) { + for (size_t index = 0; index < std::size(fxsave.st_mm); ++index) { EXPECT_EQ(BytesToHexString(fxsave.st_mm[index].st, - base::size(fxsave.st_mm[index].st)), - BytesToHexString(fsave.st[index], base::size(fsave.st[index]))) + std::size(fxsave.st_mm[index].st)), + BytesToHexString(fsave.st[index], std::size(fsave.st[index]))) << "index " << index; EXPECT_EQ(BytesToHexString(fxsave.st_mm[index].st_reserved, - base::size(fxsave.st_mm[index].st_reserved)), - std::string(base::size(fxsave.st_mm[index].st_reserved) * 2, '0')) + std::size(fxsave.st_mm[index].st_reserved)), + std::string(std::size(fxsave.st_mm[index].st_reserved) * 2, '0')) << "index " << index; } size_t unused_len = sizeof(fxsave) - offsetof(decltype(fxsave), xmm); @@ -318,7 +319,7 @@ TEST(CPUContextX86, FxsaveToFsaveTagWord) { // In this set, everything is valid. fsw = 0 << 11; // top = 0: logical 0-7 maps to physical 0-7 fxsave_tag = 0xff; // nothing empty - for (size_t index = 0; index < base::size(st_mm); ++index) { + for (size_t index = 0; index < std::size(st_mm); ++index) { SetX87OrMMXRegister(&st_mm[index], kExponentNormal, true, kFractionAllZero); } EXPECT_EQ(CPUContextX86::FxsaveToFsaveTagWord(fsw, fxsave_tag, st_mm), 0); diff --git a/external_imported/sentry-native/external/crashpad/snapshot/crashpad_info_client_options_test.cc b/external_imported/sentry-native/external/crashpad/snapshot/crashpad_info_client_options_test.cc index f5baa5bc6..73df677b5 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/crashpad_info_client_options_test.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/crashpad_info_client_options_test.cc @@ -24,13 +24,13 @@ #include "test/scoped_module_handle.h" #include "test/test_paths.h" -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) #include #include "snapshot/mac/process_snapshot_mac.h" -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) #include #include "snapshot/win/process_snapshot_win.h" -#elif defined(OS_FUCHSIA) +#elif BUILDFLAG(IS_FUCHSIA) #include #include "snapshot/fuchsia/process_snapshot_fuchsia.h" #endif @@ -79,19 +79,19 @@ class ScopedUnsetCrashpadInfoOptions { }; CrashpadInfoClientOptions SelfProcessSnapshotAndGetCrashpadOptions() { -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) ProcessSnapshotMac process_snapshot; EXPECT_TRUE(process_snapshot.Initialize(mach_task_self())); -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) ProcessSnapshotWin process_snapshot; EXPECT_TRUE(process_snapshot.Initialize( GetCurrentProcess(), ProcessSuspensionState::kRunning, 0, 0)); -#elif defined(OS_FUCHSIA) +#elif BUILDFLAG(IS_FUCHSIA) ProcessSnapshotFuchsia process_snapshot; EXPECT_TRUE(process_snapshot.Initialize(*zx::process::self())); #else #error Port. -#endif // OS_APPLE +#endif // BUILDFLAG(IS_APPLE) CrashpadInfoClientOptions options; process_snapshot.GetCrashpadOptions(&options); @@ -144,7 +144,7 @@ TEST(CrashpadInfoClientOptions, OneModule) { EXPECT_EQ(options.crashpad_handler_behavior, TriState::kUnset); EXPECT_EQ(options.system_crash_reporter_forwarding, TriState::kUnset); EXPECT_EQ(options.gather_indirectly_referenced_memory, TriState::kEnabled); - EXPECT_EQ(options.indirectly_referenced_memory_cap, 1234u); + EXPECT_LE(options.indirectly_referenced_memory_cap, 1234u); } } @@ -154,19 +154,19 @@ TEST(CrashpadInfoClientOptions, TwoModules) { TestPaths::BuildArtifact(FILE_PATH_LITERAL("snapshot"), FILE_PATH_LITERAL("module"), TestPaths::FileType::kLoadableModule); -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) ScopedModuleHandle module( dlopen(module_path.value().c_str(), RTLD_LAZY | RTLD_LOCAL)); ASSERT_TRUE(module.valid()) << "dlopen " << module_path.value() << ": " << dlerror(); -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) ScopedModuleHandle module(LoadLibrary(module_path.value().c_str())); ASSERT_TRUE(module.valid()) << "LoadLibrary " << base::WideToUTF8(module_path.value()) << ": " << ErrorMessage(); #else #error Port. -#endif // OS_APPLE +#endif // BUILDFLAG(IS_POSIX) // Get the function pointer from the module. This wraps GetCrashpadInfo(), but // because it runs in the module, it returns the remote module’s CrashpadInfo @@ -252,19 +252,19 @@ TEST_P(CrashpadInfoSizes_ClientOptions, DifferentlySizedStruct) { TestPaths::BuildArtifact(FILE_PATH_LITERAL("snapshot"), artifact, TestPaths::FileType::kLoadableModule); -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) ScopedModuleHandle module( dlopen(module_path.value().c_str(), RTLD_LAZY | RTLD_LOCAL)); ASSERT_TRUE(module.valid()) << "dlopen " << module_path.value() << ": " << dlerror(); -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) ScopedModuleHandle module(LoadLibrary(module_path.value().c_str())); ASSERT_TRUE(module.valid()) << "LoadLibrary " << base::WideToUTF8(module_path.value()) << ": " << ErrorMessage(); #else #error Port. -#endif // OS_APPLE +#endif // BUILDFLAG(IS_POSIX) // Get the function pointer from the module. CrashpadInfo* (*TestModule_GetCrashpadInfo)() = diff --git a/external_imported/sentry-native/external/crashpad/snapshot/crashpad_info_client_options_test_module.cc b/external_imported/sentry-native/external/crashpad/snapshot/crashpad_info_client_options_test_module.cc index 357d35e65..48795e3c8 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/crashpad_info_client_options_test_module.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/crashpad_info_client_options_test_module.cc @@ -15,12 +15,12 @@ #include "build/build_config.h" #include "client/crashpad_info.h" -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) #define EXPORT __attribute__((visibility("default"))) -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) #include #define EXPORT __declspec(dllexport) -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) extern "C" { @@ -40,8 +40,8 @@ EXPORT crashpad::CrashpadInfo* TestModule_GetCrashpadInfo() { } // extern "C" -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) { return TRUE; } -#endif // OS_WIN +#endif // BUILDFLAG(IS_WIN) diff --git a/external_imported/sentry-native/external/crashpad/snapshot/crashpad_info_size_test_module.cc b/external_imported/sentry-native/external/crashpad/snapshot/crashpad_info_size_test_module.cc index 584f83b0b..0a9186c24 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/crashpad_info_size_test_module.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/crashpad_info_size_test_module.cc @@ -16,11 +16,11 @@ #include "build/build_config.h" -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) #include -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) #include -#endif // OS_APPLE +#endif // BUILDFLAG(IS_APPLE) namespace crashpad { @@ -65,9 +65,9 @@ struct TestCrashpadInfo { // to get this test version to be interpreted as a genuine CrashpadInfo // structure. The size is set to the actual size of this structure (that’s kind // of the point of this test). -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) __attribute__(( -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) section(SEG_DATA ",crashpad_info"), #endif #if defined(ADDRESS_SANITIZER) @@ -75,12 +75,12 @@ __attribute__(( #endif // defined(ADDRESS_SANITIZER) visibility("hidden"), used)) -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) #pragma section("CPADinfo", read, write) __declspec(allocate("CPADinfo")) -#else // !defined(OS_POSIX) && !defined(OS_WIN) +#else // !BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_WIN) #error Port -#endif // !defined(OS_POSIX) && !defined(OS_WIN) +#endif // !BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_WIN) TestCrashpadInfo g_test_crashpad_info = {'CPad', sizeof(TestCrashpadInfo), 1, @@ -105,14 +105,15 @@ TestCrashpadInfo g_test_crashpad_info = {'CPad', extern "C" { -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) __attribute__((visibility("default"))) -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) __declspec(dllexport) #else #error Port -#endif // OS_POSIX -crashpad::TestCrashpadInfo* TestModule_GetCrashpadInfo() { +#endif // BUILDFLAG(IS_POSIX) +crashpad::TestCrashpadInfo* +TestModule_GetCrashpadInfo() { // Note that there's no need to do the back-reference here to the note on // POSIX like CrashpadInfo::GetCrashpadInfo() because the note .S file is // directly included into this test binary. @@ -121,8 +122,8 @@ crashpad::TestCrashpadInfo* TestModule_GetCrashpadInfo() { } // extern "C" -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) { return TRUE; } -#endif // OS_WIN +#endif // BUILDFLAG(IS_WIN) diff --git a/external_imported/sentry-native/external/crashpad/snapshot/crashpad_info_size_test_note.S b/external_imported/sentry-native/external/crashpad/snapshot/crashpad_info_size_test_note.S index 8b1a0bd84..ebc0d8f6d 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/crashpad_info_size_test_note.S +++ b/external_imported/sentry-native/external/crashpad/snapshot/crashpad_info_size_test_note.S @@ -17,7 +17,7 @@ // that symbol to be in the dynamic symbol table. #include "util/misc/elf_note_types.h" -#include "util/misc/arm64_bti_note.S" +#include "util/misc/arm64_pac_bti.S" // namespace crashpad { // CrashpadInfo g_test_crashpad_info; diff --git a/external_imported/sentry-native/external/crashpad/snapshot/crashpad_types/crashpad_info_reader.cc b/external_imported/sentry-native/external/crashpad/snapshot/crashpad_types/crashpad_info_reader.cc index cedab59a7..ad75292bd 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/crashpad_types/crashpad_info_reader.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/crashpad_types/crashpad_info_reader.cc @@ -20,11 +20,11 @@ #include "client/crashpad_info.h" #include "util/misc/as_underlying_type.h" -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) #include "util/win/traits.h" -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) #include "util/linux/traits.h" -#elif defined(OS_FUCHSIA) +#elif BUILDFLAG(IS_FUCHSIA) #include "util/fuchsia/traits.h" #endif diff --git a/external_imported/sentry-native/external/crashpad/snapshot/crashpad_types/crashpad_info_reader_test.cc b/external_imported/sentry-native/external/crashpad/snapshot/crashpad_types/crashpad_info_reader_test.cc index 3a1806a38..9c6e3c372 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/crashpad_types/crashpad_info_reader_test.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/crashpad_types/crashpad_info_reader_test.cc @@ -30,7 +30,7 @@ #include "util/misc/from_pointer_cast.h" #include "util/process/process_memory_native.h" -#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #include "test/linux/fake_ptrace_connection.h" #endif @@ -109,7 +109,7 @@ void ExpectCrashpadInfo(ProcessType process, VMAddress extra_memory_address, VMAddress simple_annotations_address, VMAddress annotations_list_address) { -#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) FakePtraceConnection connection; ASSERT_TRUE(connection.Initialize(process)); ProcessMemoryLinux memory(&connection); diff --git a/external_imported/sentry-native/external/crashpad/snapshot/crashpad_types/image_annotation_reader_test.cc b/external_imported/sentry-native/external/crashpad/snapshot/crashpad_types/image_annotation_reader_test.cc index b5289e7a7..f7f18cbd6 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/crashpad_types/image_annotation_reader_test.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/crashpad_types/image_annotation_reader_test.cc @@ -32,7 +32,7 @@ #include "util/misc/from_pointer_cast.h" #include "util/process/process_memory_native.h" -#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #include "test/linux/fake_ptrace_connection.h" #endif @@ -94,7 +94,7 @@ void ExpectAnnotations(ProcessType process, bool is_64_bit, VMAddress simple_map_address, VMAddress annotation_list_address) { -#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) FakePtraceConnection connection; ASSERT_TRUE(connection.Initialize(process)); ProcessMemoryLinux memory(&connection); diff --git a/external_imported/sentry-native/external/crashpad/snapshot/elf/elf_image_reader.cc b/external_imported/sentry-native/external/crashpad/snapshot/elf/elf_image_reader.cc index 5ea14c0fe..0b7d0145f 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/elf/elf_image_reader.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/elf/elf_image_reader.cc @@ -733,13 +733,13 @@ bool ElfImageReader::GetAddressFromDynamicArray(uint64_t tag, if (!dynamic_array_->GetValue(tag, log, address)) { return false; } -#if defined(OS_ANDROID) || defined(OS_FUCHSIA) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) // The GNU loader updates the dynamic array according to the load bias. // The Android and Fuchsia loaders only update the debug address. if (tag != DT_DEBUG) { *address += GetLoadBias(); } -#endif // OS_ANDROID +#endif // BUILDFLAG(IS_ANDROID) return true; } diff --git a/external_imported/sentry-native/external/crashpad/snapshot/elf/elf_image_reader_test.cc b/external_imported/sentry-native/external/crashpad/snapshot/elf/elf_image_reader_test.cc index 2ea55ad10..161eab029 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/elf/elf_image_reader_test.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/elf/elf_image_reader_test.cc @@ -30,12 +30,12 @@ #include "util/misc/from_pointer_cast.h" #include "util/process/process_memory_native.h" -#if defined(OS_FUCHSIA) +#if BUILDFLAG(IS_FUCHSIA) #include #include "base/fuchsia/fuchsia_logging.h" -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) #include "test/linux/fake_ptrace_connection.h" #include "util/linux/auxiliary_vector.h" @@ -45,7 +45,7 @@ #error Port. -#endif // OS_FUCHSIA +#endif // BUILDFLAG(IS_FUCHSIA) extern "C" { __attribute__((visibility("default"))) void ElfImageReaderTestExportedSymbol() { @@ -56,8 +56,7 @@ namespace crashpad { namespace test { namespace { - -#if defined(OS_FUCHSIA) +#if BUILDFLAG(IS_FUCHSIA) void LocateExecutable(const ProcessType& process, ProcessMemory* memory, @@ -84,7 +83,7 @@ void LocateExecutable(const ProcessType& process, *elf_address = base; } -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) void LocateExecutable(PtraceConnection* connection, ProcessMemory* memory, @@ -104,7 +103,7 @@ void LocateExecutable(PtraceConnection* connection, *elf_address = possible_mappings->Next()->range.Base(); } -#endif // OS_FUCHSIA +#endif // BUILDFLAG(IS_FUCHSIA) void ExpectSymbol(ElfImageReader* reader, const std::string& symbol_name, @@ -128,12 +127,12 @@ void ReadThisExecutableInTarget(ProcessType process, #endif // ARCH_CPU_64_BITS VMAddress elf_address; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) FakePtraceConnection connection; ASSERT_TRUE(connection.Initialize(process)); ProcessMemoryLinux memory(&connection); LocateExecutable(&connection, &memory, &elf_address); -#elif defined(OS_FUCHSIA) +#elif BUILDFLAG(IS_FUCHSIA) ProcessMemoryFuchsia memory; ASSERT_TRUE(memory.Initialize(process)); LocateExecutable(process, &memory, &elf_address); @@ -192,7 +191,7 @@ void ReadLibcInTarget(ProcessType process, constexpr bool am_64_bit = false; #endif // ARCH_CPU_64_BITS -#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) FakePtraceConnection connection; ASSERT_TRUE(connection.Initialize(process)); ProcessMemoryLinux memory(&connection); @@ -301,7 +300,7 @@ TEST(ElfImageReader, OneModuleChild) { test.Run(); } -#if defined(OS_FUCHSIA) +#if BUILDFLAG(IS_FUCHSIA) // crashpad_snapshot_test_both_dt_hash_styles is specially built and forced to // include both .hash and .gnu.hash sections. Linux, Android, and Fuchsia have @@ -356,7 +355,7 @@ TEST(ElfImageReader, DtHashAndDtGnuHashMatch) { EXPECT_EQ(from_dt_hash, from_dt_gnu_hash); } -#endif // OS_FUCHSIA +#endif // BUILDFLAG(IS_FUCHSIA) } // namespace } // namespace test diff --git a/external_imported/sentry-native/external/crashpad/snapshot/elf/elf_image_reader_test_note.S b/external_imported/sentry-native/external/crashpad/snapshot/elf/elf_image_reader_test_note.S index 08f1829fe..b6c17ff32 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/elf/elf_image_reader_test_note.S +++ b/external_imported/sentry-native/external/crashpad/snapshot/elf/elf_image_reader_test_note.S @@ -13,7 +13,7 @@ // limitations under the License. #include "util/misc/elf_note_types.h" -#include "util/misc/arm64_bti_note.S" +#include "util/misc/arm64_pac_bti.S" #define NOTE_ALIGN 4 .section .note.crashpad.test,"a",%note diff --git a/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/memory_map_region_snapshot_fuchsia.cc b/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/memory_map_region_snapshot_fuchsia.cc index a5885b06c..8d7f9b867 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/memory_map_region_snapshot_fuchsia.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/memory_map_region_snapshot_fuchsia.cc @@ -14,8 +14,9 @@ #include "snapshot/fuchsia/memory_map_region_snapshot_fuchsia.h" +#include + #include "base/check_op.h" -#include "base/cxx17_backports.h" namespace crashpad { namespace internal { @@ -50,7 +51,7 @@ uint32_t MmuFlagsToProtectFlags(zx_vm_option_t flags) { const uint32_t index = flags & (ZX_VM_PERM_READ | ZX_VM_PERM_WRITE | ZX_VM_PERM_EXECUTE); - DCHECK_LT(index, base::size(mapping)); + DCHECK_LT(index, std::size(mapping)); const uint32_t protect_flags = mapping[index]; DCHECK_NE(protect_flags, 0u); diff --git a/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/process_reader_fuchsia_test.cc b/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/process_reader_fuchsia_test.cc index f5a8aea75..362be5bd4 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/process_reader_fuchsia_test.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/process_reader_fuchsia_test.cc @@ -20,7 +20,8 @@ #include #include -#include "base/cxx17_backports.h" +#include + #include "gtest/gtest.h" #include "test/multiprocess_exec.h" #include "test/test_paths.h" @@ -35,7 +36,7 @@ TEST(ProcessReaderFuchsia, SelfBasic) { ASSERT_TRUE(process_reader.Initialize(*zx::process::self())); static constexpr char kTestMemory[] = "Some test memory"; - char buffer[base::size(kTestMemory)]; + char buffer[std::size(kTestMemory)]; ASSERT_TRUE(process_reader.Memory()->Read( reinterpret_cast(kTestMemory), sizeof(kTestMemory), &buffer)); EXPECT_STREQ(kTestMemory, buffer); diff --git a/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/process_snapshot_fuchsia_test.cc b/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/process_snapshot_fuchsia_test.cc index 496d97a82..874f15905 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/process_snapshot_fuchsia_test.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/fuchsia/process_snapshot_fuchsia_test.cc @@ -12,17 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "snapshot/fuchsia/memory_map_region_snapshot_fuchsia.h" +#include "snapshot/fuchsia/process_snapshot_fuchsia.h" #include #include -#include "base/cxx17_backports.h" +#include + #include "base/fuchsia/fuchsia_logging.h" #include "base/logging.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" -#include "snapshot/fuchsia/process_snapshot_fuchsia.h" +#include "snapshot/fuchsia/memory_map_region_snapshot_fuchsia.h" #include "test/multiprocess_exec.h" #include "util/fuchsia/koid_utilities.h" #include "util/fuchsia/scoped_task_suspend.h" @@ -56,7 +57,7 @@ CRASHPAD_CHILD_TEST_MAIN(AddressSpaceChildTestMain) { // correctly. for (const auto& t : kTestMappingPermAndSizes) { zx_handle_t vmo = ZX_HANDLE_INVALID; - const size_t size = t.pages * PAGE_SIZE; + const size_t size = t.pages * zx_system_get_page_size(); zx_status_t status = zx_vmo_create(size, 0, &vmo); ZX_CHECK(status == ZX_OK, status) << "zx_vmo_create"; status = zx_vmo_replace_as_executable(vmo, ZX_HANDLE_INVALID, &vmo); @@ -111,8 +112,8 @@ class AddressSpaceTest : public MultiprocessExec { private: void MultiprocessParent() override { - uintptr_t test_addresses[base::size(kTestMappingPermAndSizes)]; - for (size_t i = 0; i < base::size(test_addresses); ++i) { + uintptr_t test_addresses[std::size(kTestMappingPermAndSizes)]; + for (size_t i = 0; i < std::size(test_addresses); ++i) { ASSERT_TRUE(ReadFileExactly( ReadPipeHandle(), &test_addresses[i], sizeof(test_addresses[i]))); } @@ -122,11 +123,11 @@ class AddressSpaceTest : public MultiprocessExec { ProcessSnapshotFuchsia process_snapshot; ASSERT_TRUE(process_snapshot.Initialize(*ChildProcess())); - for (size_t i = 0; i < base::size(test_addresses); ++i) { + for (size_t i = 0; i < std::size(test_addresses); ++i) { const auto& t = kTestMappingPermAndSizes[i]; EXPECT_TRUE(HasSingleMatchingMapping(process_snapshot.MemoryMap(), test_addresses[i], - t.pages * PAGE_SIZE, + t.pages * zx_system_get_page_size(), t.minidump_perm)) << base::StringPrintf( "index %zu, zircon_perm 0x%x, minidump_perm 0x%x", diff --git a/external_imported/sentry-native/external/crashpad/snapshot/ios/exception_snapshot_ios_intermediate_dump.cc b/external_imported/sentry-native/external/crashpad/snapshot/ios/exception_snapshot_ios_intermediate_dump.cc index c4d99e77a..a45d4cc29 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/ios/exception_snapshot_ios_intermediate_dump.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/ios/exception_snapshot_ios_intermediate_dump.cc @@ -131,10 +131,16 @@ bool ExceptionSnapshotIOSIntermediateDump::InitializeFromSignal( #endif } - GetDataValueFromMap(exception_data, Key::kSignalNumber, &exception_); - GetDataValueFromMap(exception_data, Key::kSignalCode, &exception_info_); + exception_ = EXC_SOFT_SIGNAL; + GetDataValueFromMap(exception_data, Key::kSignalNumber, &exception_info_); GetDataValueFromMap(exception_data, Key::kSignalAddress, &exception_address_); + codes_.push_back(exception_); + codes_.push_back(exception_info_); + uint32_t code; + GetDataValueFromMap(exception_data, Key::kSignalCode, &code); + codes_.push_back(code); + INITIALIZATION_STATE_SET_VALID(initialized_); return true; } diff --git a/external_imported/sentry-native/external/crashpad/snapshot/ios/memory_snapshot_ios_intermediate_dump.cc b/external_imported/sentry-native/external/crashpad/snapshot/ios/memory_snapshot_ios_intermediate_dump.cc index 8e521d904..84275aa91 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/ios/memory_snapshot_ios_intermediate_dump.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/ios/memory_snapshot_ios_intermediate_dump.cc @@ -50,12 +50,37 @@ bool MemorySnapshotIOSIntermediateDump::Read(Delegate* delegate) const { const MemorySnapshot* MemorySnapshotIOSIntermediateDump::MergeWithOtherSnapshot( const MemorySnapshot* other) const { + INITIALIZATION_STATE_DCHECK_VALID(initialized_); + auto other_snapshot = + reinterpret_cast(other); + + INITIALIZATION_STATE_DCHECK_VALID(other_snapshot->initialized_); + if (other_snapshot->address_ < address_) { + return other_snapshot->MergeWithOtherSnapshot(this); + } + CheckedRange merged(0, 0); if (!LoggingDetermineMergedRange(this, other, &merged)) return nullptr; auto result = std::make_unique(); result->Initialize(merged.base(), data_, merged.size()); + if (size_ == merged.size()) { + return result.release(); + } + + const uint8_t* data = reinterpret_cast(data_); + const uint8_t* other_data = + reinterpret_cast(other_snapshot->data_); + vm_size_t overlap = merged.size() - other_snapshot->size_; + result->merged_data_.reserve(merged.size()); + result->merged_data_.insert(result->merged_data_.end(), data, data + overlap); + result->merged_data_.insert(result->merged_data_.end(), + other_data, + other_data + other_snapshot->size_); + result->data_ = + reinterpret_cast(result->merged_data_.data()); + DCHECK_EQ(result->merged_data_.size(), merged.size()); return result.release(); } diff --git a/external_imported/sentry-native/external/crashpad/snapshot/ios/memory_snapshot_ios_intermediate_dump.h b/external_imported/sentry-native/external/crashpad/snapshot/ios/memory_snapshot_ios_intermediate_dump.h index a93200020..244bbd8be 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/ios/memory_snapshot_ios_intermediate_dump.h +++ b/external_imported/sentry-native/external/crashpad/snapshot/ios/memory_snapshot_ios_intermediate_dump.h @@ -15,6 +15,8 @@ #ifndef CRASHPAD_SNAPSHOT_IOS_INTERMEDIATE_DUMP_MEMORY_SNAPSHOT_IOS_INTERMEDIATEDUMP_H_ #define CRASHPAD_SNAPSHOT_IOS_INTERMEDIATE_DUMP_MEMORY_SNAPSHOT_IOS_INTERMEDIATEDUMP_H_ +#include + #include "snapshot/memory_snapshot.h" #include "util/misc/address_types.h" #include "util/misc/initialization_state_dcheck.h" @@ -55,6 +57,12 @@ class MemorySnapshotIOSIntermediateDump final : public MemorySnapshot { vm_address_t address_; vm_address_t data_; + + // Because the iOS snapshot memory region is owned by the intermediate dump, + // it's necessary to copy the merged data into a vector owned by the memory + // snapshot itself. + std::vector merged_data_; + vm_size_t size_; InitializationStateDcheck initialized_; }; diff --git a/external_imported/sentry-native/external/crashpad/snapshot/ios/memory_snapshot_ios_intermediate_dump_test.cc b/external_imported/sentry-native/external/crashpad/snapshot/ios/memory_snapshot_ios_intermediate_dump_test.cc new file mode 100644 index 000000000..bbe2a88bd --- /dev/null +++ b/external_imported/sentry-native/external/crashpad/snapshot/ios/memory_snapshot_ios_intermediate_dump_test.cc @@ -0,0 +1,161 @@ +// Copyright 2022 The Crashpad Authors. All rights reserved. +// +// 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. + +#include "snapshot/ios/memory_snapshot_ios_intermediate_dump.h" + +#include +#include + +#include "gtest/gtest.h" + +namespace crashpad { +namespace test { +namespace { + +using internal::MemorySnapshotIOSIntermediateDump; + +const vm_address_t kDefaultAddress = 0x1000; + +class ReadToString : public crashpad::MemorySnapshot::Delegate { + public: + const std::string& result() { return result_; } + + private: + // MemorySnapshot::Delegate: + bool MemorySnapshotDelegateRead(void* data, size_t size) override { + result_ = std::string(reinterpret_cast(data), size); + return true; + } + + std::string result_; +}; + +std::unique_ptr CreateMemorySnapshot( + vm_address_t address, + std::vector& data) { + auto memory = std::make_unique(); + memory->Initialize( + address, reinterpret_cast(data.data()), data.size()); + return memory; +} + +TEST(MemorySnapshotIOSIntermediateDumpTest, MergeSame) { + std::vector data(10, 'a'); + auto memory = CreateMemorySnapshot(kDefaultAddress, data); + std::unique_ptr merged( + memory->MergeWithOtherSnapshot(memory.get())); + EXPECT_EQ(merged->Address(), kDefaultAddress); + EXPECT_EQ(merged->Size(), data.size()); + ReadToString delegate; + merged->Read(&delegate); + EXPECT_EQ(delegate.result(), "aaaaaaaaaa"); +} + +TEST(MemorySnapshotIOSIntermediateDumpTest, MergeNoOverlap) { + std::vector data1(10, 'a'); + auto memory1 = CreateMemorySnapshot(kDefaultAddress, data1); + + std::vector data2(10, 'b'); + auto memory2 = CreateMemorySnapshot(kDefaultAddress + 10, data2); + + std::unique_ptr merged( + memory1->MergeWithOtherSnapshot(memory2.get())); + EXPECT_EQ(merged->Address(), kDefaultAddress); + EXPECT_EQ(merged->Size(), 20u); + ReadToString delegate; + merged->Read(&delegate); + EXPECT_EQ(delegate.result(), "aaaaaaaaaabbbbbbbbbb"); +} + +TEST(MemorySnapshotIOSIntermediateDumpTest, MergePartial) { + std::vector data1(10, 'a'); + auto memory1 = CreateMemorySnapshot(kDefaultAddress, data1); + + std::vector data2(10, 'b'); + auto memory2 = CreateMemorySnapshot(kDefaultAddress + 5, data2); + + std::unique_ptr merged( + memory1->MergeWithOtherSnapshot(memory2.get())); + EXPECT_EQ(merged->Address(), kDefaultAddress); + EXPECT_EQ(merged->Size(), 15u); + ReadToString delegate; + merged->Read(&delegate); + EXPECT_EQ(delegate.result(), "aaaaabbbbbbbbbb"); +} + +TEST(MemorySnapshotIOSIntermediateDumpTest, NoMerge) { + std::vector data1(10, 'a'); + auto memory1 = CreateMemorySnapshot(kDefaultAddress, data1); + + std::vector data2(10, 'b'); + auto memory2 = CreateMemorySnapshot(kDefaultAddress + 20, data2); + + std::unique_ptr merged( + memory1->MergeWithOtherSnapshot(memory2.get())); + EXPECT_EQ(merged.get(), nullptr); +} + +TEST(MemorySnapshotIOSIntermediateDumpTest, EnvelopeBiggerFirst) { + std::vector data1(30, 'a'); + auto memory1 = CreateMemorySnapshot(kDefaultAddress, data1); + + std::vector data2(10, 'b'); + auto memory2 = CreateMemorySnapshot(kDefaultAddress + 15, data2); + + std::unique_ptr merged( + memory1->MergeWithOtherSnapshot(memory2.get())); + EXPECT_EQ(merged->Address(), kDefaultAddress); + EXPECT_EQ(merged->Size(), data1.size()); + + ReadToString delegate; + merged->Read(&delegate); + EXPECT_EQ(delegate.result(), "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); +} + +TEST(MemorySnapshotIOSIntermediateDumpTest, EnvelopeBiggerSecond) { + std::vector data1(10, 'a'); + auto memory1 = CreateMemorySnapshot(kDefaultAddress, data1); + + std::vector data2(20, 'b'); + auto memory2 = CreateMemorySnapshot(kDefaultAddress, data2); + + std::unique_ptr merged( + memory1->MergeWithOtherSnapshot(memory2.get())); + EXPECT_EQ(merged->Address(), kDefaultAddress); + EXPECT_EQ(merged->Size(), data2.size()); + + ReadToString delegate; + merged->Read(&delegate); + EXPECT_EQ(delegate.result(), "bbbbbbbbbbbbbbbbbbbb"); +} + +TEST(MemorySnapshotIOSIntermediateDumpTest, SmallerAddressSecond) { + std::vector data1(10, 'a'); + auto memory1 = CreateMemorySnapshot(kDefaultAddress, data1); + + std::vector data2(20, 'b'); + auto memory2 = CreateMemorySnapshot(kDefaultAddress - 10, data2); + + std::unique_ptr merged( + memory1->MergeWithOtherSnapshot(memory2.get())); + EXPECT_EQ(merged->Address(), kDefaultAddress - 10); + EXPECT_EQ(merged->Size(), data2.size()); + ReadToString delegate; + merged->Read(&delegate); + EXPECT_EQ(delegate.result(), "bbbbbbbbbbbbbbbbbbbb"); +} + +} // namespace +} // namespace test +} // namespace crashpad diff --git a/external_imported/sentry-native/external/crashpad/snapshot/linux/capture_memory_delegate_linux.cc b/external_imported/sentry-native/external/crashpad/snapshot/linux/capture_memory_delegate_linux.cc index 4f1587400..918e572d5 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/linux/capture_memory_delegate_linux.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/linux/capture_memory_delegate_linux.cc @@ -57,19 +57,17 @@ void CaptureMemoryDelegateLinux::AddNewMemorySnapshot( return; if (range.size() == 0) return; - if (budget_remaining_ && *budget_remaining_ == 0) + if (!budget_remaining_ || *budget_remaining_ == 0) return; snapshots_->push_back(std::make_unique()); internal::MemorySnapshotGeneric* snapshot = snapshots_->back().get(); snapshot->Initialize(process_reader_->Memory(), range.base(), range.size()); - if (budget_remaining_) { - if (!base::IsValueInRangeForNumericType(range.size())) { - *budget_remaining_ = 0; - } else { - int64_t temp = *budget_remaining_; - temp -= range.size(); - *budget_remaining_ = base::saturated_cast(temp); - } + if (!base::IsValueInRangeForNumericType(range.size())) { + *budget_remaining_ = 0; + } else { + int64_t temp = *budget_remaining_; + temp -= range.size(); + *budget_remaining_ = base::saturated_cast(temp); } } diff --git a/external_imported/sentry-native/external/crashpad/snapshot/linux/debug_rendezvous.cc b/external_imported/sentry-native/external/crashpad/snapshot/linux/debug_rendezvous.cc index 42384f743..e0af2b3b1 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/linux/debug_rendezvous.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/linux/debug_rendezvous.cc @@ -21,7 +21,7 @@ #include "base/logging.h" #include "build/build_config.h" -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) #include #endif @@ -142,7 +142,7 @@ bool DebugRendezvous::InitializeSpecific(const ProcessMemoryRange& memory, modules_.push_back(entry); } -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) // Android P (API 28) mistakenly places the vdso in the first entry in the // link map. const int android_runtime_api = android_get_device_api_level(); @@ -151,7 +151,7 @@ bool DebugRendezvous::InitializeSpecific(const ProcessMemoryRange& memory, modules_[0] = executable_; executable_ = executable; } -#endif // OS_ANDROID +#endif // BUILDFLAG(IS_ANDROID) return true; } diff --git a/external_imported/sentry-native/external/crashpad/snapshot/linux/debug_rendezvous_test.cc b/external_imported/sentry-native/external/crashpad/snapshot/linux/debug_rendezvous_test.cc index 4754528e8..9fa6d6311 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/linux/debug_rendezvous_test.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/linux/debug_rendezvous_test.cc @@ -41,7 +41,7 @@ #include "util/process/process_memory_linux.h" #include "util/process/process_memory_range.h" -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) #include #endif @@ -103,7 +103,7 @@ void TestAgainstTarget(PtraceConnection* connection) { DebugRendezvous debug; ASSERT_TRUE(debug.Initialize(range, debug_address)); -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) const int android_runtime_api = android_get_device_api_level(); ASSERT_GE(android_runtime_api, 1); @@ -125,7 +125,7 @@ void TestAgainstTarget(PtraceConnection* connection) { // glibc's loader does not set the name for the executable. EXPECT_TRUE(debug.Executable()->name.empty()); EXPECT_EQ(debug.Executable()->dynamic_array, exe_dynamic_address); -#endif // OS_ANDROID +#endif // BUILDFLAG(IS_ANDROID) // Android's loader doesn't set the load bias until Android 4.3 (API 18). if (android_runtime_api >= 18) { @@ -162,7 +162,7 @@ void TestAgainstTarget(PtraceConnection* connection) { ASSERT_GE(possible_mappings->Count(), 1u); std::unique_ptr module_reader; -#if !defined(OS_ANDROID) +#if !BUILDFLAG(IS_ANDROID) const MemoryMap::Mapping* module_mapping = nullptr; #endif const MemoryMap::Mapping* mapping = nullptr; @@ -174,7 +174,7 @@ void TestAgainstTarget(PtraceConnection* connection) { parsed_module->GetDynamicArrayAddress(&dynamic_address) && dynamic_address == module.dynamic_array) { module_reader = std::move(parsed_module); -#if !defined(OS_ANDROID) +#if !BUILDFLAG(IS_ANDROID) module_mapping = mapping; #endif break; @@ -182,7 +182,7 @@ void TestAgainstTarget(PtraceConnection* connection) { } ASSERT_TRUE(module_reader.get()); -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) EXPECT_FALSE(module.name.empty()); #else // glibc's loader doesn't always set the name in the link map for the vdso. @@ -206,7 +206,7 @@ void TestAgainstTarget(PtraceConnection* connection) { module_mapping->device, module_mapping->inode, module.name); -#endif // OS_ANDROID +#endif // BUILDFLAG(IS_ANDROID) // Android's loader stops setting its own load bias after Android 4.4.4 // (API 20) until Android 6.0 (API 23). diff --git a/external_imported/sentry-native/external/crashpad/snapshot/linux/exception_snapshot_linux.cc b/external_imported/sentry-native/external/crashpad/snapshot/linux/exception_snapshot_linux.cc index 42d0eb0b2..efc9e5694 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/linux/exception_snapshot_linux.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/linux/exception_snapshot_linux.cc @@ -24,6 +24,7 @@ #include "util/linux/traits.h" #include "util/misc/reinterpret_bytes.h" #include "util/numeric/safe_assignment.h" +#include "util/posix/signals.h" namespace crashpad { namespace internal { @@ -326,10 +327,12 @@ bool ExceptionSnapshotLinux::ReadContext( #endif // ARCH_CPU_X86_FAMILY -bool ExceptionSnapshotLinux::Initialize(ProcessReaderLinux* process_reader, - LinuxVMAddress siginfo_address, - LinuxVMAddress context_address, - pid_t thread_id) { +bool ExceptionSnapshotLinux::Initialize( + ProcessReaderLinux* process_reader, + LinuxVMAddress siginfo_address, + LinuxVMAddress context_address, + pid_t thread_id, + uint32_t* gather_indirectly_referenced_memory_cap) { INITIALIZATION_STATE_SET_INITIALIZING(initialized_); thread_id_ = thread_id; @@ -359,7 +362,10 @@ bool ExceptionSnapshotLinux::Initialize(ProcessReaderLinux* process_reader, } CaptureMemoryDelegateLinux capture_memory_delegate( - process_reader, thread, &extra_memory_, nullptr); + process_reader, + thread, + &extra_memory_, + gather_indirectly_referenced_memory_cap); CaptureMemory::PointedToByContext(context_, &capture_memory_delegate); INITIALIZATION_STATE_SET_VALID(initialized_); @@ -440,6 +446,9 @@ bool ExceptionSnapshotLinux::ReadSiginfo(ProcessReaderLinux* reader, PUSH_CODE(siginfo.sigval.sigval); break; + case Signals::kSimulatedSigno: + break; + default: LOG(WARNING) << "Unhandled signal " << siginfo.signo; } diff --git a/external_imported/sentry-native/external/crashpad/snapshot/linux/exception_snapshot_linux.h b/external_imported/sentry-native/external/crashpad/snapshot/linux/exception_snapshot_linux.h index 1719f0be7..05f6004e1 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/linux/exception_snapshot_linux.h +++ b/external_imported/sentry-native/external/crashpad/snapshot/linux/exception_snapshot_linux.h @@ -59,7 +59,8 @@ class ExceptionSnapshotLinux final : public ExceptionSnapshot { bool Initialize(ProcessReaderLinux* process_reader, LinuxVMAddress siginfo_address, LinuxVMAddress context_address, - pid_t thread_id); + pid_t thread_id, + uint32_t* gather_indirectly_referenced_memory_cap); // ExceptionSnapshot: diff --git a/external_imported/sentry-native/external/crashpad/snapshot/linux/exception_snapshot_linux_test.cc b/external_imported/sentry-native/external/crashpad/snapshot/linux/exception_snapshot_linux_test.cc index 51d3fd380..a045f3659 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/linux/exception_snapshot_linux_test.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/linux/exception_snapshot_linux_test.cc @@ -21,8 +21,9 @@ #include #include +#include + #include "base/bit_cast.h" -#include "base/cxx17_backports.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" #include "snapshot/cpu_architecture.h" @@ -170,7 +171,7 @@ void InitializeContext(NativeCPUContext* context) { test_context->vfp.head.magic = VFP_MAGIC; test_context->vfp.head.size = sizeof(test_context->vfp); memset(&test_context->vfp.context, 'v', sizeof(test_context->vfp.context)); - for (size_t reg = 0; reg < base::size(test_context->vfp.context.vfp.fpregs); + for (size_t reg = 0; reg < std::size(test_context->vfp.context.vfp.fpregs); ++reg) { test_context->vfp.context.vfp.fpregs[reg] = reg; } @@ -218,7 +219,7 @@ struct TestCoprocessorContext { void InitializeContext(NativeCPUContext* context) { memset(context, 'x', sizeof(*context)); - for (size_t index = 0; index < base::size(context->uc_mcontext.regs); + for (size_t index = 0; index < std::size(context->uc_mcontext.regs); ++index) { context->uc_mcontext.regs[index] = index; } @@ -237,7 +238,7 @@ void InitializeContext(NativeCPUContext* context) { test_context->fpsimd.head.size = sizeof(test_context->fpsimd); test_context->fpsimd.fpsr = 1; test_context->fpsimd.fpcr = 2; - for (size_t reg = 0; reg < base::size(test_context->fpsimd.vregs); ++reg) { + for (size_t reg = 0; reg < std::size(test_context->fpsimd.vregs); ++reg) { test_context->fpsimd.vregs[reg] = reg; } @@ -270,7 +271,7 @@ void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) { using NativeCPUContext = ucontext_t; void InitializeContext(NativeCPUContext* context) { - for (size_t reg = 0; reg < base::size(context->uc_mcontext.gregs); ++reg) { + for (size_t reg = 0; reg < std::size(context->uc_mcontext.gregs); ++reg) { context->uc_mcontext.gregs[reg] = reg; } memset(&context->uc_mcontext.fpregs, 44, sizeof(context->uc_mcontext.fpregs)); @@ -285,7 +286,7 @@ void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) { #define CPU_ARCH_NAME mips64 #endif - for (size_t reg = 0; reg < base::size(expected.uc_mcontext.gregs); ++reg) { + for (size_t reg = 0; reg < std::size(expected.uc_mcontext.gregs); ++reg) { EXPECT_EQ(actual.CPU_ARCH_NAME->regs[reg], expected.uc_mcontext.gregs[reg]); } @@ -320,7 +321,8 @@ TEST(ExceptionSnapshotLinux, SelfBasic) { ASSERT_TRUE(exception.Initialize(&process_reader, FromPointerCast(&siginfo), FromPointerCast(&context), - gettid())); + gettid(), + nullptr)); EXPECT_EQ(exception.Exception(), static_cast(siginfo.si_signo)); EXPECT_EQ(exception.ExceptionInfo(), static_cast(siginfo.si_code)); EXPECT_EQ(exception.ExceptionAddress(), @@ -393,7 +395,8 @@ class RaiseTest { ASSERT_TRUE(exception.Initialize(&process_reader, FromPointerCast(siginfo), FromPointerCast(context), - gettid())); + gettid(), + nullptr)); EXPECT_EQ(exception.Exception(), static_cast(kSigno)); @@ -464,7 +467,8 @@ class TimerTest { ASSERT_TRUE(exception.Initialize(&process_reader, FromPointerCast(siginfo), FromPointerCast(context), - gettid())); + gettid(), + nullptr)); EXPECT_EQ(exception.Exception(), static_cast(kSigno)); diff --git a/external_imported/sentry-native/external/crashpad/snapshot/linux/process_reader_linux.cc b/external_imported/sentry-native/external/crashpad/snapshot/linux/process_reader_linux.cc index a9098ac80..5711f343a 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/linux/process_reader_linux.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/linux/process_reader_linux.cc @@ -29,7 +29,7 @@ #include "util/linux/auxiliary_vector.h" #include "util/linux/proc_stat_reader.h" -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) #include #endif @@ -282,7 +282,7 @@ const std::vector& ProcessReaderLinux::Modules() { } void ProcessReaderLinux::InitializeAbortMessage() { -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) const MemoryMap::Mapping* mapping = memory_map_.FindMappingWithName("[anon:abort message]"); if (!mapping) { @@ -297,7 +297,7 @@ void ProcessReaderLinux::InitializeAbortMessage() { #endif } -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) // These structure definitions and the magic numbers below were copied from // bionic/libc/bionic/android_set_abort_message.cpp @@ -346,7 +346,7 @@ void ProcessReaderLinux::ReadAbortMessage(const MemoryMap::Mapping* mapping) { } } -#endif // OS_ANDROID +#endif // BUILDFLAG(IS_ANDROID) const std::string& ProcessReaderLinux::AbortMessage() { INITIALIZATION_STATE_DCHECK_VALID(initialized_); @@ -486,7 +486,7 @@ void ProcessReaderLinux::InitializeModules() { continue; } -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) // Beginning at API 21, Bionic provides android_dlopen_ext() which allows // passing a file descriptor with an existing relro segment to the loader. // This means that the mapping attributes of dyn_mapping may be unrelated diff --git a/external_imported/sentry-native/external/crashpad/snapshot/linux/process_reader_linux_test.cc b/external_imported/sentry-native/external/crashpad/snapshot/linux/process_reader_linux_test.cc index f3791f85b..81b3d6ec6 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/linux/process_reader_linux_test.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/linux/process_reader_linux_test.cc @@ -26,12 +26,12 @@ #include #include +#include #include #include #include #include -#include "base/cxx17_backports.h" #include "base/format_macros.h" #include "base/memory/free_deleter.h" #include "base/strings/stringprintf.h" @@ -53,7 +53,7 @@ #include "util/misc/memory_sanitizer.h" #include "util/synchronization/semaphore.h" -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) #include #include #include "dlfcn_internal.h" @@ -88,7 +88,7 @@ TEST(ProcessReaderLinux, SelfBasic) { EXPECT_EQ(process_reader.ParentProcessID(), getppid()); static constexpr char kTestMemory[] = "Some test memory"; - char buffer[base::size(kTestMemory)]; + char buffer[std::size(kTestMemory)]; ASSERT_TRUE(process_reader.Memory()->Read( reinterpret_cast(kTestMemory), sizeof(kTestMemory), @@ -492,7 +492,7 @@ TEST(ProcessReaderLinux, MAYBE_ChildWithSplitStack) { } // Android doesn't provide dl_iterate_phdr on ARM until API 21. -#if !defined(OS_ANDROID) || !defined(ARCH_CPU_ARMEL) || __ANDROID_API__ >= 21 +#if !BUILDFLAG(IS_ANDROID) || !defined(ARCH_CPU_ARMEL) || __ANDROID_API__ >= 21 int ExpectFindModule(dl_phdr_info* info, size_t size, void* data) { SCOPED_TRACE( base::StringPrintf("module %s at 0x%" PRIx64 " phdrs 0x%" PRIx64, @@ -502,8 +502,7 @@ int ExpectFindModule(dl_phdr_info* info, size_t size, void* data) { auto modules = reinterpret_cast*>(data); - -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) // Prior to API 27, Bionic includes a null entry for /system/bin/linker. if (!info->dlpi_name) { EXPECT_EQ(info->dlpi_addr, 0u); @@ -532,7 +531,7 @@ int ExpectFindModule(dl_phdr_info* info, size_t size, void* data) { EXPECT_TRUE(found); return 0; } -#endif // !OS_ANDROID || !ARCH_CPU_ARMEL || __ANDROID_API__ >= 21 +#endif // !BUILDFLAG(IS_ANDROID) || !ARCH_CPU_ARMEL || __ANDROID_API__ >= 21 void ExpectModulesFromSelf( const std::vector& modules) { @@ -542,14 +541,14 @@ void ExpectModulesFromSelf( } // Android doesn't provide dl_iterate_phdr on ARM until API 21. -#if !defined(OS_ANDROID) || !defined(ARCH_CPU_ARMEL) || __ANDROID_API__ >= 21 +#if !BUILDFLAG(IS_ANDROID) || !defined(ARCH_CPU_ARMEL) || __ANDROID_API__ >= 21 EXPECT_EQ( dl_iterate_phdr( ExpectFindModule, reinterpret_cast( const_cast*>(&modules))), 0); -#endif // !OS_ANDROID || !ARCH_CPU_ARMEL || __ANDROID_API__ >= 21 +#endif // !BUILDFLAG(IS_ANDROID) || !ARCH_CPU_ARMEL || __ANDROID_API__ >= 21 } #if !defined(ADDRESS_SANITIZER) && !defined(MEMORY_SANITIZER) @@ -641,7 +640,7 @@ TEST(ProcessReaderLinux, ChildModules) { test.Run(); } -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) const char kTestAbortMessage[] = "test abort message"; TEST(ProcessReaderLinux, AbortMessage) { diff --git a/external_imported/sentry-native/external/crashpad/snapshot/linux/process_snapshot_linux.cc b/external_imported/sentry-native/external/crashpad/snapshot/linux/process_snapshot_linux.cc index 14d32f2c6..cdb69a3ad 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/linux/process_snapshot_linux.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/linux/process_snapshot_linux.cc @@ -17,6 +17,7 @@ #include #include "base/logging.h" +#include "build/build_config.h" #include "util/linux/exception_information.h" namespace crashpad { @@ -42,10 +43,9 @@ bool ProcessSnapshotLinux::Initialize(PtraceConnection* connection) { client_id_.InitializeToZero(); system_.Initialize(&process_reader_, &snapshot_time_); + InitializeModules(); GetCrashpadOptionsInternal((&options_)); - InitializeThreads(); - InitializeModules(); InitializeAnnotations(); INITIALIZATION_STATE_SET_VALID(initialized_); @@ -83,11 +83,17 @@ bool ProcessSnapshotLinux::InitializeException( info.thread_id = exception_thread_id; } + uint32_t* budget_remaining_pointer = + options_.gather_indirectly_referenced_memory == TriState::kEnabled + ? &options_.indirectly_referenced_memory_cap + : nullptr; + exception_.reset(new internal::ExceptionSnapshotLinux()); if (!exception_->Initialize(&process_reader_, info.siginfo_address, info.context_address, - info.thread_id)) { + info.thread_id, + budget_remaining_pointer)) { exception_.reset(); return false; } @@ -274,11 +280,11 @@ const ProcessMemory* ProcessSnapshotLinux::Memory() const { void ProcessSnapshotLinux::InitializeThreads() { const std::vector& process_reader_threads = process_reader_.Threads(); - uint32_t* budget_remaining_pointer = nullptr; - uint32_t budget_remaining = options_.indirectly_referenced_memory_cap; - if (options_.gather_indirectly_referenced_memory == TriState::kEnabled) { - budget_remaining_pointer = &budget_remaining; - } + uint32_t* budget_remaining_pointer = + options_.gather_indirectly_referenced_memory == TriState::kEnabled + ? &options_.indirectly_referenced_memory_cap + : nullptr; + for (const ProcessReaderLinux::Thread& process_reader_thread : process_reader_threads) { auto thread = std::make_unique(); @@ -306,7 +312,7 @@ void ProcessSnapshotLinux::InitializeModules() { } void ProcessSnapshotLinux::InitializeAnnotations() { -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) const std::string& abort_message = process_reader_.AbortMessage(); if (!abort_message.empty()) { annotations_simple_map_["abort_message"] = abort_message; diff --git a/external_imported/sentry-native/external/crashpad/snapshot/linux/signal_context.h b/external_imported/sentry-native/external/crashpad/snapshot/linux/signal_context.h index 110024680..c004f8f6d 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/linux/signal_context.h +++ b/external_imported/sentry-native/external/crashpad/snapshot/linux/signal_context.h @@ -119,11 +119,11 @@ template struct Sigset< Traits, typename std::enable_if::value>::type> { -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) uint64_t val; #else typename Traits::ULong val[16]; -#endif // OS_ANDROID +#endif // BUILDFLAG(IS_ANDROID) }; #if defined(ARCH_CPU_X86_FAMILY) diff --git a/external_imported/sentry-native/external/crashpad/snapshot/linux/system_snapshot_linux.cc b/external_imported/sentry-native/external/crashpad/snapshot/linux/system_snapshot_linux.cc index a99da3e4b..e77bcafa9 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/linux/system_snapshot_linux.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/linux/system_snapshot_linux.cc @@ -26,13 +26,14 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "snapshot/cpu_context.h" #include "snapshot/posix/timezone.h" #include "util/file/file_io.h" #include "util/numeric/in_range_cast.h" #include "util/string/split_string.h" -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) #include #endif @@ -118,7 +119,7 @@ bool ReadFreqFile(const std::string& filename, uint64_t* hz) { return true; } -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) bool ReadProperty(const char* property, std::string* value) { char value_buffer[PROP_VALUE_MAX]; int length = __system_property_get(property, value_buffer); @@ -129,7 +130,7 @@ bool ReadProperty(const char* property, std::string* value) { *value = value_buffer; return true; } -#endif // OS_ANDROID +#endif // BUILDFLAG(IS_ANDROID) } // namespace @@ -158,13 +159,13 @@ void SystemSnapshotLinux::Initialize(ProcessReaderLinux* process_reader, process_reader_ = process_reader; snapshot_time_ = snapshot_time; -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) std::string build_string; if (ReadProperty("ro.build.fingerprint", &build_string)) { os_version_build_ = build_string; os_version_full_ = build_string; } -#endif // OS_ANDROID +#endif // BUILDFLAG(IS_ANDROID) utsname uts; if (uname(&uts) != 0) { @@ -314,11 +315,11 @@ bool SystemSnapshotLinux::CPUX86SupportsDAZ() const { SystemSnapshot::OperatingSystem SystemSnapshotLinux::GetOperatingSystem() const { INITIALIZATION_STATE_DCHECK_VALID(initialized_); -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) return kOperatingSystemAndroid; #else return kOperatingSystemLinux; -#endif // OS_ANDROID +#endif // BUILDFLAG(IS_ANDROID) } bool SystemSnapshotLinux::OSServer() const { @@ -344,7 +345,7 @@ std::string SystemSnapshotLinux::OSVersionFull() const { std::string SystemSnapshotLinux::MachineDescription() const { INITIALIZATION_STATE_DCHECK_VALID(initialized_); -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) std::string description; std::string prop; if (ReadProperty("ro.product.model", &prop)) { @@ -359,7 +360,7 @@ std::string SystemSnapshotLinux::MachineDescription() const { return description; #else return std::string(); -#endif // OS_ANDROID +#endif // BUILDFLAG(IS_ANDROID) } bool SystemSnapshotLinux::NXEnabled() const { diff --git a/external_imported/sentry-native/external/crashpad/snapshot/linux/system_snapshot_linux_test.cc b/external_imported/sentry-native/external/crashpad/snapshot/linux/system_snapshot_linux_test.cc index f5d26a1e7..09c219602 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/linux/system_snapshot_linux_test.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/linux/system_snapshot_linux_test.cc @@ -65,11 +65,11 @@ TEST(SystemSnapshotLinux, Basic) { system.CPURevision(); system.NXEnabled(); -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) EXPECT_FALSE(system.MachineDescription().empty()); #else system.MachineDescription(); -#endif // OS_ANDROID +#endif // BUILDFLAG(IS_ANDROID) #if defined(ARCH_CPU_X86_FAMILY) system.CPUX86Signature(); diff --git a/external_imported/sentry-native/external/crashpad/snapshot/mac/mach_o_image_reader.cc b/external_imported/sentry-native/external/crashpad/snapshot/mac/mach_o_image_reader.cc index 4e66f3db8..5c5bcb00f 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/mac/mach_o_image_reader.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/mac/mach_o_image_reader.cc @@ -18,10 +18,10 @@ #include #include +#include #include #include -#include "base/cxx17_backports.h" #include "base/logging.h" #include "base/strings/stringprintf.h" #include "client/crashpad_info.h" @@ -183,7 +183,7 @@ bool MachOImageReader::Initialize(ProcessReaderMac* process_reader, // This vector is parallel to the kLoadCommandReaders array, and tracks // whether a singleton load command matching the |command| field has been // found yet. - std::vector singleton_indices(base::size(kLoadCommandReaders), + std::vector singleton_indices(std::size(kLoadCommandReaders), kInvalidSegmentIndex); size_t offset = mach_header.Size(); @@ -236,8 +236,7 @@ bool MachOImageReader::Initialize(ProcessReaderMac* process_reader, return false; } - for (size_t reader_index = 0; - reader_index < base::size(kLoadCommandReaders); + for (size_t reader_index = 0; reader_index < std::size(kLoadCommandReaders); ++reader_index) { if (load_command.cmd != kLoadCommandReaders[reader_index].command) { continue; diff --git a/external_imported/sentry-native/external/crashpad/snapshot/mac/mach_o_image_segment_reader_test.cc b/external_imported/sentry-native/external/crashpad/snapshot/mac/mach_o_image_segment_reader_test.cc index f89b475f5..38e55dfa1 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/mac/mach_o_image_segment_reader_test.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/mac/mach_o_image_segment_reader_test.cc @@ -16,7 +16,8 @@ #include -#include "base/cxx17_backports.h" +#include + #include "base/strings/stringprintf.h" #include "gtest/gtest.h" @@ -63,7 +64,7 @@ TEST(MachOImageSegmentReader, SegmentNameString) { SEG_IMPORT, }; - for (size_t index = 0; index < base::size(kSegmentTestData); ++index) { + for (size_t index = 0; index < std::size(kSegmentTestData); ++index) { EXPECT_EQ( MachOImageSegmentReader::SegmentNameString(kSegmentTestData[index]), kSegmentTestData[index]) @@ -106,7 +107,7 @@ TEST(MachOImageSegmentReader, SectionNameString) { SECT_ICON_TIFF, }; - for (size_t index = 0; index < base::size(kSectionTestData); ++index) { + for (size_t index = 0; index < std::size(kSectionTestData); ++index) { EXPECT_EQ( MachOImageSegmentReader::SectionNameString(kSectionTestData[index]), kSectionTestData[index]) @@ -169,7 +170,7 @@ TEST(MachOImageSegmentReader, SegmentAndSectionNameString) { {SEG_IMPORT, "", "__IMPORT,"}, }; - for (size_t index = 0; index < base::size(kSegmentAndSectionTestData); + for (size_t index = 0; index < std::size(kSegmentAndSectionTestData); ++index) { const auto& test = kSegmentAndSectionTestData[index]; EXPECT_EQ(MachOImageSegmentReader::SegmentAndSectionNameString( diff --git a/external_imported/sentry-native/external/crashpad/snapshot/mac/process_reader_mac_test.cc b/external_imported/sentry-native/external/crashpad/snapshot/mac/process_reader_mac_test.cc index 6b4e108b9..886895084 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/mac/process_reader_mac_test.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/mac/process_reader_mac_test.cc @@ -25,11 +25,11 @@ #include #include +#include #include #include #include "base/check_op.h" -#include "base/cxx17_backports.h" #include "base/logging.h" #include "base/mac/mach_logging.h" #include "base/posix/eintr_wrapper.h" @@ -68,7 +68,7 @@ TEST(ProcessReaderMac, SelfBasic) { EXPECT_EQ(process_reader.ParentProcessID(), getppid()); static constexpr char kTestMemory[] = "Some test memory"; - char buffer[base::size(kTestMemory)]; + char buffer[std::size(kTestMemory)]; ASSERT_TRUE(process_reader.Memory()->Read( FromPointerCast(kTestMemory), sizeof(kTestMemory), @@ -702,11 +702,11 @@ class ScopedOpenCLNoOpKernel { const size_t source_lengths[] = { strlen(sources[0]), }; - static_assert(base::size(sources) == base::size(source_lengths), + static_assert(std::size(sources) == std::size(source_lengths), "arrays must be parallel"); program_ = clCreateProgramWithSource( - context_, base::size(sources), sources, source_lengths, &rv); + context_, std::size(sources), sources, source_lengths, &rv); ASSERT_EQ(rv, CL_SUCCESS) << "clCreateProgramWithSource"; rv = clBuildProgram( diff --git a/external_imported/sentry-native/external/crashpad/snapshot/mac/process_types.cc b/external_imported/sentry-native/external/crashpad/snapshot/mac/process_types.cc index 3d4e05902..c91b697d1 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/mac/process_types.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/mac/process_types.cc @@ -18,9 +18,9 @@ #include #include +#include #include -#include "base/cxx17_backports.h" #include "snapshot/mac/process_types/internal.h" #include "util/process/process_memory_mac.h" @@ -74,7 +74,7 @@ using UInt64Array4 = uint64_t[4]; template <> inline void Assign(UInt64Array4* destination, const UInt32Array4& source) { - for (size_t index = 0; index < base::size(source); ++index) { + for (size_t index = 0; index < std::size(source); ++index) { (*destination)[index] = source[index]; } } diff --git a/external_imported/sentry-native/external/crashpad/snapshot/mac/process_types/custom.cc b/external_imported/sentry-native/external/crashpad/snapshot/mac/process_types/custom.cc index 06c13001d..5c6dec98d 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/mac/process_types/custom.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/mac/process_types/custom.cc @@ -12,21 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "snapshot/mac/process_types.h" - #include #include #include #include +#include #include #include #include "base/check_op.h" -#include "base/cxx17_backports.h" #include "base/logging.h" #include "base/numerics/safe_math.h" #include "base/strings/stringprintf.h" +#include "snapshot/mac/process_types.h" #include "snapshot/mac/process_types/internal.h" #include "util/mac/mac_util.h" #include "util/process/process_memory_mac.h" @@ -150,8 +149,8 @@ size_t dyld_all_image_infos::ExpectedSizeForVersion( sizeof(dyld_all_image_infos), // 18 }; - if (version >= base::size(kSizeForVersion)) { - return kSizeForVersion[base::size(kSizeForVersion) - 1]; + if (version >= std::size(kSizeForVersion)) { + return kSizeForVersion[std::size(kSizeForVersion) - 1]; } static_assert(std::is_unsigned::value, diff --git a/external_imported/sentry-native/external/crashpad/snapshot/mac/process_types_test.cc b/external_imported/sentry-native/external/crashpad/snapshot/mac/process_types_test.cc index 90f5c1f67..2946dc25c 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/mac/process_types_test.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/mac/process_types_test.cc @@ -18,10 +18,10 @@ #include #include +#include #include #include -#include "base/cxx17_backports.h" #include "base/strings/stringprintf.h" #include "build/build_config.h" #include "gtest/gtest.h" @@ -172,7 +172,7 @@ TEST(ProcessTypes, DyldImagesSelf) { {16, kUnsupported, 328}, {17, kUnsupported, 368}, }; - for (size_t index = 0; index < base::size(kVersionsAndSizes); ++index) { + for (size_t index = 0; index < std::size(kVersionsAndSizes); ++index) { uint32_t version = kVersionsAndSizes[index].version; SCOPED_TRACE(base::StringPrintf("index %zu, version %u", index, version)); @@ -325,7 +325,7 @@ TEST(ProcessTypes, DyldImagesSelf) { self_image_infos->sharedCacheBaseAddress); EXPECT_EQ(proctype_image_infos.dyldPath, reinterpret_cast(self_image_infos->dyldPath)); - for (size_t index = 0; index < base::size(self_image_infos->notifyPorts); + for (size_t index = 0; index < std::size(self_image_infos->notifyPorts); ++index) { EXPECT_EQ(proctype_image_infos.notifyPorts[index], self_image_infos->notifyPorts[index]) @@ -345,7 +345,7 @@ TEST(ProcessTypes, DyldImagesSelf) { // process_types version. It’s difficult to compare the reserved fields in // these older SDKs, so only do it where the declarations match. if (proctype_image_infos.version >= 14) { - for (size_t index = 0; index < base::size(proctype_image_infos.reserved); + for (size_t index = 0; index < std::size(proctype_image_infos.reserved); ++index) { EXPECT_EQ(proctype_image_infos.reserved[index], implicit_cast(self_image_infos->reserved[index])) diff --git a/external_imported/sentry-native/external/crashpad/snapshot/minidump/minidump_context_converter.cc b/external_imported/sentry-native/external/crashpad/snapshot/minidump/minidump_context_converter.cc index 981f34c97..5e94ca2cb 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/minidump/minidump_context_converter.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/minidump/minidump_context_converter.cc @@ -16,7 +16,8 @@ #include -#include "base/cxx17_backports.h" +#include + #include "base/logging.h" #include "minidump/minidump_context.h" @@ -147,7 +148,7 @@ bool MinidumpContextConverter::Initialize( return false; } - for (size_t i = 0; i < base::size(src->regs); i++) { + for (size_t i = 0; i < std::size(src->regs); i++) { context_.arm->regs[i] = src->regs[i]; } @@ -159,7 +160,7 @@ bool MinidumpContextConverter::Initialize( context_.arm->cpsr = src->cpsr; context_.arm->vfp_regs.fpscr = src->fpscr; - for (size_t i = 0; i < base::size(src->vfp); i++) { + for (size_t i = 0; i < std::size(src->vfp); i++) { context_.arm->vfp_regs.vfp[i] = src->vfp[i]; } @@ -179,14 +180,14 @@ bool MinidumpContextConverter::Initialize( return false; } - for (size_t i = 0; i < base::size(src->regs); i++) { + for (size_t i = 0; i < std::size(src->regs); i++) { context_.arm64->regs[i] = src->regs[i]; } context_.arm64->regs[29] = src->fp; context_.arm64->regs[30] = src->lr; - for (size_t i = 0; i < base::size(src->fpsimd); i++) { + for (size_t i = 0; i < std::size(src->fpsimd); i++) { context_.arm64->fpsimd[i] = src->fpsimd[i]; } @@ -208,7 +209,7 @@ bool MinidumpContextConverter::Initialize( return false; } - for (size_t i = 0; i < base::size(src->regs); i++) { + for (size_t i = 0; i < std::size(src->regs); i++) { context_.mipsel->regs[i] = src->regs[i]; } @@ -216,7 +217,7 @@ bool MinidumpContextConverter::Initialize( context_.mipsel->mdlo = static_cast(src->mdlo); context_.mipsel->dsp_control = src->dsp_control; - for (size_t i = 0; i < base::size(src->hi); i++) { + for (size_t i = 0; i < std::size(src->hi); i++) { context_.mipsel->hi[i] = src->hi[i]; context_.mipsel->lo[i] = src->lo[i]; } @@ -244,7 +245,7 @@ bool MinidumpContextConverter::Initialize( return false; } - for (size_t i = 0; i < base::size(src->regs); i++) { + for (size_t i = 0; i < std::size(src->regs); i++) { context_.mips64->regs[i] = src->regs[i]; } @@ -252,7 +253,7 @@ bool MinidumpContextConverter::Initialize( context_.mips64->mdlo = src->mdlo; context_.mips64->dsp_control = src->dsp_control; - for (size_t i = 0; i < base::size(src->hi); i++) { + for (size_t i = 0; i < std::size(src->hi); i++) { context_.mips64->hi[i] = src->hi[i]; context_.mips64->lo[i] = src->lo[i]; } diff --git a/external_imported/sentry-native/external/crashpad/snapshot/minidump/module_snapshot_minidump.cc b/external_imported/sentry-native/external/crashpad/snapshot/minidump/module_snapshot_minidump.cc index 698f53574..7dad87a66 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/minidump/module_snapshot_minidump.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/minidump/module_snapshot_minidump.cc @@ -100,7 +100,7 @@ bool ModuleSnapshotMinidump::InitializeModuleCodeView( signature = *reinterpret_cast(cv_record.data()); if (signature == CodeViewRecordPDB70::kSignature) { - if (cv_record.size() < offsetof(CodeViewRecordPDB70, pdb_name)) { + if (cv_record.size() < offsetof(CodeViewRecordPDB70, pdb_name) + 1) { LOG(ERROR) << "CodeView record in module marked as PDB70 but too small"; return false; } @@ -111,8 +111,14 @@ bool ModuleSnapshotMinidump::InitializeModuleCodeView( age_ = cv_record_pdb70->age; uuid_ = cv_record_pdb70->uuid; + if (cv_record.back() != '\0') { + LOG(ERROR) << "CodeView record marked as PDB70 missing NUL-terminator in " + "pdb_name"; + return false; + } + std::copy(cv_record.begin() + offsetof(CodeViewRecordPDB70, pdb_name), - cv_record.end(), + cv_record.end() - 1, std::back_inserter(debug_file_name_)); return true; } diff --git a/external_imported/sentry-native/external/crashpad/snapshot/minidump/process_snapshot_minidump.cc b/external_imported/sentry-native/external/crashpad/snapshot/minidump/process_snapshot_minidump.cc index db7e59554..8c870ee00 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/minidump/process_snapshot_minidump.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/minidump/process_snapshot_minidump.cc @@ -323,7 +323,7 @@ bool ProcessSnapshotMinidump::InitializeMiscInfo() { full_version_ = base::UTF16ToUTF8(info.BuildString); #endif full_version_ = full_version_.substr(0, full_version_.find(';')); - FALLTHROUGH; + [[fallthrough]]; case sizeof(MINIDUMP_MISC_INFO_3): case sizeof(MINIDUMP_MISC_INFO_2): case sizeof(MINIDUMP_MISC_INFO): diff --git a/external_imported/sentry-native/external/crashpad/snapshot/minidump/process_snapshot_minidump_test.cc b/external_imported/sentry-native/external/crashpad/snapshot/minidump/process_snapshot_minidump_test.cc index b9fa23d73..ded561bf1 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/minidump/process_snapshot_minidump_test.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/minidump/process_snapshot_minidump_test.cc @@ -19,9 +19,9 @@ #include #include +#include #include -#include "base/cxx17_backports.h" #include "base/numerics/safe_math.h" #include "base/strings/utf_string_conversions.h" #include "gtest/gtest.h" @@ -350,6 +350,7 @@ TEST(ProcessSnapshotMinidump, Modules) { "libgeorgism", "librealistutopia", }; + constexpr char debug_name[] = "debugme.pdb"; minidump_module.BaseOfImage = 0xbadf00d; minidump_module.SizeOfImage = 9001; @@ -373,12 +374,15 @@ TEST(ProcessSnapshotMinidump, Modules) { pdb70_cv.signature = CodeViewRecordPDB70::kSignature; pdb70_cv.age = 7; pdb70_cv.uuid.InitializeFromString("00112233-4455-6677-8899-aabbccddeeff"); - pdb70_cv.pdb_name[0] = '\0'; auto pdb70_loc = static_cast(string_file.SeekGet()); - auto pdb70_size = sizeof(pdb70_cv); + auto pdb70_size = offsetof(CodeViewRecordPDB70, pdb_name); - EXPECT_TRUE(string_file.Write(&pdb70_cv, sizeof(pdb70_cv))); + EXPECT_TRUE(string_file.Write(&pdb70_cv, pdb70_size)); + + size_t nul_terminated_length = strlen(debug_name) + 1; + EXPECT_TRUE(string_file.Write(debug_name, nul_terminated_length)); + pdb70_size += nul_terminated_length; CodeViewRecordBuildID build_id_cv; build_id_cv.signature = CodeViewRecordBuildID::kSignature; @@ -545,6 +549,7 @@ TEST(ProcessSnapshotMinidump, Modules) { EXPECT_EQ(uuid.ToString(), "00112233-4455-6677-8899-aabbccddeeff"); EXPECT_EQ(age, 7U); + EXPECT_EQ(modules[i]->DebugFileName(), debug_name); } else { auto build_id = modules[i]->BuildID(); std::string build_id_text(build_id.data(), @@ -975,27 +980,27 @@ TEST(ProcessSnapshotMinidump, ThreadContextX86_64) { minidump_context.fxsave.fpu_ip_64 = 42; minidump_context.fxsave.fpu_dp_64 = 43; - for (size_t i = 0; i < base::size(minidump_context.vector_register); i++) { + for (size_t i = 0; i < std::size(minidump_context.vector_register); i++) { minidump_context.vector_register[i].lo = i * 2 + 44; minidump_context.vector_register[i].hi = i * 2 + 45; } - for (uint8_t i = 0; i < base::size(minidump_context.fxsave.reserved_4); i++) { + for (uint8_t i = 0; i < std::size(minidump_context.fxsave.reserved_4); i++) { minidump_context.fxsave.reserved_4[i] = i * 2 + 115; minidump_context.fxsave.available[i] = i * 2 + 116; } - for (size_t i = 0; i < base::size(minidump_context.fxsave.st_mm); i++) { + for (size_t i = 0; i < std::size(minidump_context.fxsave.st_mm); i++) { for (uint8_t j = 0; - j < base::size(minidump_context.fxsave.st_mm[0].mm_value); + j < std::size(minidump_context.fxsave.st_mm[0].mm_value); j++) { minidump_context.fxsave.st_mm[i].mm_value[j] = j + 1; minidump_context.fxsave.st_mm[i].mm_reserved[j] = j + 1; } } - for (size_t i = 0; i < base::size(minidump_context.fxsave.xmm); i++) { - for (uint8_t j = 0; j < base::size(minidump_context.fxsave.xmm[0]); j++) { + for (size_t i = 0; i < std::size(minidump_context.fxsave.xmm); i++) { + for (uint8_t j = 0; j < std::size(minidump_context.fxsave.xmm[0]); j++) { minidump_context.fxsave.xmm[i][j] = j + 1; } } @@ -1078,20 +1083,20 @@ TEST(ProcessSnapshotMinidump, ThreadContextX86_64) { EXPECT_EQ(ctx->fxsave.fpu_ip_64, 42U); EXPECT_EQ(ctx->fxsave.fpu_dp_64, 43U); - for (uint8_t i = 0; i < base::size(ctx->fxsave.reserved_4); i++) { + for (uint8_t i = 0; i < std::size(ctx->fxsave.reserved_4); i++) { EXPECT_EQ(ctx->fxsave.reserved_4[i], i * 2 + 115); EXPECT_EQ(ctx->fxsave.available[i], i * 2 + 116); } - for (size_t i = 0; i < base::size(ctx->fxsave.st_mm); i++) { - for (uint8_t j = 0; j < base::size(ctx->fxsave.st_mm[0].mm_value); j++) { + for (size_t i = 0; i < std::size(ctx->fxsave.st_mm); i++) { + for (uint8_t j = 0; j < std::size(ctx->fxsave.st_mm[0].mm_value); j++) { EXPECT_EQ(ctx->fxsave.st_mm[i].mm_value[j], j + 1); EXPECT_EQ(ctx->fxsave.st_mm[i].mm_reserved[j], j + 1); } } - for (size_t i = 0; i < base::size(ctx->fxsave.xmm); i++) { - for (uint8_t j = 0; j < base::size(ctx->fxsave.xmm[0]); j++) { + for (size_t i = 0; i < std::size(ctx->fxsave.xmm); i++) { + for (uint8_t j = 0; j < std::size(ctx->fxsave.xmm[0]); j++) { EXPECT_EQ(ctx->fxsave.xmm[i][j], j + 1); } } diff --git a/external_imported/sentry-native/external/crashpad/snapshot/posix/timezone.cc b/external_imported/sentry-native/external/crashpad/snapshot/posix/timezone.cc index c413d7080..3591157e8 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/posix/timezone.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/posix/timezone.cc @@ -17,8 +17,9 @@ #include #include +#include + #include "base/check.h" -#include "base/cxx17_backports.h" #include "base/logging.h" #include "build/build_config.h" @@ -40,7 +41,7 @@ void TimeZone(const timeval& snapshot_time, bool found_transition = false; long probe_gmtoff = local.tm_gmtoff; -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) // Some versions of the timezone database on Android have incorrect // information (e.g. Asia/Kolkata and Pacific/Honolulu). These timezones set // daylight to a non-zero value and return incorrect, >= 0 values for tm_isdst @@ -61,8 +62,7 @@ void TimeZone(const timeval& snapshot_time, static constexpr int kMonthDeltas[] = {0, 1, -1, 2, -2, 3, -3, 4, -4, 5, -5, 6, -6, 7, -7, 8, -8, 9, -9, 10, -10, 11, -11, 12, -12}; - for (size_t index = 0; - index < base::size(kMonthDeltas) && !found_transition; + for (size_t index = 0; index < std::size(kMonthDeltas) && !found_transition; ++index) { // Look at a day of each month at local noon. Set tm_isdst to -1 to avoid // giving mktime() any hints about whether to consider daylight saving @@ -105,14 +105,14 @@ void TimeZone(const timeval& snapshot_time, } else { *daylight_name = tzname[0]; *dst_status = SystemSnapshot::kDoesNotObserveDaylightSavingTime; -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) // timezone is more reliably set correctly on Android. *standard_offset_seconds = -timezone; *daylight_offset_seconds = -timezone; #else *standard_offset_seconds = local.tm_gmtoff; *daylight_offset_seconds = local.tm_gmtoff; -#endif // OS_ANDROID +#endif // BUILDFLAG(IS_ANDROID) } } diff --git a/external_imported/sentry-native/external/crashpad/snapshot/posix/timezone_test.cc b/external_imported/sentry-native/external/crashpad/snapshot/posix/timezone_test.cc index 6a343767e..990a063eb 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/posix/timezone_test.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/posix/timezone_test.cc @@ -18,9 +18,9 @@ #include #include +#include #include -#include "base/cxx17_backports.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" #include "test/errors.h" @@ -154,7 +154,7 @@ TEST(TimeZone, Basic) { {"UTC", false, 0, 0, "UTC", "UTC"}, }; - for (size_t index = 0; index < base::size(kTestTimeZones); ++index) { + for (size_t index = 0; index < std::size(kTestTimeZones); ++index) { const auto& test_time_zone = kTestTimeZones[index]; const char* tz = test_time_zone.tz; SCOPED_TRACE(base::StringPrintf("index %zu, tz %s", index, tz)); diff --git a/external_imported/sentry-native/external/crashpad/snapshot/sanitized/process_snapshot_sanitized_test.cc b/external_imported/sentry-native/external/crashpad/snapshot/sanitized/process_snapshot_sanitized_test.cc index 0bdea432b..306f2df26 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/sanitized/process_snapshot_sanitized_test.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/sanitized/process_snapshot_sanitized_test.cc @@ -16,7 +16,8 @@ #include -#include "base/cxx17_backports.h" +#include + #include "base/notreached.h" #include "build/build_config.h" #include "gtest/gtest.h" @@ -25,7 +26,7 @@ #include "util/misc/address_sanitizer.h" #include "util/numeric/safe_assignment.h" -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) #include #include "snapshot/linux/process_snapshot_linux.h" @@ -101,7 +102,7 @@ void ChildTestFunction() { static StringAnnotation<32> non_allowed_annotation(kNonAllowedAnnotationName); non_allowed_annotation.Set(kNonAllowedAnnotationValue); - char string_data[base::size(kSensitiveStackData)]; + char string_data[std::size(kSensitiveStackData)]; strcpy(string_data, kSensitiveStackData); void (*code_pointer)(void) = ChildTestFunction; diff --git a/external_imported/sentry-native/external/crashpad/snapshot/sanitized/sanitization_information_test.cc b/external_imported/sentry-native/external/crashpad/snapshot/sanitized/sanitization_information_test.cc index 425ec7528..65b01f085 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/sanitized/sanitization_information_test.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/sanitized/sanitization_information_test.cc @@ -14,13 +14,14 @@ #include "snapshot/sanitized/sanitization_information.h" -#include "base/cxx17_backports.h" +#include + #include "build/build_config.h" #include "gtest/gtest.h" #include "util/misc/from_pointer_cast.h" #include "util/process/process_memory_linux.h" -#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #include "test/linux/fake_ptrace_connection.h" #endif @@ -66,7 +67,7 @@ const char* const kNonEmptyAllowedAnnotations[] = {"string1", TEST_F(AllowedAnnotationsTest, NonEmptyAllowedAnnotations) { ASSERT_TRUE(DoReadAllowedAnnotations(kNonEmptyAllowedAnnotations)); ASSERT_EQ(allowed_annotations_.size(), - base::size(kNonEmptyAllowedAnnotations) - 1); + std::size(kNonEmptyAllowedAnnotations) - 1); for (size_t index = 0; index < allowed_annotations_.size(); ++index) { EXPECT_EQ(allowed_annotations_[index], kNonEmptyAllowedAnnotations[index]); } diff --git a/external_imported/sentry-native/external/crashpad/snapshot/test/test_cpu_context.cc b/external_imported/sentry-native/external/crashpad/snapshot/test/test_cpu_context.cc index 4923d4c4f..75d9c5a1f 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/test/test_cpu_context.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/test/test_cpu_context.cc @@ -17,7 +17,7 @@ #include #include -#include "base/cxx17_backports.h" +#include namespace crashpad { namespace test { @@ -44,28 +44,28 @@ void InitializeCPUContextFxsave(FxsaveType* fxsave, uint32_t* seed) { fxsave->reserved_3 = static_cast(value++); fxsave->mxcsr = value++; fxsave->mxcsr_mask = value++; - for (size_t st_mm_index = 0; st_mm_index < base::size(fxsave->st_mm); + for (size_t st_mm_index = 0; st_mm_index < std::size(fxsave->st_mm); ++st_mm_index) { - for (size_t byte = 0; byte < base::size(fxsave->st_mm[st_mm_index].st); + for (size_t byte = 0; byte < std::size(fxsave->st_mm[st_mm_index].st); ++byte) { fxsave->st_mm[st_mm_index].st[byte] = static_cast(value++); } for (size_t byte = 0; - byte < base::size(fxsave->st_mm[st_mm_index].st_reserved); + byte < std::size(fxsave->st_mm[st_mm_index].st_reserved); ++byte) { fxsave->st_mm[st_mm_index].st_reserved[byte] = static_cast(value); } } - for (size_t xmm_index = 0; xmm_index < base::size(fxsave->xmm); ++xmm_index) { - for (size_t byte = 0; byte < base::size(fxsave->xmm[xmm_index]); ++byte) { + for (size_t xmm_index = 0; xmm_index < std::size(fxsave->xmm); ++xmm_index) { + for (size_t byte = 0; byte < std::size(fxsave->xmm[xmm_index]); ++byte) { fxsave->xmm[xmm_index][byte] = static_cast(value++); } } - for (size_t byte = 0; byte < base::size(fxsave->reserved_4); ++byte) { + for (size_t byte = 0; byte < std::size(fxsave->reserved_4); ++byte) { fxsave->reserved_4[byte] = static_cast(value++); } - for (size_t byte = 0; byte < base::size(fxsave->available); ++byte) { + for (size_t byte = 0; byte < std::size(fxsave->available); ++byte) { fxsave->available[byte] = static_cast(value++); } @@ -174,7 +174,7 @@ void InitializeCPUContextARM(CPUContext* context, uint32_t seed) { uint32_t value = seed; - for (size_t index = 0; index < base::size(arm->regs); ++index) { + for (size_t index = 0; index < std::size(arm->regs); ++index) { arm->regs[index] = value++; } arm->fp = value++; @@ -185,7 +185,7 @@ void InitializeCPUContextARM(CPUContext* context, uint32_t seed) { arm->pc = value++; arm->cpsr = value++; - for (size_t index = 0; index < base::size(arm->vfp_regs.vfp); ++index) { + for (size_t index = 0; index < std::size(arm->vfp_regs.vfp); ++index) { arm->vfp_regs.vfp[index] = value++; } arm->vfp_regs.fpscr = value++; @@ -205,14 +205,14 @@ void InitializeCPUContextARM64(CPUContext* context, uint32_t seed) { uint32_t value = seed; - for (size_t index = 0; index < base::size(arm64->regs); ++index) { + for (size_t index = 0; index < std::size(arm64->regs); ++index) { arm64->regs[index] = value++; } arm64->sp = value++; arm64->pc = value++; arm64->spsr = value++; - for (size_t index = 0; index < base::size(arm64->fpsimd); ++index) { + for (size_t index = 0; index < std::size(arm64->fpsimd); ++index) { arm64->fpsimd[index].lo = value++; arm64->fpsimd[index].hi = value++; } @@ -231,7 +231,7 @@ void InitializeCPUContextMIPS(CPUContext* context, uint32_t seed) { uint32_t value = seed; - for (size_t index = 0; index < base::size(mipsel->regs); ++index) { + for (size_t index = 0; index < std::size(mipsel->regs); ++index) { mipsel->regs[index] = value++; } @@ -242,7 +242,7 @@ void InitializeCPUContextMIPS(CPUContext* context, uint32_t seed) { mipsel->cp0_status = value++; mipsel->cp0_cause = value++; - for (size_t index = 0; index < base::size(mipsel->fpregs.fregs); ++index) { + for (size_t index = 0; index < std::size(mipsel->fpregs.fregs); ++index) { mipsel->fpregs.fregs[index]._fp_fregs = static_cast(value++); } @@ -267,7 +267,7 @@ void InitializeCPUContextMIPS64(CPUContext* context, uint32_t seed) { uint64_t value = seed; - for (size_t index = 0; index < base::size(mips64->regs); ++index) { + for (size_t index = 0; index < std::size(mips64->regs); ++index) { mips64->regs[index] = value++; } @@ -278,7 +278,7 @@ void InitializeCPUContextMIPS64(CPUContext* context, uint32_t seed) { mips64->cp0_status = value++; mips64->cp0_cause = value++; - for (size_t index = 0; index < base::size(mips64->fpregs.dregs); ++index) { + for (size_t index = 0; index < std::size(mips64->fpregs.dregs); ++index) { mips64->fpregs.dregs[index] = static_cast(value++); } diff --git a/external_imported/sentry-native/external/crashpad/snapshot/win/capture_memory_delegate_win.cc b/external_imported/sentry-native/external/crashpad/snapshot/win/capture_memory_delegate_win.cc index ee5e5d644..43067caa6 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/win/capture_memory_delegate_win.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/win/capture_memory_delegate_win.cc @@ -55,19 +55,17 @@ void CaptureMemoryDelegateWin::AddNewMemorySnapshot( return; if (range.size() == 0) return; - if (budget_remaining_ && *budget_remaining_ == 0) + if (!budget_remaining_ || *budget_remaining_ == 0) return; snapshots_->push_back(std::make_unique()); internal::MemorySnapshotGeneric* snapshot = snapshots_->back().get(); snapshot->Initialize(process_reader_->Memory(), range.base(), range.size()); - if (budget_remaining_) { - if (!base::IsValueInRangeForNumericType(range.size())) { - *budget_remaining_ = 0; - } else { - int64_t temp = *budget_remaining_; - temp -= range.size(); - *budget_remaining_ = base::saturated_cast(temp); - } + if (!base::IsValueInRangeForNumericType(range.size())) { + *budget_remaining_ = 0; + } else { + int64_t temp = *budget_remaining_; + temp -= range.size(); + *budget_remaining_ = base::saturated_cast(temp); } } diff --git a/external_imported/sentry-native/external/crashpad/snapshot/win/cpu_context_win_test.cc b/external_imported/sentry-native/external/crashpad/snapshot/win/cpu_context_win_test.cc index 15f766777..ab8b8b313 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/win/cpu_context_win_test.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/win/cpu_context_win_test.cc @@ -16,7 +16,8 @@ #include -#include "base/cxx17_backports.h" +#include + #include "build/build_config.h" #include "gtest/gtest.h" #include "snapshot/cpu_context.h" @@ -87,13 +88,13 @@ void TestInitializeX86Context_FsaveWithoutFxsave() { for (size_t st_mm = 0; st_mm < 7; ++st_mm) { EXPECT_EQ( BytesToHexString(cpu_context_x86.fxsave.st_mm[st_mm].st, - base::size(cpu_context_x86.fxsave.st_mm[st_mm].st)), - std::string(base::size(cpu_context_x86.fxsave.st_mm[st_mm].st) * 2, + std::size(cpu_context_x86.fxsave.st_mm[st_mm].st)), + std::string(std::size(cpu_context_x86.fxsave.st_mm[st_mm].st) * 2, '0')) << "st_mm " << st_mm; } EXPECT_EQ(BytesToHexString(cpu_context_x86.fxsave.st_mm[7].st, - base::size(cpu_context_x86.fxsave.st_mm[7].st)), + std::size(cpu_context_x86.fxsave.st_mm[7].st)), "0000000000000080ff7f"); EXPECT_EQ(cpu_context_x86.dr0, 3u); diff --git a/external_imported/sentry-native/external/crashpad/snapshot/win/crashpad_snapshot_test_image_reader.cc b/external_imported/sentry-native/external/crashpad/snapshot/win/crashpad_snapshot_test_image_reader.cc index 94d0e47d8..65c778318 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/win/crashpad_snapshot_test_image_reader.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/win/crashpad_snapshot_test_image_reader.cc @@ -14,7 +14,8 @@ #include -#include "base/cxx17_backports.h" +#include + #include "base/logging.h" #include "client/crashpad_info.h" #include "util/file/file_io.h" @@ -29,7 +30,7 @@ DWORD WINAPI LotsOfReferencesThreadProc(void* param) { // Allocate a bunch of pointers to things on the stack. int* pointers[1000]; - for (size_t i = 0; i < base::size(pointers); ++i) { + for (size_t i = 0; i < std::size(pointers); ++i) { pointers[i] = new int[2048]; } @@ -53,7 +54,7 @@ int wmain(int argc, wchar_t* argv[]) { // verify the cap on pointed-to memory. crashpad::Semaphore semaphore(0); crashpad::ScopedKernelHANDLE threads[100]; - for (size_t i = 0; i < base::size(threads); ++i) { + for (size_t i = 0; i < std::size(threads); ++i) { threads[i].reset(CreateThread(nullptr, 0, &LotsOfReferencesThreadProc, @@ -66,7 +67,7 @@ int wmain(int argc, wchar_t* argv[]) { } } - for (size_t i = 0; i < base::size(threads); ++i) { + for (size_t i = 0; i < std::size(threads); ++i) { semaphore.Wait(); } diff --git a/external_imported/sentry-native/external/crashpad/snapshot/win/end_to_end_test.py b/external_imported/sentry-native/external/crashpad/snapshot/win/end_to_end_test.py index b1919adef..9d319078d 100755 --- a/external_imported/sentry-native/external/crashpad/snapshot/win/end_to_end_test.py +++ b/external_imported/sentry-native/external/crashpad/snapshot/win/end_to_end_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright 2015 The Crashpad Authors. All rights reserved. # @@ -14,13 +14,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import print_function - import os import platform import pywintypes import random import re +import struct import subprocess import sys import tempfile @@ -104,7 +103,7 @@ def NamedPipeExistsAndReady(pipe_name): try: win32pipe.WaitNamedPipe(pipe_name, win32pipe.NMPWAIT_WAIT_FOREVER) except pywintypes.error as e: - if e[0] == winerror.ERROR_FILE_NOT_FOUND: + if e.winerror == winerror.ERROR_FILE_NOT_FOUND: return False raise return True @@ -152,6 +151,14 @@ def GetDumpFromProgram(out_dir, pipe_name, executable_name, expect_exit_code, ] + list(args)) print('Running %s' % os.path.basename(command[0])) exit_code = subprocess.call(command) + + # Some win32con codes are negative signed integers, whereas all exit + # codes are unsigned integers. Convert from signed to unsigned. + if expect_exit_code < 0: + expect_exit_code = struct.unpack('I', + struct.pack('i', + expect_exit_code))[0] + if exit_code != expect_exit_code: raise subprocess.CalledProcessError(exit_code, executable_name) @@ -160,7 +167,8 @@ def GetDumpFromProgram(out_dir, pipe_name, executable_name, expect_exit_code, '--database=' + test_database, '--show-pending-reports', '--show-all-report-info', - ]) + ], + text=True) for line in out.splitlines(): if line.strip().startswith('Path:'): return line.partition(':')[2].strip() @@ -205,7 +213,7 @@ def __init__(self, cdb_path, dump_path, command): # Run a command line that loads the dump, runs the specified cdb # command, and then quits, and capturing stdout. self.out = subprocess.check_output( - [cdb_path, '-z', dump_path, '-c', command + ';q']) + [cdb_path, '-z', dump_path, '-c', command + ';q'], text=True) def Check(self, pattern, message, re_flags=0): match_obj = re.search(pattern, self.out, re_flags) diff --git a/external_imported/sentry-native/external/crashpad/snapshot/win/exception_snapshot_win.cc b/external_imported/sentry-native/external/crashpad/snapshot/win/exception_snapshot_win.cc index 5759652d4..29cf165d1 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/win/exception_snapshot_win.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/win/exception_snapshot_win.cc @@ -15,13 +15,13 @@ #include "snapshot/win/exception_snapshot_win.h" #include "base/logging.h" -#include "client/crashpad_client.h" #include "snapshot/capture_memory.h" #include "snapshot/memory_snapshot.h" #include "snapshot/memory_snapshot_generic.h" #include "snapshot/win/capture_memory_delegate_win.h" #include "snapshot/win/cpu_context_win.h" #include "snapshot/win/process_reader_win.h" +#include "util/win/exception_codes.h" #include "util/win/nt_internals.h" namespace crashpad { @@ -84,7 +84,8 @@ ExceptionSnapshotWin::~ExceptionSnapshotWin() { bool ExceptionSnapshotWin::Initialize( ProcessReaderWin* process_reader, DWORD thread_id, - WinVMAddress exception_pointers_address) { + WinVMAddress exception_pointers_address, + uint32_t* gather_indirectly_referenced_memory_cap) { INITIALIZATION_STATE_SET_INITIALIZING(initialized_); const ProcessReaderWin::Thread* thread = nullptr; @@ -132,7 +133,10 @@ bool ExceptionSnapshotWin::Initialize( #endif CaptureMemoryDelegateWin capture_memory_delegate( - process_reader, *thread, &extra_memory_, nullptr); + process_reader, + *thread, + &extra_memory_, + gather_indirectly_referenced_memory_cap); CaptureMemory::PointedToByContext(context_, &capture_memory_delegate); INITIALIZATION_STATE_SET_VALID(initialized_); @@ -211,7 +215,7 @@ bool ExceptionSnapshotWin::InitializeFromExceptionPointers( } const bool triggered_by_client = - first_record.ExceptionCode == CrashpadClient::kTriggeredExceptionCode && + first_record.ExceptionCode == ExceptionCodes::kTriggeredExceptionCode && first_record.NumberParameters == 2; if (triggered_by_client) process_reader->DecrementThreadSuspendCounts(exception_thread_id); diff --git a/external_imported/sentry-native/external/crashpad/snapshot/win/exception_snapshot_win.h b/external_imported/sentry-native/external/crashpad/snapshot/win/exception_snapshot_win.h index 9167a9ef6..b8fa73530 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/win/exception_snapshot_win.h +++ b/external_imported/sentry-native/external/crashpad/snapshot/win/exception_snapshot_win.h @@ -72,7 +72,8 @@ class ExceptionSnapshotWin final : public ExceptionSnapshot { //! an appropriate message logged. bool Initialize(ProcessReaderWin* process_reader, DWORD thread_id, - WinVMAddress exception_pointers); + WinVMAddress exception_pointers, + uint32_t* gather_indirectly_referenced_memory_cap); // ExceptionSnapshot: diff --git a/external_imported/sentry-native/external/crashpad/snapshot/win/exception_snapshot_win_test.cc b/external_imported/sentry-native/external/crashpad/snapshot/win/exception_snapshot_win_test.cc index dbf9cfc05..91ff48fa1 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/win/exception_snapshot_win_test.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/win/exception_snapshot_win_test.cc @@ -18,7 +18,6 @@ #include "base/files/file_path.h" #include "base/strings/utf_string_conversions.h" -#include "client/crashpad_client.h" #include "gtest/gtest.h" #include "snapshot/win/process_snapshot_win.h" #include "test/errors.h" diff --git a/external_imported/sentry-native/external/crashpad/snapshot/win/pe_image_annotations_reader.cc b/external_imported/sentry-native/external/crashpad/snapshot/win/pe_image_annotations_reader.cc index 494b33980..9130e6d4f 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/win/pe_image_annotations_reader.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/win/pe_image_annotations_reader.cc @@ -17,7 +17,8 @@ #include #include -#include "base/cxx17_backports.h" +#include + #include "base/logging.h" #include "base/strings/utf_string_conversions.h" #include "client/annotation.h" @@ -157,8 +158,7 @@ void PEImageAnnotationsReader::ReadCrashpadAnnotationsList( snapshot.type = current.type; char name[Annotation::kNameMaxLength]; - if (!process_reader_->Memory()->Read( - current.name, base::size(name), name)) { + if (!process_reader_->Memory()->Read(current.name, std::size(name), name)) { LOG(WARNING) << "could not read annotation name at index " << index << " in " << base::WideToUTF8(name_); continue; diff --git a/external_imported/sentry-native/external/crashpad/snapshot/win/pe_image_reader.cc b/external_imported/sentry-native/external/crashpad/snapshot/win/pe_image_reader.cc index bc4511b37..2a7b15109 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/win/pe_image_reader.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/win/pe_image_reader.cc @@ -18,9 +18,9 @@ #include #include +#include #include -#include "base/cxx17_backports.h" #include "base/logging.h" #include "base/strings/stringprintf.h" #include "client/crashpad_info.h" @@ -288,7 +288,7 @@ bool PEImageReader::VSFixedFileInfo( version_info.wType != 0 || wcsncmp(version_info.szKey, L"VS_VERSION_INFO", - base::size(version_info.szKey)) != 0) { + std::size(version_info.szKey)) != 0) { LOG(WARNING) << "unexpected VS_VERSIONINFO in " << module_subrange_reader_.name(); return false; diff --git a/external_imported/sentry-native/external/crashpad/snapshot/win/process_reader_win_test.cc b/external_imported/sentry-native/external/crashpad/snapshot/win/process_reader_win_test.cc index 68933bbe6..709e56b21 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/win/process_reader_win_test.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/win/process_reader_win_test.cc @@ -17,7 +17,8 @@ #include #include -#include "base/cxx17_backports.h" +#include + #include "gtest/gtest.h" #include "test/win/win_multiprocess.h" #include "util/misc/from_pointer_cast.h" @@ -44,7 +45,7 @@ TEST(ProcessReaderWin, SelfBasic) { EXPECT_EQ(process_reader.GetProcessInfo().ProcessID(), GetCurrentProcessId()); static constexpr char kTestMemory[] = "Some test memory"; - char buffer[base::size(kTestMemory)]; + char buffer[std::size(kTestMemory)]; ASSERT_TRUE(process_reader.Memory()->Read( reinterpret_cast(kTestMemory), sizeof(kTestMemory), &buffer)); EXPECT_STREQ(kTestMemory, buffer); @@ -193,7 +194,7 @@ class ProcessReaderChildThreadSuspendCount final : public WinMultiprocess { // the pipe. CheckedReadFileAtEOF(ReadPipeHandle()); - for (size_t i = 0; i < base::size(threads); ++i) + for (size_t i = 0; i < std::size(threads); ++i) done.Signal(); for (auto& thread : threads) thread.Join(); diff --git a/external_imported/sentry-native/external/crashpad/snapshot/win/process_snapshot_win.cc b/external_imported/sentry-native/external/crashpad/snapshot/win/process_snapshot_win.cc index b60ea38ea..f1a20b5d7 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/win/process_snapshot_win.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/win/process_snapshot_win.cc @@ -18,9 +18,9 @@ #include #include +#include #include -#include "base/cxx17_backports.h" #include "base/logging.h" #include "base/numerics/safe_conversions.h" #include "base/strings/utf_string_conversions.h" @@ -63,6 +63,26 @@ bool ProcessSnapshotWin::Initialize( if (!process_reader_.Initialize(process, suspension_state)) return false; + client_id_.InitializeToZero(); + system_.Initialize(&process_reader_); + + if (process_reader_.Is64Bit()) { + InitializePebData( + debug_critical_section_address); + } else { + InitializePebData( + debug_critical_section_address); + } + + InitializeModules(); + InitializeUnloadedModules(); + + GetCrashpadOptionsInternal(&options_); + uint32_t* budget_remaining_pointer = + options_.gather_indirectly_referenced_memory == TriState::kEnabled + ? &options_.indirectly_referenced_memory_cap + : nullptr; + if (exception_information_address != 0) { ExceptionInformation exception_information = {}; if (!process_reader_.Memory()->Read(exception_information_address, @@ -75,31 +95,14 @@ bool ProcessSnapshotWin::Initialize( exception_.reset(new internal::ExceptionSnapshotWin()); if (!exception_->Initialize(&process_reader_, exception_information.thread_id, - exception_information.exception_pointers)) { + exception_information.exception_pointers, + budget_remaining_pointer)) { exception_.reset(); return false; } } - client_id_.InitializeToZero(); - system_.Initialize(&process_reader_); - - if (process_reader_.Is64Bit()) { - InitializePebData( - debug_critical_section_address); - } else { - InitializePebData( - debug_critical_section_address); - } - - InitializeModules(); - InitializeUnloadedModules(); - - GetCrashpadOptionsInternal(&options_); - - InitializeThreads( - options_.gather_indirectly_referenced_memory == TriState::kEnabled, - options_.indirectly_referenced_memory_cap); + InitializeThreads(budget_remaining_pointer); for (const MEMORY_BASIC_INFORMATION64& mbi : process_reader_.GetProcessInfo().MemoryInfo()) { @@ -239,15 +242,9 @@ const ProcessMemory* ProcessSnapshotWin::Memory() const { return process_reader_.Memory(); } -void ProcessSnapshotWin::InitializeThreads( - bool gather_indirectly_referenced_memory, - uint32_t indirectly_referenced_memory_cap) { +void ProcessSnapshotWin::InitializeThreads(uint32_t* budget_remaining_pointer) { const std::vector& process_reader_threads = process_reader_.Threads(); - uint32_t* budget_remaining_pointer = nullptr; - uint32_t budget_remaining = indirectly_referenced_memory_cap; - if (gather_indirectly_referenced_memory) - budget_remaining_pointer = &budget_remaining; for (const ProcessReaderWin::Thread& process_reader_thread : process_reader_threads) { auto thread = std::make_unique(); @@ -335,7 +332,7 @@ void ProcessSnapshotWin::InitializeUnloadedModules() { uet.TimeDateStamp, base::WideToUTF8(base::WStringPiece( uet.ImageName, - wcsnlen(uet.ImageName, base::size(uet.ImageName)))))); + wcsnlen(uet.ImageName, std::size(uet.ImageName)))))); } } } @@ -535,9 +532,9 @@ WinVMSize ProcessSnapshotWin::DetermineSizeOfEnvironmentBlock( env_block.resize( static_cast(bytes_read / sizeof(env_block[0]))); static constexpr wchar_t terminator[] = {0, 0}; - size_t at = env_block.find(std::wstring(terminator, base::size(terminator))); + size_t at = env_block.find(std::wstring(terminator, std::size(terminator))); if (at != std::wstring::npos) - env_block.resize(at + base::size(terminator)); + env_block.resize(at + std::size(terminator)); return env_block.size() * sizeof(env_block[0]); } diff --git a/external_imported/sentry-native/external/crashpad/snapshot/win/process_snapshot_win.h b/external_imported/sentry-native/external/crashpad/snapshot/win/process_snapshot_win.h index 7a8ae2fd3..002107078 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/win/process_snapshot_win.h +++ b/external_imported/sentry-native/external/crashpad/snapshot/win/process_snapshot_win.h @@ -137,8 +137,7 @@ class ProcessSnapshotWin final : public ProcessSnapshot { private: // Initializes threads_ on behalf of Initialize(). - void InitializeThreads(bool gather_indirectly_referenced_memory, - uint32_t indirectly_referenced_memory_cap); + void InitializeThreads(uint32_t* indirectly_referenced_memory_cap); // Initializes modules_ on behalf of Initialize(). void InitializeModules(); diff --git a/external_imported/sentry-native/external/crashpad/snapshot/win/system_snapshot_win.cc b/external_imported/sentry-native/external/crashpad/snapshot/win/system_snapshot_win.cc index 905976d8b..a19253f23 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/win/system_snapshot_win.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/win/system_snapshot_win.cc @@ -14,11 +14,14 @@ #include "snapshot/win/system_snapshot_win.h" -#include #include #include +#include #include +// Must be after windows.h. +#include + #include #include #include @@ -30,6 +33,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" +#include "util/stdlib/string_number_conversion.h" #include "util/win/module_version.h" #include "util/win/scoped_registry_key.h" @@ -67,6 +71,50 @@ std::string GetStringForFileOS(uint32_t file_os) { return "Unknown"; } +//! \brief Reads a DWORD from the registry and returns it as an int. +bool ReadRegistryDWORD(HKEY key, const wchar_t* name, int* out_value) { + DWORD type; + DWORD local_value; + DWORD size = sizeof(local_value); + if (RegQueryValueExW(key, + name, + nullptr, + &type, + reinterpret_cast(&local_value), + &size) == ERROR_SUCCESS && + type == REG_DWORD) { + *out_value = static_cast(local_value); + return true; + } + return false; +} + +//! \brief Reads a string from the registry and returns it as an int. +bool ReadRegistryDWORDFromSZ(HKEY key, const char* name, int* out_value) { + char string_value[11]; + DWORD type; + // Leave space for a terminating zero. + DWORD size = sizeof(string_value) - sizeof(string_value[0]); + // Use the 'A' version of this function so that we can use + // StringToNumber. + if (RegQueryValueExA(key, + name, + nullptr, + &type, + reinterpret_cast(&string_value), + &size) == ERROR_SUCCESS && + type == REG_SZ) { + // Make sure the string is null-terminated. + string_value[size / sizeof(string_value[0])] = '\0'; + unsigned local_value; + if (StringToNumber(string_value, &local_value)) { + *out_value = local_value; + return true; + } + } + return false; +} + } // namespace namespace internal { @@ -89,16 +137,50 @@ void SystemSnapshotWin::Initialize(ProcessReaderWin* process_reader) { process_reader_ = process_reader; - // We use both GetVersionEx() and GetModuleVersionAndType() (which uses - // VerQueryValue() internally). GetVersionEx() is not trustworthy after - // Windows 8 (depending on the application manifest) so its data is used only - // to fill the os_server_ field, and the rest comes from the version - // information stamped on kernel32.dll. - OSVERSIONINFOEX version_info = {sizeof(version_info)}; - if (!GetVersionEx(reinterpret_cast(&version_info))) { - PLOG(WARNING) << "GetVersionEx"; - } else { - os_server_ = version_info.wProductType != VER_NT_WORKSTATION; + // We use both IsWindowsServer() (which uses VerifyVersionInfo() internally) + // and GetModuleVersionAndType() (which uses VerQueryValue() internally). + // VerifyVersionInfo() is not trustworthy after Windows 8 (depending on the + // application manifest) so its data is used only to fill the os_server_ + // field, and the rest comes from the version information stamped on + // kernel32.dll and from the registry. + os_server_ = IsWindowsServer(); + + // kernel32.dll used to be a good way to get a non-lying version number, but + // kernel32.dll has been refactored into multiple DLLs so it sometimes does + // not get updated when a new version of Windows ships, especially on + // Windows 11. Additionally, pairs of releases such as 19041/19042 + // (20H1/20H2) actually have identical code and have their differences + // enabled by a configuration setting. Therefore the recommended way to get + // OS version information on recent versions of Windows is to read it from the + // registry. If any of the version-number components are missing from the + // registry (on Windows 7, for instance) then kernel32.dll is used as a + // fallback. + bool version_data_found = false; + int os_version_build = 0; + HKEY key; + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", + 0, + KEY_QUERY_VALUE, + &key) == ERROR_SUCCESS) { + ScopedRegistryKey scoped_key(key); + + // Read the four components of the version from the registry. + // UBR apparently stands for Update Build Revision and it goes up every + // month when patches are installed. The full version is stored in the + // registry as: + // CurrentMajorVersionNumber.CurrentMinorVersionNumber.CurrentBuildNumber.UBR + if (ReadRegistryDWORD( + key, L"CurrentMajorVersionNumber", &os_version_major_) && + ReadRegistryDWORD( + key, L"CurrentMinorVersionNumber", &os_version_minor_) && + ReadRegistryDWORDFromSZ( + key, "CurrentBuildNumber", &os_version_bugfix_) && + ReadRegistryDWORD(key, L"UBR", &os_version_build)) { + // Since we found all four components in the registry we don't need + // to read them from kernel32.dll. + version_data_found = true; + } } static constexpr wchar_t kSystemDll[] = L"kernel32.dll"; @@ -106,10 +188,15 @@ void SystemSnapshotWin::Initialize(ProcessReaderWin* process_reader) { if (GetModuleVersionAndType(base::FilePath(kSystemDll), &ffi)) { std::string flags_string = GetStringForFileFlags(ffi.dwFileFlags); std::string os_name = GetStringForFileOS(ffi.dwFileOS); - os_version_major_ = ffi.dwFileVersionMS >> 16; - os_version_minor_ = ffi.dwFileVersionMS & 0xffff; - os_version_bugfix_ = ffi.dwFileVersionLS >> 16; - os_version_build_ = base::StringPrintf("%lu", ffi.dwFileVersionLS & 0xffff); + if (!version_data_found) { + os_version_major_ = ffi.dwFileVersionMS >> 16; + os_version_minor_ = ffi.dwFileVersionMS & 0xffff; + os_version_bugfix_ = ffi.dwFileVersionLS >> 16; + os_version_build = static_cast(ffi.dwFileVersionLS & 0xffff); + } + + os_version_build_ = base::StringPrintf("%u", os_version_build); + os_version_full_ = base::StringPrintf( "%s %u.%u.%u.%s%s", os_name.c_str(), @@ -195,11 +282,11 @@ std::string SystemSnapshotWin::CPUVendor() const { #elif defined(ARCH_CPU_ARM64) HKEY key; - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, - L"HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0", - 0, - KEY_QUERY_VALUE, - &key) != ERROR_SUCCESS) { + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0", + 0, + KEY_QUERY_VALUE, + &key) != ERROR_SUCCESS) { return std::string(); } diff --git a/external_imported/sentry-native/external/crashpad/snapshot/x86/cpuid_reader.cc b/external_imported/sentry-native/external/crashpad/snapshot/x86/cpuid_reader.cc index 583405844..c1bd837c4 100644 --- a/external_imported/sentry-native/external/crashpad/snapshot/x86/cpuid_reader.cc +++ b/external_imported/sentry-native/external/crashpad/snapshot/x86/cpuid_reader.cc @@ -16,12 +16,13 @@ #include +#include "build/build_config.h" #include "snapshot/cpu_context.h" -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) #include #include -#endif // OS_WIN +#endif // BUILDFLAG(IS_WIN) #if defined(ARCH_CPU_X86_FAMILY) @@ -101,7 +102,7 @@ bool CpuidReader::SupportsDAZ() const { using Fxsave = CPUContextX86_64::Fxsave; #endif -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) __declspec(align(16)) Fxsave fxsave = {}; #else Fxsave fxsave __attribute__((aligned(16))) = {}; @@ -111,7 +112,7 @@ bool CpuidReader::SupportsDAZ() const { static_assert(offsetof(decltype(fxsave), mxcsr_mask) == 28, "mxcsr_mask offset"); -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) _fxsave(&fxsave); #else asm("fxsave %0" : "=m"(fxsave)); @@ -122,13 +123,13 @@ bool CpuidReader::SupportsDAZ() const { } void CpuidReader::Cpuid(uint32_t cpuinfo[4], uint32_t leaf) const { -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) __cpuid(reinterpret_cast(cpuinfo), leaf); #else asm("cpuid" : "=a"(cpuinfo[0]), "=b"(cpuinfo[1]), "=c"(cpuinfo[2]), "=d"(cpuinfo[3]) : "a"(leaf), "b"(0), "c"(0), "d"(0)); -#endif // OS_WIN +#endif // BUILDFLAG(IS_WIN) } } // namespace internal diff --git a/external_imported/sentry-native/external/crashpad/test/errors.cc b/external_imported/sentry-native/external/crashpad/test/errors.cc index 148450625..1f14db28c 100644 --- a/external_imported/sentry-native/external/crashpad/test/errors.cc +++ b/external_imported/sentry-native/external/crashpad/test/errors.cc @@ -20,9 +20,9 @@ #include "base/strings/stringprintf.h" #include "build/build_config.h" -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) #include "base/posix/safe_strerror.h" -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) #include #include #endif @@ -31,10 +31,10 @@ namespace crashpad { namespace test { std::string ErrnoMessage(int err, const std::string& base) { -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) std::string err_as_string = base::safe_strerror(errno); const char* err_string = err_as_string.c_str(); -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) char err_string[256]; strerror_s(err_string, errno); #endif @@ -49,7 +49,7 @@ std::string ErrnoMessage(const std::string& base) { return ErrnoMessage(errno, base); } -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) std::string ErrorMessage(const std::string& base) { return base::StringPrintf( "%s%s%s", diff --git a/external_imported/sentry-native/external/crashpad/test/errors.h b/external_imported/sentry-native/external/crashpad/test/errors.h index 471fbb5f7..5be04f1b9 100644 --- a/external_imported/sentry-native/external/crashpad/test/errors.h +++ b/external_imported/sentry-native/external/crashpad/test/errors.h @@ -67,7 +67,7 @@ std::string ErrnoMessage(int err, const std::string& base = std::string()); //! a colon. std::string ErrnoMessage(const std::string& base = std::string()); -#if defined(OS_WIN) || DOXYGEN +#if BUILDFLAG(IS_WIN) || DOXYGEN //! \brief Formats an error message using `GetLastError()`. //! //! The returned string will combine the \a base string, if supplied, with a diff --git a/external_imported/sentry-native/external/crashpad/test/file.cc b/external_imported/sentry-native/external/crashpad/test/file.cc index 04b4625f1..bcfb987ec 100644 --- a/external_imported/sentry-native/external/crashpad/test/file.cc +++ b/external_imported/sentry-native/external/crashpad/test/file.cc @@ -17,19 +17,25 @@ #include #include +#include "base/logging.h" +#include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "gtest/gtest.h" #include "test/errors.h" +#if BUILDFLAG(IS_WIN) +#include +#endif + namespace crashpad { namespace test { bool FileExists(const base::FilePath& path) { -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) struct stat st; int rv = lstat(path.value().c_str(), &st); static constexpr char stat_function[] = "lstat"; -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) struct _stat st; int rv = _wstat(path.value().c_str(), &st); static constexpr char stat_function[] = "_wstat"; @@ -44,12 +50,30 @@ bool FileExists(const base::FilePath& path) { return true; } +bool RemoveFileIfExists(const base::FilePath& path) { +#if BUILDFLAG(IS_POSIX) + if (unlink(path.value().c_str()) != 0 && errno != ENOENT) { + PLOG(ERROR) << "unlink " << path.value(); + return false; + } +#elif BUILDFLAG(IS_WIN) + if (!DeleteFile(path.value().c_str()) && + GetLastError() != ERROR_FILE_NOT_FOUND) { + PLOG(ERROR) << "DeleteFile " << base::WideToUTF8(path.value()); + return false; + } +#else +#error "Not implemented" +#endif + return true; +} + FileOffset FileSize(const base::FilePath& path) { -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) struct stat st; int rv = lstat(path.value().c_str(), &st); static constexpr char stat_function[] = "lstat"; -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) struct _stati64 st; int rv = _wstati64(path.value().c_str(), &st); static constexpr char stat_function[] = "_wstati64"; diff --git a/external_imported/sentry-native/external/crashpad/test/file.h b/external_imported/sentry-native/external/crashpad/test/file.h index 918cc3915..451588a4d 100644 --- a/external_imported/sentry-native/external/crashpad/test/file.h +++ b/external_imported/sentry-native/external/crashpad/test/file.h @@ -30,6 +30,12 @@ namespace test { //! `false` with a Google Test failure added. bool FileExists(const base::FilePath& path); +//! \brief Removes a file if it exists, logging a message on failure. +//! +//! \param[in] path The path to the file to remove. +//! \return `true` on success. `false` on failure with a message logged. +bool RemoveFileIfExists(const base::FilePath& path); + //! \brief Determines the size of a file. //! //! \param[in] path The path of the file to check. The file must exist. diff --git a/external_imported/sentry-native/external/crashpad/test/filesystem.cc b/external_imported/sentry-native/external/crashpad/test/filesystem.cc index 39b864819..a43421206 100644 --- a/external_imported/sentry-native/external/crashpad/test/filesystem.cc +++ b/external_imported/sentry-native/external/crashpad/test/filesystem.cc @@ -22,6 +22,7 @@ #include "base/logging.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "gtest/gtest.h" #include "test/errors.h" #include "test/scoped_temp_dir.h" @@ -29,11 +30,11 @@ #include "util/file/filesystem.h" #include "util/misc/time.h" -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) #include #include "base/posix/eintr_wrapper.h" -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) #include #endif @@ -42,7 +43,7 @@ namespace test { namespace { -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) // Detects the flags necessary to create symbolic links and stores them in // |flags| if non-nullptr, and returns true on success. If symbolic links can’t @@ -89,7 +90,7 @@ bool SymbolicLinkFlags(DWORD* flags) { return true; } -#endif // OS_WIN +#endif // BUILDFLAG(IS_WIN) } // namespace @@ -101,14 +102,14 @@ bool CreateFile(const base::FilePath& file) { } bool PathExists(const base::FilePath& path) { -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) struct stat st; if (lstat(path.value().c_str(), &st) != 0) { EXPECT_EQ(errno, ENOENT) << ErrnoMessage("lstat ") << path.value(); return false; } return true; -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) if (GetFileAttributes(path.value().c_str()) == INVALID_FILE_ATTRIBUTES) { EXPECT_EQ(GetLastError(), static_cast(ERROR_FILE_NOT_FOUND)) << ErrorMessage("GetFileAttributes ") << base::WideToUTF8(path.value()); @@ -120,7 +121,7 @@ bool PathExists(const base::FilePath& path) { bool SetFileModificationTime(const base::FilePath& path, const timespec& mtime) { -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) // utimensat() isn't available on macOS until 10.13, so lutimes() is used // instead. struct stat st; @@ -136,7 +137,7 @@ bool SetFileModificationTime(const base::FilePath& path, return false; } return true; -#elif defined(OS_POSIX) +#elif BUILDFLAG(IS_POSIX) timespec times[2]; times[0].tv_sec = 0; times[0].tv_nsec = UTIME_OMIT; @@ -147,7 +148,7 @@ bool SetFileModificationTime(const base::FilePath& path, return false; } return true; -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) DWORD flags = FILE_FLAG_OPEN_REPARSE_POINT; if (IsDirectory(path, true)) { // required for directory handles @@ -172,22 +173,22 @@ bool SetFileModificationTime(const base::FilePath& path, return false; } return true; -#endif // OS_APPLE +#endif // BUILDFLAG(IS_APPLE) } -#if !defined(OS_FUCHSIA) +#if !BUILDFLAG(IS_FUCHSIA) bool CanCreateSymbolicLinks() { -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) return true; -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) return SymbolicLinkFlags(nullptr); -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) } bool CreateSymbolicLink(const base::FilePath& target_path, const base::FilePath& symlink_path) { -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) int rv = HANDLE_EINTR( symlink(target_path.value().c_str(), symlink_path.value().c_str())); if (rv != 0) { @@ -195,7 +196,7 @@ bool CreateSymbolicLink(const base::FilePath& target_path, return false; } return true; -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) DWORD symbolic_link_flags = 0; SymbolicLinkFlags(&symbolic_link_flags); if (!::CreateSymbolicLink( @@ -208,10 +209,10 @@ bool CreateSymbolicLink(const base::FilePath& target_path, return false; } return true; -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) } -#endif // !OS_FUCHSIA +#endif // !BUILDFLAG(IS_FUCHSIA) } // namespace test } // namespace crashpad diff --git a/external_imported/sentry-native/external/crashpad/test/filesystem.h b/external_imported/sentry-native/external/crashpad/test/filesystem.h index 516335bb7..683213689 100644 --- a/external_imported/sentry-native/external/crashpad/test/filesystem.h +++ b/external_imported/sentry-native/external/crashpad/test/filesystem.h @@ -37,7 +37,7 @@ bool PathExists(const base::FilePath& path); //! \return `true` on success. Otherwise `false` with a message logged. bool SetFileModificationTime(const base::FilePath& path, const timespec& mtime); -#if !defined(OS_FUCHSIA) || DOXYGEN +#if !BUILDFLAG(IS_FUCHSIA) || DOXYGEN // There are no symbolic links on Fuchsia. Don’t bother declaring or defining // symbolic link-related functions at all, because it’s an error to even pretend // that symbolic links might be available on Fuchsia. @@ -67,7 +67,7 @@ bool CanCreateSymbolicLinks(); bool CreateSymbolicLink(const base::FilePath& target_path, const base::FilePath& symlink_path); -#endif // !OS_FUCHSIA || DOXYGEN +#endif // !BUILDFLAG(IS_FUCHSIA) || DOXYGEN } // namespace test } // namespace crashpad diff --git a/external_imported/sentry-native/external/crashpad/test/gtest_death.h b/external_imported/sentry-native/external/crashpad/test/gtest_death.h index c67d33452..8142c3d13 100644 --- a/external_imported/sentry-native/external/crashpad/test/gtest_death.h +++ b/external_imported/sentry-native/external/crashpad/test/gtest_death.h @@ -19,13 +19,13 @@ #include "build/build_config.h" #include "gtest/gtest.h" -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) #include "test/mac/exception_swallower.h" #endif //! \file -#if defined(OS_MAC) || DOXYGEN +#if BUILDFLAG(IS_MAC) || DOXYGEN //! \brief Wraps the Google Test `ASSERT_DEATH_IF_SUPPORTED()` macro to make //! assertions about death caused by crashes. @@ -73,14 +73,14 @@ regex); \ } while (false) -#else // OS_MAC +#else // BUILDFLAG(IS_MAC) #define ASSERT_DEATH_CRASH(statement, regex) \ ASSERT_DEATH_IF_SUPPORTED(statement, regex) #define EXPECT_DEATH_CRASH(statement, regex) \ EXPECT_DEATH_IF_SUPPORTED(statement, regex) -#endif // OS_MAC +#endif // BUILDFLAG(IS_MAC) #if !(!defined(MINI_CHROMIUM_BASE_LOGGING_H_) && \ defined(OFFICIAL_BUILD) && \ diff --git a/external_imported/sentry-native/external/crashpad/test/gtest_main.cc b/external_imported/sentry-native/external/crashpad/test/gtest_main.cc index c67b8e24b..04c539b77 100644 --- a/external_imported/sentry-native/external/crashpad/test/gtest_main.cc +++ b/external_imported/sentry-native/external/crashpad/test/gtest_main.cc @@ -22,17 +22,17 @@ #include "gmock/gmock.h" #endif // CRASHPAD_TEST_LAUNCHER_GOOGLEMOCK -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) #include "util/linux/initial_signal_dispositions.h" -#endif // OS_ANDROID +#endif // BUILDFLAG(IS_ANDROID) -#if defined(OS_IOS) +#if BUILDFLAG(IS_IOS) #include "test/ios/google_test_setup.h" #endif -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) #include "test/win/win_child_process.h" -#endif // OS_WIN +#endif // BUILDFLAG(IS_WIN) #if defined(CRASHPAD_IS_IN_CHROMIUM) #include "base/bind.h" @@ -42,7 +42,7 @@ namespace { -#if !defined(OS_IOS) +#if !BUILDFLAG(IS_IOS) bool GetChildTestFunctionName(std::string* child_func_name) { constexpr size_t arg_length = sizeof(crashpad::test::internal::kChildTestFunction) - 1; @@ -55,38 +55,38 @@ bool GetChildTestFunctionName(std::string* child_func_name) { } return false; } -#endif // !OS_IOS +#endif // !BUILDFLAG(IS_IOS) } // namespace int main(int argc, char* argv[]) { -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) crashpad::InitializeSignalDispositions(); -#endif // OS_ANDROID +#endif // BUILDFLAG(IS_ANDROID) crashpad::test::InitializeMainArguments(argc, argv); -#if !defined(OS_IOS) +#if !BUILDFLAG(IS_IOS) std::string child_func_name; if (GetChildTestFunctionName(&child_func_name)) { return crashpad::test::internal::CheckedInvokeMultiprocessChild( child_func_name); } -#endif // !OS_IOS +#endif // !BUILDFLAG(IS_IOS) #if defined(CRASHPAD_IS_IN_CHROMIUM) -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) // Chromium’s test launcher interferes with WinMultiprocess-based tests. Allow // their child processes to be launched by the standard Google Test-based test // runner. const bool use_chromium_test_launcher = !crashpad::test::WinChildProcess::IsChildProcess(); -#elif defined(OS_ANDROID) +#elif BUILDFLAG(IS_ANDROID) constexpr bool use_chromium_test_launcher = false; -#else // OS_WIN +#else // BUILDFLAG(IS_WIN) constexpr bool use_chromium_test_launcher = true; -#endif // OS_WIN +#endif // BUILDFLAG(IS_WIN) if (use_chromium_test_launcher) { // This supports --test-launcher-summary-output, which writes a JSON file @@ -115,7 +115,7 @@ int main(int argc, char* argv[]) { CRASHPAD_TEST_LAUNCHER_GOOGLEMOCK #endif // CRASHPAD_TEST_LAUNCHER_GOOGLEMOCK -#if defined(OS_IOS) +#if BUILDFLAG(IS_IOS) // iOS needs to run tests within the context of an app, so call a helper that // invokes UIApplicationMain(). The application delegate will call // RUN_ALL_TESTS() and exit before returning control to this function. diff --git a/external_imported/sentry-native/external/crashpad/test/hex_string.h b/external_imported/sentry-native/external/crashpad/test/hex_string.h index b0d445319..be0143b7b 100644 --- a/external_imported/sentry-native/external/crashpad/test/hex_string.h +++ b/external_imported/sentry-native/external/crashpad/test/hex_string.h @@ -29,8 +29,8 @@ namespace test { //! uint8_t expected[10]; //! uint8_t observed[10]; //! // … -//! EXPECT_EQ(BytesToHexString(observed, base::size(observed)), -//! BytesToHexString(expected, base::size(expected))); +//! EXPECT_EQ(BytesToHexString(observed, std::size(observed)), +//! BytesToHexString(expected, std::size(expected))); //! \endcode std::string BytesToHexString(const void* bytes, size_t length); diff --git a/external_imported/sentry-native/external/crashpad/test/hex_string_test.cc b/external_imported/sentry-native/external/crashpad/test/hex_string_test.cc index ac6343bf5..13aa311a3 100644 --- a/external_imported/sentry-native/external/crashpad/test/hex_string_test.cc +++ b/external_imported/sentry-native/external/crashpad/test/hex_string_test.cc @@ -14,7 +14,8 @@ #include "test/hex_string.h" -#include "base/cxx17_backports.h" +#include + #include "gtest/gtest.h" namespace crashpad { @@ -25,7 +26,7 @@ TEST(HexString, HexString) { EXPECT_EQ(BytesToHexString(nullptr, 0), ""); static constexpr char kBytes[] = "Abc123xyz \x0a\x7f\xf0\x9f\x92\xa9_"; - EXPECT_EQ(BytesToHexString(kBytes, base::size(kBytes)), + EXPECT_EQ(BytesToHexString(kBytes, std::size(kBytes)), "41626331323378797a200a7ff09f92a95f00"); } diff --git a/external_imported/sentry-native/external/crashpad/test/ios/crash_type_xctest.mm b/external_imported/sentry-native/external/crashpad/test/ios/crash_type_xctest.mm index 2dcfac786..27b4e1f7f 100644 --- a/external_imported/sentry-native/external/crashpad/test/ios/crash_type_xctest.mm +++ b/external_imported/sentry-native/external/crashpad/test/ios/crash_type_xctest.mm @@ -16,6 +16,7 @@ #include #import "Service/Sources/EDOClientService.h" +#include "build/build_config.h" #import "test/ios/host/cptest_shared_object.h" #include "util/mach/exception_types.h" #include "util/mach/mach_extensions.h" @@ -33,8 +34,20 @@ @interface CPTestTestCase : XCTestCase { @implementation CPTestTestCase + (void)setUp { - // Swizzle away the handleCrashUnderSymbol callback. Without this, any time - // the host app is intentionally crashed, the test is immediately failed. + [CPTestTestCase swizzleHandleCrashUnderSymbol]; + [CPTestTestCase swizleMayTerminateOutOfBandWithoutCrashReport]; + + // Override EDO default error handler. Without this, the default EDO error + // handler will throw an error and fail the test. + EDOSetClientErrorHandler(^(NSError* error){ + // Do nothing. + }); +} + +// Swizzle away the -[XCUIApplicationImpl handleCrashUnderSymbol:] callback. +// Without this, any time the host app is intentionally crashed, the test is +// immediately failed. ++ (void)swizzleHandleCrashUnderSymbol { SEL originalSelector = NSSelectorFromString(@"handleCrashUnderSymbol:"); SEL swizzledSelector = @selector(handleCrashUnderSymbol:); Method originalMethod = class_getInstanceMethod( @@ -42,12 +55,20 @@ + (void)setUp { Method swizzledMethod = class_getInstanceMethod([self class], swizzledSelector); method_exchangeImplementations(originalMethod, swizzledMethod); +} - // Override EDO default error handler. Without this, the default EDO error - // handler will throw an error and fail the test. - EDOSetClientErrorHandler(^(NSError* error){ - // Do nothing. - }); +// Swizzle away the time consuming 'Checking for crash reports corresponding to' +// from -[XCUIApplicationProcess swizleMayTerminateOutOfBandWithoutCrashReport] +// that is unnecessary for these tests. ++ (void)swizleMayTerminateOutOfBandWithoutCrashReport { + SEL originalSelector = + NSSelectorFromString(@"mayTerminateOutOfBandWithoutCrashReport"); + SEL swizzledSelector = @selector(mayTerminateOutOfBandWithoutCrashReport); + Method originalMethod = class_getInstanceMethod( + objc_getClass("XCUIApplicationProcess"), originalSelector); + Method swizzledMethod = + class_getInstanceMethod([self class], swizzledSelector); + method_exchangeImplementations(originalMethod, swizzledMethod); } // This gets called after tearDown, so there's no straightforward way to @@ -56,6 +77,10 @@ + (void)setUp { - (void)handleCrashUnderSymbol:(id)arg1 { } +- (BOOL)mayTerminateOutOfBandWithoutCrashReport { + return YES; +} + - (void)setUp { app_ = [[XCUIApplication alloc] init]; [app_ launch]; @@ -65,7 +90,7 @@ - (void)setUp { XCTAssertTrue(app_.state == XCUIApplicationStateRunningForeground); } -- (void)verifyCrashReportException:(int)exception { +- (void)verifyCrashReportException:(uint32_t)exception { // Confirm the app is not running. XCTAssertTrue([app_ waitForState:XCUIApplicationStateNotRunning timeout:15]); XCTAssertTrue(app_.state == XCUIApplicationStateNotRunning); @@ -75,7 +100,12 @@ - (void)verifyCrashReportException:(int)exception { XCTAssertTrue(app_.state == XCUIApplicationStateRunningForeground); rootObject_ = [EDOClientService rootObjectWithPort:12345]; XCTAssertEqual([rootObject_ pendingReportCount], 1); - XCTAssertEqual([rootObject_ pendingReportException], exception); + NSNumber* report_exception; + XCTAssertTrue([rootObject_ pendingReportException:&report_exception]); + XCTAssertEqual(report_exception.unsignedIntValue, exception); + + NSString* rawLogContents = [rootObject_ rawLogContents]; + XCTAssertFalse([rawLogContents containsString:@"allocator used in handler."]); } - (void)testEDO { @@ -83,46 +113,44 @@ - (void)testEDO { XCTAssertEqualObjects(result, @"crashpad"); } -- (void)testSegv { - [rootObject_ crashSegv]; -#if defined(NDEBUG) && TARGET_OS_SIMULATOR - [self verifyCrashReportException:SIGINT]; -#else - [self verifyCrashReportException:SIGHUP]; -#endif -} - - (void)testKillAbort { [rootObject_ crashKillAbort]; - [self verifyCrashReportException:SIGABRT]; + [self verifyCrashReportException:EXC_SOFT_SIGNAL]; + NSNumber* report_exception; + XCTAssertTrue([rootObject_ pendingReportExceptionInfo:&report_exception]); + XCTAssertEqual(report_exception.intValue, SIGABRT); } - (void)testTrap { [rootObject_ crashTrap]; -#if TARGET_OS_SIMULATOR - [self verifyCrashReportException:SIGINT]; +#if defined(ARCH_CPU_X86_64) + [self verifyCrashReportException:EXC_BAD_INSTRUCTION]; +#elif defined(ARCH_CPU_ARM64) + [self verifyCrashReportException:EXC_BREAKPOINT]; #else - [self verifyCrashReportException:SIGABRT]; +#error Port to your CPU architecture #endif } - (void)testAbort { [rootObject_ crashAbort]; - [self verifyCrashReportException:SIGABRT]; + [self verifyCrashReportException:EXC_SOFT_SIGNAL]; + NSNumber* report_exception; + XCTAssertTrue([rootObject_ pendingReportExceptionInfo:&report_exception]); + XCTAssertEqual(report_exception.intValue, SIGABRT); } - (void)testBadAccess { [rootObject_ crashBadAccess]; -#if defined(NDEBUG) && TARGET_OS_SIMULATOR - [self verifyCrashReportException:SIGINT]; -#else - [self verifyCrashReportException:SIGHUP]; -#endif + [self verifyCrashReportException:EXC_BAD_ACCESS]; } - (void)testException { [rootObject_ crashException]; - [self verifyCrashReportException:SIGABRT]; + [self verifyCrashReportException:EXC_SOFT_SIGNAL]; + NSNumber* report_exception; + XCTAssertTrue([rootObject_ pendingReportExceptionInfo:&report_exception]); + XCTAssertEqual(report_exception.intValue, SIGABRT); } - (void)testNSException { @@ -138,6 +166,22 @@ - (void)testNSException { isEqualToString:@"NSInternalInconsistencyException"]); } +- (void)testUnhandledNSException { + [rootObject_ crashUnhandledNSException]; + [self verifyCrashReportException:crashpad::kMachExceptionFromNSException]; + NSDictionary* dict = [rootObject_ getAnnotations]; + NSString* uncaught_flag = + [dict[@"objects"][0] valueForKeyPath:@"UncaughtNSException"]; + XCTAssertTrue([uncaught_flag containsString:@"true"]); + NSString* userInfo = + [dict[@"objects"][1] valueForKeyPath:@"exceptionUserInfo"]; + XCTAssertTrue([userInfo containsString:@"Error Object=* old_args = app_.launchArguments; app_.launchArguments = @[ @"--alternate-client-annotations" ]; - [self verifyCrashReportException:SIGABRT]; + [self verifyCrashReportException:EXC_SOFT_SIGNAL]; + NSNumber* report_exception; + XCTAssertTrue([rootObject_ pendingReportExceptionInfo:&report_exception]); + XCTAssertEqual(report_exception.intValue, SIGABRT); + app_.launchArguments = old_args; // Confirm the initial crash took the standard annotations. @@ -205,7 +253,10 @@ - (void)testClientAnnotations { // Confirm passing alternate client annotation args works. [rootObject_ clearPendingReports]; [rootObject_ crashKillAbort]; - [self verifyCrashReportException:SIGABRT]; + [self verifyCrashReportException:EXC_SOFT_SIGNAL]; + XCTAssertTrue([rootObject_ pendingReportExceptionInfo:&report_exception]); + XCTAssertEqual(report_exception.intValue, SIGABRT); + dict = [rootObject_ getProcessAnnotations]; XCTAssertTrue([dict[@"crashpad"] isEqualToString:@"no"]); XCTAssertTrue([dict[@"plat"] isEqualToString:@"macOS"]); @@ -220,7 +271,7 @@ - (void)testCrashWithCrashInfoMessage { return; } [rootObject_ crashWithCrashInfoMessage]; - [self verifyCrashReportException:SIGHUP]; + [self verifyCrashReportException:EXC_BAD_ACCESS]; NSDictionary* dict = [rootObject_ getAnnotations]; NSString* dyldMessage = dict[@"vector"][0]; XCTAssertTrue([dyldMessage isEqualToString:@"dyld: in dlsym()"]); @@ -235,7 +286,7 @@ - (void)testCrashWithDyldErrorString { return; } [rootObject_ crashWithDyldErrorString]; - [self verifyCrashReportException:SIGINT]; + [self verifyCrashReportException:EXC_BAD_INSTRUCTION]; NSArray* vector = [rootObject_ getAnnotations][@"vector"]; // This message is set by dyld-353.2.1/src/ImageLoaderMachO.cpp // ImageLoaderMachO::doInitialization(). @@ -246,7 +297,11 @@ - (void)testCrashWithDyldErrorString { - (void)testCrashWithAnnotations { [rootObject_ crashWithAnnotations]; - [self verifyCrashReportException:SIGABRT]; + [self verifyCrashReportException:EXC_SOFT_SIGNAL]; + NSNumber* report_exception; + XCTAssertTrue([rootObject_ pendingReportExceptionInfo:&report_exception]); + XCTAssertEqual(report_exception.intValue, SIGABRT); + NSDictionary* dict = [rootObject_ getAnnotations]; NSDictionary* simpleMap = dict[@"simplemap"]; XCTAssertTrue([simpleMap[@"#TEST# empty_value"] isEqualToString:@""]); @@ -263,4 +318,67 @@ - (void)testCrashWithAnnotations { isEqualToString:@"moocow"]); } +- (void)testDumpWithoutCrash { + [rootObject_ generateDumpWithoutCrash:10 threads:3]; + + // The app should not crash + XCTAssertTrue(app_.state == XCUIApplicationStateRunningForeground); + + XCTAssertEqual([rootObject_ pendingReportCount], 30); +} + +- (void)testSimultaneousCrash { + [rootObject_ crashConcurrentSignalAndMach]; + + // Confirm the app is not running. + XCTAssertTrue([app_ waitForState:XCUIApplicationStateNotRunning timeout:15]); + XCTAssertTrue(app_.state == XCUIApplicationStateNotRunning); + + [app_ launch]; + XCTAssertTrue(app_.state == XCUIApplicationStateRunningForeground); + rootObject_ = [EDOClientService rootObjectWithPort:12345]; + XCTAssertEqual([rootObject_ pendingReportCount], 1); +} + +- (void)testCrashInHandlerReentrant { + XCTAssertTrue(app_.state == XCUIApplicationStateRunningForeground); + rootObject_ = [EDOClientService rootObjectWithPort:12345]; + + [rootObject_ crashInHandlerReentrant]; + + // Confirm the app is not running. + XCTAssertTrue([app_ waitForState:XCUIApplicationStateNotRunning timeout:15]); + XCTAssertTrue(app_.state == XCUIApplicationStateNotRunning); + + [app_ launch]; + XCTAssertTrue(app_.state == XCUIApplicationStateRunningForeground); + rootObject_ = [EDOClientService rootObjectWithPort:12345]; + + XCTAssertEqual([rootObject_ pendingReportCount], 0); + + NSString* rawLogContents = [rootObject_ rawLogContents]; + NSString* errmsg = @"Cannot DumpExceptionFromSignal without writer"; + XCTAssertTrue([rawLogContents containsString:errmsg]); +} + +- (void)testFailureWhenHandlerAllocates { + XCTAssertTrue(app_.state == XCUIApplicationStateRunningForeground); + rootObject_ = [EDOClientService rootObjectWithPort:12345]; + + [rootObject_ allocateWithForbiddenAllocators]; + + // Confirm the app is not running. + XCTAssertTrue([app_ waitForState:XCUIApplicationStateNotRunning timeout:15]); + XCTAssertTrue(app_.state == XCUIApplicationStateNotRunning); + + [app_ launch]; + XCTAssertTrue(app_.state == XCUIApplicationStateRunningForeground); + rootObject_ = [EDOClientService rootObjectWithPort:12345]; + + XCTAssertEqual([rootObject_ pendingReportCount], 0); + + NSString* rawLogContents = [rootObject_ rawLogContents]; + XCTAssertTrue([rawLogContents containsString:@"allocator used in handler."]); +} + @end diff --git a/external_imported/sentry-native/external/crashpad/test/ios/host/BUILD.gn b/external_imported/sentry-native/external/crashpad/test/ios/host/BUILD.gn index 77842a98e..a5e04ee79 100644 --- a/external_imported/sentry-native/external/crashpad/test/ios/host/BUILD.gn +++ b/external_imported/sentry-native/external/crashpad/test/ios/host/BUILD.gn @@ -35,6 +35,8 @@ static_library("app_host_sources") { "cptest_application_delegate.mm", "cptest_crash_view_controller.h", "cptest_crash_view_controller.mm", + "handler_forbidden_allocators.cc", + "handler_forbidden_allocators.h", "main.mm", ] configs += [ "../../..:crashpad_config" ] @@ -43,6 +45,7 @@ static_library("app_host_sources") { "../../../build:ios_enable_arc", "../../../client", "../../../snapshot", + "../../../test", "../../../third_party/edo", ] frameworks = [ diff --git a/external_imported/sentry-native/external/crashpad/test/ios/host/cptest_application_delegate.mm b/external_imported/sentry-native/external/crashpad/test/ios/host/cptest_application_delegate.mm index 44a7d88ad..503d2febf 100644 --- a/external_imported/sentry-native/external/crashpad/test/ios/host/cptest_application_delegate.mm +++ b/external_imported/sentry-native/external/crashpad/test/ios/host/cptest_application_delegate.mm @@ -18,16 +18,20 @@ #include #include #include +#include #include +#include #include #include #include +#include #include #import "Service/Sources/EDOHostNamingService.h" #import "Service/Sources/EDOHostService.h" #import "Service/Sources/NSObject+EDOValueObject.h" +#include "base/logging.h" #include "base/strings/sys_string_conversions.h" #include "client/annotation.h" #include "client/annotation_list.h" @@ -35,9 +39,15 @@ #include "client/crashpad_client.h" #include "client/crashpad_info.h" #include "client/simple_string_dictionary.h" +#include "client/simulate_crash.h" #include "snapshot/minidump/process_snapshot_minidump.h" +#include "test/file.h" #import "test/ios/host/cptest_crash_view_controller.h" #import "test/ios/host/cptest_shared_object.h" +#import "test/ios/host/handler_forbidden_allocators.h" +#include "util/file/filesystem.h" +#include "util/ios/raw_logging.h" +#include "util/thread/thread.h" #if !defined(__has_feature) || !__has_feature(objc_arc) #error "This file requires ARC support." @@ -56,6 +66,14 @@ return database_dir.Append("crashpad"); } +base::FilePath GetRawLogOutputFile() { + base::FilePath document_directory([NSFileManager.defaultManager + URLsForDirectory:NSDocumentDirectory + inDomains:NSUserDomainMask] + .lastObject.path.UTF8String); + return document_directory.Append("raw_log_output.txt"); +} + std::unique_ptr GetDatabase() { base::FilePath database_dir = GetDatabaseDir(); std::unique_ptr database = @@ -68,6 +86,35 @@ OperationStatus GetPendingReports(std::vector* pending_reports) { return database->GetPendingReports(pending_reports); } +std::unique_ptr +GetProcessSnapshotMinidumpFromSinglePending() { + std::vector pending_reports; + OperationStatus status = GetPendingReports(&pending_reports); + if (status != crashpad::CrashReportDatabase::kNoError || + pending_reports.size() != 1) { + return nullptr; + } + + auto reader = std::make_unique(); + auto process_snapshot = std::make_unique(); + if (!reader->Open(pending_reports[0].file_path) || + !process_snapshot->Initialize(reader.get())) { + return nullptr; + } + return process_snapshot; +} + +UIWindow* GetAnyWindow() { +#if defined(__IPHONE_15_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_15_0 + if (@available(iOS 15.0, *)) { + UIWindowScene* scene = reinterpret_cast( + [UIApplication sharedApplication].connectedScenes.anyObject); + return scene.keyWindow; + } +#endif + return [UIApplication sharedApplication].windows[0]; +} + [[clang::optnone]] void recurse(int counter) { // Fill up the stack faster. int arr[1024]; @@ -81,20 +128,34 @@ OperationStatus GetPendingReports(std::vector* pending_reports) { @interface CPTestApplicationDelegate () - (void)processIntermediateDumps; +@property(copy, nonatomic) NSString* raw_log_output; @end @implementation CPTestApplicationDelegate { crashpad::CrashpadClient client_; + crashpad::ScopedFileHandle raw_logging_file_; } @synthesize window = _window; - (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(NSDictionary*)launchOptions { + base::FilePath raw_log_file_path = GetRawLogOutputFile(); + NSString* path = + [NSString stringWithUTF8String:raw_log_file_path.value().c_str()]; + self.raw_log_output = + [[NSString alloc] initWithContentsOfFile:path + encoding:NSUTF8StringEncoding + error:NULL]; + raw_logging_file_.reset( + LoggingOpenFileForWrite(raw_log_file_path, + crashpad::FileWriteMode::kTruncateOrCreate, + crashpad::FilePermissions::kOwnerOnly)); + crashpad::internal::SetFileHandleForTesting(raw_logging_file_.get()); + // Start up crashpad. std::map annotations = { {"prod", "xcuitest"}, {"ver", "1"}, {"plat", "iOS"}, {"crashpad", "yes"}}; - NSArray* arguments = [[NSProcessInfo processInfo] arguments]; if ([arguments containsObject:@"--alternate-client-annotations"]) { annotations = {{"prod", "some_app"}, @@ -159,40 +220,36 @@ - (int)pendingReportCount { return pending_reports.size(); } -- (int)pendingReportException { - std::vector pending_reports; - OperationStatus status = GetPendingReports(&pending_reports); - if (status != crashpad::CrashReportDatabase::kNoError || - pending_reports.size() != 1) { - return -1; - } +- (bool)pendingReportException:(NSNumber**)exception { + auto process_snapshot = GetProcessSnapshotMinidumpFromSinglePending(); + if (!process_snapshot || !process_snapshot->Exception()->Exception()) + return false; + *exception = [NSNumber + numberWithUnsignedInt:process_snapshot->Exception()->Exception()]; + return true; +} - auto reader = std::make_unique(); - reader->Open(pending_reports[0].file_path); - crashpad::ProcessSnapshotMinidump process_snapshot; - process_snapshot.Initialize(reader.get()); - return static_cast(process_snapshot.Exception()->Exception()); +- (bool)pendingReportExceptionInfo:(NSNumber**)exception_info { + auto process_snapshot = GetProcessSnapshotMinidumpFromSinglePending(); + if (!process_snapshot || !process_snapshot->Exception()->ExceptionInfo()) + return false; + + *exception_info = [NSNumber + numberWithUnsignedInt:process_snapshot->Exception()->ExceptionInfo()]; + return true; } - (NSDictionary*)getAnnotations { - std::vector pending_reports; - OperationStatus status = GetPendingReports(&pending_reports); - if (status != crashpad::CrashReportDatabase::kNoError || - pending_reports.size() != 1) { + auto process_snapshot = GetProcessSnapshotMinidumpFromSinglePending(); + if (!process_snapshot) return @{}; - } - - auto reader = std::make_unique(); - reader->Open(pending_reports[0].file_path); - crashpad::ProcessSnapshotMinidump process_snapshot; - process_snapshot.Initialize(reader.get()); NSDictionary* dict = @{ @"simplemap" : [@{} mutableCopy], @"vector" : [@[] mutableCopy], @"objects" : [@[] mutableCopy] }; - for (const auto* module : process_snapshot.Modules()) { + for (const auto* module : process_snapshot->Modules()) { for (const auto& kv : module->AnnotationsSimpleMap()) { [dict[@"simplemap"] setValue:@(kv.second.c_str()) forKey:@(kv.first.c_str())]; @@ -215,43 +272,36 @@ - (NSDictionary*)getAnnotations { } - (NSDictionary*)getProcessAnnotations { - std::vector pending_reports; - OperationStatus status = GetPendingReports(&pending_reports); - if (status != crashpad::CrashReportDatabase::kNoError || - pending_reports.size() != 1) { + auto process_snapshot = GetProcessSnapshotMinidumpFromSinglePending(); + if (!process_snapshot) return @{}; - } - auto reader = std::make_unique(); - reader->Open(pending_reports[0].file_path); - crashpad::ProcessSnapshotMinidump process_snapshot; - process_snapshot.Initialize(reader.get()); NSDictionary* dict = [@{} mutableCopy]; - for (const auto& kv : process_snapshot.AnnotationsSimpleMap()) { + for (const auto& kv : process_snapshot->AnnotationsSimpleMap()) { [dict setValue:@(kv.second.c_str()) forKey:@(kv.first.c_str())]; } return [dict passByValue]; } -- (void)crashBadAccess { +// Use [[clang::optnone]] here to get consistent exception codes, otherwise the +// exception can change depending on optimization level. +- (void)crashBadAccess [[clang::optnone]] { strcpy(nullptr, "bla"); } - (void)crashKillAbort { + crashpad::test::ReplaceAllocatorsWithHandlerForbidden(); kill(getpid(), SIGABRT); } -- (void)crashSegv { - long* zero = nullptr; - *zero = 0xc045004d; -} - - (void)crashTrap { + crashpad::test::ReplaceAllocatorsWithHandlerForbidden(); __builtin_trap(); } - (void)crashAbort { + crashpad::test::ReplaceAllocatorsWithHandlerForbidden(); abort(); } @@ -261,7 +311,8 @@ - (void)crashException { } - (void)crashNSException { - // EDO has its own sinkhole, so dispatch this away. + // EDO has its own sinkhole which will suppress this attempt at an NSException + // crash, so dispatch this out of the sinkhole. dispatch_async(dispatch_get_main_queue(), ^{ NSError* error = [NSError errorWithDomain:@"com.crashpad.xcuitests" code:200 @@ -273,6 +324,27 @@ - (void)crashNSException { }); } +- (void)crashUnhandledNSException { + std::thread t([self]() { + @autoreleasepool { + @try { + NSError* error = [NSError errorWithDomain:@"com.crashpad.xcuitests" + code:200 + userInfo:@{@"Error Object" : self}]; + + [[NSException exceptionWithName:NSInternalInconsistencyException + reason:@"Intentionally throwing error." + userInfo:@{NSUnderlyingErrorKey : error}] raise]; + } @catch (id reason_exception) { + // Intentionally use throw here to intentionally make a sinkhole that + // will be missed by ObjcPreprocessor. + objc_exception_throw(reason_exception); + } + } + }); + t.join(); +} + - (void)crashUnrecognizedSelectorAfterDelay { #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wundeclared-selector" @@ -290,10 +362,11 @@ - (void)catchNSException { } - (void)crashCoreAutoLayoutSinkhole { - // EDO has its own sinkhole, so dispatch this away. + // EDO has its own sinkhole which will suppress this attempt at an NSException + // crash, so dispatch this out of the sinkhole. dispatch_async(dispatch_get_main_queue(), ^{ UIView* unattachedView = [[UIView alloc] init]; - UIWindow* window = [UIApplication sharedApplication].windows[0]; + UIWindow* window = GetAnyWindow(); [NSLayoutConstraint activateConstraints:@[ [window.rootViewController.view.bottomAnchor constraintEqualToAnchor:unattachedView.bottomAnchor], @@ -350,4 +423,76 @@ - (void)crashWithAnnotations { abort(); } +class RaceThread : public crashpad::Thread { + public: + explicit RaceThread() : Thread() {} + + void SetCount(int count) { count_ = count; } + + private: + void ThreadMain() override { + for (int i = 0; i < count_; ++i) { + CRASHPAD_SIMULATE_CRASH(); + } + } + + int count_; +}; + +- (void)generateDumpWithoutCrash:(int)dump_count threads:(int)threads { + std::vector race_threads(threads); + for (RaceThread& race_thread : race_threads) { + race_thread.SetCount(dump_count); + race_thread.Start(); + } + + for (RaceThread& race_thread : race_threads) { + race_thread.Join(); + } +} + +class CrashThread : public crashpad::Thread { + public: + explicit CrashThread(bool signal) : Thread(), signal_(signal) {} + + private: + void ThreadMain() override { + sleep(1); + if (signal_) { + abort(); + } else { + __builtin_trap(); + } + } + bool signal_; +}; + +- (void)crashConcurrentSignalAndMach { + CrashThread signal_thread(true); + CrashThread mach_thread(false); + signal_thread.Start(); + mach_thread.Start(); + signal_thread.Join(); + mach_thread.Join(); +} + +- (void)crashInHandlerReentrant { + crashpad::CrashpadClient client_; + client_.SetMachExceptionCallbackForTesting(abort); + + // Trigger a Mach exception. + [self crashTrap]; +} + +- (void)allocateWithForbiddenAllocators { + crashpad::test::ReplaceAllocatorsWithHandlerForbidden(); + (void)malloc(10); +} + +- (NSString*)rawLogContents { + CPTestApplicationDelegate* delegate = + (CPTestApplicationDelegate*)UIApplication.sharedApplication.delegate; + return delegate.raw_log_output; +} + @end diff --git a/external_imported/sentry-native/external/crashpad/test/ios/host/cptest_shared_object.h b/external_imported/sentry-native/external/crashpad/test/ios/host/cptest_shared_object.h index bcd755479..47ee7ad35 100644 --- a/external_imported/sentry-native/external/crashpad/test/ios/host/cptest_shared_object.h +++ b/external_imported/sentry-native/external/crashpad/test/ios/host/cptest_shared_object.h @@ -32,9 +32,15 @@ // report. - (int)pendingReportCount; -// Returns exception code when there's a single pending report, or -1 if there's -// a different number of pending reports. -- (int)pendingReportException; +// Returns true if there's a single pending report and sets the exception code +// in the out |exception| parameter. Returns false if there's a different number +// of pending reports. +- (bool)pendingReportException:(NSNumber**)exception; + +// Returns true if there's a single pending report and sets the second-level +// exception code in the out |exception_info| parameter. Returns false if +// there's a different number of pending reports. +- (bool)pendingReportExceptionInfo:(NSNumber**)exception_info; // Return an NSDictionary with a dictionary named "simplemap", an array named // "vector" and an array named "objects", representing the combination of all @@ -49,16 +55,16 @@ // Triggers an EXC_BAD_ACCESS exception and crash. - (void)crashBadAccess; -// Triggers a crash with a call to kill(SIGABRT). +// Triggers a crash with a call to kill(SIGABRT). This crash runs with +// ReplaceAllocatorsWithHandlerForbidden. - (void)crashKillAbort; -// Triggers a segfault crash. -- (void)crashSegv; - -// Trigger a crash with a __builtin_trap. +// Trigger a crash with a __builtin_trap. This crash runs with +// ReplaceAllocatorsWithHandlerForbidden. - (void)crashTrap; -// Trigger a crash with an abort(). +// Trigger a crash with an abort(). This crash runs with +// ReplaceAllocatorsWithHandlerForbidden. - (void)crashAbort; // Trigger a crash with an uncaught exception. @@ -67,6 +73,9 @@ // Trigger a crash with an uncaught NSException. - (void)crashNSException; +// Trigger a crash with an uncaught and unhandled NSException. +- (void)crashUnhandledNSException; + // Trigger an unrecognized selector after delay. - (void)crashUnrecognizedSelectorAfterDelay; @@ -88,6 +97,24 @@ // Trigger a crash after writing various annotations. - (void)crashWithAnnotations; +// Triggers a DumpWithoutCrash |dump_count| times in each of |threads| threads. +- (void)generateDumpWithoutCrash:(int)dump_count threads:(int)threads; + +// Triggers a simulataneous Mach exception and signal in different threads. +- (void)crashConcurrentSignalAndMach; + +// Triggers a SIGABRT signal while handling an NSException to test reentrant +// exceptions. +- (void)crashInHandlerReentrant; + +// Runs with ReplaceAllocatorsWithHandlerForbidden and allocates memory, testing +// that the handler forbidden allocator works. +- (void)allocateWithForbiddenAllocators; + +// Return the contents of the RawLog output from the previous run of the host +// application. +- (NSString*)rawLogContents; + @end #endif // CRASHPAD_TEST_IOS_HOST_SHARED_OBJECT_H_ diff --git a/external_imported/sentry-native/external/crashpad/test/ios/host/handler_forbidden_allocators.cc b/external_imported/sentry-native/external/crashpad/test/ios/host/handler_forbidden_allocators.cc new file mode 100644 index 000000000..dbb499a70 --- /dev/null +++ b/external_imported/sentry-native/external/crashpad/test/ios/host/handler_forbidden_allocators.cc @@ -0,0 +1,295 @@ +// Copyright 2022 The Crashpad Authors. All rights reserved. +// +// 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. + +#import "test/ios/host/handler_forbidden_allocators.h" + +#include +#include +#include +#include + +#include "base/mac/mach_logging.h" +#include "client/crashpad_client.h" +#include "util/ios/raw_logging.h" + +namespace crashpad { +namespace test { + +namespace { + +uint64_t g_main_thread = 0; +uint64_t g_mach_exception_thread = 0; +malloc_zone_t g_old_zone; + +bool is_handler_thread() { + uint64_t thread_self; + pthread_threadid_np(pthread_self(), &thread_self); + return (thread_self == g_main_thread || + thread_self == g_mach_exception_thread); +} + +void* handler_forbidden_malloc(struct _malloc_zone_t* zone, size_t size) { + if (is_handler_thread()) { + CRASHPAD_RAW_LOG("handler_forbidden_malloc allocator used in handler."); + exit(EXIT_FAILURE); + } + return g_old_zone.malloc(zone, size); +} + +void* handler_forbidden_calloc(struct _malloc_zone_t* zone, + size_t num_items, + size_t size) { + if (is_handler_thread()) { + CRASHPAD_RAW_LOG("handler_forbidden_calloc allocator used in handler."); + exit(EXIT_FAILURE); + } + return g_old_zone.calloc(zone, num_items, size); +} + +void* handler_forbidden_valloc(struct _malloc_zone_t* zone, size_t size) { + if (is_handler_thread()) { + CRASHPAD_RAW_LOG("handler_forbidden_valloc allocator used in handler."); + exit(EXIT_FAILURE); + } + return g_old_zone.valloc(zone, size); +} + +void handler_forbidden_free(struct _malloc_zone_t* zone, void* ptr) { + if (is_handler_thread()) { + CRASHPAD_RAW_LOG("handler_forbidden_free allocator used in handler."); + exit(EXIT_FAILURE); + } + g_old_zone.free(zone, ptr); +} + +void* handler_forbidden_realloc(struct _malloc_zone_t* zone, + void* ptr, + size_t size) { + if (is_handler_thread()) { + CRASHPAD_RAW_LOG("handler_forbidden_realloc allocator used in handler."); + exit(EXIT_FAILURE); + } + return g_old_zone.realloc(zone, ptr, size); +} + +void handler_forbidden_destroy(struct _malloc_zone_t* zone) { + if (is_handler_thread()) { + CRASHPAD_RAW_LOG("handler_forbidden_destroy allocator used in handler."); + exit(EXIT_FAILURE); + } + g_old_zone.destroy(zone); +} + +void* handler_forbidden_memalign(struct _malloc_zone_t* zone, + size_t alignment, + size_t size) { + if (is_handler_thread()) { + CRASHPAD_RAW_LOG("handler_forbidden_memalign allocator used in handler."); + exit(EXIT_FAILURE); + } + return g_old_zone.memalign(zone, alignment, size); +} + +unsigned handler_forbidden_batch_malloc(struct _malloc_zone_t* zone, + size_t size, + void** results, + unsigned num_requested) { + if (is_handler_thread()) { + CRASHPAD_RAW_LOG( + "handler_forbidden_batch_malloc allocator used in handler."); + exit(EXIT_FAILURE); + } + return g_old_zone.batch_malloc(zone, size, results, num_requested); +} + +void handler_forbidden_batch_free(struct _malloc_zone_t* zone, + void** to_be_freed, + unsigned num_to_be_freed) { + if (is_handler_thread()) { + CRASHPAD_RAW_LOG("handler_forbidden_batch_free allocator used in handler."); + exit(EXIT_FAILURE); + } + g_old_zone.batch_free(zone, to_be_freed, num_to_be_freed); +} + +void handler_forbidden_free_definite_size(struct _malloc_zone_t* zone, + void* ptr, + size_t size) { + if (is_handler_thread()) { + CRASHPAD_RAW_LOG( + "handler_forbidden_free_definite_size allocator used in handler."); + exit(EXIT_FAILURE); + } + g_old_zone.free_definite_size(zone, ptr, size); +} + +size_t handler_forbidden_pressure_relief(struct _malloc_zone_t* zone, + size_t goal) { + if (is_handler_thread()) { + CRASHPAD_RAW_LOG( + "handler_forbidden_pressure_relief allocator used in handler."); + exit(EXIT_FAILURE); + } + return g_old_zone.pressure_relief(zone, goal); +} + +boolean_t handler_forbidden_claimed_address(struct _malloc_zone_t* zone, + void* ptr) { + if (is_handler_thread()) { + CRASHPAD_RAW_LOG( + "handler_forbidden_claimed_address allocator used in handler."); + exit(EXIT_FAILURE); + } + return g_old_zone.claimed_address(zone, ptr); +} + +size_t handler_forbidden_size(struct _malloc_zone_t* zone, const void* ptr) { + if (is_handler_thread()) { + CRASHPAD_RAW_LOG("handler_forbidden_size allocator used in handler."); + exit(EXIT_FAILURE); + } + return g_old_zone.size(zone, ptr); +} + +bool DeprotectMallocZone(malloc_zone_t* default_zone, + vm_address_t* reprotection_start, + vm_size_t* reprotection_length, + vm_prot_t* reprotection_value) { + mach_port_t unused; + *reprotection_start = reinterpret_cast(default_zone); + struct vm_region_basic_info_64 info; + mach_msg_type_number_t count = VM_REGION_BASIC_INFO_COUNT_64; + kern_return_t result = vm_region_64(mach_task_self(), + reprotection_start, + reprotection_length, + VM_REGION_BASIC_INFO_64, + reinterpret_cast(&info), + &count, + &unused); + if (result != KERN_SUCCESS) { + MACH_LOG(ERROR, result) << "vm_region_64"; + return false; + } + + // The kernel always returns a null object for VM_REGION_BASIC_INFO_64, but + // balance it with a deallocate in case this ever changes. See + // the VM_REGION_BASIC_INFO_64 case in vm_map_region() in 10.15's + // https://opensource.apple.com/source/xnu/xnu-6153.11.26/osfmk/vm/vm_map.c . + mach_port_deallocate(mach_task_self(), unused); + + if (!(info.max_protection & VM_PROT_WRITE)) { + LOG(ERROR) << "Invalid max_protection " << info.max_protection; + return false; + } + + // Does the region fully enclose the zone pointers? Possibly unwarranted + // simplification used: using the size of a full version 10 malloc zone rather + // than the actual smaller size if the passed-in zone is not version 10. + DCHECK_LE(*reprotection_start, reinterpret_cast(default_zone)); + vm_size_t zone_offset = reinterpret_cast(default_zone) - + reinterpret_cast(*reprotection_start); + DCHECK_LE(zone_offset + sizeof(malloc_zone_t), *reprotection_length); + + if (info.protection & VM_PROT_WRITE) { + // No change needed; the zone is already writable. + *reprotection_start = 0; + *reprotection_length = 0; + *reprotection_value = VM_PROT_NONE; + } else { + *reprotection_value = info.protection; + result = vm_protect(mach_task_self(), + *reprotection_start, + *reprotection_length, + false, + info.protection | VM_PROT_WRITE); + if (result != KERN_SUCCESS) { + MACH_LOG(ERROR, result) << "vm_protect"; + return false; + } + } + return true; +} + +void ReplaceZoneFunctions(malloc_zone_t* zone, const malloc_zone_t* functions) { + // Remove protection. + vm_address_t reprotection_start = 0; + vm_size_t reprotection_length = 0; + vm_prot_t reprotection_value = VM_PROT_NONE; + bool success = DeprotectMallocZone( + zone, &reprotection_start, &reprotection_length, &reprotection_value); + if (!success) { + return; + } + + zone->size = functions->size; + zone->malloc = functions->malloc; + zone->calloc = functions->calloc; + zone->valloc = functions->valloc; + zone->free = functions->free; + zone->realloc = functions->realloc; + zone->destroy = functions->destroy; + zone->batch_malloc = functions->batch_malloc; + zone->batch_free = functions->batch_free; + zone->introspect = functions->introspect; + zone->memalign = functions->memalign; + zone->free_definite_size = functions->free_definite_size; + zone->pressure_relief = functions->pressure_relief; + zone->claimed_address = functions->claimed_address; + + // Restore protection if it was active. + if (reprotection_start) { + kern_return_t result = vm_protect(mach_task_self(), + reprotection_start, + reprotection_length, + false, + reprotection_value); + if (result != KERN_SUCCESS) { + MACH_LOG(ERROR, result) << "vm_protect"; + return; + } + } +} + +} // namespace + +void ReplaceAllocatorsWithHandlerForbidden() { + pthread_threadid_np(pthread_self(), &g_main_thread); + + CrashpadClient crashpad_client; + g_mach_exception_thread = crashpad_client.GetThreadIdForTesting(); + + malloc_zone_t* default_zone = malloc_default_zone(); + memcpy(&g_old_zone, default_zone, sizeof(g_old_zone)); + malloc_zone_t new_functions = {}; + new_functions.size = handler_forbidden_size; + new_functions.malloc = handler_forbidden_malloc; + new_functions.calloc = handler_forbidden_calloc; + new_functions.valloc = handler_forbidden_valloc; + new_functions.free = handler_forbidden_free; + new_functions.realloc = handler_forbidden_realloc; + new_functions.destroy = handler_forbidden_destroy; + new_functions.batch_malloc = handler_forbidden_batch_malloc; + new_functions.batch_free = handler_forbidden_batch_free; + new_functions.memalign = handler_forbidden_memalign; + new_functions.free_definite_size = handler_forbidden_free_definite_size; + new_functions.pressure_relief = handler_forbidden_pressure_relief; + new_functions.claimed_address = handler_forbidden_claimed_address; + ReplaceZoneFunctions(default_zone, &new_functions); + + malloc_zone_t* purgeable_zone = malloc_default_purgeable_zone(); + ReplaceZoneFunctions(purgeable_zone, &new_functions); +} + +} // namespace test +} // namespace crashpad diff --git a/external_imported/sentry-native/external/crashpad/test/ios/host/handler_forbidden_allocators.h b/external_imported/sentry-native/external/crashpad/test/ios/host/handler_forbidden_allocators.h new file mode 100644 index 000000000..c32a092de --- /dev/null +++ b/external_imported/sentry-native/external/crashpad/test/ios/host/handler_forbidden_allocators.h @@ -0,0 +1,31 @@ +// Copyright 2022 The Crashpad Authors. All rights reserved. +// +// 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 CRASHPAD_TEST_IOS_HANDLER_FORBIDDEN_ALLOCATIONS_H_ +#define CRASHPAD_TEST_IOS_HANDLER_FORBIDDEN_ALLOCATIONS_H_ + +namespace crashpad { +namespace test { + +// Override malloc_default_zone and malloc_default_purgeable_zone with functions +// that immediately exit if called from the same thread that this helper is +// called from or from the Crashpad Mach exception handler thread indicated by +// GetThreadIdForTesting. This is used to ensure the allocator is not used by +// the Crashpad InProcessHandler. +void ReplaceAllocatorsWithHandlerForbidden(); + +} // namespace test +} // namespace crashpad + +#endif // CRASHPAD_TEST_IOS_HANDLER_FORBIDDEN_ALLOCATIONS_H_ diff --git a/external_imported/sentry-native/external/crashpad/test/mac/mach_multiprocess.cc b/external_imported/sentry-native/external/crashpad/test/mac/mach_multiprocess.cc index 91a06e3ac..5f1b3aca2 100644 --- a/external_imported/sentry-native/external/crashpad/test/mac/mach_multiprocess.cc +++ b/external_imported/sentry-native/external/crashpad/test/mac/mach_multiprocess.cc @@ -19,9 +19,9 @@ #include #include +#include #include "base/auto_reset.h" -#include "base/ignore_result.h" #include "base/mac/scoped_mach_port.h" #include "gtest/gtest.h" #include "test/errors.h" @@ -212,7 +212,7 @@ void MachMultiprocess::MultiprocessChild() { ScopedForbidReturn forbid_return; // local_port is not valid in the forked child process. - ignore_result(info_->local_port.release()); + std::ignore = info_->local_port.release(); info_->local_port.reset(NewMachPort(MACH_PORT_RIGHT_RECEIVE)); ASSERT_NE(info_->local_port, kMachPortNull); diff --git a/external_imported/sentry-native/external/crashpad/test/multiprocess.h b/external_imported/sentry-native/external/crashpad/test/multiprocess.h index ca48ce80a..dd96a0fe1 100644 --- a/external_imported/sentry-native/external/crashpad/test/multiprocess.h +++ b/external_imported/sentry-native/external/crashpad/test/multiprocess.h @@ -28,7 +28,7 @@ namespace internal { struct MultiprocessInfo; } // namespace internal -#if defined(OS_FUCHSIA) +#if BUILDFLAG(IS_FUCHSIA) using ReturnCodeType = int64_t; #else using ReturnCodeType = int; @@ -55,13 +55,13 @@ class Multiprocess { //! that call `exit()` or `_exit()`. kTerminationNormal = false, -#if !defined(OS_FUCHSIA) // There are no signals on Fuchsia. +#if !BUILDFLAG(IS_FUCHSIA) // There are no signals on Fuchsia. //! \brief The child terminated by signal. //! //! Signal termination happens as a result of a crash, a call to `abort()`, //! assertion failure (including Google Test assertions), etc. kTerminationSignal, -#endif // !defined(OS_FUCHSIA) +#endif // !BUILDFLAG(IS_FUCHSIA) }; Multiprocess(); @@ -104,11 +104,11 @@ class Multiprocess { void SetExpectedChildTermination(TerminationReason reason, ReturnCodeType code); -#if !defined(OS_WIN) +#if !BUILDFLAG(IS_WIN) //! \brief Sets termination reason and code appropriately for a child that //! terminates via `__builtin_trap()`. void SetExpectedChildTerminationBuiltinTrap(); -#endif // !OS_WIN +#endif // !BUILDFLAG(IS_WIN) protected: ~Multiprocess(); @@ -131,17 +131,17 @@ class Multiprocess { //! Subclass implementations may signal failure by raising their own fatal //! Google Test assertions. virtual void PreFork() -#if defined(OS_WIN) || defined(OS_FUCHSIA) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) = 0 -#endif // OS_WIN || OS_FUCHSIA +#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) ; -#if !defined(OS_WIN) && !defined(OS_FUCHSIA) +#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_FUCHSIA) //! \brief Returns the child process’ process ID. //! //! This method may only be called by the parent process. pid_t ChildPID() const; -#endif // !OS_WIN && !OS_FUCHSIA +#endif // !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_FUCHSIA) //! \brief Returns the read pipe’s file handle. //! diff --git a/external_imported/sentry-native/external/crashpad/test/multiprocess_exec.cc b/external_imported/sentry-native/external/crashpad/test/multiprocess_exec.cc index cd9a32c0b..805090d0a 100644 --- a/external_imported/sentry-native/external/crashpad/test/multiprocess_exec.cc +++ b/external_imported/sentry-native/external/crashpad/test/multiprocess_exec.cc @@ -18,6 +18,7 @@ #include "base/check.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "test/main_arguments.h" #include "test/test_paths.h" #include "util/stdlib/map_insert.h" @@ -59,7 +60,7 @@ void MultiprocessExec::SetChildTestMainFunction( GetMainArguments().end()); rest.push_back(internal::kChildTestFunction + function_name); -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) // Instead of using argv[0] on Windows, use the actual binary name. This is // necessary because if originally the test isn't run with ".exe" on the // command line, then argv[0] also won't include ".exe". This argument is used diff --git a/external_imported/sentry-native/external/crashpad/test/multiprocess_exec.h b/external_imported/sentry-native/external/crashpad/test/multiprocess_exec.h index a03f8c1ad..3be9b7a25 100644 --- a/external_imported/sentry-native/external/crashpad/test/multiprocess_exec.h +++ b/external_imported/sentry-native/external/crashpad/test/multiprocess_exec.h @@ -141,11 +141,11 @@ class MultiprocessExec : public Multiprocess { base::FilePath command_; std::vector arguments_; -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) std::vector argv_; -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) std::wstring command_line_; -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) }; } // namespace test diff --git a/external_imported/sentry-native/external/crashpad/test/multiprocess_exec_posix.cc b/external_imported/sentry-native/external/crashpad/test/multiprocess_exec_posix.cc index e14a3b88a..fa87f0888 100644 --- a/external_imported/sentry-native/external/crashpad/test/multiprocess_exec_posix.cc +++ b/external_imported/sentry-native/external/crashpad/test/multiprocess_exec_posix.cc @@ -26,11 +26,11 @@ #include "util/misc/scoped_forbid_return.h" #include "util/posix/close_multiple.h" -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #include #endif -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) #include "util/mach/task_for_pid.h" #endif @@ -90,7 +90,7 @@ void MultiprocessExec::MultiprocessChild() { int rv; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) __fpurge(stdin); #else rv = fpurge(stdin); @@ -154,7 +154,7 @@ void MultiprocessExec::MultiprocessChild() { } ProcessType MultiprocessExec::ChildProcess() { -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) return TaskForPID(ChildPID()); #else return ChildPID(); diff --git a/external_imported/sentry-native/external/crashpad/test/multiprocess_exec_test.cc b/external_imported/sentry-native/external/crashpad/test/multiprocess_exec_test.cc index fb77d642f..8d8f1e201 100644 --- a/external_imported/sentry-native/external/crashpad/test/multiprocess_exec_test.cc +++ b/external_imported/sentry-native/external/crashpad/test/multiprocess_exec_test.cc @@ -101,7 +101,7 @@ TEST(MultiprocessExec, MultiprocessExecSimpleChildReturnsNonZero) { exec.Run(); } -#if !defined(OS_WIN) +#if !BUILDFLAG(IS_WIN) CRASHPAD_CHILD_TEST_MAIN(BuiltinTrapChild) { __builtin_trap(); @@ -130,7 +130,7 @@ TEST(MultiprocessExec, BuiltinTrapTermination) { test.Run(); } -#endif // !OS_WIN +#endif // !BUILDFLAG(IS_WIN) } // namespace } // namespace test diff --git a/external_imported/sentry-native/external/crashpad/test/multiprocess_exec_test_child.cc b/external_imported/sentry-native/external/crashpad/test/multiprocess_exec_test_child.cc index 8c77015c1..f74b58560 100644 --- a/external_imported/sentry-native/external/crashpad/test/multiprocess_exec_test_child.cc +++ b/external_imported/sentry-native/external/crashpad/test/multiprocess_exec_test_child.cc @@ -22,19 +22,19 @@ #include "base/logging.h" #include "build/build_config.h" -#if defined(OS_POSIX) -#if !defined(OS_FUCHSIA) +#if BUILDFLAG(IS_POSIX) +#if !BUILDFLAG(IS_FUCHSIA) #include -#endif // !OS_FUCHSIA +#endif // !BUILDFLAG(IS_FUCHSIA) #include -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) #include #endif int main(int argc, char* argv[]) { -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) -#if defined(OS_FUCHSIA) +#if BUILDFLAG(IS_FUCHSIA) // getrlimit() is not implemented on Fuchsia. By construction, the child only // receieves specific fds that it's given, but check low values as mild // verification. @@ -45,7 +45,7 @@ int main(int argc, char* argv[]) { LOG(FATAL) << "getrlimit"; } int last_fd = static_cast(rlimit_nofile.rlim_cur); -#endif // OS_FUCHSIA +#endif // BUILDFLAG(IS_FUCHSIA) // Make sure that there’s nothing open at any FD higher than 3. All FDs other // than stdin, stdout, and stderr should have been closed prior to or at @@ -69,7 +69,7 @@ int main(int argc, char* argv[]) { if (rv != 1) { LOG(FATAL) << "write"; } -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) // TODO(scottmg): Verify that only the handles we expect to be open, are. // Read a byte from stdin, expecting it to be a specific value. @@ -89,7 +89,7 @@ int main(int argc, char* argv[]) { bytes_written != 1) { LOG(FATAL) << "WriteFile"; } -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) return 0; } diff --git a/external_imported/sentry-native/external/crashpad/test/multiprocess_posix.cc b/external_imported/sentry-native/external/crashpad/test/multiprocess_posix.cc index c16aa08f7..f1b138f6c 100644 --- a/external_imported/sentry-native/external/crashpad/test/multiprocess_posix.cc +++ b/external_imported/sentry-native/external/crashpad/test/multiprocess_posix.cc @@ -33,7 +33,7 @@ #include "util/misc/scoped_forbid_return.h" #include "util/posix/signals.h" -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) #include "test/mac/exception_swallower.h" #endif @@ -73,7 +73,7 @@ void Multiprocess::Run() { ASSERT_NO_FATAL_FAILURE(PreFork()); -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) // If the child is expected to crash, set up an exception swallower to swallow // the exception instead of allowing it to be seen by the system’s crash // reporter. @@ -81,7 +81,7 @@ void Multiprocess::Run() { if (reason_ == kTerminationSignal && Signals::IsCrashSignal(code_)) { exception_swallower.reset(new ExceptionSwallower()); } -#endif // OS_APPLE +#endif // BUILDFLAG(IS_APPLE) pid_t pid = fork(); ASSERT_GE(pid, 0) << ErrnoMessage("fork"); @@ -139,15 +139,15 @@ void Multiprocess::Run() { ADD_FAILURE() << message; } } else { -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) if (exception_swallower.get()) { ExceptionSwallower::SwallowExceptions(); } -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) if (reason_ == kTerminationSignal && Signals::IsCrashSignal(code_)) { Signals::InstallDefaultHandler(code_); } -#endif // OS_APPLE +#endif // BUILDFLAG(IS_APPLE) RunChild(); } diff --git a/external_imported/sentry-native/external/crashpad/test/process_type.cc b/external_imported/sentry-native/external/crashpad/test/process_type.cc index f6eec36ab..7c6f88fa9 100644 --- a/external_imported/sentry-native/external/crashpad/test/process_type.cc +++ b/external_imported/sentry-native/external/crashpad/test/process_type.cc @@ -14,9 +14,11 @@ #include "test/process_type.h" -#if defined(OS_FUCHSIA) +#include "build/build_config.h" + +#if BUILDFLAG(IS_FUCHSIA) #include -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) #include #endif @@ -24,13 +26,13 @@ namespace crashpad { namespace test { ProcessType GetSelfProcess() { -#if defined(OS_FUCHSIA) +#if BUILDFLAG(IS_FUCHSIA) return zx::process::self(); -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) return getpid(); -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) return GetCurrentProcess(); -#elif defined(OS_APPLE) +#elif BUILDFLAG(IS_APPLE) return mach_task_self(); #endif } diff --git a/external_imported/sentry-native/external/crashpad/test/process_type.h b/external_imported/sentry-native/external/crashpad/test/process_type.h index cacac04fb..a1c727cb0 100644 --- a/external_imported/sentry-native/external/crashpad/test/process_type.h +++ b/external_imported/sentry-native/external/crashpad/test/process_type.h @@ -17,28 +17,28 @@ #include "build/build_config.h" -#if defined(OS_FUCHSIA) +#if BUILDFLAG(IS_FUCHSIA) #include -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) #include -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) #include -#elif defined(OS_APPLE) +#elif BUILDFLAG(IS_APPLE) #include #endif namespace crashpad { namespace test { -#if defined(OS_FUCHSIA) +#if BUILDFLAG(IS_FUCHSIA) using ProcessType = zx::unowned_process; -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ - DOXYGEN +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ + BUILDFLAG(IS_ANDROID) || DOXYGEN //! \brief Alias for platform-specific type to represent a process. using ProcessType = pid_t; -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) using ProcessType = HANDLE; -#elif defined(OS_APPLE) +#elif BUILDFLAG(IS_APPLE) using ProcessType = task_t; #else #error Port. diff --git a/external_imported/sentry-native/external/crashpad/test/scoped_module_handle.cc b/external_imported/sentry-native/external/crashpad/test/scoped_module_handle.cc index df246fcf4..ff8e0bd9c 100644 --- a/external_imported/sentry-native/external/crashpad/test/scoped_module_handle.cc +++ b/external_imported/sentry-native/external/crashpad/test/scoped_module_handle.cc @@ -15,17 +15,18 @@ #include "test/scoped_module_handle.h" #include "base/logging.h" +#include "build/build_config.h" namespace crashpad { namespace test { // static void ScopedModuleHandle::Impl::Close(ModuleHandle handle) { -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) if (dlclose(handle) != 0) { LOG(ERROR) << "dlclose: " << dlerror(); } -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) if (!FreeLibrary(handle)) { PLOG(ERROR) << "FreeLibrary"; } diff --git a/external_imported/sentry-native/external/crashpad/test/scoped_module_handle.h b/external_imported/sentry-native/external/crashpad/test/scoped_module_handle.h index 0e96c9510..1a8ed1bf9 100644 --- a/external_imported/sentry-native/external/crashpad/test/scoped_module_handle.h +++ b/external_imported/sentry-native/external/crashpad/test/scoped_module_handle.h @@ -17,9 +17,9 @@ #include "build/build_config.h" -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) #include -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) #include #endif @@ -36,13 +36,13 @@ class ScopedModuleHandle { Impl(const Impl&) = delete; Impl& operator=(const Impl&) = delete; -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) using ModuleHandle = void*; static void* LookUpSymbol(ModuleHandle handle, const char* symbol_name) { return dlsym(handle, symbol_name); } -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) using ModuleHandle = HMODULE; static void* LookUpSymbol(ModuleHandle handle, const char* symbol_name) { diff --git a/external_imported/sentry-native/external/crashpad/test/scoped_temp_dir_posix.cc b/external_imported/sentry-native/external/crashpad/test/scoped_temp_dir_posix.cc index 38aa4fb84..848ab5692 100644 --- a/external_imported/sentry-native/external/crashpad/test/scoped_temp_dir_posix.cc +++ b/external_imported/sentry-native/external/crashpad/test/scoped_temp_dir_posix.cc @@ -42,7 +42,7 @@ base::FilePath ScopedTempDir::CreateTemporaryDirectory() { if (tmpdir && tmpdir[0] != '\0') { dir.assign(tmpdir); } else { -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) dir.assign("/data/local/tmp"); #else dir.assign("/tmp"); diff --git a/external_imported/sentry-native/external/crashpad/test/scoped_temp_dir_test.cc b/external_imported/sentry-native/external/crashpad/test/scoped_temp_dir_test.cc index 9ad801f7f..3b5a31642 100644 --- a/external_imported/sentry-native/external/crashpad/test/scoped_temp_dir_test.cc +++ b/external_imported/sentry-native/external/crashpad/test/scoped_temp_dir_test.cc @@ -23,26 +23,26 @@ #include "test/errors.h" #include "test/file.h" -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) #include -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) #include #include -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) namespace crashpad { namespace test { namespace { void CreateFile(const base::FilePath& path) { -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) int fd = HANDLE_EINTR(creat(path.value().c_str(), 0644)); ASSERT_GE(fd, 0) << ErrnoMessage("creat") << " " << path.value(); // gcc refuses to compile ASSERT_EQ(IGNORE_EINTR(close(fd)), 0). int close_rv = IGNORE_EINTR(close(fd)); ASSERT_EQ(close_rv, 0) << ErrnoMessage("close") << " " << path.value(); -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) int fd = _wcreat(path.value().c_str(), _S_IREAD | _S_IWRITE); ASSERT_GE(fd, 0) << ErrnoMessage("_wcreat") << " " << path.value(); ASSERT_EQ(_close(fd), 0) << ErrnoMessage("_close") << " " << path.value(); @@ -53,10 +53,10 @@ void CreateFile(const base::FilePath& path) { } void CreateDirectory(const base::FilePath& path) { -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) ASSERT_EQ(mkdir(path.value().c_str(), 0755), 0) << ErrnoMessage("mkdir") << " " << path.value(); -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) ASSERT_EQ(_wmkdir(path.value().c_str()), 0) << ErrnoMessage("_wmkdir") << " " << path.value(); #else diff --git a/external_imported/sentry-native/external/crashpad/test/test_paths.cc b/external_imported/sentry-native/external/crashpad/test/test_paths.cc index 475e2b019..c55aa647b 100644 --- a/external_imported/sentry-native/external/crashpad/test/test_paths.cc +++ b/external_imported/sentry-native/external/crashpad/test/test_paths.cc @@ -31,7 +31,7 @@ bool IsTestDataRoot(const base::FilePath& candidate) { candidate.Append(FILE_PATH_LITERAL("test")) .Append(FILE_PATH_LITERAL("test_paths_test_data_root.txt")); -#if !defined(OS_WIN) +#if !BUILDFLAG(IS_WIN) struct stat stat_buf; int rv = stat(marker_path.value().c_str(), &stat_buf); #else @@ -43,16 +43,16 @@ bool IsTestDataRoot(const base::FilePath& candidate) { } base::FilePath TestDataRootInternal() { -#if defined(OS_FUCHSIA) +#if BUILDFLAG(IS_FUCHSIA) base::FilePath asset_path("/pkg/data"); if (!IsTestDataRoot(asset_path)) { LOG(WARNING) << "test data root seems invalid, continuing anyway"; } return asset_path; -#else // defined(OS_FUCHSIA) -#if !defined(OS_WIN) +#else // BUILDFLAG(IS_FUCHSIA) +#if !BUILDFLAG(IS_WIN) const char* environment_value = getenv("CRASHPAD_TEST_DATA_ROOT"); -#else // defined(OS_WIN) +#else // BUILDFLAG(IS_WIN) const wchar_t* environment_value = _wgetenv(L"CRASHPAD_TEST_DATA_ROOT"); #endif @@ -67,21 +67,21 @@ base::FilePath TestDataRootInternal() { base::FilePath executable_path; if (Paths::Executable(&executable_path)) { -#if defined(OS_IOS) || defined(OS_ANDROID) +#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_ANDROID) // On Android and iOS, test data is in a crashpad_test_data directory // adjacent to the main executable. On iOS, this refers to the main // executable file inside the .app bundle, so crashpad_test_data is also // inside the bundle. base::FilePath candidate = executable_path.DirName() .Append("crashpad_test_data"); -#else // OS_IOS || OS_ANDRID +#else // BUILDFLAG(IS_IOS) || BUILDFLAG(IS_ANDRID) // In a standalone build, the test executable is usually at // out/{Debug,Release} relative to the Crashpad root. base::FilePath candidate = base::FilePath(executable_path.DirName() .Append(base::FilePath::kParentDirectory) .Append(base::FilePath::kParentDirectory)); -#endif // OS_IOS || OS_ANDROID +#endif // BUILDFLAG(IS_IOS) || BUILDFLAG(IS_ANDROID) if (IsTestDataRoot(candidate)) { return candidate; } @@ -104,10 +104,10 @@ base::FilePath TestDataRootInternal() { } return base::FilePath(base::FilePath::kCurrentDirectory); -#endif // defined(OS_FUCHSIA) +#endif // BUILDFLAG(IS_FUCHSIA) } -#if defined(OS_WIN) && defined(ARCH_CPU_64_BITS) +#if BUILDFLAG(IS_WIN) && defined(ARCH_CPU_64_BITS) // Returns the pathname of a directory containing 32-bit test build output. // @@ -122,7 +122,7 @@ base::FilePath Output32BitDirectory() { return base::FilePath(environment_value); } -#endif // defined(OS_WIN) && defined(ARCH_CPU_64_BITS) +#endif // BUILDFLAG(IS_WIN) && defined(ARCH_CPU_64_BITS) } // namespace @@ -139,10 +139,10 @@ base::FilePath TestPaths::Executable() { // static base::FilePath TestPaths::ExpectedExecutableBasename( const base::FilePath::StringType& name) { -#if defined(OS_FUCHSIA) +#if BUILDFLAG(IS_FUCHSIA) // Apps in Fuchsia packages are always named "app". return base::FilePath("app"); -#else // OS_FUCHSIA +#else // BUILDFLAG(IS_FUCHSIA) #if defined(CRASHPAD_IS_IN_CHROMIUM) base::FilePath::StringType executable_name( FILE_PATH_LITERAL("crashpad_tests")); @@ -150,12 +150,12 @@ base::FilePath TestPaths::ExpectedExecutableBasename( base::FilePath::StringType executable_name(name); #endif // CRASHPAD_IS_IN_CHROMIUM -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) executable_name += FILE_PATH_LITERAL(".exe"); -#endif // OS_WIN +#endif // BUILDFLAG(IS_WIN) return base::FilePath(executable_name); -#endif // OS_FUCHSIA +#endif // BUILDFLAG(IS_FUCHSIA) } // static @@ -177,17 +177,17 @@ base::FilePath TestPaths::BuildArtifact( directory = Executable().DirName(); break; -#if defined(OS_WIN) && defined(ARCH_CPU_64_BITS) +#if BUILDFLAG(IS_WIN) && defined(ARCH_CPU_64_BITS) case Architecture::k32Bit: directory = Output32BitDirectory(); CHECK(!directory.empty()); break; -#endif // OS_WIN && ARCH_CPU_64_BITS +#endif // BUILDFLAG(IS_WIN) && ARCH_CPU_64_BITS } base::FilePath::StringType test_name = FILE_PATH_LITERAL("crashpad_") + module + FILE_PATH_LITERAL("_test"); -#if !defined(CRASHPAD_IS_IN_CHROMIUM) && !defined(OS_FUCHSIA) +#if !defined(CRASHPAD_IS_IN_CHROMIUM) && !BUILDFLAG(IS_FUCHSIA) CHECK(Executable().BaseName().RemoveFinalExtension().value() == test_name); #endif // !CRASHPAD_IS_IN_CHROMIUM @@ -197,21 +197,21 @@ base::FilePath TestPaths::BuildArtifact( break; case FileType::kExecutable: -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) extension = FILE_PATH_LITERAL(".exe"); -#elif defined(OS_FUCHSIA) +#elif BUILDFLAG(IS_FUCHSIA) directory = base::FilePath(FILE_PATH_LITERAL("/pkg/bin")); -#endif // OS_WIN +#endif // BUILDFLAG(IS_WIN) break; case FileType::kLoadableModule: -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) extension = FILE_PATH_LITERAL(".dll"); -#else // OS_WIN +#else // BUILDFLAG(IS_WIN) extension = FILE_PATH_LITERAL(".so"); -#endif // OS_WIN +#endif // BUILDFLAG(IS_WIN) -#if defined(OS_FUCHSIA) +#if BUILDFLAG(IS_FUCHSIA) // TODO(scottmg): .so files are currently deployed into /boot/lib, where // they'll be found (without a path) by the loader. Application packaging // infrastructure is in progress, so this will likely change again in the @@ -232,14 +232,14 @@ base::FilePath TestPaths::BuildArtifact( extension); } -#if defined(OS_WIN) && defined(ARCH_CPU_64_BITS) +#if BUILDFLAG(IS_WIN) && defined(ARCH_CPU_64_BITS) // static bool TestPaths::Has32BitBuildArtifacts() { return !Output32BitDirectory().empty(); } -#endif // defined(OS_WIN) && defined(ARCH_CPU_64_BITS) +#endif // BUILDFLAG(IS_WIN) && defined(ARCH_CPU_64_BITS) } // namespace test } // namespace crashpad diff --git a/external_imported/sentry-native/external/crashpad/test/test_paths.h b/external_imported/sentry-native/external/crashpad/test/test_paths.h index 72bb15539..0fc021e13 100644 --- a/external_imported/sentry-native/external/crashpad/test/test_paths.h +++ b/external_imported/sentry-native/external/crashpad/test/test_paths.h @@ -49,14 +49,14 @@ class TestPaths { //! architecture as the running process. kDefault = 0, -#if (defined(OS_WIN) && defined(ARCH_CPU_64_BITS)) || DOXYGEN +#if (BUILDFLAG(IS_WIN) && defined(ARCH_CPU_64_BITS)) || DOXYGEN //! \brief The 32-bit variant is requested. //! //! On Windows, when running 64-bit code, the 32-bit variant can be //! requested. Before doing so, Has32BitBuildArtifacts() must be called and //! must return `true`. Otherwise, execution will be aborted. k32Bit, -#endif // OS_WIN && ARCH_CPU_64_BITS +#endif // BUILDFLAG(IS_WIN) && ARCH_CPU_64_BITS }; TestPaths() = delete; @@ -128,7 +128,7 @@ class TestPaths { FileType file_type, Architecture architecture = Architecture::kDefault); -#if (defined(OS_WIN) && defined(ARCH_CPU_64_BITS)) || DOXYGEN +#if (BUILDFLAG(IS_WIN) && defined(ARCH_CPU_64_BITS)) || DOXYGEN //! \return `true` if 32-bit build artifacts are available. //! //! Tests that require the use of 32-bit build output should call this @@ -142,7 +142,7 @@ class TestPaths { //! can be found its own directory, and located by calling BuildArtifact() //! with Architecture::kDefault. static bool Has32BitBuildArtifacts(); -#endif // OS_WIN && ARCH_CPU_64_BITS +#endif // BUILDFLAG(IS_WIN) && ARCH_CPU_64_BITS }; } // namespace test diff --git a/external_imported/sentry-native/external/crashpad/third_party/edo/BUILD.gn b/external_imported/sentry-native/external/crashpad/third_party/edo/BUILD.gn index 73dca1aab..ea6e9d38b 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/edo/BUILD.gn +++ b/external_imported/sentry-native/external/crashpad/third_party/edo/BUILD.gn @@ -7,9 +7,7 @@ import("../../build/crashpad_buildconfig.gni") if (crashpad_is_in_chromium) { group("edo") { testonly = true - public_deps = [ - "//ios/third_party/edo", - ] + public_deps = [ "//ios/third_party/edo" ] } } else { config("config") { @@ -103,6 +101,8 @@ if (crashpad_is_in_chromium) { "edo/Service/Sources/EDORemoteException.m", "edo/Service/Sources/EDORemoteVariable.h", "edo/Service/Sources/EDORemoteVariable.m", + "edo/Service/Sources/EDORuntimeUtils.h", + "edo/Service/Sources/EDORuntimeUtils.m", "edo/Service/Sources/EDOServiceError.h", "edo/Service/Sources/EDOServiceError.m", "edo/Service/Sources/EDOServiceException.h", @@ -139,8 +139,6 @@ if (crashpad_is_in_chromium) { ] public_configs = [ ":config" ] - deps = [ - "../../build:ios_enable_arc", - ] + deps = [ "../../build:ios_enable_arc" ] } } diff --git a/external_imported/sentry-native/external/crashpad/third_party/googletest/BUILD.gn b/external_imported/sentry-native/external/crashpad/third_party/googletest/BUILD.gn index de1c84d44..2cfb50892 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/googletest/BUILD.gn +++ b/external_imported/sentry-native/external/crashpad/third_party/googletest/BUILD.gn @@ -55,6 +55,7 @@ if (crashpad_is_in_chromium) { static_library("googletest") { testonly = true sources = [ + "$googletest_dir/googletest/include/gtest/gtest-assertion-result.h", "$googletest_dir/googletest/include/gtest/gtest-death-test.h", "$googletest_dir/googletest/include/gtest/gtest-matchers.h", "$googletest_dir/googletest/include/gtest/gtest-message.h", @@ -78,6 +79,7 @@ if (crashpad_is_in_chromium) { "$googletest_dir/googletest/include/gtest/internal/gtest-string.h", "$googletest_dir/googletest/include/gtest/internal/gtest-type-util.h", "$googletest_dir/googletest/src/gtest-all.cc", + "$googletest_dir/googletest/src/gtest-assertion-result.cc", "$googletest_dir/googletest/src/gtest-death-test.cc", "$googletest_dir/googletest/src/gtest-filepath.cc", "$googletest_dir/googletest/src/gtest-internal-inl.h", @@ -176,14 +178,6 @@ if (crashpad_is_in_chromium) { configs -= [ "$mini_chromium_dir/build/config:Wexit_time_destructors" ] configs += [ ":googletest_private_config" ] deps = [ ":googletest" ] - - if (crashpad_is_clang) { - cflags_cc = [ - # For googletest/googlemock/test/gmock-matchers_test.cc’s - # Unstreamable::value_. - "-Wno-unused-private-field", - ] - } } test("gtest_premature_exit_test") { @@ -299,7 +293,11 @@ if (crashpad_is_in_chromium) { "$googletest_dir/googlemock/test/gmock-cardinalities_test.cc", "$googletest_dir/googlemock/test/gmock-function-mocker_test.cc", "$googletest_dir/googlemock/test/gmock-internal-utils_test.cc", - "$googletest_dir/googlemock/test/gmock-matchers_test.cc", + "$googletest_dir/googlemock/test/gmock-matchers-arithmetic_test.cc", + "$googletest_dir/googlemock/test/gmock-matchers-comparisons_test.cc", + "$googletest_dir/googlemock/test/gmock-matchers-containers_test.cc", + "$googletest_dir/googlemock/test/gmock-matchers-misc_test.cc", + "$googletest_dir/googlemock/test/gmock-matchers_test.h", "$googletest_dir/googlemock/test/gmock-more-actions_test.cc", "$googletest_dir/googlemock/test/gmock-nice-strict_test.cc", "$googletest_dir/googlemock/test/gmock-port_test.cc", @@ -324,15 +322,21 @@ if (crashpad_is_in_chromium) { # always use the override modifier with MOCK_METHOD. "-Wno-inconsistent-missing-override", - # For googletest/googlemock/test/gmock-matchers_test.cc’s - # testing::googlemock_matchers_test::Unprintable::c_. - "-Wno-unused-private-field", + # For googlemock/test/gmock-matchers-misc_test.cc comparison of + # integers of different signs. + "-Wno-sign-compare", ] } if (crashpad_is_win) { - # TODO: Correct SDK in vc\tools\msvc\14.14.26428\include\functional - cflags = [ "/wd4789" ] # VAR of size N bytes will be overrun + cflags = [ + # TODO: Correct SDK in vc\tools\msvc\14.14.26428\include\functional + "/wd4789", # VAR of size N bytes will be overrun + + # For googlemock/test/gmock-matchers-misc_test.cc comparison of + # integers of different signs. + "/wd4018", + ] } } diff --git a/external_imported/sentry-native/external/crashpad/third_party/lss/lss.h b/external_imported/sentry-native/external/crashpad/third_party/lss/lss.h index 2646b6c00..0bdd381c6 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/lss/lss.h +++ b/external_imported/sentry-native/external/crashpad/third_party/lss/lss.h @@ -20,7 +20,7 @@ #elif defined(CRASHPAD_LSS_SOURCE_EMBEDDED) #include "third_party/lss/lss/linux_syscall_support.h" #elif defined(CRASHPAD_LSS_SOURCE_FUCHSIA) -#include "../../../../third_party/lss/linux_syscall_support.h" +#include "../../../../third_party/linux-syscall-support/linux_syscall_support.h" #else #error Unknown lss source #endif diff --git a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/DIR_METADATA b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/DIR_METADATA new file mode 100644 index 000000000..eccfd35fa --- /dev/null +++ b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/DIR_METADATA @@ -0,0 +1,12 @@ +# Metadata information for this directory. +# +# For more information on DIR_METADATA files, see: +# https://source.chromium.org/chromium/infra/infra/+/HEAD:go/src/infra/tools/dirmd/README.md +# +# For the schema of this file, see Metadata message: +# https://source.chromium.org/chromium/infra/infra/+/HEAD:go/src/infra/tools/dirmd/proto/dir_metadata.proto + +os: LINUX +monorail { + project: "linux-syscall-support" +} diff --git a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/LICENSE b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/LICENSE new file mode 100644 index 000000000..58ab3fba9 --- /dev/null +++ b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/LICENSE @@ -0,0 +1,28 @@ +Copyright (c) 2005-2011, 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. diff --git a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/OWNERS b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/OWNERS new file mode 100644 index 000000000..29b02fa11 --- /dev/null +++ b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/OWNERS @@ -0,0 +1,2 @@ +mseaborn@chromium.org +vapier@chromium.org diff --git a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/README.md b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/README.md index 70cbc8531..b0cd12977 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/README.md +++ b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/README.md @@ -130,7 +130,7 @@ It only compiles things (does not execute at all). If you commit a change to LSS, please also commit a Chromium change to update `lss_revision` in -[Chromium's DEPS](https://chromium.googlesource.com/chromium/src/+/master/DEPS) +[Chromium's DEPS](https://chromium.googlesource.com/chromium/src/+/HEAD/DEPS) file. This ensures that the LSS change gets tested, so that people who commit later diff --git a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/linux_syscall_support.h b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/linux_syscall_support.h index a71bea890..d3791cd4e 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/linux_syscall_support.h +++ b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/linux_syscall_support.h @@ -88,7 +88,7 @@ */ #if (defined(__i386__) || defined(__x86_64__) || defined(__ARM_ARCH_3__) || \ defined(__mips__) || defined(__PPC__) || defined(__ARM_EABI__) || \ - defined(__aarch64__) || defined(__s390__)) \ + defined(__aarch64__) || defined(__s390__) || defined(__e2k__)) \ && (defined(__linux) || defined(__ANDROID__)) #ifndef SYS_CPLUSPLUS @@ -130,18 +130,25 @@ extern "C" { #endif #endif -/* The Android NDK's #defines these macros as aliases - * to their non-64 counterparts. To avoid naming conflict, remove them. */ -#ifdef __ANDROID__ - /* These are restored by the corresponding #pragma pop_macro near - * the end of this file. */ -# pragma push_macro("stat64") -# pragma push_macro("fstat64") -# pragma push_macro("lstat64") -# undef stat64 -# undef fstat64 -# undef lstat64 -#endif +/* Some libcs, for example Android NDK and musl, #define these + * macros as aliases to their non-64 counterparts. To avoid naming + * conflict, remove them. + * + * These are restored by the corresponding #pragma pop_macro near + * the end of this file. + */ +#pragma push_macro("stat64") +#pragma push_macro("fstat64") +#pragma push_macro("lstat64") +#pragma push_macro("pread64") +#pragma push_macro("pwrite64") +#pragma push_macro("getdents64") +#undef stat64 +#undef fstat64 +#undef lstat64 +#undef pread64 +#undef pwrite64 +#undef getdents64 #if defined(__ANDROID__) && defined(__x86_64__) // A number of x86_64 syscalls are blocked by seccomp on recent Android; @@ -280,7 +287,8 @@ struct kernel_rusage { }; #if defined(__i386__) || defined(__ARM_EABI__) || defined(__ARM_ARCH_3__) \ - || defined(__PPC__) || (defined(__s390__) && !defined(__s390x__)) + || defined(__PPC__) || (defined(__s390__) && !defined(__s390x__)) \ + || defined(__e2k__) /* include/asm-{arm,i386,mips,ppc}/signal.h */ struct kernel_old_sigaction { @@ -394,6 +402,28 @@ struct kernel_stat64 { unsigned long __unused4; unsigned long __unused5; }; +#elif defined(__e2k__) +struct kernel_stat64 { + unsigned long long st_dev; + unsigned long long st_ino; + unsigned int st_mode; + unsigned int st_nlink; + unsigned int st_uid; + unsigned int st_gid; + unsigned long long st_rdev; + long long st_size; + int st_blksize; + int __pad2; + unsigned long long st_blocks; + int st_atime_; + unsigned int st_atime_nsec_; + int st_mtime_; + unsigned int st_mtime_nsec_; + int st_ctime_; + unsigned int st_ctime_nsec_; + unsigned int __unused4; + unsigned int __unused5; +}; #else struct kernel_stat64 { unsigned long long st_dev; @@ -579,6 +609,25 @@ struct kernel_stat { unsigned long __unused4; unsigned long __unused5; }; +#elif defined(__e2k__) +struct kernel_stat { + unsigned long st_dev; + unsigned long st_ino; + unsigned int st_mode; + unsigned long st_nlink; + unsigned int st_uid; + unsigned int st_gid; + unsigned long st_rdev; + unsigned long st_size; + unsigned long st_blksize; + unsigned long st_blocks; + unsigned long st_atime_; + unsigned long st_atime_nsec_; + unsigned long st_mtime_; + unsigned long st_mtime_nsec_; + unsigned long st_ctime_; + unsigned long st_ctime_nsec_; +}; #endif /* include/asm-{arm,aarch64,i386,mips,x86_64,ppc,s390}/statfs.h */ @@ -947,6 +996,9 @@ struct kernel_statfs { #ifndef __NR_fallocate #define __NR_fallocate 324 #endif +#ifndef __NR_getrandom +#define __NR_getrandom 355 +#endif /* End of i386 definitions */ #elif defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) #ifndef __NR_setresuid @@ -1045,12 +1097,18 @@ struct kernel_statfs { #ifndef __NR_ioprio_get #define __NR_ioprio_get (__NR_SYSCALL_BASE + 315) #endif +#ifndef __NR_fstatat64 +#define __NR_fstatat64 (__NR_SYSCALL_BASE + 327) +#endif #ifndef __NR_move_pages #define __NR_move_pages (__NR_SYSCALL_BASE + 344) #endif #ifndef __NR_getcpu #define __NR_getcpu (__NR_SYSCALL_BASE + 345) #endif +#ifndef __NR_getrandom +#define __NR_getrandom (__NR_SYSCALL_BASE + 384) +#endif /* End of ARM 3/EABI definitions */ #elif defined(__aarch64__) #ifndef __NR_setxattr @@ -1148,6 +1206,9 @@ struct kernel_statfs { #ifndef __NR_move_pages #define __NR_move_pages 239 #endif +#ifndef __NR_getrandom +#define __NR_getrandom 278 +#endif /* End of aarch64 definitions */ #elif defined(__x86_64__) #ifndef __NR_pread64 @@ -1239,6 +1300,9 @@ struct kernel_statfs { #ifndef __NR_fallocate #define __NR_fallocate 285 #endif +#ifndef __NR_getrandom +#define __NR_getrandom 318 +#endif /* End of x86-64 definitions */ #elif defined(__mips__) #if _MIPS_SIM == _MIPS_SIM_ABI32 @@ -1340,6 +1404,9 @@ struct kernel_statfs { #ifndef __NR_ioprio_get #define __NR_ioprio_get (__NR_Linux + 315) #endif +#ifndef __NR_getrandom +#define __NR_getrandom (__NR_Linux + 353) +#endif /* End of MIPS (old 32bit API) definitions */ #elif _MIPS_SIM == _MIPS_SIM_ABI64 #ifndef __NR_pread64 @@ -1418,6 +1485,9 @@ struct kernel_statfs { #ifndef __NR_ioprio_get #define __NR_ioprio_get (__NR_Linux + 274) #endif +#ifndef __NR_getrandom +#define __NR_getrandom (__NR_Linux + 313) +#endif /* End of MIPS (64bit API) definitions */ #else #ifndef __NR_setresuid @@ -1854,8 +1924,9 @@ struct kernel_statfs { #endif #undef LSS_RETURN - #if (defined(__i386__) || defined(__x86_64__) || defined(__ARM_ARCH_3__) \ - || defined(__ARM_EABI__) || defined(__aarch64__) || defined(__s390__)) + #if defined(__i386__) || defined(__x86_64__) || defined(__ARM_ARCH_3__) \ + || defined(__ARM_EABI__) || defined(__aarch64__) || defined(__s390__) \ + || defined(__e2k__) /* Failing system calls return a negative result in the range of * -1..-4095. These are "errno" values with the sign inverted. */ @@ -1955,7 +2026,7 @@ struct kernel_statfs { LSS_ENTRYPOINT \ "pop %%ebx" \ args \ - : "esp", "memory"); \ + : "memory"); \ LSS_RETURN(type,__res) #undef _syscall0 #define _syscall0(type,name) \ @@ -2012,7 +2083,7 @@ struct kernel_statfs { : "i" (__NR_##name), "ri" ((long)(arg1)), \ "c" ((long)(arg2)), "d" ((long)(arg3)), \ "S" ((long)(arg4)), "D" ((long)(arg5)) \ - : "esp", "memory"); \ + : "memory"); \ LSS_RETURN(type,__res); \ } #undef _syscall6 @@ -2034,7 +2105,7 @@ struct kernel_statfs { : "i" (__NR_##name), "0" ((long)(&__s)), \ "c" ((long)(arg2)), "d" ((long)(arg3)), \ "S" ((long)(arg4)), "D" ((long)(arg5)) \ - : "esp", "memory"); \ + : "memory"); \ LSS_RETURN(type,__res); \ } LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack, @@ -2120,7 +2191,7 @@ struct kernel_statfs { : "0"(-EINVAL), "i"(__NR_clone), "m"(fn), "m"(child_stack), "m"(flags), "m"(arg), "m"(parent_tidptr), "m"(newtls), "m"(child_tidptr) - : "esp", "memory", "ecx", "edx", "esi", "edi"); + : "memory", "ecx", "edx", "esi", "edi"); LSS_RETURN(int, __res); } @@ -3348,6 +3419,259 @@ struct kernel_statfs { } LSS_RETURN(int, __ret); } + #elif defined(__e2k__) + + #undef _LSS_BODY + #define _LSS_BODY(nr, type, name, ...) \ + register unsigned long long __res; \ + __asm__ __volatile__ \ + ( \ + "{\n\t" \ + " sdisp %%ctpr1, 0x3\n\t" \ + " addd, s 0x0, %[sys_num], %%b[0]\n\t" \ + LSS_BODY_ASM##nr \ + "}\n\t" \ + "{\n\t" \ + " call %%ctpr1, wbs = %#\n\t" \ + "}\n\t" \ + "{\n\t" \ + " addd, s 0x0, %%b[0], %[res]\n\t" \ + "}\n\t" \ + : [res] "=r" (__res) \ + : \ + LSS_BODY_ARG##nr(__VA_ARGS__) \ + [sys_num] "ri" (__NR_##name) \ + : "ctpr1", "ctpr2", "ctpr3", \ + "b[0]", "b[1]", "b[2]", "b[3]", \ + "b[4]", "b[5]", "b[6]", "b[7]" \ + ); \ + LSS_RETURN(type, __res); + + #undef LSS_BODY + #define LSS_BODY(nr, type, name, args...) \ + _LSS_BODY(nr, type, name, ## args) + + #undef LSS_BODY_ASM0 + #undef LSS_BODY_ASM1 + #undef LSS_BODY_ASM2 + #undef LSS_BODY_ASM3 + #undef LSS_BODY_ASM4 + #undef LSS_BODY_ASM5 + #undef LSS_BODY_ASM6 + + #define LSS_BODY_ASM0 + #define LSS_BODY_ASM1 LSS_BODY_ASM0 \ + " addd, s 0x0, %[arg1], %%b[1]\n\t" + #define LSS_BODY_ASM2 LSS_BODY_ASM1 \ + " addd, s 0x0, %[arg2], %%b[2]\n\t" + #define LSS_BODY_ASM3 LSS_BODY_ASM2 \ + " addd, s 0x0, %[arg3], %%b[3]\n\t" + #define LSS_BODY_ASM4 LSS_BODY_ASM3 \ + " addd, s 0x0, %[arg4], %%b[4]\n\t" + #define LSS_BODY_ASM5 LSS_BODY_ASM4 \ + " addd, s 0x0, %[arg5], %%b[5]\n\t" + #define LSS_BODY_ASM6 LSS_BODY_ASM5 \ + "}\n\t" \ + "{\n\t" \ + " addd, s 0x0, %[arg6], %%b[6]\n\t" + + #undef LSS_SYSCALL_ARG + #define LSS_SYSCALL_ARG(a) ((unsigned long long)(uintptr_t)(a)) + + #undef LSS_BODY_ARG0 + #undef LSS_BODY_ARG1 + #undef LSS_BODY_ARG2 + #undef LSS_BODY_ARG3 + #undef LSS_BODY_ARG4 + #undef LSS_BODY_ARG5 + #undef LSS_BODY_ARG6 + + #define LSS_BODY_ARG0() + #define LSS_BODY_ARG1(_arg1) \ + [arg1] "ri" LSS_SYSCALL_ARG(_arg1), + #define LSS_BODY_ARG2(_arg1, _arg2) \ + LSS_BODY_ARG1(_arg1) \ + [arg2] "ri" LSS_SYSCALL_ARG(_arg2), + #define LSS_BODY_ARG3(_arg1, _arg2, _arg3) \ + LSS_BODY_ARG2(_arg1, _arg2) \ + [arg3] "ri" LSS_SYSCALL_ARG(_arg3), + #define LSS_BODY_ARG4(_arg1, _arg2, _arg3, _arg4) \ + LSS_BODY_ARG3(_arg1, _arg2, _arg3) \ + [arg4] "ri" LSS_SYSCALL_ARG(_arg4), + #define LSS_BODY_ARG5(_arg1, _arg2, _arg3, _arg4, _arg5) \ + LSS_BODY_ARG4(_arg1, _arg2, _arg3, _arg4) \ + [arg5] "ri" LSS_SYSCALL_ARG(_arg5), + #define LSS_BODY_ARG6(_arg1, _arg2, _arg3, _arg4, _arg5, _arg6) \ + LSS_BODY_ARG5(_arg1, _arg2, _arg3, _arg4, _arg5) \ + [arg6] "ri" LSS_SYSCALL_ARG(_arg6), + + #undef _syscall0 + #define _syscall0(type, name) \ + type LSS_NAME(name)(void) { \ + LSS_BODY(0, type, name); \ + } + + #undef _syscall1 + #define _syscall1(type, name, type1, arg1) \ + type LSS_NAME(name)(type1 arg1) { \ + LSS_BODY(1, type, name, arg1) \ + } + + #undef _syscall2 + #define _syscall2(type, name, type1, arg1, type2, arg2) \ + type LSS_NAME(name)(type1 arg1, type2 arg2) { \ + LSS_BODY(2, type, name, arg1, arg2) \ + } + + #undef _syscall3 + #define _syscall3(type, name, type1, arg1, type2, arg2, type3, arg3) \ + type LSS_NAME(name)(type1 arg1, type2 arg2, type3 arg3) { \ + LSS_BODY(3, type, name, arg1, arg2, arg3) \ + } + + #undef _syscall4 + #define _syscall4(type, name, type1, arg1, type2, arg2, type3, arg3, \ + type4, arg4) \ + type LSS_NAME(name)(type1 arg1, type2 arg2, type3 arg3, type4 arg4) { \ + LSS_BODY(4, type, name, arg1, arg2, arg3, arg4) \ + } + + #undef _syscall5 + #define _syscall5(type, name, type1, arg1, type2, arg2, type3, arg3, \ + type4, arg4, type5, arg5) \ + type LSS_NAME(name)(type1 arg1, type2 arg2, type3 arg3, type4 arg4, \ + type5 arg5) { \ + LSS_BODY(5, type, name, arg1, arg2, arg3, arg4, arg5) \ + } + + #undef _syscall6 + #define _syscall6(type, name, type1, arg1, type2, arg2, type3, arg3, \ + type4, arg4, type5, arg5, type6, arg6) \ + type LSS_NAME(name)(type1 arg1, type2 arg2, type3 arg3, type4 arg4, \ + type5 arg5, type6 arg6) { \ + LSS_BODY(6, type, name, arg1, arg2, arg3, arg4, arg5, arg6) \ + } + + LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack, + int flags, void *arg, int *parent_tidptr, + void *newtls, int *child_tidptr) { + unsigned long long __res; + + __asm__ __volatile__ ( + "{\n\t" + " addd,s 0x0, %[nr_clone], %%b[0]\n\t" + " addd,s 0x0, %[flags], %%db[1]\n\t" + " addd,s 0x0, %[child_stack], %%db[2]\n\t" + " addd,s 0x0, %[parent_tidptr], %%db[3]\n\t" + " addd,s 0x0, %[child_tidptr], %%db[4]\n\t" + " addd,s 0x0, %[newtls], %%db[5]\n\t" + "}\n\t" + /* if (fn == NULL) + * return -EINVAL; + */ + + "{\n\t" + " disp %%ctpr1, .L1\n\t" + "}\n\t" + "{\n\t" + " cmpesb,s 0x0, %[fn], %%pred0\n\t" + "}\n\t" + "{\n\t" + " ct %%ctpr1 ? %%pred0\n\t" + "}\n\t" + + /* if (child_stack == NULL) + * return -EINVAL; + */ + "{\n\t" + " cmpesb,s 0x0, %%db[2], %%pred0\n\t" + "}\n\t" + "{\n\t" + " ct %%ctpr1 ? %%pred0\n\t" + "}\n\t" + + /* b[0] = syscall(%b[0] = __NR_clone, + * %db[1] = flags, + * %db[2] = child_stack, + * %db[3] = parent_tidptr, + * %db[4] = child_tidptr, + * %db[5] = newtls) + */ + "{\n\t" + " sdisp %%ctpr1, 0x3\n\t" + "}\n\t" + "{\n\t" + " call %%ctpr1, wbs = %#\n\t" + "}\n\t" + + /* if (%[b0] != 0) + * return %b[0]; + */ + "{\n\t" + " disp %%ctpr1, .L2\n\t" + " cmpesb,s 0x0, %%b[0], %%pred0\n\t" + "}\n\t" + "{\n\t" + " ct %%ctpr1 ? ~%%pred0\n\t" + "}\n\t" + /* In the child, now. Call "fn(arg)". + */ + + "{\n\t" + " movtd,s %[fn], %%ctpr1\n\t" + "}\n\t" + "{\n\t" + " addd,s 0x0, %[arg], %%db[0]\n\t" + "}\n\t" + "{\n\t" + " call %%ctpr1, wbs = %#\n\t" + "}\n\t" + /* Call _exit(%b[0]). + */ + + "{\n\t" + " sdisp %%ctpr1, 0x3\n\t" + " addd,s 0x0, %%b[0], %%b[1]\n\t" + "}\n\t" + "{\n\t" + " addd,s 0x0, %[nr_exit], %%b[0]\n\t" + "}\n\t" + "{\n\t" + " call %%ctpr1, wbs = %#\n\t" + "}\n\t" + "{\n\t" + " disp %%ctpr1, .L2\n\t" + " adds,s 0x0, 0x0, %%b[0]\n\t" + "}\n\t" + "{\n\t" + " ct %%ctpr1\n\t" + "}\n\t" + ".L1:\n\t" + "{\n\t" + " addd,s 0x0, %[einval], %%b[0]\n\t" + "}\n\t" + ".L2:\n\t" + "{\n\t" + " addd,s 0x0, %%b[0], %[res]\n\t" + "}\n\t" + : [res] "=r" LSS_SYSCALL_ARG(__res) + : [nr_clone] "ri" LSS_SYSCALL_ARG(__NR_clone) + [arg] "ri" LSS_SYSCALL_ARG(arg) + [nr_exit] "ri" LSS_SYSCALL_ARG(__NR_exit) + [flags] "ri" LSS_SYSCALL_ARG(flags) + [child_stack] "ri" LSS_SYSCALL_ARG(child_stack) + [parent_tidptr] "ri" + LSS_SYSCALL_ARG(parent_tidptr) + [newtls] "ri" LSS_SYSCALL_ARG(newtls) + [child_tidptr] "ri" + LSS_SYSCALL_ARG(child_tidptr) + [fn] "ri" LSS_SYSCALL_ARG(fn) + [einval] "ri" LSS_SYSCALL_ARG(-EINVAL) + : "ctpr1", "b[0]", "b[1]", "b[2]", "b[3]", + "b[4]", "b[5]", "pred0"); + LSS_RETURN(int, __res); + } + #endif #define __NR__exit __NR_exit #define __NR__gettid __NR_gettid @@ -3391,9 +3715,10 @@ struct kernel_statfs { LSS_INLINE _syscall2(int, ftruncate, int, f, off_t, l) #endif - LSS_INLINE _syscall4(int, futex, int*, a, - int, o, int, v, - struct kernel_timespec*, t) + LSS_INLINE _syscall6(int, futex, int*, u, + int, o, int, v, + struct kernel_timespec*, t, + int*, u2, int, v2) LSS_INLINE _syscall3(int, getdents, int, f, struct kernel_dirent*, d, int, c) LSS_INLINE _syscall3(int, getdents64, int, f, @@ -3538,10 +3863,14 @@ struct kernel_statfs { LSS_INLINE _syscall1(int, sigreturn, unsigned long, u) #endif #if defined(__NR_stat) - // stat is polyfilled below when not available. + // stat and lstat are polyfilled below when not available. LSS_INLINE _syscall2(int, stat, const char*, f, struct kernel_stat*, b) #endif + #if defined(__NR_lstat) + LSS_INLINE _syscall2(int, lstat, const char*, f, + struct kernel_stat*, b) + #endif LSS_INLINE _syscall2(int, statfs, const char*, f, struct kernel_statfs*, b) LSS_INLINE _syscall3(int, tgkill, pid_t, p, @@ -3560,7 +3889,7 @@ struct kernel_statfs { LSS_INLINE _syscall3(long, getcpu, unsigned *, cpu, unsigned *, node, void *, unused) #endif - #if defined(__x86_64__) || \ + #if defined(__x86_64__) || defined(__e2k__) || \ (defined(__mips__) && _MIPS_SIM != _MIPS_SIM_ABI32) LSS_INLINE _syscall3(int, recvmsg, int, s, struct kernel_msghdr*, m, int, f) @@ -3650,6 +3979,10 @@ struct kernel_statfs { int, f, int, mode, loff_t, offset, loff_t, len) #endif #endif + #if defined(__NR_getrandom) + LSS_INLINE _syscall3(ssize_t, getrandom, void*, buffer, size_t, length, + unsigned int, flags) + #endif #if defined(__NR_newfstatat) LSS_INLINE _syscall4(int, newfstatat, int, d, const char *, p, @@ -3897,7 +4230,7 @@ struct kernel_statfs { defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) || \ (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) || \ defined(__PPC__) || \ - (defined(__s390__) && !defined(__s390x__)) + (defined(__s390__) && !defined(__s390x__)) || defined(__e2k__) #define __NR__sigaction __NR_sigaction #define __NR__sigpending __NR_sigpending #define __NR__sigsuspend __NR_sigsuspend @@ -4462,6 +4795,12 @@ struct kernel_statfs { return LSS_NAME(newfstatat)(AT_FDCWD, pathname, buf, 0); } #endif +#if !defined(__NR_lstat) + LSS_INLINE int LSS_NAME(lstat)(const char *pathname, + struct kernel_stat *buf) { + return LSS_NAME(newfstatat)(AT_FDCWD, pathname, buf, AT_SYMLINK_NOFOLLOW); + } +#endif #if !defined(__NR_waitpid) LSS_INLINE pid_t LSS_NAME(waitpid)(pid_t pid, int *status, int options) { @@ -4511,13 +4850,14 @@ struct kernel_statfs { # endif #endif -#ifdef __ANDROID__ - /* These restore the original values of these macros saved by the - * corresponding #pragma push_macro near the top of this file. */ -# pragma pop_macro("stat64") -# pragma pop_macro("fstat64") -# pragma pop_macro("lstat64") -#endif +/* These restore the original values of these macros saved by the + * corresponding #pragma push_macro near the top of this file. */ +#pragma pop_macro("stat64") +#pragma pop_macro("fstat64") +#pragma pop_macro("lstat64") +#pragma pop_macro("pread64") +#pragma pop_macro("pwrite64") +#pragma pop_macro("getdents64") #if defined(__cplusplus) && !defined(SYS_CPLUSPLUS) } diff --git a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/Makefile b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/Makefile index 5e37345f1..a6f1ec6a5 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/Makefile +++ b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/Makefile @@ -41,7 +41,11 @@ LDFLAGS += -static TESTS = \ fallocate \ + getrandom \ + lstat \ + sigaction \ sigtimedwait \ + stat \ unlink \ all: check @@ -55,7 +59,12 @@ all: check %_run: %_test @t=$(@:_run=_test); \ echo "./$$t"; \ - if ! env -i ./$$t; then \ + env -i ./$$t; \ + exit_status=$$?; \ + if [ $$exit_status = 77 ]; then \ + echo "SKIP: $$t"; \ + elif [ $$exit_status != 0 ]; then \ + echo "FAIL: $$t"; \ env -i strace -f -v ./$$t; \ echo "TRY: gdb -q -ex r -ex bt ./$$t"; \ exit 1; \ diff --git a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/fallocate.c b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/fallocate.c index c156e5898..f6589070f 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/fallocate.c +++ b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/fallocate.c @@ -63,5 +63,7 @@ int main(int argc, char *argv[]) { #endif assert(st.st_size == offset + len); + sys_unlink(filename); + return 0; } diff --git a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/getrandom.c b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/getrandom.c new file mode 100644 index 000000000..eb1f16228 --- /dev/null +++ b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/getrandom.c @@ -0,0 +1,59 @@ +/* Copyright 2020, 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. + */ + +#include "test_skel.h" + +#define BUFFER_SIZE 256 + +int main(int argc, char *argv[]) { + char buffer[BUFFER_SIZE]; + // Zero it out so we can check later that it's at least not all 0s. + memset(buffer, 0, BUFFER_SIZE); + bool buffer_contains_all_zeros = true; + + // Don't bother passing any flags. (If we're using lss, we might not have the + // right header files with the flags defined anyway, and we'd have to copy + // this in here too, and risk getting out of sync in yet another way.) + const ssize_t r = sys_getrandom(buffer, BUFFER_SIZE, 0); + + // Make sure it either worked, or that it's just not supported. + assert(r == BUFFER_SIZE || errno == ENOSYS); + + if (r == BUFFER_SIZE) { + // If all the bytes are 0, it didn't really work. + for (size_t i = 0; i < BUFFER_SIZE; ++i) { + if (buffer[i] != 0) { + buffer_contains_all_zeros = false; + } + } + assert(!buffer_contains_all_zeros); + } + + return 0; +} diff --git a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/lstat.c b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/lstat.c new file mode 100644 index 000000000..33848a981 --- /dev/null +++ b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/lstat.c @@ -0,0 +1,97 @@ +/* Copyright 2021, 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. + */ + +#include "test_skel.h" + +int main(int argc, char *argv[]) { + int exit_status = 0; + + // Get two unique paths to play with. + char foo[] = "tempfile.XXXXXX"; + char bar[] = "tempfile.XXXXXX"; + int fd_foo = mkstemp(foo); + int fd_bar = mkstemp(bar); + assert(fd_foo != -1); + assert(fd_bar != -1); + + // Then delete foo. + assert(sys_unlink(foo) == 0); + + // Now make foo a symlink to bar. + assert(symlink(bar, foo) == 0); + + // Make sure sys_stat() and sys_lstat() implementation return different + // information. + + // We need to check our stat syscalls for EOVERFLOW, as sometimes the integer + // types used in the stat structures are too small to fit the actual value. + // E.g. on some systems st_ino is 32-bit, but some filesystems have 64-bit + // inodes. + + struct kernel_stat lstat_info; + int rc = sys_lstat(foo, &lstat_info); + if (rc < 0 && errno == EOVERFLOW) { + // Bail out since we had an overflow in the stat structure. + exit_status = SKIP_TEST_EXIT_STATUS; + goto cleanup; + } + assert(rc == 0); + + struct kernel_stat stat_info; + rc = sys_stat(foo, &stat_info); + if (rc < 0 && errno == EOVERFLOW) { + // Bail out since we had an overflow in the stat structure. + exit_status = SKIP_TEST_EXIT_STATUS; + goto cleanup; + } + assert(rc == 0); + + struct kernel_stat bar_stat_info; + rc = sys_stat(bar, &bar_stat_info); + if (rc < 0 && errno == EOVERFLOW) { + // Bail out since we had an overflow in the stat structure. + exit_status = SKIP_TEST_EXIT_STATUS; + goto cleanup; + } + assert(rc == 0); + + // lstat should produce information about a symlink. + assert((lstat_info.st_mode & S_IFMT) == S_IFLNK); + + // stat-ing foo and bar should produce the same inode. + assert(stat_info.st_ino == bar_stat_info.st_ino); + + // lstat-ing foo should give a different inode than stat-ing foo. + assert(stat_info.st_ino != lstat_info.st_ino); + +cleanup: + sys_unlink(foo); + sys_unlink(bar); + return exit_status; +} diff --git a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/sigaction.c b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/sigaction.c new file mode 100644 index 000000000..f247aca7c --- /dev/null +++ b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/sigaction.c @@ -0,0 +1,54 @@ +/* Copyright 2020, 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. + */ + +#include "test_skel.h" + +void test_handler(int sig) {} + +int main(int argc, char *argv[]) { + const size_t kSigsetSize = sizeof(struct kernel_sigset_t); + struct kernel_sigaction action = {}; + // Invalid signal returns EINVAL. + assert(sys_rt_sigaction(SIGKILL, &action, NULL, kSigsetSize) == -1); + assert(errno == EINVAL); + + // Set an action. + action.sa_handler_ = test_handler; + action.sa_flags = SA_SIGINFO; + assert(sys_sigemptyset(&action.sa_mask) == 0); + assert(sys_sigaddset(&action.sa_mask, SIGPIPE) == 0); + assert(sys_rt_sigaction(SIGSEGV, &action, NULL, kSigsetSize) == 0); + + // Retrieve the action. + struct kernel_sigaction old_action = {}; + assert(sys_rt_sigaction(SIGSEGV, NULL, &old_action, kSigsetSize) == 0); + assert(memcmp(&action, &old_action, sizeof(action)) == 0); + + return 0; +} diff --git a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/stat.c b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/stat.c new file mode 100644 index 000000000..48cac620c --- /dev/null +++ b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/stat.c @@ -0,0 +1,67 @@ +/* Copyright 2021, 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. + */ + +#include "test_skel.h" + +int main(int argc, char *argv[]) { + int exit_status = 0; + + // Get two unique paths to play with. + char foo[] = "tempfile.XXXXXX"; + int fd_foo = mkstemp(foo); + assert(fd_foo != -1); + + // Make sure it exists. + assert(access(foo, F_OK) == 0); + + // Make sure sys_stat() and a libc stat() implementation return the same + // information. + struct stat libc_stat; + assert(stat(foo, &libc_stat) == 0); + + struct kernel_stat raw_stat; + // We need to check our stat syscall for EOVERFLOW, as sometimes the integer + // types used in the stat structures are too small to fit the actual value. + // E.g. on some systems st_ino is 32-bit, but some filesystems have 64-bit + // inodes. + int rc = sys_stat(foo, &raw_stat); + if (rc < 0 && errno == EOVERFLOW) { + // Bail out since we had an overflow in the stat structure. + exit_status = SKIP_TEST_EXIT_STATUS; + goto cleanup; + } + assert(rc == 0); + + assert(libc_stat.st_ino == raw_stat.st_ino); + + +cleanup: + sys_unlink(foo); + return exit_status; +} diff --git a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/test_skel.h b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/test_skel.h index 9ff0eb371..238c48d1d 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/test_skel.h +++ b/external_imported/sentry-native/external/crashpad/third_party/lss/lss/tests/test_skel.h @@ -44,9 +44,11 @@ #include #include #include +#include #include #include #include +#include #include #include #include @@ -57,6 +59,8 @@ #include "linux_syscall_support.h" +#define SKIP_TEST_EXIT_STATUS 77 + void assert_buffers_eq_len(const void *buf1, const void *buf2, size_t len) { const uint8_t *u8_1 = (const uint8_t *)buf1; const uint8_t *u8_2 = (const uint8_t *)buf2; diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/CMakeLists.txt b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/CMakeLists.txt index 342b7aa3d..4577c1d12 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/CMakeLists.txt +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/CMakeLists.txt @@ -24,7 +24,6 @@ mc_append_sources( files/scoped_file.cc files/scoped_file.h format_macros.h - ignore_result.h logging.cc logging.h memory/free_deleter.h diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/build/chromeos_buildflags.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/build/chromeos_buildflags.h index c54f07684..72714a24a 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/build/chromeos_buildflags.h +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/build/chromeos_buildflags.h @@ -7,7 +7,7 @@ #include "build/buildflag.h" -#define BUILDFLAG_INTERNAL_IS_CHROMEOS_LACROS() (0) -#define BUILDFLAG_INTERNAL_IS_CHROMEOS_ASH() (0) +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_CHROMEOS_LACROS() (0) +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_CHROMEOS_ASH() (0) #endif // MINI_CHROMIUM_BUILD_CHROMEOS_BUILDFLAGS_H_ diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/.style.yapf b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/.style.yapf new file mode 100644 index 000000000..c9970ee73 --- /dev/null +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/.style.yapf @@ -0,0 +1,7 @@ +# Copyright 2022 The Crashpad Authors. All rights reserved. +# +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +[style] +based_on_style = google diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/BUILD.gn b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/BUILD.gn index bcd327a8a..bd3663841 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/BUILD.gn +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/BUILD.gn @@ -23,7 +23,6 @@ static_library("base") { "files/scoped_file.cc", "files/scoped_file.h", "format_macros.h", - "ignore_result.h", "logging.cc", "logging.h", "memory/free_deleter.h", diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/atomicops.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/atomicops.h index 422d16917..b6058e550 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/atomicops.h +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/atomicops.h @@ -38,7 +38,7 @@ #include "build/build_config.h" -#if defined(OS_WIN) && defined(ARCH_CPU_64_BITS) +#if BUILDFLAG(IS_WIN) && defined(ARCH_CPU_64_BITS) // windows.h #defines this (only on x64). This causes problems because the // public API also uses MemoryBarrier at the public name for this fence. So, on // X64, undef it, and call its documented @@ -54,9 +54,7 @@ typedef int32_t Atomic32; #ifdef ARCH_CPU_64_BITS // We need to be able to go between Atomic64 and AtomicWord implicitly. This // means Atomic64 and AtomicWord should be the same type on 64-bit. -#if defined(__ILP32__) || defined(OS_NACL) -// NaCl's intptr_t is not actually 64-bits on 64-bit! -// http://code.google.com/p/nativeclient/issues/detail?id=1162 +#if defined(__ILP32__) typedef int64_t Atomic64; #else typedef intptr_t Atomic64; @@ -173,7 +171,7 @@ extern struct AtomicOps_x86CPUFeatureStruct AtomicOps_Internalx86CPUFeatures; // On some platforms we need additional declarations to make // AtomicWord compatible with our other Atomic* types. -#if defined(OS_APPLE) || defined(OS_OPENBSD) +#if BUILDFLAG(IS_APPLE) #include "base/atomicops_internals_atomicword_compat.h" #endif diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/compiler_specific.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/compiler_specific.h index 25e65b954..b1c83c953 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/compiler_specific.h +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/compiler_specific.h @@ -7,23 +7,6 @@ #include "build/build_config.h" -// Annotate a variable indicating it's ok if the variable is not used. -// (Typically used to silence a compiler warning when the assignment -// is important for some other reason.) -// Use like: -// int x = ...; -// ALLOW_UNUSED_LOCAL(x); -#define ALLOW_UNUSED_LOCAL(x) false ? (void)x : (void)0 - -// Annotate a typedef or function indicating it's ok if it's not used. -// Use like: -// typedef Foo Bar ALLOW_UNUSED_TYPE; -#if defined(COMPILER_GCC) -#define ALLOW_UNUSED_TYPE __attribute__((unused)) -#else -#define ALLOW_UNUSED_TYPE -#endif - // Specify memory alignment for structs, classes, etc. // Use like: // class ALIGNAS(16) MyClass { ... } @@ -34,12 +17,6 @@ #define ALIGNAS(byte_alignment) __attribute__((aligned(byte_alignment))) #endif -#if defined(COMPILER_MSVC) -#define WARN_UNUSED_RESULT -#else -#define WARN_UNUSED_RESULT __attribute__((warn_unused_result)) -#endif - #if defined(COMPILER_MSVC) #define PRINTF_FORMAT(format_param, dots_param) #else @@ -58,7 +35,7 @@ #endif // DISABLE_CFI_ICALL -- Disable Control Flow Integrity indirect call checks. -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) // Windows also needs __declspec(guard(nocf)). #define DISABLE_CFI_ICALL NO_SANITIZE("cfi-icall") __declspec(guard(nocf)) #else @@ -73,13 +50,4 @@ #define HAS_FEATURE(FEATURE) 0 #endif -// Macro for telling -Wimplicit-fallthrough that a fallthrough is intentional. -#if __cplusplus >= 201703L // C++17 -#define FALLTHROUGH [[fallthrough]] -#elif defined(__clang__) -#define FALLTHROUGH [[clang::fallthrough]] -#else -#define FALLTHROUGH -#endif - #endif // MINI_CHROMIUM_BASE_COMPILER_SPECIFIC_H_ diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/files/file_path.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/files/file_path.h index 0ac91bf87..216c396e8 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/files/file_path.h +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/files/file_path.h @@ -107,17 +107,16 @@ #include #include -#include "base/compiler_specific.h" #include "build/build_config.h" // Windows-style drive letter support and pathname separator characters can be // enabled and disabled independently, to aid testing. These #defines are // here so that the same setting can be used in both the implementation and // in the unit test. -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) #define FILE_PATH_USES_DRIVE_LETTERS #define FILE_PATH_USES_WIN_SEPARATORS -#endif // OS_WIN +#endif // BUILDFLAG(IS_WIN) namespace base { @@ -125,16 +124,16 @@ namespace base { // pathnames on different platforms. class FilePath { public: -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) // On most platforms, native pathnames are char arrays, and the encoding // may or may not be specified. On Mac OS X, native pathnames are encoded // in UTF-8. typedef std::string StringType; -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) // On Windows, for Unicode-aware applications, native pathnames are wchar_t // arrays encoded in UTF-16. typedef std::wstring StringType; -#endif // OS_WIN +#endif // BUILDFLAG(IS_WIN) typedef StringType::value_type CharType; @@ -182,21 +181,21 @@ class FilePath { // only contains one component, returns a FilePath identifying // kCurrentDirectory. If this object already refers to the root directory, // returns a FilePath identifying the root directory. - FilePath DirName() const WARN_UNUSED_RESULT; + [[nodiscard]] FilePath DirName() const; // Returns a FilePath corresponding to the last path component of this // object, either a file or a directory. If this object already refers to // the root directory, returns a FilePath identifying the root directory; // this is the only situation in which BaseName will return an absolute path. - FilePath BaseName() const WARN_UNUSED_RESULT; + [[nodiscard]] FilePath BaseName() const; // Returns the path's file extension. This does not have a special case for // common double extensions, so FinalExtension() of "foo.tar.gz" is simply // ".gz". If there is no extension, "" will be returned. - StringType FinalExtension() const WARN_UNUSED_RESULT; + [[nodiscard]] StringType FinalExtension() const; // Returns a FilePath with FinalExtension() removed. - FilePath RemoveFinalExtension() const WARN_UNUSED_RESULT; + [[nodiscard]] FilePath RemoveFinalExtension() const; // Returns a FilePath by appending a separator and the supplied path // component to this object's path. Append takes care to avoid adding @@ -204,8 +203,8 @@ class FilePath { // If this object's path is kCurrentDirectory, a new FilePath corresponding // only to |component| is returned. |component| must be a relative path; // it is an error to pass an absolute path. - FilePath Append(const StringType& component) const WARN_UNUSED_RESULT; - FilePath Append(const FilePath& component) const WARN_UNUSED_RESULT; + [[nodiscard]] FilePath Append(const StringType& component) const; + [[nodiscard]] FilePath Append(const FilePath& component) const; // Returns true if this FilePath contains an absolute path. On Windows, an // absolute path begins with either a drive letter specification followed by @@ -231,14 +230,14 @@ extern void PrintTo(const base::FilePath& path, std::ostream* out); // Macros for string literal initialization of FilePath::CharType[], and for // using a FilePath::CharType[] in a printf-style format string. -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) #define FILE_PATH_LITERAL(x) x #define PRFilePath "s" #define PRFilePathLiteral "%s" -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) #define FILE_PATH_LITERAL(x) L ## x #define PRFilePath "ls" #define PRFilePathLiteral L"%ls" -#endif // OS_WIN +#endif // BUILDFLAG(IS_WIN) #endif // MINI_CHROMIUM_BASE_FILES_FILE_PATH_H_ diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/files/file_util.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/files/file_util.h index 312525176..95906af3d 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/files/file_util.h +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/files/file_util.h @@ -7,7 +7,7 @@ #include "build/build_config.h" -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) #include @@ -17,6 +17,6 @@ bool ReadFromFD(int fd, char* buffer, size_t bytes); } // namespace base -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) #endif // MINI_CHROMIUM_BASE_FILES_FILE_UTIL_H_ diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/files/scoped_file.cc b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/files/scoped_file.cc index e7aa07011..215407d9a 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/files/scoped_file.cc +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/files/scoped_file.cc @@ -8,7 +8,7 @@ #include "base/logging.h" -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) #include #include "base/posix/eintr_wrapper.h" #endif @@ -16,11 +16,11 @@ namespace base { namespace internal { -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) void ScopedFDCloseTraits::Free(int fd) { PCHECK(IGNORE_EINTR(close(fd)) == 0); } -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) void ScopedFILECloser::operator()(FILE* file) const { if (file) { diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/files/scoped_file.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/files/scoped_file.h index 462f56138..a0cc882bf 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/files/scoped_file.h +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/files/scoped_file.h @@ -16,14 +16,14 @@ namespace base { namespace internal { -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) struct ScopedFDCloseTraits { static int InvalidValue() { return -1; } static void Free(int fd); }; -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) struct ScopedFILECloser { void operator()(FILE* file) const; @@ -31,9 +31,9 @@ struct ScopedFILECloser { } // namespace internal -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) typedef ScopedGeneric ScopedFD; -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) typedef std::unique_ptr ScopedFILE; } // namespace base diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/format_macros.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/format_macros.h index 1ceb0dd31..30459f7c7 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/format_macros.h +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/format_macros.h @@ -23,7 +23,7 @@ #include "build/build_config.h" -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) #if (defined(_INTTYPES_H) || defined(_INTTYPES_H_)) && !defined(PRId64) #error "inttypes.h has already been included before this header file, but " @@ -50,7 +50,7 @@ // architectures and Apple does not provides standard format macros and // recommends casting. This has many drawbacks, so instead define macros // for formatting those types. -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) #if defined(ARCH_CPU_64_BITS) #if !defined(PRIdNS) #define PRIdNS "ld" @@ -72,9 +72,9 @@ #define PRIxNS "x" #endif #endif -#endif // defined(OS_APPLE) +#endif // BUILDFLAG(IS_APPLE) -#else // OS_WIN +#else // BUILDFLAG(IS_WIN) #if !defined(PRId64) #define PRId64 "I64d" diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/ignore_result.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/ignore_result.h deleted file mode 100644 index 3cc2f377a..000000000 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/ignore_result.h +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright 2006-2008 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef MINI_CHROMIUM_BASE_IGNORE_RESULT_H_ -#define MINI_CHROMIUM_BASE_IGNORE_RESULT_H_ - -#include -#include - -template -inline void ignore_result(const T&) {} - -#endif // MINI_CHROMIUM_BASE_IGNORE_RESULT_H_ diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/logging.cc b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/logging.cc index 61d62e064..38c947feb 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/logging.cc +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/logging.cc @@ -10,28 +10,28 @@ #include #include -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) #include #include #include #include #include "base/posix/safe_strerror.h" -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) // In macOS 10.12 and iOS 10.0 and later ASL (Apple System Log) was deprecated // in favor of OS_LOG (Unified Logging). #include -#if defined(OS_IOS) +#if BUILDFLAG(IS_IOS) #if !defined(__IPHONE_10_0) || __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_10_0 #define USE_ASL #endif -#else // !defined(OS_IOS) +#else // !BUILDFLAG(IS_IOS) #if !defined(MAC_OS_X_VERSION_10_12) || \ MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_12 #define USE_ASL #endif -#endif // defined(OS_IOS) +#endif // BUILDFLAG(IS_IOS) #if defined(USE_ASL) #include @@ -42,15 +42,15 @@ #include #include -#elif defined(OS_LINUX) +#elif BUILDFLAG(IS_LINUX) #include #include -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) #include #include -#elif defined(OS_ANDROID) +#elif BUILDFLAG(IS_ANDROID) #include -#elif defined(OS_FUCHSIA) +#elif BUILDFLAG(IS_FUCHSIA) #include #endif @@ -92,7 +92,7 @@ LogMessageHandlerFunction GetLogMessageHandler() { return g_log_message_handler; } -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) std::string SystemErrorCodeToString(unsigned long error_code) { wchar_t msgbuf[256]; DWORD flags = FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS | @@ -117,7 +117,7 @@ std::string SystemErrorCodeToString(unsigned long error_code) { GetLastError(), error_code); } -#endif // OS_WIN +#endif // BUILDFLAG(IS_WIN) LogMessage::LogMessage(const char* function, const char* file_path, @@ -161,7 +161,7 @@ LogMessage::~LogMessage() { } if ((g_logging_destination & LOG_TO_SYSTEM_DEBUG_LOG) != 0) { -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) const bool log_to_system = []() { struct stat stderr_stat; if (fstat(fileno(stderr), &stderr_stat) == -1) { @@ -316,9 +316,9 @@ LogMessage::~LogMessage() { log.get(), os_log_type, "%{public}s", str_newline.c_str()); #endif } -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) OutputDebugString(base::UTF8ToWide(str_newline).c_str()); -#elif defined(OS_ANDROID) +#elif BUILDFLAG(IS_ANDROID) android_LogPriority priority = (severity_ < 0) ? ANDROID_LOG_VERBOSE : ANDROID_LOG_UNKNOWN; switch (severity_) { @@ -337,35 +337,38 @@ LogMessage::~LogMessage() { } // The Android system may truncate the string if it's too long. __android_log_write(priority, "chromium", str_newline.c_str()); -#elif defined(OS_FUCHSIA) - fx_log_severity_t fx_severity; - switch (severity_) { - case LOG_INFO: - fx_severity = FX_LOG_INFO; - break; - case LOG_WARNING: - fx_severity = FX_LOG_WARNING; - break; - case LOG_ERROR: - fx_severity = FX_LOG_ERROR; - break; - case LOG_FATAL: - fx_severity = FX_LOG_FATAL; - break; - default: - fx_severity = FX_LOG_INFO; - break; - } - // Temporarily remove the trailing newline from |str_newline|'s C-string - // representation, since fx_logger will add a newline of its own. - str_newline.pop_back(); - // Ideally the tag would be the same as the caller, but this is not supported - // right now. - fx_logger_log_with_source(fx_log_get_logger(), fx_severity, /*tag=*/nullptr, - file_path_, line_, - str_newline.c_str() + message_start_); - str_newline.push_back('\n'); -#endif // OS_* +#elif BUILDFLAG(IS_FUCHSIA) + fx_log_severity_t fx_severity; + switch (severity_) { + case LOG_INFO: + fx_severity = FX_LOG_INFO; + break; + case LOG_WARNING: + fx_severity = FX_LOG_WARNING; + break; + case LOG_ERROR: + fx_severity = FX_LOG_ERROR; + break; + case LOG_FATAL: + fx_severity = FX_LOG_FATAL; + break; + default: + fx_severity = FX_LOG_INFO; + break; + } + // Temporarily remove the trailing newline from |str_newline|'s C-string + // representation, since fx_logger will add a newline of its own. + str_newline.pop_back(); + // Ideally the tag would be the same as the caller, but this is not + // supported right now. + fx_logger_log_with_source(fx_log_get_logger(), + fx_severity, + /*tag=*/nullptr, + file_path_, + line_, + str_newline.c_str() + message_start_); + str_newline.push_back('\n'); +#endif // BUILDFLAG(IS_*) } if (severity_ == LOG_FATAL) { @@ -392,7 +395,7 @@ LogMessage::~LogMessage() { void LogMessage::Init(const char* function) { std::string file_name(file_path_); -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) size_t last_slash = file_name.find_last_of("\\/"); #else size_t last_slash = file_name.find_last_of('/'); @@ -401,26 +404,26 @@ void LogMessage::Init(const char* function) { file_name.assign(file_name.substr(last_slash + 1)); } -#if defined(OS_POSIX) && !defined(OS_FUCHSIA) +#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_FUCHSIA) pid_t pid = getpid(); -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) DWORD pid = GetCurrentProcessId(); #endif -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) uint64_t thread; pthread_threadid_np(pthread_self(), &thread); -#elif defined(OS_ANDROID) +#elif BUILDFLAG(IS_ANDROID) pid_t thread = gettid(); -#elif defined(OS_LINUX) +#elif BUILDFLAG(IS_LINUX) pid_t thread = static_cast(syscall(__NR_gettid)); -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) DWORD thread = GetCurrentThreadId(); #endif // On Fuchsia, the platform is responsible for adding the process id and // thread id, not the process itself. -#if !defined(OS_FUCHSIA) +#if !BUILDFLAG(IS_FUCHSIA) stream_ << '[' << pid << ':' @@ -431,7 +434,7 @@ void LogMessage::Init(const char* function) { // On Fuchsia, the platform is responsible for adding the log timestamp, // not the process itself. -#if defined(OS_POSIX) && !defined(OS_FUCHSIA) +#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_FUCHSIA) timeval tv; gettimeofday(&tv, nullptr); tm local_time; @@ -446,7 +449,7 @@ void LogMessage::Init(const char* function) { << '.' << std::setw(6) << tv.tv_usec << ':'; -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) SYSTEMTIME local_time; GetLocalTime(&local_time); stream_ << std::setw(4) << local_time.wYear @@ -465,7 +468,7 @@ void LogMessage::Init(const char* function) { // number when LOG_TO_SYSTEM_DEBUG_LOG is enabled, but not on // LOG_TO_STDERR so if LOG_TO_STDERR is enabled, print them here with // potentially repetition if LOG_TO_SYSTEM_DEBUG_LOG is also enabled. -#if defined(OS_FUCHSIA) +#if BUILDFLAG(IS_FUCHSIA) if ((g_logging_destination & LOG_TO_STDERR)) { #endif if (severity_ >= 0) { @@ -479,14 +482,14 @@ void LogMessage::Init(const char* function) { << ':' << line_ << "] "; -#if defined(OS_FUCHSIA) +#if BUILDFLAG(IS_FUCHSIA) } #endif message_start_ = stream_.str().size(); } -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) unsigned long GetLastSystemErrorCode() { return GetLastError(); @@ -504,7 +507,7 @@ Win32ErrorLogMessage::~Win32ErrorLogMessage() { stream() << ": " << SystemErrorCodeToString(err_); } -#elif defined(OS_POSIX) +#elif BUILDFLAG(IS_POSIX) ErrnoLogMessage::ErrnoLogMessage(const char* function, const char* file_path, @@ -523,7 +526,7 @@ ErrnoLogMessage::~ErrnoLogMessage() { << ")"; } -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) } // namespace logging diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/logging.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/logging.h index d93ef3a35..a12353578 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/logging.h +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/logging.h @@ -34,11 +34,11 @@ enum : LoggingDestination { LOG_TO_ALL = LOG_TO_FILE | LOG_TO_SYSTEM_DEBUG_LOG | LOG_TO_STDERR, -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) LOG_DEFAULT = LOG_TO_FILE, -#elif defined(OS_FUCHSIA) +#elif BUILDFLAG(IS_FUCHSIA) LOG_DEFAULT = LOG_TO_SYSTEM_DEBUG_LOG, -#elif defined(OS_POSIX) +#elif BUILDFLAG(IS_POSIX) LOG_DEFAULT = LOG_TO_SYSTEM_DEBUG_LOG | LOG_TO_STDERR, #endif }; @@ -84,12 +84,12 @@ static inline int GetVlogLevel(const char*) { return std::numeric_limits::max(); } -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) // This is just ::GetLastError, but out-of-line to avoid including windows.h in // such a widely used place. unsigned long GetLastSystemErrorCode(); std::string SystemErrorCodeToString(unsigned long error_code); -#elif defined(OS_POSIX) +#elif BUILDFLAG(IS_POSIX) static inline int GetLastSystemErrorCode() { return errno; } @@ -130,7 +130,7 @@ class LogMessageVoidify { void operator&(const std::ostream&) const {} }; -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) class Win32ErrorLogMessage : public LogMessage { public: Win32ErrorLogMessage(const char* function, @@ -147,7 +147,7 @@ class Win32ErrorLogMessage : public LogMessage { private: unsigned long err_; }; -#elif defined(OS_POSIX) +#elif BUILDFLAG(IS_POSIX) class ErrnoLogMessage : public LogMessage { public: ErrnoLogMessage(const char* function, @@ -206,7 +206,7 @@ class ErrnoLogMessage : public LogMessage { #define COMPACT_GOOGLE_LOG_DFATAL \ COMPACT_GOOGLE_LOG_EX_DFATAL(LogMessage) -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) // wingdi.h defines ERROR 0. We don't want to include windows.h here, and we // want to allow "LOG(ERROR)", which will expand to LOG_0. @@ -222,7 +222,7 @@ namespace logging { const LogSeverity LOG_0 = LOG_ERROR; } // namespace logging -#endif // OS_WIN +#endif // BUILDFLAG(IS_WIN) #define LAZY_STREAM(stream, condition) \ !(condition) ? (void) 0 : ::logging::LogMessageVoidify() & (stream) @@ -237,14 +237,14 @@ const LogSeverity LOG_0 = LOG_ERROR; logging::LogMessage(FUNCTION_SIGNATURE, __FILE__, __LINE__, \ -verbose_level).stream() -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) #define PLOG_STREAM(severity) COMPACT_GOOGLE_LOG_EX_ ## severity( \ Win32ErrorLogMessage, ::logging::GetLastSystemErrorCode()).stream() #define VPLOG_STREAM(verbose_level) \ logging::Win32ErrorLogMessage(FUNCTION_SIGNATURE, __FILE__, __LINE__, \ -verbose_level, \ ::logging::GetLastSystemErrorCode()).stream() -#elif defined(OS_POSIX) +#elif BUILDFLAG(IS_POSIX) #define PLOG_STREAM(severity) COMPACT_GOOGLE_LOG_EX_ ## severity( \ ErrnoLogMessage, ::logging::GetLastSystemErrorCode()).stream() #define VPLOG_STREAM(verbose_level) \ diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/foundation_util.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/foundation_util.h index f22cf0ae9..ee9deafbd 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/foundation_util.h +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/foundation_util.h @@ -8,7 +8,7 @@ #include "base/logging.h" #include "build/build_config.h" -#if defined(OS_IOS) +#if BUILDFLAG(IS_IOS) #include #else #include @@ -134,7 +134,7 @@ CF_CAST_DECL(CGColor); CF_CAST_DECL(CTFont); CF_CAST_DECL(CTRun); -#if !defined(OS_IOS) +#if !BUILDFLAG(IS_IOS) CF_CAST_DECL(SecACL); CF_CAST_DECL(SecTrustedApplication); #endif diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/foundation_util.mm b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/foundation_util.mm index 790a25ae6..1e86235ef 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/foundation_util.mm +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/foundation_util.mm @@ -4,7 +4,7 @@ #include "base/mac/foundation_util.h" -#if !defined(OS_IOS) +#if !BUILDFLAG(IS_IOS) extern "C" { CFTypeID SecACLGetTypeID(); CFTypeID SecTrustedApplicationGetTypeID(); @@ -105,7 +105,7 @@ CF_CAST_DEFN(CTFont) CF_CAST_DEFN(CTRun) -#if !defined(OS_IOS) +#if !BUILDFLAG(IS_IOS) CF_CAST_DEFN(SecACL) CF_CAST_DEFN(SecTrustedApplication) #endif diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/mach_logging.cc b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/mach_logging.cc index 0411e3070..d3008e63f 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/mach_logging.cc +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/mach_logging.cc @@ -9,9 +9,9 @@ #include "base/strings/stringprintf.h" -#if !defined(OS_IOS) +#if !BUILDFLAG(IS_IOS) #include -#endif // !OS_IOS +#endif // !BUILDFLAG(IS_IOS) namespace { @@ -44,7 +44,7 @@ MachLogMessage::~MachLogMessage() { << FormatMachErrorNumber(mach_err_); } -#if !defined(OS_IOS) +#if !BUILDFLAG(IS_IOS) BootstrapLogMessage::BootstrapLogMessage(const char* function, const char* file_path, @@ -84,6 +84,6 @@ BootstrapLogMessage::~BootstrapLogMessage() { } } -#endif // !OS_IOS +#endif // !BUILDFLAG(IS_IOS) } // namespace logging diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/mach_logging.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/mach_logging.h index 20c2bb988..94322c496 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/mach_logging.h +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/mach_logging.h @@ -91,7 +91,7 @@ class MachLogMessage : public logging::LogMessage { DCHECK_IS_ON && !(condition)) \ << "Check failed: " # condition << ". " -#if !defined(OS_IOS) +#if !BUILDFLAG(IS_IOS) namespace logging { @@ -158,6 +158,6 @@ class BootstrapLogMessage : public logging::LogMessage { DCHECK_IS_ON && !(condition)) \ << "Check failed: " # condition << ". " -#endif // !OS_IOS +#endif // !BUILDFLAG(IS_IOS) #endif // MINI_CHROMIUM_BASE_MAC_MACH_LOGGING_H_ diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_nsautorelease_pool.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_nsautorelease_pool.h index 811d7ff88..634c2f7de 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_nsautorelease_pool.h +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_nsautorelease_pool.h @@ -7,13 +7,13 @@ #include "build/build_config.h" -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) #if defined(__OBJC__) @class NSAutoreleasePool; #else // __OBJC__ class NSAutoreleasePool; #endif // __OBJC__ -#endif // OS_APPLE +#endif // BUILDFLAG(IS_APPLE) namespace base { namespace mac { @@ -28,10 +28,10 @@ namespace mac { // ugly #ifdefs. class ScopedNSAutoreleasePool { public: -#if !defined(OS_APPLE) +#if !BUILDFLAG(IS_APPLE) ScopedNSAutoreleasePool() {} void Recycle() { } -#else // OS_APPLE +#else // BUILDFLAG(IS_APPLE) ScopedNSAutoreleasePool(); ScopedNSAutoreleasePool(const ScopedNSAutoreleasePool&) = delete; @@ -46,7 +46,7 @@ class ScopedNSAutoreleasePool { void Recycle(); private: NSAutoreleasePool* autorelease_pool_; -#endif // OS_APPLE +#endif // BUILDFLAG(IS_APPLE) }; } // namespace mac diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_typeref.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_typeref.h index 9f00b1a21..196451839 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_typeref.h +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/mac/scoped_typeref.h @@ -5,7 +5,6 @@ #ifndef MINI_CHROMIUM_BASE_MAC_SCOPED_TYPEREF_H_ #define MINI_CHROMIUM_BASE_MAC_SCOPED_TYPEREF_H_ -#include "base/compiler_specific.h" #include "base/logging.h" #include "base/memory/scoped_policy.h" @@ -42,7 +41,7 @@ class ScopedTypeRef { return *this; } - T* InitializeInto() WARN_UNUSED_RESULT { + [[nodiscard]] T* InitializeInto() { DCHECK(!object_); return &object_; } @@ -71,7 +70,7 @@ class ScopedTypeRef { object_ = temp; } - T release() WARN_UNUSED_RESULT { + [[nodiscard]] T release() { T temp = object_; object_ = Traits::InvalidValue(); return temp; diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/checked_math.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/checked_math.h index 6b918c427..9eefced22 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/checked_math.h +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/numerics/checked_math.h @@ -61,13 +61,7 @@ class CheckedNumeric { // and is within the range supported by the destination type. Returns true if // successful and false otherwise. template -#if defined(__clang__) || defined(__GNUC__) - __attribute__((warn_unused_result)) -#elif defined(_MSC_VER) - _Check_return_ -#endif - constexpr bool - AssignIfValid(Dst* result) const { + [[nodiscard]] constexpr bool AssignIfValid(Dst* result) const { return BASE_NUMERICS_LIKELY(IsValid()) ? ((*result = static_cast(state_.value())), true) : false; diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/posix/eintr_wrapper.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/posix/eintr_wrapper.h index 3b1d6d3f6..e6e19f6b3 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/posix/eintr_wrapper.h +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/posix/eintr_wrapper.h @@ -13,7 +13,7 @@ #include "build/build_config.h" // On Fuchsia, these wrapper macros do nothing because there are no signals. -#if defined(OS_POSIX) && !defined(OS_FUCHSIA) +#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_FUCHSIA) #include @@ -41,6 +41,6 @@ #define HANDLE_EINTR(x) (x) #define IGNORE_EINTR(x) (x) -#endif // OS_POSIX && !OS_FUCHSIA +#endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_FUCHSIA) #endif // MINI_CHROMIUM_BASE_POSIX_EINTR_WRAPPER_H_ diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/posix/safe_strerror.cc b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/posix/safe_strerror.cc index f39495c63..012966c59 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/posix/safe_strerror.cc +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/posix/safe_strerror.cc @@ -11,7 +11,7 @@ #include "base/cxx17_backports.h" #include "build/build_config.h" -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) #include #endif @@ -19,7 +19,7 @@ namespace base { void safe_strerror_r(int err, char* buf, size_t len) { #if defined(__GLIBC__) || \ - (defined(OS_ANDROID) && defined(_GNU_SOURCE) && __ANDROID_API__ >= 23) + (BUILDFLAG(IS_ANDROID) && defined(_GNU_SOURCE) && __ANDROID_API__ >= 23) char* ret = strerror_r(err, buf, len); if (ret != buf) { snprintf(buf, len, "%s", ret); diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/process/memory.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/process/memory.h index fca87456c..88799af0b 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/process/memory.h +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/process/memory.h @@ -7,15 +7,12 @@ #include -#include "base/compiler_specific.h" - namespace base { // Special allocator function for callers that want to check for OOM. // On success, *result will contain a pointer that should be dallocated with // free(). -WARN_UNUSED_RESULT bool UncheckedMalloc(size_t size, - void** result); +[[nodiscard]] bool UncheckedMalloc(size_t size, void** result); } // namespace base diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/rand_util.cc b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/rand_util.cc index ae5cdbfb1..9f4196d16 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/rand_util.cc +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/rand_util.cc @@ -15,12 +15,12 @@ #include "base/logging.h" #include "build/build_config.h" -#if defined(OS_FUCHSIA) +#if BUILDFLAG(IS_FUCHSIA) #include #include "base/fuchsia/fuchsia_logging.h" -#elif defined(OS_POSIX) +#elif BUILDFLAG(IS_POSIX) #include "base/posix/eintr_wrapper.h" -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) #include // #define needed to link in RtlGenRandom(), a.k.a. SystemFunction036. See the @@ -30,9 +30,9 @@ #include #undef SystemFunction036 -#endif // OS_WIN +#endif // BUILDFLAG(IS_WIN) -#if defined(OS_POSIX) && !defined(OS_FUCHSIA) +#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_FUCHSIA) namespace { @@ -49,7 +49,7 @@ int GetUrandomFD() { } // namespace -#endif // OS_POSIX && !OS_FUCHSIA +#endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_FUCHSIA) namespace base { @@ -109,13 +109,13 @@ void RandBytes(void* output, size_t output_length) { return; } -#if defined(OS_FUCHSIA) +#if BUILDFLAG(IS_FUCHSIA) zx_cprng_draw(output, output_length); -#elif defined(OS_POSIX) +#elif BUILDFLAG(IS_POSIX) int fd = GetUrandomFD(); bool success = ReadFromFD(fd, static_cast(output), output_length); CHECK(success); -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) char* output_ptr = static_cast(output); while (output_length > 0) { const ULONG output_bytes_this_pass = static_cast(std::min( diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/scoped_clear_last_error.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/scoped_clear_last_error.h index acc256844..85f59df75 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/scoped_clear_last_error.h +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/scoped_clear_last_error.h @@ -24,7 +24,7 @@ class ScopedClearLastErrorBase { const int last_errno_; }; -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) class ScopedClearLastError : public ScopedClearLastErrorBase { public: @@ -39,11 +39,11 @@ class ScopedClearLastError : public ScopedClearLastErrorBase { const unsigned long last_system_error_; }; -#elif defined(OS_POSIX) || defined(OS_FUCHSIA) +#elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) using ScopedClearLastError = ScopedClearLastErrorBase; -#endif // defined(OS_WIN) +#endif // BUILDFLAG(IS_WIN) } // namespace base diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/scoped_generic.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/scoped_generic.h index 062ae1b47..d3a6dfd13 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/scoped_generic.h +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/scoped_generic.h @@ -9,8 +9,6 @@ #include -#include "base/compiler_specific.h" - namespace base { template @@ -63,7 +61,7 @@ class ScopedGeneric { swap(data_.generic, other.data_.generic); } - element_type release() WARN_UNUSED_RESULT { + [[nodiscard]] element_type release() { element_type old_generic = data_.generic; data_.generic = traits_type::InvalidValue(); return old_generic; diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_util.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_util.h index 80dd87964..bfb02acd0 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_util.h +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/string_util.h @@ -7,6 +7,7 @@ #include "base/compiler_specific.h" #include "base/logging.h" +#include "build/build_config.h" namespace base { @@ -18,9 +19,9 @@ size_t wcslcpy(wchar_t* dst, const wchar_t* src, size_t dst_size); } // namespace base -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) #include "base/strings/string_util_win.h" -#elif defined(OS_POSIX) +#elif BUILDFLAG(IS_POSIX) #include "base/strings/string_util_posix.h" #endif diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/stringprintf.cc b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/stringprintf.cc index 627ccb527..684f3e7ab 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/stringprintf.cc +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/stringprintf.cc @@ -12,6 +12,7 @@ #include "base/logging.h" #include "base/scoped_clear_last_error.h" #include "base/strings/string_util.h" +#include "build/build_config.h" namespace base { @@ -46,7 +47,7 @@ static void StringAppendVT(StringType* dst, size_t mem_length = size(stack_buf); while (true) { if (result < 0) { -#if !defined(OS_WIN) +#if !BUILDFLAG(IS_WIN) // On Windows, vsnprintfT always returns the number of characters in a // fully-formatted string, so if we reach this point, something else is // wrong and no amount of buffer-doubling is going to fix it. @@ -56,7 +57,7 @@ static void StringAppendVT(StringType* dst, DLOG(WARNING) << "Unable to printf the requested string due to error."; return; } -#if !defined(OS_WIN) +#if !BUILDFLAG(IS_WIN) // Try doubling the buffer size. mem_length *= 2; #endif diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/sys_string_conversions.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/sys_string_conversions.h index 154f224a8..c8c84c523 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/sys_string_conversions.h +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/strings/sys_string_conversions.h @@ -7,7 +7,7 @@ #include "build/build_config.h" -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) #include @@ -28,6 +28,6 @@ NSString* SysUTF8ToNSString(const std::string& utf8); } // namespace base -#endif // defined(OS_APPLE) +#endif // BUILDFLAG(IS_APPLE) #endif // MINI_CHROMIUM_BASE_STRINGS_SYS_STRING_CONVERSIONS_H_ diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock.cc b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock.cc index e94e63799..e7c0d8c3f 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock.cc +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock.cc @@ -17,9 +17,9 @@ namespace base { namespace { ThreadRefType GetCurrentThreadRef() { -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) return GetCurrentThreadId(); -#elif defined(OS_POSIX) +#elif BUILDFLAG(IS_POSIX) return pthread_self(); #endif } diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock.h index 89f2558c5..66e74f358 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock.h +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock.h @@ -7,9 +7,9 @@ #include "build/build_config.h" -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) #include -#elif defined(OS_POSIX) +#elif BUILDFLAG(IS_POSIX) #include #endif @@ -17,9 +17,9 @@ namespace base { -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) typedef DWORD ThreadRefType; -#elif defined(OS_POSIX) +#elif BUILDFLAG(IS_POSIX) typedef pthread_t ThreadRefType; #endif diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock_impl.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock_impl.h index cfd9dcad7..b82df6adb 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock_impl.h +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/synchronization/lock_impl.h @@ -7,9 +7,9 @@ #include "build/build_config.h" -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) #include -#elif defined(OS_POSIX) +#elif BUILDFLAG(IS_POSIX) #include #endif @@ -22,9 +22,9 @@ namespace internal { // should instead use Lock. class LockImpl { public: -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) typedef CRITICAL_SECTION NativeHandle; -#elif defined(OS_POSIX) +#elif BUILDFLAG(IS_POSIX) typedef pthread_mutex_t NativeHandle; #endif diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/sys_byteorder.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/sys_byteorder.h index 0e18e5a9c..dba8fb5b8 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/sys_byteorder.h +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/sys_byteorder.h @@ -7,9 +7,9 @@ #include "build/build_config.h" -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) #include -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) #include #else #include @@ -18,9 +18,9 @@ namespace base { inline uint16_t ByteSwap(uint16_t x) { -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) return OSSwapInt16(x); -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) return _byteswap_ushort(x); #else return bswap_16(x); @@ -28,9 +28,9 @@ inline uint16_t ByteSwap(uint16_t x) { } inline uint32_t ByteSwap(uint32_t x) { -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) return OSSwapInt32(x); -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) return _byteswap_ulong(x); #else return bswap_32(x); @@ -38,9 +38,9 @@ inline uint32_t ByteSwap(uint32_t x) { } inline uint64_t ByteSwap(uint64_t x) { -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) return OSSwapInt64(x); -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) return _byteswap_uint64(x); #else return bswap_64(x); diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/threading/thread_local_storage.cc b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/threading/thread_local_storage.cc index 470896ca1..e3eab3d4f 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/threading/thread_local_storage.cc +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/threading/thread_local_storage.cc @@ -175,7 +175,7 @@ namespace base { namespace internal { -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) void PlatformThreadLocalStorage::OnThreadExit() { PlatformThreadLocalStorage::TLSKey key = base::subtle::NoBarrier_Load(&g_native_tls_key); @@ -187,11 +187,11 @@ void PlatformThreadLocalStorage::OnThreadExit() { return; OnThreadExitInternal(tls_data); } -#elif defined(OS_POSIX) +#elif BUILDFLAG(IS_POSIX) void PlatformThreadLocalStorage::OnThreadExit(void* value) { OnThreadExitInternal(value); } -#endif // defined(OS_WIN) +#endif // BUILDFLAG(IS_WIN) } // namespace internal diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/threading/thread_local_storage.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/threading/thread_local_storage.h index ec5b19100..01a212a10 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/threading/thread_local_storage.h +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/base/threading/thread_local_storage.h @@ -7,9 +7,9 @@ #include "build/build_config.h" -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) #include -#elif defined(OS_POSIX) +#elif BUILDFLAG(IS_POSIX) #include #endif @@ -22,11 +22,10 @@ namespace internal { // interface, you should instead be using ThreadLocalStorage::StaticSlot/Slot. class PlatformThreadLocalStorage { public: - -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) typedef unsigned long TLSKey; enum { TLS_KEY_OUT_OF_INDEXES = TLS_OUT_OF_INDEXES }; -#elif defined(OS_POSIX) +#elif BUILDFLAG(IS_POSIX) typedef pthread_key_t TLSKey; // The following is a "reserved key" which is used in our generic Chromium // ThreadLocalStorage implementation. We expect that an OS will not return @@ -58,11 +57,11 @@ class PlatformThreadLocalStorage { // Destructors may end up being called multiple times on a terminating // thread, as other destructors may re-set slots that were previously // destroyed. -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) // Since Windows which doesn't support TLS destructor, the implementation // should use GetTLSValue() to retrieve the value of TLS slot. static void OnThreadExit(); -#elif defined(OS_POSIX) +#elif BUILDFLAG(IS_POSIX) // |Value| is the data stored in TLS slot, The implementation can't use // GetTLSValue() to retrieve the value of slot as it has already been reset // in Posix. diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/BUILD.gn b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/BUILD.gn index 561a4bccf..ed507eea5 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/BUILD.gn +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/BUILD.gn @@ -12,13 +12,14 @@ import("./platform.gni") config("mini_chromium_config") { include_dirs = [ "..", - root_gen_dir + root_gen_dir, ] } source_set("build") { sources = [ "build_config.h" ] public_configs = [ ":mini_chromium_config" ] + public_deps = [ ":buildflag_header_h" ] } source_set("buildflag_header_h") { diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/build_config.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/build_config.h index 3d670a90c..113500063 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/build_config.h +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/build_config.h @@ -5,34 +5,73 @@ #ifndef MINI_CHROMIUM_BUILD_BUILD_CONFIG_H_ #define MINI_CHROMIUM_BUILD_BUILD_CONFIG_H_ +#include "build/buildflag.h" + #if defined(__APPLE__) -#define OS_APPLE 1 +#include +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_APPLE() 1 +#if defined(TARGET_OS_OSX) && TARGET_OS_OSX +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_MAC() 1 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_IOS() 0 +#elif defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_MAC() 0 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_IOS() 1 +#endif // TARGET_OS_* +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_ANDROID() 0 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_LINUX() 0 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_CHROMEOS() 0 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_WIN() 0 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_FUCHSIA() 0 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_POSIX() 1 #elif defined(__ANDROID__) -#define OS_ANDROID 1 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_APPLE() 0 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_MAC() 0 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_IOS() 0 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_ANDROID() 1 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_LINUX() 0 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_CHROMEOS() 0 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_WIN() 0 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_FUCHSIA() 0 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_POSIX() 1 #elif defined(__linux__) -#define OS_LINUX 1 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_APPLE() 0 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_MAC() 0 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_IOS() 0 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_ANDROID() 0 +#if !defined(OS_CHROMEOS) +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_LINUX() 1 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_CHROMEOS() 0 +#else +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_LINUX() 0 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_CHROMEOS() 1 +#endif +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_WIN() 0 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_FUCHSIA() 0 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_POSIX() 1 #elif defined(_WIN32) -#define OS_WIN 1 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_APPLE() 0 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_MAC() 0 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_IOS() 0 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_ANDROID() 0 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_LINUX() 0 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_CHROMEOS() 0 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_WIN() 1 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_FUCHSIA() 0 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_POSIX() 0 #elif defined(__Fuchsia__) -#define OS_FUCHSIA 1 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_APPLE() 0 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_MAC() 0 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_IOS() 0 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_ANDROID() 0 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_LINUX() 0 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_CHROMEOS() 0 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_WIN() 0 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_FUCHSIA() 1 +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_IS_POSIX() 1 #else #error Please add support for your platform in build/build_config.h #endif -#if defined(OS_APPLE) -#include -#if defined(TARGET_OS_OSX) && TARGET_OS_OSX -#define OS_MAC 1 -#elif defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE -#define OS_IOS 1 -#endif // TARGET_OS_* -#endif // defined(OS_APPLE) - -#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_ANDROID) || \ - defined(OS_FUCHSIA) -#define OS_POSIX 1 -#endif - // Compiler detection. #if defined(__GNUC__) #define COMPILER_GCC 1 @@ -88,11 +127,10 @@ #endif #endif -#if defined(OS_POSIX) && defined(COMPILER_GCC) && \ - defined(__WCHAR_MAX__) && \ +#if BUILDFLAG(IS_POSIX) && defined(COMPILER_GCC) && defined(__WCHAR_MAX__) && \ (__WCHAR_MAX__ == 0x7fffffff || __WCHAR_MAX__ == 0xffffffff) #define WCHAR_T_IS_UTF32 -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) #define WCHAR_T_IS_UTF16 #else #error Please add support for your compiler in build/build_config.h diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/buildflag.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/buildflag.h index ca057979c..62222a892 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/buildflag.h +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/buildflag.h @@ -5,9 +5,12 @@ #ifndef BUILD_BUILDFLAG_H_ #define BUILD_BUILDFLAG_H_ -#define BUILDFLAG_CAT_INDIRECT(a, b) a ## b -#define BUILDFLAG_CAT(a, b) BUILDFLAG_CAT_INDIRECT(a, b) +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_CAT_INDIRECT(a, b) a##b +#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_CAT(a, b) \ + MINI_CHROMIUM_INTERNAL_BUILDFLAG_CAT_INDIRECT(a, b) -#define BUILDFLAG(flag) (BUILDFLAG_CAT(BUILDFLAG_INTERNAL_, flag)()) +#define BUILDFLAG(flag) \ + (MINI_CHROMIUM_INTERNAL_BUILDFLAG_CAT( \ + MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_, flag)()) #endif // BUILD_BUILDFLAG_H_ diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/config/BUILD.gn b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/config/BUILD.gn index d6171efad..e32e40de1 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/config/BUILD.gn +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/config/BUILD.gn @@ -153,7 +153,7 @@ config("default") { ] cflags_c = [ "-std=c11" ] - cflags_cc = [ "-std=c++14" ] + cflags_cc = [ "-std=c++17" ] cflags_objc = cflags_c cflags_objcc = cflags_cc @@ -225,10 +225,10 @@ config("default") { if (mini_chromium_is_ios) { if (ios_deployment_target != "") { - if (current_cpu == "x64") { + if (target_environment == "simulator") { common_flags += [ "-mios-simulator-version-min=" + ios_deployment_target ] - } else if (current_cpu == "arm64") { + } else if (target_environment == "device") { common_flags += [ "-mios-version-min=" + ios_deployment_target ] } } @@ -255,6 +255,11 @@ config("default") { "/wd4996", # 'X' was declared deprecated. ] + cflags_cc = [ + "/std:c++17", + "/Zc:__cplusplus", + ] + ldflags += [ "/DEBUG" ] libs = [ "kernel32.lib" ] @@ -665,7 +670,7 @@ if (mini_chromium_is_win) { tool("cxx") { depfile = "{{output}}.d" pdbname = "{{target_out_dir}}/{{label_name}}_cc.pdb" - command = "ninja -t msvc -e $env -- $cxx /nologo /showIncludes {{defines}} {{include_dirs}} {{cflags}} {{cflags_c}}${extra_cflags}${extra_cflags_cc} /c {{source}} /Fo{{output}} /Fd\"$pdbname\"" + command = "ninja -t msvc -e $env -- $cxx /nologo /showIncludes {{defines}} {{include_dirs}} {{cflags}} {{cflags_cc}}${extra_cflags}${extra_cflags_cc} /c {{source}} /Fo{{output}} /Fd\"$pdbname\"" depsformat = "msvc" description = "CXX {{output}}" outputs = diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/ios/XCTRunnerAddition+Info.plist b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/ios/XCTRunnerAddition+Info.plist index c171601c2..040d76c37 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/ios/XCTRunnerAddition+Info.plist +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/ios/XCTRunnerAddition+Info.plist @@ -5,7 +5,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - com.apple.test.${EXECUTABLE_NAME} + ${BUNDLE_IDENTIFIER} CFBundleName ${PRODUCT_NAME} diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/ios/codesign.py b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/ios/codesign.py index e81297838..c93c46af1 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/ios/codesign.py +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/ios/codesign.py @@ -1,14 +1,15 @@ -#!/usr/bin/env python - # Copyright 2016 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +from __future__ import print_function + import argparse import codecs import datetime import fnmatch import glob +import json import os import plistlib import shutil @@ -16,6 +17,11 @@ import sys import tempfile +if sys.version_info.major < 3: + basestring_compat = basestring +else: + basestring_compat = str + def GetProvisioningProfilesDir(): """Returns the location of the installed mobile provisioning profiles. @@ -28,6 +34,21 @@ def GetProvisioningProfilesDir(): os.environ['HOME'], 'Library', 'MobileDevice', 'Provisioning Profiles') +def ReadPlistFromString(plist_bytes): + """Parse property list from given |plist_bytes|. + + Args: + plist_bytes: contents of property list to load. Must be bytes in python 3. + + Returns: + The contents of property list as a python object. + """ + if sys.version_info.major == 2: + return plistlib.readPlistFromString(plist_bytes) + else: + return plistlib.loads(plist_bytes) + + def LoadPlistFile(plist_path): """Loads property list file at |plist_path|. @@ -37,29 +58,94 @@ def LoadPlistFile(plist_path): Returns: The content of the property list file as a python object. """ - return plistlib.readPlistFromString(subprocess.check_output([ - 'xcrun', 'plutil', '-convert', 'xml1', '-o', '-', plist_path])) + if sys.version_info.major == 2: + return plistlib.readPlistFromString( + subprocess.check_output( + ['xcrun', 'plutil', '-convert', 'xml1', '-o', '-', plist_path])) + else: + with open(plist_path, 'rb') as fp: + return plistlib.load(fp) + + +def CreateSymlink(value, location): + """Creates symlink with value at location if the target exists.""" + target = os.path.join(os.path.dirname(location), value) + if os.path.exists(location): + os.unlink(location) + os.symlink(value, location) class Bundle(object): """Wraps a bundle.""" - def __init__(self, bundle_path): + def __init__(self, bundle_path, platform): """Initializes the Bundle object with data from bundle Info.plist file.""" self._path = bundle_path - self._data = LoadPlistFile(os.path.join(self._path, 'Info.plist')) + self._kind = Bundle.Kind(platform, os.path.splitext(bundle_path)[-1]) + self._data = None + + def Load(self): + self._data = LoadPlistFile(self.info_plist_path) + + @staticmethod + def Kind(platform, extension): + if platform == 'iphonesimulator' or platform == 'iphoneos': + return 'ios' + if platform == 'macosx': + if extension == '.framework': + return 'mac_framework' + return 'mac' + raise ValueError('unknown bundle type %s for %s' % (extension, platform)) + + @property + def kind(self): + return self._kind @property def path(self): return self._path + @property + def contents_dir(self): + if self._kind == 'mac': + return os.path.join(self.path, 'Contents') + if self._kind == 'mac_framework': + return os.path.join(self.path, 'Versions/A') + return self.path + + @property + def executable_dir(self): + if self._kind == 'mac': + return os.path.join(self.contents_dir, 'MacOS') + return self.contents_dir + + @property + def resources_dir(self): + if self._kind == 'mac' or self._kind == 'mac_framework': + return os.path.join(self.contents_dir, 'Resources') + return self.path + + @property + def info_plist_path(self): + if self._kind == 'mac_framework': + return os.path.join(self.resources_dir, 'Info.plist') + return os.path.join(self.contents_dir, 'Info.plist') + + @property + def signature_dir(self): + return os.path.join(self.contents_dir, '_CodeSignature') + @property def identifier(self): return self._data['CFBundleIdentifier'] + @property + def binary_name(self): + return self._data['CFBundleExecutable'] + @property def binary_path(self): - return os.path.join(self._path, self._data['CFBundleExecutable']) + return os.path.join(self.executable_dir, self.binary_name) def Validate(self, expected_mappings): """Checks that keys in the bundle have the expected value. @@ -75,7 +161,7 @@ def Validate(self, expected_mappings): error message. The dictionary will be empty if there are no errors. """ errors = {} - for key, expected_value in expected_mappings.iteritems(): + for key, expected_value in expected_mappings.items(): if key in self._data: value = self._data[key] if value != expected_value: @@ -89,21 +175,31 @@ class ProvisioningProfile(object): def __init__(self, provisioning_profile_path): """Initializes the ProvisioningProfile with data from profile file.""" self._path = provisioning_profile_path - self._data = plistlib.readPlistFromString(subprocess.check_output([ - 'xcrun', 'security', 'cms', '-D', '-u', 'certUsageAnyCA', - '-i', provisioning_profile_path])) + self._data = ReadPlistFromString( + subprocess.check_output([ + 'xcrun', 'security', 'cms', '-D', '-u', 'certUsageAnyCA', '-i', + provisioning_profile_path + ])) @property def path(self): return self._path + @property + def team_identifier(self): + return self._data.get('TeamIdentifier', [''])[0] + + @property + def name(self): + return self._data.get('Name', '') + @property def application_identifier_pattern(self): return self._data.get('Entitlements', {}).get('application-identifier', '') @property - def team_identifier(self): - return self._data.get('TeamIdentifier', [''])[0] + def application_identifier_prefix(self): + return self._data.get('ApplicationIdentifierPrefix', [''])[0] @property def entitlements(self): @@ -124,7 +220,7 @@ def ValidToSignBundle(self, bundle_identifier): with the corresponding bundle_identifier, False otherwise. """ return fnmatch.fnmatch( - '%s.%s' % (self.team_identifier, bundle_identifier), + '%s.%s' % (self.application_identifier_prefix, bundle_identifier), self.application_identifier_pattern) def Install(self, installation_path): @@ -148,13 +244,13 @@ def ExpandVariables(self, substitutions): self._data = self._ExpandVariables(self._data, substitutions) def _ExpandVariables(self, data, substitutions): - if isinstance(data, str): - for key, substitution in substitutions.iteritems(): + if isinstance(data, basestring_compat): + for key, substitution in substitutions.items(): data = data.replace('$(%s)' % (key,), substitution) return data if isinstance(data, dict): - for key, value in data.iteritems(): + for key, value in data.items(): data[key] = self._ExpandVariables(value, substitutions) return data @@ -165,12 +261,16 @@ def _ExpandVariables(self, data, substitutions): return data def LoadDefaults(self, defaults): - for key, value in defaults.iteritems(): + for key, value in defaults.items(): if key not in self._data: self._data[key] = value def WriteTo(self, target_path): - plistlib.writePlist(self._data, target_path) + with open(target_path, 'wb') as fp: + if sys.version_info.major == 2: + plistlib.writePlist(self._data, fp) + else: + plistlib.dump(self._data, fp) def FindProvisioningProfile(bundle_identifier, required): @@ -225,9 +325,11 @@ def FindProvisioningProfile(bundle_identifier, required): def CodeSignBundle(bundle_path, identity, extra_args): - process = subprocess.Popen(['xcrun', 'codesign', '--force', '--sign', - identity, '--timestamp=none'] + list(extra_args) + [bundle_path], - stderr=subprocess.PIPE) + process = subprocess.Popen( + ['xcrun', 'codesign', '--force', '--sign', identity, '--timestamp=none'] + + list(extra_args) + [bundle_path], + stderr=subprocess.PIPE, + universal_newlines=True) _, stderr = process.communicate() if process.returncode: sys.stderr.write(stderr) @@ -268,7 +370,8 @@ def GenerateEntitlements(path, provisioning_profile, bundle_identifier): entitlements = Entitlements(path) if provisioning_profile: entitlements.LoadDefaults(provisioning_profile.entitlements) - app_identifier_prefix = provisioning_profile.team_identifier + '.' + app_identifier_prefix = \ + provisioning_profile.application_identifier_prefix + '.' else: app_identifier_prefix = '*.' entitlements.ExpandVariables({ @@ -278,19 +381,18 @@ def GenerateEntitlements(path, provisioning_profile, bundle_identifier): return entitlements -def GenerateBundleInfoPlist(bundle_path, plist_compiler, partial_plist): +def GenerateBundleInfoPlist(bundle, plist_compiler, partial_plist): """Generates the bundle Info.plist for a list of partial .plist files. Args: - bundle_path: path to the bundle + bundle: a Bundle instance plist_compiler: string, path to the Info.plist compiler partial_plist: list of path to partial .plist files to merge """ # Filter empty partial .plist files (this happens if an application - # does not include need to compile any asset catalog, in which case - # the partial .plist file from the asset catalog compilation step is - # just a stamp file). + # does not compile any asset catalog, in which case the partial .plist + # file from the asset catalog compilation step is just a stamp file). filtered_partial_plist = [] for plist in partial_plist: plist_size = os.stat(plist).st_size @@ -299,8 +401,13 @@ def GenerateBundleInfoPlist(bundle_path, plist_compiler, partial_plist): # Invoke the plist_compiler script. It needs to be a python script. subprocess.check_call([ - 'python', plist_compiler, 'merge', '-f', 'binary1', - '-o', os.path.join(bundle_path, 'Info.plist'), + 'python3', + plist_compiler, + 'merge', + '-f', + 'binary1', + '-o', + bundle.info_plist_path, ] + filtered_partial_plist) @@ -359,13 +466,16 @@ def _Execute(args): if not args.identity: args.identity = '-' + bundle = Bundle(args.path, args.platform) + if args.partial_info_plist: - GenerateBundleInfoPlist( - args.path, - args.plist_compiler_path, - args.partial_info_plist) + GenerateBundleInfoPlist(bundle, args.plist_compiler_path, + args.partial_info_plist) - bundle = Bundle(args.path) + # The bundle Info.plist may have been updated by GenerateBundleInfoPlist() + # above. Load the bundle information from Info.plist after the modification + # have been written to disk. + bundle.Load() # According to Apple documentation, the application binary must be the same # as the bundle name without the .app suffix. See crbug.com/740476 for more @@ -402,19 +512,37 @@ def _Execute(args): os.unlink(embedded_provisioning_profile) # Delete existing code signature. - signature_file = os.path.join(args.path, '_CodeSignature', 'CodeResources') - if os.path.isfile(signature_file): - shutil.rmtree(os.path.dirname(signature_file)) + if os.path.exists(bundle.signature_dir): + shutil.rmtree(bundle.signature_dir) # Install system frameworks if requested. for framework_path in args.frameworks: InstallSystemFramework(framework_path, args.path, args) # Copy main binary into bundle. - if os.path.isfile(bundle.binary_path): - os.unlink(bundle.binary_path) + if not os.path.isdir(bundle.executable_dir): + os.makedirs(bundle.executable_dir) shutil.copy(args.binary, bundle.binary_path) + if bundle.kind == 'mac_framework': + # Create Versions/Current -> Versions/A symlink + CreateSymlink('A', os.path.join(bundle.path, 'Versions/Current')) + + # Create $binary_name -> Versions/Current/$binary_name symlink + CreateSymlink(os.path.join('Versions/Current', bundle.binary_name), + os.path.join(bundle.path, bundle.binary_name)) + + # Create optional symlinks. + for name in ('Headers', 'Resources', 'Modules'): + target = os.path.join(bundle.path, 'Versions/A', name) + if os.path.exists(target): + CreateSymlink(os.path.join('Versions/Current', name), + os.path.join(bundle.path, name)) + else: + obsolete_path = os.path.join(bundle.path, name) + if os.path.exists(obsolete_path): + os.unlink(obsolete_path) + if args.no_signature: return @@ -512,6 +640,31 @@ def _Execute(args): entitlements.WriteTo(args.path) +class FindProvisioningProfileAction(Action): + """Class implementing the find-codesign-identity action.""" + + name = 'find-provisioning-profile' + help = 'find provisioning profile for use by Xcode project generator' + + @staticmethod + def _Register(parser): + parser.add_argument('--bundle-id', + '-b', + required=True, + help='bundle identifier') + + @staticmethod + def _Execute(args): + provisioning_profile_info = {} + provisioning_profile = FindProvisioningProfile(args.bundle_id, False) + for key in ('team_identifier', 'name'): + if provisioning_profile: + provisioning_profile_info[key] = getattr(provisioning_profile, key) + else: + provisioning_profile_info[key] = '' + print(json.dumps(provisioning_profile_info)) + + def Main(): # Cache this codec so that plistlib can find it. See # https://crbug.com/999461#c12 for more details. @@ -524,6 +677,7 @@ def Main(): CodeSignBundleAction, CodeSignFileAction, GenerateEntitlementsAction, + FindProvisioningProfileAction, ] for action in actions: diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/ios/find_signing_identity.py b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/ios/find_signing_identity.py index 985281b50..f6c2342aa 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/ios/find_signing_identity.py +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/ios/find_signing_identity.py @@ -1,6 +1,4 @@ -#!/usr/bin/env python - -# Copyright 2015 The Chromium Authors. All rights reserved. +# Copyright (c) 2015 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -12,35 +10,80 @@ import sys import re + +def Redact(value, from_nth_char=5): + """Redact value past the N-th character.""" + return value[:from_nth_char] + '*' * (len(value) - from_nth_char) + + +class Identity(object): + """Represents a valid identity.""" + + def __init__(self, identifier, name, team): + self.identifier = identifier + self.name = name + self.team = team + + def redacted(self): + return Identity(Redact(self.identifier), self.name, Redact(self.team)) + + def format(self): + return '%s: "%s (%s)"' % (self.identifier, self.name, self.team) + + def ListIdentities(): return subprocess.check_output([ - 'xcrun', - 'security', - 'find-identity', - '-v', - '-p', - 'codesigning', - ]) + 'xcrun', + 'security', + 'find-identity', + '-v', + '-p', + 'codesigning', + ]).decode('utf8') -def FindValidIdentity(identity_description): - lines = list(map(str.strip, ListIdentities().splitlines())) +def FindValidIdentity(pattern): + """Find all identities matching the pattern.""" + lines = list(l.strip() for l in ListIdentities().splitlines()) # Look for something like "2) XYZ "iPhone Developer: Name (ABC)"" - exp = re.compile('[0-9]+\) ([A-F0-9]+) "([^"]*)"') + regex = re.compile('[0-9]+\) ([A-F0-9]+) "([^"(]*) \(([^)"]*)\)"') + + result = [] for line in lines: - res = exp.match(line) + res = regex.match(line) if res is None: continue - if identity_description in res.group(2): - yield res.group(1) + if pattern is None or pattern in res.group(2): + result.append(Identity(*res.groups())) + return result -if __name__ == '__main__': +def Main(args): parser = argparse.ArgumentParser('codesign iOS bundles') parser.add_argument( - '--identity-description', required=True, + '--identity-description', required=True, dest='pattern', help='Text description used to select the code signing identity.') - args = parser.parse_args() + parsed = parser.parse_args(args) + + identities = FindValidIdentity(parsed.pattern) + if len(identities) == 1: + print(identities[0].identifier, end='') + return 0 - for identity in FindValidIdentity(args.identity_description): - print(identity) + all_identities = FindValidIdentity(None) + + print('Automatic code signing identity selection was enabled but could not') + print('find exactly one codesigning identity matching "%s".' % parsed.pattern) + print('') + print('Check that the keychain is accessible and that there is exactly one') + print('valid codesigning identity matching the pattern. Here is the parsed') + print('output of `xcrun security find-identity -v -p codesigning`:') + print() + for i, identity in enumerate(all_identities): + print(' %d) %s' % (i + 1, identity.redacted().format())) + print(' %d valid identities found' % (len(all_identities))) + return 1 + + +if __name__ == '__main__': + sys.exit(Main(sys.argv[1:])) diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/ios/ios_sdk.gni b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/ios/ios_sdk.gni index 1aacf4999..8a01f6f97 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/ios/ios_sdk.gni +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/ios/ios_sdk.gni @@ -6,7 +6,7 @@ declare_args() { # The minimum runtime iOS version that built products are expected to run # on. If empty, the toolchain will choose its own default, typically the # most recent OS version. - ios_deployment_target = "12.0" + ios_deployment_target = "14.0" # SDK path to use. When empty this will use the default SDK based on the # value of use_ios_simulator. @@ -21,9 +21,24 @@ declare_args() { ios_enable_code_signing = true ios_code_signing_identity = "" ios_code_signing_identity_description = "Apple Development" + + # Configure the environment for which to build. Could be either "device", + # "simulator" or "catalyst". If unspecified, then it will be assumed to be + # "simulator" if the target_cpu is "x68" or "x64", "device" otherwise. The + # default is only there for compatibility reasons and will be removed (see + # crbug.com/1138425 for more details). + target_environment = "" +} + +if (target_environment == "") { + if (current_cpu == "x86" || current_cpu == "x64") { + target_environment = "simulator" + } else { + target_environment = "device" + } } -use_ios_simulator = current_cpu == "x86" || current_cpu == "x64" +use_ios_simulator = target_environment == "simulator" if (ios_sdk_path == "") { # Compute default target. diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/ios/plist_util.py b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/ios/plist_util.py index f90883553..54cf46176 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/ios/plist_util.py +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/ios/plist_util.py @@ -1,10 +1,9 @@ -#!/usr/bin/env python - # Copyright 2016 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. import argparse +import codecs import plistlib import os import re @@ -13,6 +12,10 @@ import tempfile import shlex +if sys.version_info.major < 3: + basestring_compat = basestring +else: + basestring_compat = str # Xcode substitutes variables like ${PRODUCT_NAME} or $(PRODUCT_NAME) when # compiling Info.plist. It also supports supports modifiers like :identifier @@ -48,6 +51,7 @@ def InterpolateString(value, substitutions): value in |substitutions|. Raises SubstitutionError if a variable has no substitution. """ + def repl(match): variable = match.group('id') if variable not in substitutions: @@ -63,6 +67,7 @@ def repl(match): return INVALID_CHARACTER_REGEXP.sub('-', substitutions[variable]) else: return substitutions[variable] + for substitution_regexp in SUBSTITUTION_REGEXP_LIST: value = substitution_regexp.sub(repl, value) return value @@ -81,40 +86,49 @@ def Interpolate(value, substitutions): substitution. """ if isinstance(value, dict): - return {k: Interpolate(v, substitutions) for k, v in value.iteritems()} + return {k: Interpolate(v, substitutions) for k, v in value.items()} if isinstance(value, list): return [Interpolate(v, substitutions) for v in value] - if isinstance(value, str): + if isinstance(value, basestring_compat): return InterpolateString(value, substitutions) return value def LoadPList(path): """Loads Plist at |path| and returns it as a dictionary.""" - fd, name = tempfile.mkstemp() - try: - subprocess.check_call(['plutil', '-convert', 'xml1', '-o', name, path]) - with os.fdopen(fd, 'r') as f: - return plistlib.readPlist(f) - finally: - os.unlink(name) + if sys.version_info.major == 2: + fd, name = tempfile.mkstemp() + try: + subprocess.check_call(['plutil', '-convert', 'xml1', '-o', name, path]) + with os.fdopen(fd, 'rb') as f: + return plistlib.readPlist(f) + finally: + os.unlink(name) + else: + with open(path, 'rb') as f: + return plistlib.load(f) def SavePList(path, format, data): """Saves |data| as a Plist to |path| in the specified |format|.""" - fd, name = tempfile.mkstemp() - try: - # "plutil" does not replace the destination file but update it in place, - # so if more than one hardlink points to destination all of them will be - # modified. This is not what is expected, so delete destination file if - # it does exist. - if os.path.exists(path): - os.unlink(path) - with os.fdopen(fd, 'w') as f: - plistlib.writePlist(data, f) - subprocess.check_call(['plutil', '-convert', format, '-o', path, name]) - finally: - os.unlink(name) + # The below does not replace the destination file but update it in place, + # so if more than one hardlink points to destination all of them will be + # modified. This is not what is expected, so delete destination file if + # it does exist. + if os.path.exists(path): + os.unlink(path) + if sys.version_info.major == 2: + fd, name = tempfile.mkstemp() + try: + with os.fdopen(fd, 'wb') as f: + plistlib.writePlist(data, f) + subprocess.check_call(['plutil', '-convert', format, '-o', path, name]) + finally: + os.unlink(name) + else: + with open(path, 'wb') as f: + plist_format = {'binary1': plistlib.FMT_BINARY, 'xml1': plistlib.FMT_XML} + plistlib.dump(data, f, fmt=plist_format[format]) def MergePList(plist1, plist2): @@ -135,7 +149,7 @@ def MergePList(plist1, plist2): are concatenated. """ result = plist1.copy() - for key, value in plist2.iteritems(): + for key, value in plist2.items(): if isinstance(value, dict): old_value = result.get(key) if isinstance(old_value, dict): @@ -164,15 +178,20 @@ class MergeAction(Action): @staticmethod def _Register(parser): + parser.add_argument('-o', + '--output', + required=True, + help='path to the output plist file') + parser.add_argument('-f', + '--format', + required=True, + choices=('xml1', 'binary1'), + help='format of the plist file to generate') parser.add_argument( - '-o', '--output', required=True, - help='path to the output plist file') - parser.add_argument( - '-f', '--format', required=True, choices=('xml1', 'binary1', 'json'), - help='format of the plist file to generate') - parser.add_argument( - 'path', nargs="+", - help='path to plist files to merge') + '-x', + '--xcode-version', + help='version of Xcode, ignored (can be used to force rebuild)') + parser.add_argument('path', nargs="+", help='path to plist files to merge') @staticmethod def _Execute(args): @@ -190,18 +209,28 @@ class SubstituteAction(Action): @staticmethod def _Register(parser): + parser.add_argument('-o', + '--output', + required=True, + help='path to the output plist file') + parser.add_argument('-t', + '--template', + required=True, + help='path to the template file') + parser.add_argument('-s', + '--substitution', + action='append', + default=[], + help='substitution rule in the format key=value') + parser.add_argument('-f', + '--format', + required=True, + choices=('xml1', 'binary1'), + help='format of the plist file to generate') parser.add_argument( - '-o', '--output', required=True, - help='path to the output plist file') - parser.add_argument( - '-t', '--template', required=True, - help='path to the template file') - parser.add_argument( - '-s', '--substitution', action='append', default=[], - help='substitution rule in the format key=value') - parser.add_argument( - '-f', '--format', required=True, choices=('xml1', 'binary1', 'json'), - help='format of the plist file to generate') + '-x', + '--xcode-version', + help='version of Xcode, ignored (can be used to force rebuild)') @staticmethod def _Execute(args): @@ -214,6 +243,10 @@ def _Execute(args): def Main(): + # Cache this codec so that plistlib can find it. See + # https://crbug.com/1005190#c2 for more details. + codecs.lookup('utf-8') + parser = argparse.ArgumentParser(description='manipulate plist files') subparsers = parser.add_subparsers() @@ -225,4 +258,8 @@ def Main(): if __name__ == '__main__': + # TODO(https://crbug.com/941669): Temporary workaround until all scripts use + # python3 by default. + if sys.version_info[0] < 3: + os.execvp('python3', ['python3'] + sys.argv) sys.exit(Main()) diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/ios/rules.gni b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/ios/rules.gni index 2fd17154c..7a3b7bd14 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/ios/rules.gni +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/ios/rules.gni @@ -109,10 +109,20 @@ template("create_signed_bundle") { "_", "-") + _ios_provisioning_profile_info = + exec_script(code_signing_script, + [ + "find-provisioning-profile", + "-b=" + _xcode_product_bundle_id, + ], + "json") + xcode_extra_attributes = { IPHONEOS_DEPLOYMENT_TARGET = ios_deployment_target + CODE_SIGN_IDENTITY = "iPhone Developer" + DEVELOPMENT_TEAM = _ios_provisioning_profile_info.team_identifier + PROVISIONING_PROFILE_SPECIFIER = _ios_provisioning_profile_info.name CODE_SIGN_STYLE = "Manual" - CODE_SIGN_IDENTITY = "" PRODUCT_BUNDLE_IDENTIFIER = _xcode_product_bundle_id if (defined(invoker.xcode_extra_attributes)) { @@ -548,6 +558,10 @@ template("ios_xcuitest_test_runner_bundle") { ] } + # Bundle identifier should respect rfc1034, so replace "_" with "-". + _bundle_identifier = "$ios_app_bundle_id_prefix.chrome." + + string_replace(_output_name, "_", "-") + _info_plist_target = _target_name + "_info_plist" _info_plist_bundle = _target_name + "_info_plist_bundle" info_plist(_info_plist_target) { @@ -563,6 +577,7 @@ template("ios_xcuitest_test_runner_bundle") { # "CFBundleName". "//third_party/mini_chromium/mini_chromium/build/ios/XCTRunnerAddition+Info.plist", ] + extra_substitutions = [ "BUNDLE_IDENTIFIER=$_bundle_identifier" ] } bundle_data(_info_plist_bundle) { @@ -604,6 +619,15 @@ template("ios_xcuitest_test_runner_bundle") { "$ios_sdk_platform_path/Developer/Library/PrivateFrameworks/XCTAutomationSupport.framework", ] + if (xcode_version_int >= 1300) { + extra_system_frameworks += [ + "$ios_sdk_platform_path/Developer/Library/PrivateFrameworks/XCTestCore.framework", + "$ios_sdk_platform_path/Developer/Library/PrivateFrameworks/XCUIAutomation.framework", + "$ios_sdk_platform_path/Developer/Library/PrivateFrameworks/XCUnit.framework", + "$ios_sdk_platform_path/Developer/usr/lib/libXCTestSwiftSupport.dylib", + ] + } + bundle_deps = [] if (defined(invoker.bundle_deps)) { bundle_deps += invoker.bundle_deps 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 index 26ac8da1a..9f662edce 100644 --- 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 @@ -1,5 +1,3 @@ -#!/usr/bin/env python - # Copyright 2014 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -11,13 +9,34 @@ import itertools import os import plistlib +import re import subprocess import sys +if sys.version_info.major < 3: + basestring_compat = basestring +else: + basestring_compat = str + +# src directory +ROOT_SRC_DIR = os.path.dirname( + os.path.dirname(os.path.dirname(os.path.dirname( + os.path.realpath(__file__))))) + # This script prints information about the build system, the operating # system and the iOS or Mac SDK (depending on the platform "iphonesimulator", # "iphoneos" or "macosx" generally). + +def LoadPList(path): + """Loads Plist at |path| and returns it as a dictionary.""" + # Cloned from //build/apple/plist_util.py. + if sys.version_info.major == 2: + return plistlib.readPlist(path) + with open(path, 'rb') as f: + return plistlib.load(f) + + def SplitVersion(version): """Splits the Xcode version to 3 values. @@ -31,6 +50,7 @@ def SplitVersion(version): version = version.split('.') return itertools.islice(itertools.chain(version, itertools.repeat('0')), 0, 3) + def FormatVersion(version): """Converts Xcode version to a format required for DTXcode in Info.plist @@ -44,19 +64,21 @@ def FormatVersion(version): major, minor, patch = SplitVersion(version) return ('%2s%s%s' % (major, minor, patch)).replace(' ', '0') + def FillXcodeVersion(settings, developer_dir): """Fills the Xcode version and build number into |settings|.""" if developer_dir: - xcode_version_plist_path = os.path.join( - developer_dir, 'Contents/version.plist') - version_plist = plistlib.readPlist(xcode_version_plist_path) + xcode_version_plist_path = os.path.join(developer_dir, + 'Contents/version.plist') + version_plist = LoadPList(xcode_version_plist_path) settings['xcode_version'] = FormatVersion( version_plist['CFBundleShortVersionString']) settings['xcode_version_int'] = int(settings['xcode_version'], 10) settings['xcode_build'] = version_plist['ProductBuildVersion'] return - lines = subprocess.check_output(['xcodebuild', '-version']).splitlines() + lines = subprocess.check_output(['xcodebuild', + '-version']).decode('UTF-8').splitlines() settings['xcode_version'] = FormatVersion(lines[0].split()[-1]) settings['xcode_version_int'] = int(settings['xcode_version'], 10) settings['xcode_build'] = lines[-1].split()[-1] @@ -64,43 +86,79 @@ def FillXcodeVersion(settings, developer_dir): def FillMachineOSBuild(settings): """Fills OS build number into |settings|.""" - settings['machine_os_build'] = subprocess.check_output( - ['sw_vers', '-buildVersion']).strip() + machine_os_build = subprocess.check_output(['sw_vers', '-buildVersion' + ]).decode('UTF-8').strip() + settings['machine_os_build'] = machine_os_build def FillSDKPathAndVersion(settings, platform, xcode_version): """Fills the SDK path and version for |platform| into |settings|.""" - settings['sdk_path'] = subprocess.check_output([ - 'xcrun', '-sdk', platform, '--show-sdk-path']).strip() - settings['sdk_version'] = subprocess.check_output([ - 'xcrun', '-sdk', platform, '--show-sdk-version']).strip() - settings['sdk_platform_path'] = subprocess.check_output([ - 'xcrun', '-sdk', platform, '--show-sdk-platform-path']).strip() - # TODO: unconditionally use --show-sdk-build-version once Xcode 7.2 or - # higher is required to build Chrome for iOS or OS X. - if xcode_version >= '0720': - settings['sdk_build'] = subprocess.check_output([ - 'xcrun', '-sdk', platform, '--show-sdk-build-version']).strip() - else: - settings['sdk_build'] = settings['sdk_version'] + settings['sdk_path'] = subprocess.check_output( + ['xcrun', '-sdk', platform, '--show-sdk-path']).decode('UTF-8').strip() + settings['sdk_version'] = subprocess.check_output( + ['xcrun', '-sdk', platform, + '--show-sdk-version']).decode('UTF-8').strip() + settings['sdk_platform_path'] = subprocess.check_output( + ['xcrun', '-sdk', platform, + '--show-sdk-platform-path']).decode('UTF-8').strip() + settings['sdk_build'] = subprocess.check_output( + ['xcrun', '-sdk', platform, + '--show-sdk-build-version']).decode('UTF-8').strip() + settings['toolchains_path'] = os.path.join( + subprocess.check_output(['xcode-select', + '-print-path']).decode('UTF-8').strip(), + 'Toolchains/XcodeDefault.xctoolchain') + + +def CreateXcodeSymlinkAt(src, dst): + """Create symlink to Xcode directory at target location.""" + + if not os.path.isdir(dst): + os.makedirs(dst) + + dst = os.path.join(dst, os.path.basename(src)) + updated_value = '//' + os.path.relpath(dst, ROOT_SRC_DIR) + + # Update the symlink only if it is different from the current destination. + if os.path.islink(dst): + current_src = os.readlink(dst) + if current_src == src: + return updated_value + os.unlink(dst) + sys.stderr.write('existing symlink %s points %s; want %s. Removed.' % + (dst, current_src, src)) + os.symlink(src, dst) + return updated_value if __name__ == '__main__': doctest.testmod() parser = argparse.ArgumentParser() - parser.add_argument("--developer_dir", required=False) + parser.add_argument("--developer_dir", dest="developer_dir", required=False) parser.add_argument("--get_sdk_info", - action="store_true", dest="get_sdk_info", default=False, - help="Returns SDK info in addition to xcode/machine info.") + action="store_true", + dest="get_sdk_info", + default=False, + help="Returns SDK info in addition to xcode info.") + parser.add_argument("--get_machine_info", + action="store_true", + dest="get_machine_info", + default=False, + help="Returns machine info in addition to xcode info.") + parser.add_argument("--create_symlink_at", + action="store", + dest="create_symlink_at", + help="Create symlink of SDK at given location and " + "returns the symlinked paths as SDK info instead " + "of the original location.") args, unknownargs = parser.parse_known_args() if args.developer_dir: os.environ['DEVELOPER_DIR'] = args.developer_dir if len(unknownargs) != 1: - sys.stderr.write( - 'usage: %s [iphoneos|iphonesimulator|macosx]\n' % - os.path.basename(sys.argv[0])) + sys.stderr.write('usage: %s [iphoneos|iphonesimulator|macosx]\n' % + os.path.basename(sys.argv[0])) sys.exit(1) settings = {} @@ -111,6 +169,8 @@ def FillSDKPathAndVersion(settings, platform, xcode_version): for key in sorted(settings): value = settings[key] - if isinstance(value, str): + if args.create_symlink_at and '_path' in key: + value = CreateXcodeSymlinkAt(value, args.create_symlink_at) + if isinstance(value, basestring_compat): value = '"%s"' % value print('%s=%s' % (key, value)) diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/ios/strip_arm64e.py b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/ios/strip_arm64e.py index 667cd08a5..005d1f853 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/ios/strip_arm64e.py +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/ios/strip_arm64e.py @@ -1,9 +1,6 @@ -#!/usr/bin/env python - # Copyright 2020 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. - """Strip arm64e architecture from a binary if present.""" import argparse @@ -21,9 +18,9 @@ def check_output(command): if process.returncode: sys.stderr.write('error: command failed with retcode %d: %s\n\n' % (process.returncode, ' '.join(map(repr, command)))) - sys.stderr.write(errs) + sys.stderr.write(errs.decode('UTF-8', errors='ignore')) sys.exit(process.returncode) - return outs + return outs.decode('UTF-8') def check_call(command): diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/win_helper.py b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/win_helper.py index a5e1fdd4c..223716da8 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/win_helper.py +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/win_helper.py @@ -1,10 +1,8 @@ -#!/usr/bin/env python - # Copyright 2017 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import _winreg +import winreg import os import re import subprocess @@ -12,7 +10,7 @@ def _RegistryGetValue(key, value): - """Use the _winreg module to obtain the value of a registry key. + """Use the winreg module to obtain the value of a registry key. Args: key: The registry key. @@ -23,8 +21,8 @@ def _RegistryGetValue(key, value): try: root, subkey = key.split('\\', 1) assert root == 'HKLM' # Only need HKLM for now. - with _winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE, subkey) as hkey: - return _winreg.QueryValueEx(hkey, value)[0] + with winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, subkey) as hkey: + return winreg.QueryValueEx(hkey, value)[0] except WindowsError: return None @@ -44,6 +42,7 @@ def _ExtractImportantEnvironment(output_of_set): ) env = {} for line in output_of_set.splitlines(): + line = line.decode("utf-8") for envvar in envvars_to_save: if re.match(envvar + '=', line.lower()): var, setting = line.split('=', 1) @@ -62,7 +61,7 @@ def _FormatAsEnvironmentBlock(envvar_dict): CreateProcess() documentation for more details.""" block = '' nul = '\0' - for key, value in envvar_dict.iteritems(): + for key, value in envvar_dict.items(): block += key + '=' + value + nul block += nul return block @@ -99,7 +98,7 @@ def _GenerateEnvironmentFiles(install_dir, out_dir, script_path): env_block = _FormatAsEnvironmentBlock(env) basename = 'environment.' + arch with open(os.path.join(out_dir, basename), 'wb') as f: - f.write(env_block) + f.write(env_block.encode()) result.append(basename) return result @@ -139,10 +138,11 @@ def ExecLinkWrapper(self, arch, *args): link = subprocess.Popen(args, env=env, shell=True, stdout=subprocess.PIPE) out, _ = link.communicate() for line in out.splitlines(): + line = line.decode("utf-8") if (not line.startswith(' Creating library ') and not line.startswith('Generating code') and not line.startswith('Finished generating code')): - print line + print(line) return link.returncode def ExecAsmWrapper(self, arch, *args): @@ -152,24 +152,32 @@ def ExecAsmWrapper(self, arch, *args): stdout=subprocess.PIPE, stderr=subprocess.STDOUT) out, _ = popen.communicate() for line in out.splitlines(): + line = line.decode("utf-8") if (not line.startswith('Copyright (C) Microsoft Corporation') and not line.startswith('Microsoft (R) Macro Assembler') and not line.startswith(' Assembling: ') and line): - print line + print(line) return popen.returncode def ExecGetVisualStudioData(self, outdir, toolchain_path): - setenv_path = os.path.join('win_sdk', 'bin', 'SetEnv.cmd') + setenv_paths = [ + # cipd packaged SDKs from 10.0.19041.0 onwards. + os.path.join('Windows Kits', '10', 'bin', 'SetEnv.cmd'), + # cipd packaged SDKs prior to 10.0.19041.0. + os.path.join('win_sdk', 'bin', 'SetEnv.cmd'), + ] def explicit(): - if os.path.exists(os.path.join(toolchain_path, setenv_path)): - return toolchain_path, setenv_path + for setenv_path in setenv_paths: + if os.path.exists(os.path.join(toolchain_path, setenv_path)): + return toolchain_path, setenv_path def env(): from_env = os.environ.get('VSINSTALLDIR') - if from_env and os.path.exists(os.path.join(from_env, setenv_path)): - return from_env, setenv_path + for setenv_path in setenv_paths: + if from_env and os.path.exists(os.path.join(from_env, setenv_path)): + return from_env, setenv_path def autodetect(): # Try vswhere, which will find VS2017.2+. Note that earlier VS2017s will @@ -180,7 +188,7 @@ def autodetect(): installation_path = subprocess.check_output( [vswhere_path, '-latest', '-property', 'installationPath']).strip() if installation_path: - return (installation_path, + return (installation_path.decode("utf-8"), os.path.join('VC', 'Auxiliary', 'Build', 'vcvarsall.bat')) # Otherwise, try VS2015. @@ -203,11 +211,13 @@ def fail(): raise Exception('Visual Studio installation dir not found') x86_file, x64_file, arm64_file = _GenerateEnvironmentFiles( install_dir, outdir, script_path) + # gn is unhappy with trailing backslashes. + install_dir = install_dir.rstrip('\\') result = '''install_dir = "%s" x86_environment_file = "%s" x64_environment_file = "%s" arm64_environment_file = "%s"''' % (install_dir, x86_file, x64_file, arm64_file) - print result + print(result) return 0 def ExecStamp(self, path): diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/write_buildflag_header.py b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/write_buildflag_header.py index f45af6c0d..719022ddd 100755 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/write_buildflag_header.py +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/write_buildflag_header.py @@ -1,4 +1,5 @@ #!/usr/bin/env python + # Copyright 2015 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -20,79 +21,84 @@ class Options: - def __init__(self, output, rulename, header_guard, flags): - self.output = output - self.rulename = rulename - self.header_guard = header_guard - self.flags = flags + + def __init__(self, output, rulename, header_guard, flags): + self.output = output + self.rulename = rulename + self.header_guard = header_guard + self.flags = flags def GetOptions(): - parser = optparse.OptionParser() - parser.add_option('--output', help="Output header name inside --gen-dir.") - parser.add_option('--rulename', - help="Helpful name of build rule for including in the " + - "comment at the top of the file.") - parser.add_option('--gen-dir', - help="Path to root of generated file directory tree.") - parser.add_option('--definitions', - help="Name of the response file containing the flags.") - cmdline_options, cmdline_flags = parser.parse_args() - - # Compute header guard by replacing some chars with _ and upper-casing. - header_guard = cmdline_options.output.upper() - header_guard = \ - header_guard.replace('/', '_').replace('\\', '_').replace('.', '_') - header_guard += '_' - - # The actual output file is inside the gen dir. - output = os.path.join(cmdline_options.gen_dir, cmdline_options.output) - - # Definition file in GYP is newline separated, in GN they are shell formatted. - # shlex can parse both of these. - with open(cmdline_options.definitions, 'r') as def_file: - defs = shlex.split(def_file.read()) - flags_index = defs.index('--flags') - - # Everything after --flags are flags. true/false are remapped to 1/0, - # everything else is passed through. - flags = [] - for flag in defs[flags_index + 1 :]: - equals_index = flag.index('=') - key = flag[:equals_index] - value = flag[equals_index + 1:] - - # Canonicalize and validate the value. - if value == 'true': - value = '1' - elif value == 'false': - value = '0' - flags.append((key, str(value))) - - return Options(output=output, - rulename=cmdline_options.rulename, - header_guard=header_guard, - flags=flags) + parser = optparse.OptionParser() + parser.add_option('--output', help="Output header name inside --gen-dir.") + parser.add_option('--rulename', + help="Helpful name of build rule for including in the " + + "comment at the top of the file.") + parser.add_option('--gen-dir', + help="Path to root of generated file directory tree.") + parser.add_option('--definitions', + help="Name of the response file containing the flags.") + cmdline_options, cmdline_flags = parser.parse_args() + + # Compute header guard by replacing some chars with _ and upper-casing. + header_guard = cmdline_options.output.upper() + header_guard = \ + header_guard.replace('/', '_').replace('\\', '_').replace('.', '_') + header_guard += '_' + + # The actual output file is inside the gen dir. + output = os.path.join(cmdline_options.gen_dir, cmdline_options.output) + + # Definition file in GYP is newline separated, in GN they are shell formatted. + # shlex can parse both of these. + with open(cmdline_options.definitions, 'r') as def_file: + defs = shlex.split(def_file.read()) + flags_index = defs.index('--flags') + + # Everything after --flags are flags. true/false are remapped to 1/0, + # everything else is passed through. + flags = [] + for flag in defs[flags_index + 1:]: + equals_index = flag.index('=') + key = flag[:equals_index] + value = flag[equals_index + 1:] + + # Canonicalize and validate the value. + if value == 'true': + value = '1' + elif value == 'false': + value = '0' + flags.append((key, str(value))) + + return Options(output=output, + rulename=cmdline_options.rulename, + header_guard=header_guard, + flags=flags) def WriteHeader(options): - with open(options.output, 'w') as output_file: - output_file.write("// Generated by build/write_buildflag_header.py\n") - if options.rulename: - output_file.write('// From "' + options.rulename + '"\n') + with open(options.output, 'w') as output_file: + output_file.write("// Generated by build/write_buildflag_header.py\n") + if options.rulename: + output_file.write('// From "' + options.rulename + '"\n') - output_file.write('\n#ifndef %s\n' % options.header_guard) - output_file.write('#define %s\n\n' % options.header_guard) - output_file.write('#include "build/buildflag.h"\n\n') + output_file.write('\n#ifndef %s\n' % options.header_guard) + output_file.write('#define %s\n\n' % options.header_guard) + output_file.write('#include "build/buildflag.h"\n\n') - for pair in options.flags: - output_file.write('#define BUILDFLAG_INTERNAL_%s() (%s)\n' % pair) + for pair in options.flags: + output_file.write( + '#define MINI_CHROMIUM_INTERNAL_BUILDFLAG_VALUE_%s() (%s)\n' % + pair) + + output_file.write('\n#endif // %s\n' % options.header_guard) - output_file.write('\n#endif // %s\n' % options.header_guard) def main(): - options = GetOptions() - WriteHeader(options) + options = GetOptions() + WriteHeader(options) + if __name__ == "__main__": - sys.exit(main()) + sys.exit(main()) diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/testing/platform_test.h b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/testing/platform_test.h index 136eb299e..a858d5eba 100644 --- a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/testing/platform_test.h +++ b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/testing/platform_test.h @@ -8,7 +8,7 @@ #include "build/build_config.h" #include "gtest/gtest.h" -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) #import // The implementation is in this header because mini_chromium does not directly @@ -34,6 +34,6 @@ class PlatformTest : public testing::Test { }; #else using PlatformTest = testing::Test; -#endif // OS_APPLE +#endif // BUILDFLAG(IS_APPLE) #endif // MINI_CHROMIUM_TESTING_PLATFORM_TEST_H_ diff --git a/external_imported/sentry-native/external/crashpad/tools/base94_encoder.cc b/external_imported/sentry-native/external/crashpad/tools/base94_encoder.cc index 1b184e9fb..b0f7e0e32 100644 --- a/external_imported/sentry-native/external/crashpad/tools/base94_encoder.cc +++ b/external_imported/sentry-native/external/crashpad/tools/base94_encoder.cc @@ -24,6 +24,7 @@ namespace crashpad { namespace { void Usage(const base::FilePath& me) { + // clang-format off fprintf(stderr, "Usage: %" PRFilePath " [options] \n" "Encode/Decode the given file\n" @@ -34,6 +35,7 @@ void Usage(const base::FilePath& me) { " --help display this help and exit\n" " --version output version information and exit\n", me.value().c_str()); + // clang-format on ToolSupport::UsageTail(me); } @@ -117,12 +119,12 @@ int Base94EncoderMain(int argc, char* argv[]) { } // namespace } // namespace crashpad -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) int main(int argc, char* argv[]) { return crashpad::Base94EncoderMain(argc, argv); } -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) int wmain(int argc, wchar_t* argv[]) { return crashpad::ToolSupport::Wmain(argc, argv, crashpad::Base94EncoderMain); } -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) diff --git a/external_imported/sentry-native/external/crashpad/tools/crashpad_database_util.cc b/external_imported/sentry-native/external/crashpad/tools/crashpad_database_util.cc index e9927bd40..d55937772 100644 --- a/external_imported/sentry-native/external/crashpad/tools/crashpad_database_util.cc +++ b/external_imported/sentry-native/external/crashpad/tools/crashpad_database_util.cc @@ -21,13 +21,13 @@ #include #include +#include #include #include #include #include #include "base/check_op.h" -#include "base/cxx17_backports.h" #include "base/files/file_path.h" #include "base/numerics/safe_conversions.h" #include "base/strings/utf_string_conversions.h" @@ -44,6 +44,7 @@ namespace crashpad { namespace { void Usage(const base::FilePath& me) { + // clang-format off fprintf(stderr, "Usage: %" PRFilePath " [OPTION]... PID\n" "Operate on Crashpad crash report databases.\n" @@ -66,6 +67,7 @@ void Usage(const base::FilePath& me) { " --help display this help and exit\n" " --version output version information and exit\n", me.value().c_str()); + // clang-format on ToolSupport::UsageTail(me); } @@ -109,14 +111,14 @@ bool StringToBool(const char* string, bool* boolean) { "set", }; - for (size_t index = 0; index < base::size(kFalseWords); ++index) { + for (size_t index = 0; index < std::size(kFalseWords); ++index) { if (strcasecmp(string, kFalseWords[index]) == 0) { *boolean = false; return true; } } - for (size_t index = 0; index < base::size(kTrueWords); ++index) { + for (size_t index = 0; index < std::size(kTrueWords); ++index) { if (strcasecmp(string, kTrueWords[index]) == 0) { *boolean = true; return true; @@ -159,7 +161,7 @@ bool StringToTime(const char* string, time_t* out_time, bool utc) { "%+", }; - for (size_t index = 0; index < base::size(kFormats); ++index) { + for (size_t index = 0; index < std::size(kFormats); ++index) { tm time_tm; const char* strptime_result = strptime(string, kFormats[index], &time_tm); if (strptime_result == end) { @@ -214,7 +216,7 @@ std::string TimeToString(time_t out_time, bool utc) { char string[64]; CHECK_NE( - strftime(string, base::size(string), "%Y-%m-%d %H:%M:%S %Z", &time_tm), + strftime(string, std::size(string), "%Y-%m-%d %H:%M:%S %Z", &time_tm), 0u); return std::string(string); @@ -619,12 +621,12 @@ int DatabaseUtilMain(int argc, char* argv[]) { } // namespace } // namespace crashpad -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) int main(int argc, char* argv[]) { return crashpad::DatabaseUtilMain(argc, argv); } -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) int wmain(int argc, wchar_t* argv[]) { return crashpad::ToolSupport::Wmain(argc, argv, crashpad::DatabaseUtilMain); } -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) diff --git a/external_imported/sentry-native/external/crashpad/tools/crashpad_http_upload.cc b/external_imported/sentry-native/external/crashpad/tools/crashpad_http_upload.cc index 624aaa715..1470b410e 100644 --- a/external_imported/sentry-native/external/crashpad/tools/crashpad_http_upload.cc +++ b/external_imported/sentry-native/external/crashpad/tools/crashpad_http_upload.cc @@ -22,6 +22,7 @@ #include #include "base/files/file_path.h" +#include "build/build_config.h" #include "tools/tool_support.h" #include "util/file/file_reader.h" #include "util/file/file_writer.h" @@ -34,6 +35,7 @@ namespace crashpad { namespace { void Usage(const base::FilePath& me) { + // clang-format off fprintf(stderr, "Usage: %" PRFilePath " [OPTION]...\n" "Send an HTTP POST request.\n" @@ -45,6 +47,7 @@ void Usage(const base::FilePath& me) { " --help display this help and exit\n" " --version output version information and exit\n", me.value().c_str()); + // clang-format on ToolSupport::UsageTail(me); } @@ -205,12 +208,12 @@ int HTTPUploadMain(int argc, char* argv[]) { } // namespace } // namespace crashpad -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) int main(int argc, char* argv[]) { return crashpad::HTTPUploadMain(argc, argv); } -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) int wmain(int argc, wchar_t* argv[]) { return crashpad::ToolSupport::Wmain(argc, argv, crashpad::HTTPUploadMain); } -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) diff --git a/external_imported/sentry-native/external/crashpad/tools/generate_dump.cc b/external_imported/sentry-native/external/crashpad/tools/generate_dump.cc index ab027b879..ba561a583 100644 --- a/external_imported/sentry-native/external/crashpad/tools/generate_dump.cc +++ b/external_imported/sentry-native/external/crashpad/tools/generate_dump.cc @@ -29,33 +29,34 @@ #include "util/process/process_id.h" #include "util/stdlib/string_number_conversion.h" -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) #include #include "util/posix/drop_privileges.h" #endif -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) #include #include "base/mac/scoped_mach_port.h" #include "snapshot/mac/process_snapshot_mac.h" #include "util/mach/scoped_task_suspend.h" #include "util/mach/task_for_pid.h" -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) #include "base/strings/utf_string_conversions.h" #include "snapshot/win/process_snapshot_win.h" #include "util/win/scoped_process_suspend.h" #include "util/win/xp_compat.h" -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) #include "snapshot/linux/process_snapshot_linux.h" #include "util/linux/direct_ptrace_connection.h" -#endif // OS_APPLE +#endif // BUILDFLAG(IS_APPLE) namespace crashpad { namespace { void Usage(const base::FilePath& me) { + // clang-format off fprintf(stderr, "Usage: %" PRFilePath " [OPTION]... PID\n" "Generate a minidump file containing a snapshot of a running process.\n" @@ -65,6 +66,7 @@ void Usage(const base::FilePath& me) { " --help display this help and exit\n" " --version output version information and exit\n", me.value().c_str()); + // clang-format on ToolSupport::UsageTail(me); } @@ -137,7 +139,7 @@ int GenerateDumpMain(int argc, char* argv[]) { return EXIT_FAILURE; } -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) task_t task = TaskForPID(options.pid); if (task == TASK_NULL) { return EXIT_FAILURE; @@ -155,14 +157,14 @@ int GenerateDumpMain(int argc, char* argv[]) { } LOG(WARNING) << "operating on myself"; } -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) ScopedKernelHANDLE process( OpenProcess(kXPProcessAllAccess, false, options.pid)); if (!process.is_valid()) { PLOG(ERROR) << "could not open process " << options.pid; return EXIT_FAILURE; } -#endif // OS_APPLE +#endif // BUILDFLAG(IS_APPLE) if (options.dump_path.empty()) { options.dump_path = base::StringPrintf("minidump.%" PRI_PROCESS_ID, @@ -170,24 +172,24 @@ int GenerateDumpMain(int argc, char* argv[]) { } { -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) std::unique_ptr suspend; if (options.suspend) { suspend.reset(new ScopedTaskSuspend(task)); } -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) std::unique_ptr suspend; if (options.suspend) { suspend.reset(new ScopedProcessSuspend(process.get())); } -#endif // OS_APPLE +#endif // BUILDFLAG(IS_APPLE) -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) ProcessSnapshotMac process_snapshot; if (!process_snapshot.Initialize(task)) { return EXIT_FAILURE; } -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) ProcessSnapshotWin process_snapshot; if (!process_snapshot.Initialize(process.get(), options.suspend @@ -197,7 +199,7 @@ int GenerateDumpMain(int argc, char* argv[]) { 0)) { return EXIT_FAILURE; } -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) // TODO(jperaza): https://crashpad.chromium.org/bug/30. DirectPtraceConnection task; if (!task.Initialize(options.pid)) { @@ -207,7 +209,7 @@ int GenerateDumpMain(int argc, char* argv[]) { if (!process_snapshot.Initialize(&task)) { return EXIT_FAILURE; } -#endif // OS_APPLE +#endif // BUILDFLAG(IS_APPLE) FileWriter file_writer; base::FilePath dump_path( @@ -236,12 +238,12 @@ int GenerateDumpMain(int argc, char* argv[]) { } // namespace } // namespace crashpad -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) int main(int argc, char* argv[]) { return crashpad::GenerateDumpMain(argc, argv); } -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) int wmain(int argc, wchar_t* argv[]) { return crashpad::ToolSupport::Wmain(argc, argv, crashpad::GenerateDumpMain); } -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) diff --git a/external_imported/sentry-native/external/crashpad/tools/mac/catch_exception_tool.cc b/external_imported/sentry-native/external/crashpad/tools/mac/catch_exception_tool.cc index 06fda23d4..568672d78 100644 --- a/external_imported/sentry-native/external/crashpad/tools/mac/catch_exception_tool.cc +++ b/external_imported/sentry-native/external/crashpad/tools/mac/catch_exception_tool.cc @@ -181,6 +181,7 @@ class ExceptionServer final : public UniversalMachExcServer::Interface { }; void Usage(const std::string& me) { + // clang-format off fprintf(stderr, "Usage: %s -m SERVICE [OPTION]...\n" "Catch Mach exceptions and display information about them.\n" @@ -192,6 +193,7 @@ void Usage(const std::string& me) { " --help display this help and exit\n" " --version output version information and exit\n", me.c_str()); + // clang-format on ToolSupport::UsageTail(me); } diff --git a/external_imported/sentry-native/external/crashpad/tools/mac/exception_port_tool.cc b/external_imported/sentry-native/external/crashpad/tools/mac/exception_port_tool.cc index 2fdc58001..60d841445 100644 --- a/external_imported/sentry-native/external/crashpad/tools/mac/exception_port_tool.cc +++ b/external_imported/sentry-native/external/crashpad/tools/mac/exception_port_tool.cc @@ -311,6 +311,7 @@ bool SetExceptionPort(const ExceptionHandlerDescription* description, } void Usage(const std::string& me) { + // clang-format off fprintf(stderr, "Usage: %s [OPTION]... [COMMAND [ARG]...]\n" "View and change Mach exception ports, and run COMMAND if supplied.\n" @@ -343,6 +344,7 @@ void Usage(const std::string& me) { "The default DESCRIPTION is\n" " target=task,mask=CRASH,behavior=DEFAULT|MACH,flavor=NONE,handler=NULL\n", me.c_str()); + // clang-format on ToolSupport::UsageTail(me); } diff --git a/external_imported/sentry-native/external/crashpad/tools/mac/on_demand_service_tool.mm b/external_imported/sentry-native/external/crashpad/tools/mac/on_demand_service_tool.mm index 7b3e10416..ffb7920c8 100644 --- a/external_imported/sentry-native/external/crashpad/tools/mac/on_demand_service_tool.mm +++ b/external_imported/sentry-native/external/crashpad/tools/mac/on_demand_service_tool.mm @@ -34,6 +34,7 @@ namespace { void Usage(const std::string& me) { + // clang-format off fprintf(stderr, "Usage: %s -L -l LABEL [OPTION]... COMMAND [ARG]...\n" " %s -U -l LABEL\n" @@ -48,6 +49,7 @@ void Usage(const std::string& me) { " --version output version information and exit\n", me.c_str(), me.c_str()); + // clang-format on ToolSupport::UsageTail(me); } diff --git a/external_imported/sentry-native/external/crashpad/tools/run_with_crashpad.cc b/external_imported/sentry-native/external/crashpad/tools/run_with_crashpad.cc index 5ef0edb68..487f378fa 100644 --- a/external_imported/sentry-native/external/crashpad/tools/run_with_crashpad.cc +++ b/external_imported/sentry-native/external/crashpad/tools/run_with_crashpad.cc @@ -31,7 +31,7 @@ #include "util/stdlib/map_insert.h" #include "util/string/split_string.h" -#if defined(OS_FUCHSIA) +#if BUILDFLAG(IS_FUCHSIA) #include #include #include @@ -43,16 +43,23 @@ namespace crashpad { namespace { void Usage(const std::string& me) { + // clang-format off fprintf(stderr, "Usage: %s [OPTION]... COMMAND [ARG]...\n" "Start a Crashpad handler and have it handle crashes from COMMAND.\n" "\n" -#if defined(OS_FUCHSIA) + // clang-format on +#if BUILDFLAG(IS_FUCHSIA) + // clang-format off "COMMAND is run via fdio_spawn, so must be a qualified path to the subprocess to\n" "be executed.\n" + // clang-format on #else + // clang-format off "COMMAND is run via execvp() so the PATH will be searched.\n" + // clang-format on #endif + // clang-format off "\n" " -h, --handler=HANDLER invoke HANDLER instead of crashpad_handler\n" " --annotation=KEY=VALUE passed to the handler as an --annotation argument\n" @@ -62,6 +69,7 @@ void Usage(const std::string& me) { " --help display this help and exit\n" " --version output version information and exit\n", me.c_str()); + // clang-format on ToolSupport::UsageTail(me); } @@ -189,7 +197,7 @@ int RunWithCrashpadMain(int argc, char* argv[]) { return kExitFailure; } -#if defined(OS_FUCHSIA) +#if BUILDFLAG(IS_FUCHSIA) // Fuchsia doesn't implement execvp(), launch with fdio_spawn here. zx_handle_t child = ZX_HANDLE_INVALID; zx_status_t status = fdio_spawn( diff --git a/external_imported/sentry-native/external/crashpad/tools/tool_support.cc b/external_imported/sentry-native/external/crashpad/tools/tool_support.cc index b453f6e87..aa6a2d9e4 100644 --- a/external_imported/sentry-native/external/crashpad/tools/tool_support.cc +++ b/external_imported/sentry-native/external/crashpad/tools/tool_support.cc @@ -21,6 +21,7 @@ #include "base/strings/string_piece.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "package.h" namespace crashpad { @@ -55,7 +56,7 @@ void ToolSupport::UsageHint(const base::FilePath& me, const char* hint) { me.value().c_str()); } -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) // static void ToolSupport::Version(const std::string& me) { Version(base::FilePath(me)); @@ -70,9 +71,9 @@ void ToolSupport::UsageTail(const std::string& me) { void ToolSupport::UsageHint(const std::string& me, const char* hint) { UsageHint(base::FilePath(me), hint); } -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) // static int ToolSupport::Wmain(int argc, wchar_t* argv[], int (*entry)(int, char* [])) { @@ -87,26 +88,26 @@ int ToolSupport::Wmain(int argc, wchar_t* argv[], int (*entry)(int, char* [])) { return entry(argc, argv_as_utf8.get()); } -#endif // OS_WIN +#endif // BUILDFLAG(IS_WIN) // static base::FilePath::StringType ToolSupport::CommandLineArgumentToFilePathStringType( const base::StringPiece& path) { -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) return std::string(path.data(), path.size()); -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) return base::UTF8ToWide(path); -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) } // static std::string ToolSupport::FilePathToCommandLineArgument( const base::FilePath& file_path) { -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) return file_path.value(); -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) return base::WideToUTF8(file_path.value()); -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) } } // namespace crashpad diff --git a/external_imported/sentry-native/external/crashpad/tools/tool_support.h b/external_imported/sentry-native/external/crashpad/tools/tool_support.h index fd4955e43..87db24dbb 100644 --- a/external_imported/sentry-native/external/crashpad/tools/tool_support.h +++ b/external_imported/sentry-native/external/crashpad/tools/tool_support.h @@ -48,7 +48,7 @@ class ToolSupport { //! Optional, may be `nullptr`, in which case no hint will be presented. static void UsageHint(const base::FilePath& me, const char* hint); -#if defined(OS_POSIX) || DOXYGEN +#if BUILDFLAG(IS_POSIX) || DOXYGEN //! \copydoc Version static void Version(const std::string& me); @@ -57,15 +57,15 @@ class ToolSupport { //! \copydoc UsageHint static void UsageHint(const std::string& me, const char* hint); -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) -#if defined(OS_WIN) || DOXYGEN +#if BUILDFLAG(IS_WIN) || DOXYGEN //! \brief Converts \a argv `wchar_t` UTF-16 to UTF-8, and passes onwards to a //! UTF-8 entry point. //! //! \return The return value of \a entry. static int Wmain(int argc, wchar_t* argv[], int (*entry)(int, char*[])); -#endif // OS_WIN +#endif // BUILDFLAG(IS_WIN) //! \brief Converts a command line argument to the string type suitable for //! base::FilePath. diff --git a/external_imported/sentry-native/external/crashpad/util/BUILD.gn b/external_imported/sentry-native/external/crashpad/util/BUILD.gn index 7b7044088..c372ff49b 100644 --- a/external_imported/sentry-native/external/crashpad/util/BUILD.gn +++ b/external_imported/sentry-native/external/crashpad/util/BUILD.gn @@ -385,6 +385,8 @@ crashpad_static_library("util") { "ios/ios_system_data_collector.mm", "ios/raw_logging.cc", "ios/raw_logging.h", + "ios/scoped_background_task.h", + "ios/scoped_background_task.mm", "ios/scoped_vm_read.cc", "ios/scoped_vm_read.h", ] @@ -466,6 +468,7 @@ crashpad_static_library("util") { "win/context_wrappers.h", "win/critical_section_with_debug_info.cc", "win/critical_section_with_debug_info.h", + "win/exception_codes.h", "win/exception_handler_server.cc", "win/exception_handler_server.h", "win/get_function.cc", @@ -578,10 +581,14 @@ crashpad_static_library("util") { ] if (crashpad_is_mac || crashpad_is_ios) { - include_dirs += [ "$root_build_dir/gen" ] + include_dirs += [ "$root_gen_dir" ] deps += [ ":mig_output" ] } + if (crashpad_is_ios) { + deps += [ "../build:ios_enable_arc" ] + } + if (crashpad_is_mac && !crashpad_is_in_fuchsia) { libs = [ "bsm" ] frameworks = [ @@ -655,7 +662,7 @@ crashpad_static_library("net") { if (crashpad_http_transport_impl == "socket") { sources += [ "net/http_transport_socket.cc" ] if (crashpad_use_boringssl_for_http_transport_socket) { - defines += [ "CRASHPAD_USE_BORINGSSL" ] + defines = [ "CRASHPAD_USE_BORINGSSL" ] if (crashpad_is_in_chromium || crashpad_is_in_fuchsia) { deps += [ "//third_party/boringssl" ] diff --git a/external_imported/sentry-native/external/crashpad/util/CMakeLists.txt b/external_imported/sentry-native/external/crashpad/util/CMakeLists.txt index 2b42bd9f5..e37bfb155 100644 --- a/external_imported/sentry-native/external/crashpad/util/CMakeLists.txt +++ b/external_imported/sentry-native/external/crashpad/util/CMakeLists.txt @@ -221,9 +221,19 @@ if(APPLE) ios/ios_system_data_collector.mm ios/raw_logging.cc ios/raw_logging.h + ios/scoped_background_task.h + ios/scoped_background_task.mm ios/scoped_vm_read.cc ios/scoped_vm_read.h - ) + ) + # This specific file requires ARC support, while other parts do not + # build when ARC is enabled. + set_source_files_properties( + ios/scoped_background_task.mm + PROPERTIES + COMPILE_FLAGS + "-fobjc-arc" + ) endif() endif() @@ -303,6 +313,7 @@ if(WIN32) win/context_wrappers.h win/critical_section_with_debug_info.cc win/critical_section_with_debug_info.h + win/exception_codes.h win/exception_handler_server.cc win/exception_handler_server.h win/get_function.cc @@ -376,7 +387,7 @@ if(APPLE) list(APPEND input_files "${full_path}") endforeach() - find_package(PythonInterp 2.7 REQUIRED) + find_package(Python COMPONENTS Interpreter REQUIRED) set(output_dir "${CMAKE_CURRENT_BINARY_DIR}/util/mach") file(MAKE_DIRECTORY "${output_dir}") @@ -428,7 +439,7 @@ if(APPLE) OUTPUT ${output_files} COMMAND - "${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/mach/mig.py" ${archs} ${sdk} ${includes} "${input}" ${output_files} + "${Python_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/mach/mig.py" ${archs} ${sdk} ${includes} "${input}" ${output_files} DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/mach/mig.py" "${input}" ) diff --git a/external_imported/sentry-native/external/crashpad/util/file/delimited_file_reader.cc b/external_imported/sentry-native/external/crashpad/util/file/delimited_file_reader.cc index f899dbf34..015a09dc5 100644 --- a/external_imported/sentry-native/external/crashpad/util/file/delimited_file_reader.cc +++ b/external_imported/sentry-native/external/crashpad/util/file/delimited_file_reader.cc @@ -17,10 +17,10 @@ #include #include +#include #include #include "base/check_op.h" -#include "base/cxx17_backports.h" #include "base/numerics/safe_conversions.h" namespace crashpad { @@ -76,7 +76,7 @@ DelimitedFileReader::Result DelimitedFileReader::GetDelim(char delimiter, return Result::kEndOfFile; } - DCHECK_LE(static_cast(read_result), base::size(buf_)); + DCHECK_LE(static_cast(read_result), std::size(buf_)); DCHECK( base::IsValueInRangeForNumericType(read_result)); buf_len_ = static_cast(read_result); diff --git a/external_imported/sentry-native/external/crashpad/util/file/delimited_file_reader_test.cc b/external_imported/sentry-native/external/crashpad/util/file/delimited_file_reader_test.cc index 05e610119..5cc1f0fc7 100644 --- a/external_imported/sentry-native/external/crashpad/util/file/delimited_file_reader_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/file/delimited_file_reader_test.cc @@ -14,9 +14,9 @@ #include "util/file/delimited_file_reader.h" +#include #include -#include "base/cxx17_backports.h" #include "base/format_macros.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" @@ -260,7 +260,7 @@ TEST(DelimitedFileReader, ReallyLongMultiLineFile) { TEST(DelimitedFileReader, EmbeddedNUL) { static constexpr char kString[] = "embedded\0NUL\n"; StringFile string_file; - string_file.SetString(std::string(kString, base::size(kString) - 1)); + string_file.SetString(std::string(kString, std::size(kString) - 1)); DelimitedFileReader delimited_file_reader(&string_file); std::string line; @@ -278,7 +278,7 @@ TEST(DelimitedFileReader, EmbeddedNUL) { TEST(DelimitedFileReader, NULDelimiter) { static constexpr char kString[] = "aa\0b\0ccc\0"; StringFile string_file; - string_file.SetString(std::string(kString, base::size(kString) - 1)); + string_file.SetString(std::string(kString, std::size(kString) - 1)); DelimitedFileReader delimited_file_reader(&string_file); std::string field; @@ -302,7 +302,7 @@ TEST(DelimitedFileReader, NULDelimiter) { TEST(DelimitedFileReader, EdgeCases) { static constexpr size_t kSizes[] = {4094, 4095, 4096, 4097, 8190, 8191, 8192, 8193}; - for (size_t index = 0; index < base::size(kSizes); ++index) { + for (size_t index = 0; index < std::size(kSizes); ++index) { size_t size = kSizes[index]; SCOPED_TRACE( base::StringPrintf("index %" PRIuS ", size %" PRIuS, index, size)); diff --git a/external_imported/sentry-native/external/crashpad/util/file/directory_reader.h b/external_imported/sentry-native/external/crashpad/util/file/directory_reader.h index 096d120d6..ccde8b717 100644 --- a/external_imported/sentry-native/external/crashpad/util/file/directory_reader.h +++ b/external_imported/sentry-native/external/crashpad/util/file/directory_reader.h @@ -18,13 +18,13 @@ #include "base/files/file_path.h" #include "build/build_config.h" -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) #include "util/posix/scoped_dir.h" -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) #include #include "util/win/scoped_handle.h" -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) namespace crashpad { @@ -67,20 +67,20 @@ class DirectoryReader { //! logged. Result NextFile(base::FilePath* filename); -#if defined(OS_POSIX) || DOXYGEN +#if BUILDFLAG(IS_POSIX) || DOXYGEN //! \brief Returns the file descriptor associated with this reader, logging a //! message and returning -1 on error. int DirectoryFD(); #endif private: -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) ScopedDIR dir_; -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) WIN32_FIND_DATA find_data_; ScopedSearchHANDLE handle_; bool first_entry_; -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) }; } // namespace crashpad diff --git a/external_imported/sentry-native/external/crashpad/util/file/directory_reader_test.cc b/external_imported/sentry-native/external/crashpad/util/file/directory_reader_test.cc index 5d09c6fb3..e1dcee2fa 100644 --- a/external_imported/sentry-native/external/crashpad/util/file/directory_reader_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/file/directory_reader_test.cc @@ -19,6 +19,7 @@ #include "base/files/file_path.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "gtest/gtest.h" #include "test/filesystem.h" #include "test/scoped_temp_dir.h" @@ -42,7 +43,7 @@ TEST(DirectoryReader, BadPaths) { reader.Open(temp_dir.path().Append(FILE_PATH_LITERAL("doesntexist")))); } -#if !defined(OS_FUCHSIA) +#if !BUILDFLAG(IS_FUCHSIA) TEST(DirectoryReader, BadPaths_SymbolicLinks) { if (!CanCreateSymbolicLinks()) { @@ -63,7 +64,7 @@ TEST(DirectoryReader, BadPaths_SymbolicLinks) { EXPECT_FALSE(reader.Open(link)); } -#endif // !OS_FUCHSIA +#endif // !BUILDFLAG(IS_FUCHSIA) TEST(DirectoryReader, EmptyDirectory) { ScopedTempDir temp_dir; @@ -103,7 +104,7 @@ void TestFilesAndDirectories(bool symbolic_links) { ASSERT_TRUE( CreateFile(temp_dir.path().Append(directory).Append(nested_file))); -#if !defined(OS_FUCHSIA) +#if !BUILDFLAG(IS_FUCHSIA) if (symbolic_links) { base::FilePath link(FILE_PATH_LITERAL("link")); @@ -118,7 +119,7 @@ void TestFilesAndDirectories(bool symbolic_links) { EXPECT_TRUE(expected_files.insert(dangling).second); } -#endif // !OS_FUCHSIA +#endif // !BUILDFLAG(IS_FUCHSIA) std::set files; DirectoryReader reader; @@ -138,7 +139,7 @@ TEST(DirectoryReader, FilesAndDirectories) { TestFilesAndDirectories(false); } -#if !defined(OS_FUCHSIA) +#if !BUILDFLAG(IS_FUCHSIA) TEST(DirectoryReader, FilesAndDirectories_SymbolicLinks) { if (!CanCreateSymbolicLinks()) { @@ -148,7 +149,7 @@ TEST(DirectoryReader, FilesAndDirectories_SymbolicLinks) { TestFilesAndDirectories(true); } -#endif // !OS_FUCHSIA +#endif // !BUILDFLAG(IS_FUCHSIA) } // namespace } // namespace test diff --git a/external_imported/sentry-native/external/crashpad/util/file/file_io.h b/external_imported/sentry-native/external/crashpad/util/file/file_io.h index 526debdda..6a6a58653 100644 --- a/external_imported/sentry-native/external/crashpad/util/file/file_io.h +++ b/external_imported/sentry-native/external/crashpad/util/file/file_io.h @@ -21,9 +21,9 @@ #include "build/build_config.h" -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) #include "base/files/scoped_file.h" -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) #include #include "util/win/scoped_handle.h" #endif @@ -34,7 +34,7 @@ class FilePath; namespace crashpad { -#if defined(OS_POSIX) || DOXYGEN +#if BUILDFLAG(IS_POSIX) || DOXYGEN //! \brief Platform-specific alias for a low-level file handle. using FileHandle = int; @@ -51,7 +51,7 @@ using FileOperationResult = ssize_t; //! \brief A value that can never be a valid FileHandle. const FileHandle kInvalidFileHandle = -1; -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) using FileHandle = HANDLE; using FileOffset = LONGLONG; @@ -132,7 +132,7 @@ enum class StdioStream { namespace internal { -#if defined(OS_POSIX) || DOXYGEN +#if BUILDFLAG(IS_POSIX) || DOXYGEN //! \brief The name of the native read function used by ReadFile(). //! @@ -148,7 +148,7 @@ constexpr char kNativeReadFunctionName[] = "read"; //! \sa kNativeReadFunctionName constexpr char kNativeWriteFunctionName[] = "write"; -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) constexpr char kNativeReadFunctionName[] = "ReadFile"; constexpr char kNativeWriteFunctionName[] = "WriteFile"; @@ -422,7 +422,7 @@ FileHandle LoggingOpenFileForWrite(const base::FilePath& path, FileWriteMode mode, FilePermissions permissions); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) //! \brief Opens an in-memory file for input and output. //! //! This function first attempts to open the file with `memfd_create()`. If @@ -444,7 +444,7 @@ FileHandle LoggingOpenFileForWrite(const base::FilePath& path, //! \sa LoggingOpenFileForWrite //! \sa LoggingOpenFileForReadAndWrite FileHandle LoggingOpenMemoryFileForReadAndWrite(const base::FilePath& name); -#endif // OS_LINUX || OS_CHROMEOS +#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) //! \brief Wraps OpenFileForReadAndWrite(), logging an error if the operation //! fails. @@ -461,7 +461,7 @@ FileHandle LoggingOpenFileForReadAndWrite(const base::FilePath& path, // Fuchsia does not currently support any sort of file locking. See // https://crashpad.chromium.org/bug/196 and // https://crashpad.chromium.org/bug/217. -#if !defined(OS_FUCHSIA) +#if !BUILDFLAG(IS_FUCHSIA) //! \brief Locks the given \a file using `flock()` on POSIX or `LockFileEx()` on //! Windows. @@ -500,7 +500,7 @@ FileLockingResult LoggingLockFile(FileHandle file, //! \return `true` on success, or `false` and a message will be logged. bool LoggingUnlockFile(FileHandle file); -#endif // !OS_FUCHSIA +#endif // !BUILDFLAG(IS_FUCHSIA) //! \brief Wraps `lseek()` or `SetFilePointerEx()`. Logs an error if the //! operation fails. diff --git a/external_imported/sentry-native/external/crashpad/util/file/file_io_posix.cc b/external_imported/sentry-native/external/crashpad/util/file/file_io_posix.cc index 119a2fcf6..5276b36da 100644 --- a/external_imported/sentry-native/external/crashpad/util/file/file_io_posix.cc +++ b/external_imported/sentry-native/external/crashpad/util/file/file_io_posix.cc @@ -72,7 +72,7 @@ FileHandle OpenFileForOutput(int rdwr_or_wronly, const base::FilePath& path, FileWriteMode mode, FilePermissions permissions) { -#if defined(OS_FUCHSIA) +#if BUILDFLAG(IS_FUCHSIA) // O_NOCTTY is invalid on Fuchsia, and O_CLOEXEC isn't necessary. int flags = 0; #else @@ -120,7 +120,7 @@ FileOperationResult ReadFile(FileHandle file, void* buffer, size_t size) { FileHandle OpenFileForRead(const base::FilePath& path) { int flags = O_RDONLY; -#if !defined(OS_FUCHSIA) +#if !BUILDFLAG(IS_FUCHSIA) // O_NOCTTY is invalid on Fuchsia, and O_CLOEXEC isn't necessary. flags |= O_NOCTTY | O_CLOEXEC; #endif @@ -153,7 +153,7 @@ FileHandle LoggingOpenFileForWrite(const base::FilePath& path, return fd; } -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) FileHandle LoggingOpenMemoryFileForReadAndWrite(const base::FilePath& name) { DCHECK(name.value().find('/') == std::string::npos); @@ -208,7 +208,7 @@ FileHandle LoggingOpenFileForReadAndWrite(const base::FilePath& path, return fd; } -#if !defined(OS_FUCHSIA) +#if !BUILDFLAG(IS_FUCHSIA) FileLockingResult LoggingLockFile(FileHandle file, FileLocking locking, @@ -234,7 +234,7 @@ bool LoggingUnlockFile(FileHandle file) { return rv == 0; } -#endif // !OS_FUCHSIA +#endif // !BUILDFLAG(IS_FUCHSIA) FileOffset LoggingSeekFile(FileHandle file, FileOffset offset, int whence) { off_t rv = lseek(file, offset, whence); diff --git a/external_imported/sentry-native/external/crashpad/util/file/file_io_test.cc b/external_imported/sentry-native/external/crashpad/util/file/file_io_test.cc index abfef1291..2d45cfb6c 100644 --- a/external_imported/sentry-native/external/crashpad/util/file/file_io_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/file/file_io_test.cc @@ -16,12 +16,13 @@ #include +#include #include #include #include "base/atomicops.h" -#include "base/cxx17_backports.h" #include "base/files/file_path.h" +#include "build/build_config.h" #include "gmock/gmock.h" #include "gtest/gtest.h" #include "test/errors.h" @@ -474,7 +475,7 @@ TEST(FileIO, LoggingOpenFileForReadAndWrite) { TestOpenFileForWrite(LoggingOpenFileForReadAndWrite); } -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) TEST(FileIO, LoggingOpenMemoryFileForReadAndWrite) { ScopedFileHandle handle( LoggingOpenMemoryFileForReadAndWrite(base::FilePath("memfile"))); @@ -489,7 +490,7 @@ TEST(FileIO, LoggingOpenMemoryFileForReadAndWrite) { ASSERT_TRUE(LoggingReadFileExactly(handle.get(), buffer, sizeof(buffer))); EXPECT_EQ(memcmp(buffer, kTestData, sizeof(buffer)), 0); } -#endif // OS_LINUX || OS_CHROMEOS +#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) enum class ReadOrWrite : bool { kRead, @@ -545,7 +546,7 @@ TEST(FileIO, FileShareMode_Write_Write) { // Fuchsia does not currently support any sort of file locking. See // https://crashpad.chromium.org/bug/196 and // https://crashpad.chromium.org/bug/217. -#if !defined(OS_FUCHSIA) +#if !BUILDFLAG(IS_FUCHSIA) TEST(FileIO, MultipleSharedLocks) { ScopedTempDir temp_dir; @@ -642,7 +643,7 @@ void LockingTest(FileLocking main_lock, FileLocking other_locks) { LockingTestThread threads[20]; int expected_iterations = 0; - for (size_t index = 0; index < base::size(threads); ++index) { + for (size_t index = 0; index < std::size(threads); ++index) { int iterations_for_this_thread = static_cast(index * 10); threads[index].Init( (other_locks == FileLocking::kShared) @@ -720,7 +721,7 @@ TEST(FileIO, ExclusiveVsExclusivesNonBlocking) { EXPECT_TRUE(LoggingUnlockFile(handle2.get())); } -#endif // !OS_FUCHSIA +#endif // !BUILDFLAG(IS_FUCHSIA) TEST(FileIO, FileSizeByHandle) { EXPECT_EQ(LoggingFileSizeByHandle(kInvalidFileHandle), -1); @@ -742,9 +743,9 @@ TEST(FileIO, FileSizeByHandle) { FileHandle FileHandleForFILE(FILE* file) { int fd = fileno(file); -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) return fd; -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) return reinterpret_cast(_get_osfhandle(fd)); #else #error Port diff --git a/external_imported/sentry-native/external/crashpad/util/file/file_writer.cc b/external_imported/sentry-native/external/crashpad/util/file/file_writer.cc index 73fe70879..b6f50eb78 100644 --- a/external_imported/sentry-native/external/crashpad/util/file/file_writer.cc +++ b/external_imported/sentry-native/external/crashpad/util/file/file_writer.cc @@ -25,22 +25,22 @@ #include "build/build_config.h" #include "util/misc/implicit_cast.h" -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) #include #include #include "base/posix/eintr_wrapper.h" -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) namespace crashpad { -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) // Ensure type compatibility between WritableIoVec and iovec. static_assert(sizeof(WritableIoVec) == sizeof(iovec), "WritableIoVec size"); static_assert(offsetof(WritableIoVec, iov_base) == offsetof(iovec, iov_base), "WritableIoVec base offset"); static_assert(offsetof(WritableIoVec, iov_len) == offsetof(iovec, iov_len), "WritableIoVec len offset"); -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) WeakFileHandleFileWriter::WeakFileHandleFileWriter(FileHandle file_handle) : file_handle_(file_handle) { @@ -62,7 +62,7 @@ bool WeakFileHandleFileWriter::WriteIoVec(std::vector* iovecs) { return false; } -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) ssize_t size = 0; for (const WritableIoVec& iov : *iovecs) { @@ -79,7 +79,7 @@ bool WeakFileHandleFileWriter::WriteIoVec(std::vector* iovecs) { iovec* iov = reinterpret_cast(&(*iovecs)[0]); size_t remaining_iovecs = iovecs->size(); -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) // Android does not expose the IOV_MAX macro, but makes its value available // via sysconf(). See Android 7.0.0 bionic/libc/bionic/sysconf.cpp sysconf(). // Bionic defines IOV_MAX at bionic/libc/include/limits.h, but does not ship @@ -127,14 +127,14 @@ bool WeakFileHandleFileWriter::WriteIoVec(std::vector* iovecs) { DCHECK_EQ(remaining_iovecs, 0u); -#else // !OS_POSIX +#else // !BUILDFLAG(IS_POSIX) for (const WritableIoVec& iov : *iovecs) { if (!Write(iov.iov_base, iov.iov_len)) return false; } -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) #ifndef NDEBUG // The interface says that |iovecs| is not sacred, so scramble it to make sure @@ -171,7 +171,7 @@ bool FileWriter::Open(const base::FilePath& path, return true; } -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) bool FileWriter::OpenMemfd(const base::FilePath& path) { CHECK(!file_.is_valid()); file_.reset(LoggingOpenMemoryFileForReadAndWrite(path)); diff --git a/external_imported/sentry-native/external/crashpad/util/file/file_writer.h b/external_imported/sentry-native/external/crashpad/util/file/file_writer.h index 4ba7a4386..8d82d1473 100644 --- a/external_imported/sentry-native/external/crashpad/util/file/file_writer.h +++ b/external_imported/sentry-native/external/crashpad/util/file/file_writer.h @@ -20,6 +20,7 @@ #include #include "base/files/file_path.h" +#include "build/build_config.h" #include "util/file/file_io.h" #include "util/file/file_seeker.h" @@ -136,7 +137,7 @@ class FileWriter : public FileWriterInterface { FileWriteMode write_mode, FilePermissions permissions); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) //! \brief Wraps LoggingOpenMemoryFileForWrite(). //! //! \return `true` if the operation succeeded, `false` if it failed, with an diff --git a/external_imported/sentry-native/external/crashpad/util/file/filesystem_posix.cc b/external_imported/sentry-native/external/crashpad/util/file/filesystem_posix.cc index c41339744..8853b9f67 100644 --- a/external_imported/sentry-native/external/crashpad/util/file/filesystem_posix.cc +++ b/external_imported/sentry-native/external/crashpad/util/file/filesystem_posix.cc @@ -33,9 +33,9 @@ bool FileModificationTime(const base::FilePath& path, timespec* mtime) { return false; } -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) *mtime = st.st_mtimespec; -#elif defined(OS_ANDROID) +#elif BUILDFLAG(IS_ANDROID) // This is needed to compile with traditional NDK headers. mtime->tv_sec = st.st_mtime; mtime->tv_nsec = st.st_mtime_nsec; diff --git a/external_imported/sentry-native/external/crashpad/util/file/filesystem_test.cc b/external_imported/sentry-native/external/crashpad/util/file/filesystem_test.cc index 9338cdcc1..cc683b3a0 100644 --- a/external_imported/sentry-native/external/crashpad/util/file/filesystem_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/file/filesystem_test.cc @@ -31,7 +31,7 @@ namespace { constexpr char kTestFileContent[] = "file_content"; bool CurrentTime(timespec* now) { -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) timeval now_tv; int res = gettimeofday(&now_tv, nullptr); if (res != 0) { @@ -40,7 +40,7 @@ bool CurrentTime(timespec* now) { } TimevalToTimespec(now_tv, now); return true; -#elif defined(OS_POSIX) +#elif BUILDFLAG(IS_POSIX) int res = clock_gettime(CLOCK_REALTIME, now); if (res != 0) { EXPECT_EQ(res, 0) << ErrnoMessage("clock_gettime"); @@ -90,7 +90,7 @@ TEST(Filesystem, FileModificationTime) { temp_dir.path().Append(FILE_PATH_LITERAL("notafile")), &mtime)); } -#if !defined(OS_FUCHSIA) +#if !BUILDFLAG(IS_FUCHSIA) TEST(Filesystem, FileModificationTime_SymbolicLinks) { if (!CanCreateSymbolicLinks()) { @@ -140,7 +140,7 @@ TEST(Filesystem, FileModificationTime_SymbolicLinks) { EXPECT_LE(mtime.tv_sec, expected_time_end.tv_sec + 2); } -#endif // !OS_FUCHSIA +#endif // !BUILDFLAG(IS_FUCHSIA) TEST(Filesystem, CreateDirectory) { ScopedTempDir temp_dir; @@ -221,7 +221,7 @@ TEST(Filesystem, MoveFileOrDirectory) { EXPECT_TRUE(IsRegularFile(file)); } -#if !defined(OS_FUCHSIA) +#if !BUILDFLAG(IS_FUCHSIA) TEST(Filesystem, MoveFileOrDirectory_SymbolicLinks) { if (!CanCreateSymbolicLinks()) { @@ -284,7 +284,7 @@ TEST(Filesystem, MoveFileOrDirectory_SymbolicLinks) { EXPECT_FALSE(PathExists(link2)); } -#endif // !OS_FUCHSIA +#endif // !BUILDFLAG(IS_FUCHSIA) TEST(Filesystem, IsRegularFile) { EXPECT_FALSE(IsRegularFile(base::FilePath())); @@ -299,7 +299,7 @@ TEST(Filesystem, IsRegularFile) { EXPECT_TRUE(IsRegularFile(file)); } -#if !defined(OS_FUCHSIA) +#if !BUILDFLAG(IS_FUCHSIA) TEST(Filesystem, IsRegularFile_SymbolicLinks) { if (!CanCreateSymbolicLinks()) { @@ -323,7 +323,7 @@ TEST(Filesystem, IsRegularFile_SymbolicLinks) { EXPECT_FALSE(IsRegularFile(dir_link)); } -#endif // !OS_FUCHSIA +#endif // !BUILDFLAG(IS_FUCHSIA) TEST(Filesystem, IsDirectory) { EXPECT_FALSE(IsDirectory(base::FilePath(), false)); @@ -341,7 +341,7 @@ TEST(Filesystem, IsDirectory) { EXPECT_FALSE(IsDirectory(file, true)); } -#if !defined(OS_FUCHSIA) +#if !BUILDFLAG(IS_FUCHSIA) TEST(Filesystem, IsDirectory_SymbolicLinks) { if (!CanCreateSymbolicLinks()) { @@ -368,7 +368,7 @@ TEST(Filesystem, IsDirectory_SymbolicLinks) { EXPECT_TRUE(IsDirectory(dir_link, true)); } -#endif // !OS_FUCHSIA +#endif // !BUILDFLAG(IS_FUCHSIA) TEST(Filesystem, RemoveFile) { EXPECT_FALSE(LoggingRemoveFile(base::FilePath())); @@ -390,7 +390,7 @@ TEST(Filesystem, RemoveFile) { EXPECT_FALSE(LoggingRemoveFile(file)); } -#if !defined(OS_FUCHSIA) +#if !BUILDFLAG(IS_FUCHSIA) TEST(Filesystem, RemoveFile_SymbolicLinks) { if (!CanCreateSymbolicLinks()) { @@ -417,7 +417,7 @@ TEST(Filesystem, RemoveFile_SymbolicLinks) { EXPECT_TRUE(PathExists(dir)); } -#endif // !OS_FUCHSIA +#endif // !BUILDFLAG(IS_FUCHSIA) TEST(Filesystem, RemoveDirectory) { EXPECT_FALSE(LoggingRemoveDirectory(base::FilePath())); @@ -432,7 +432,7 @@ TEST(Filesystem, RemoveDirectory) { EXPECT_FALSE(LoggingRemoveDirectory(file)); ASSERT_TRUE(CreateFile(file)); -#if !defined(OS_FUCHSIA) +#if !BUILDFLAG(IS_FUCHSIA) // The current implementation of Fuchsia's rmdir() simply calls unlink(), and // unlink() works on all FS objects. This is incorrect as // http://pubs.opengroup.org/onlinepubs/9699919799/functions/rmdir.html says @@ -447,7 +447,7 @@ TEST(Filesystem, RemoveDirectory) { EXPECT_TRUE(LoggingRemoveDirectory(dir)); } -#if !defined(OS_FUCHSIA) +#if !BUILDFLAG(IS_FUCHSIA) TEST(Filesystem, RemoveDirectory_SymbolicLinks) { if (!CanCreateSymbolicLinks()) { @@ -472,7 +472,7 @@ TEST(Filesystem, RemoveDirectory_SymbolicLinks) { EXPECT_TRUE(LoggingRemoveFile(link)); } -#endif // !OS_FUCHSIA +#endif // !BUILDFLAG(IS_FUCHSIA) TEST(Filesystem, GetFileSize) { ScopedTempDir temp_dir; @@ -486,13 +486,13 @@ TEST(Filesystem, GetFileSize) { uint64_t filesize = GetFileSize(filepath); EXPECT_EQ(filesize, sizeof(kTestFileContent)); -#if !defined(OS_FUCHSIA) +#if !BUILDFLAG(IS_FUCHSIA) // Create a link to a file. base::FilePath link(temp_dir.path().Append(FILE_PATH_LITERAL("link"))); ASSERT_TRUE(CreateSymbolicLink(filepath, link)); uint64_t filesize_link = GetFileSize(link); EXPECT_EQ(filesize_link, 0u); -#endif // !OS_FUCHSIA +#endif // !BUILDFLAG(IS_FUCHSIA) } TEST(Filesystem, GetDirectorySize) { @@ -516,7 +516,7 @@ TEST(Filesystem, GetDirectorySize) { writer2.Write(kTestFileContent, sizeof(kTestFileContent)); writer2.Close(); -#if !defined(OS_FUCHSIA) +#if !BUILDFLAG(IS_FUCHSIA) // Create a link to a file. base::FilePath link(dir.Append(FILE_PATH_LITERAL("link"))); ASSERT_TRUE(CreateSymbolicLink(filepath2, link)); @@ -524,7 +524,7 @@ TEST(Filesystem, GetDirectorySize) { // Create a link to a dir. base::FilePath linkdir(temp_dir.path().Append(FILE_PATH_LITERAL("link"))); ASSERT_TRUE(CreateSymbolicLink(dir, linkdir)); -#endif // !OS_FUCHSIA +#endif // !BUILDFLAG(IS_FUCHSIA) uint64_t filesize = GetDirectorySize(temp_dir.path()); EXPECT_EQ(filesize, 2 * sizeof(kTestFileContent)); diff --git a/external_imported/sentry-native/external/crashpad/util/ios/ios_system_data_collector.h b/external_imported/sentry-native/external/crashpad/util/ios/ios_system_data_collector.h index 035f9d81e..916a67456 100644 --- a/external_imported/sentry-native/external/crashpad/util/ios/ios_system_data_collector.h +++ b/external_imported/sentry-native/external/crashpad/util/ios/ios_system_data_collector.h @@ -17,6 +17,7 @@ #import +#include #include namespace crashpad { @@ -41,28 +42,25 @@ class IOSSystemDataCollector { int DaylightOffsetSeconds() const { return daylight_offset_seconds_; } const std::string& StandardName() const { return standard_name_; } const std::string& DaylightName() const { return daylight_name_; } + bool IsApplicationActive() const { return active_; } // Currently unused by minidump. int Orientation() const { return orientation_; } + // A completion callback that takes a bool indicating that the application has + // become active or inactive. + using ActiveApplicationCallback = std::function; + + void SetActiveApplicationCallback(ActiveApplicationCallback callback) { + active_application_callback_ = callback; + } + private: - // Notification handlers. + // Notification handlers for time zone, orientation and active state. void InstallHandlers(); - static void SystemTimeZoneDidChangeNotificationHandler( - CFNotificationCenterRef center, - void* observer, - CFStringRef name, - const void* object, - CFDictionaryRef userInfo); void SystemTimeZoneDidChangeNotification(); - - static void OrientationDidChangeNotificationHandler( - CFNotificationCenterRef center, - void* observer, - CFStringRef name, - const void* object, - CFDictionaryRef userInfo); void OrientationDidChangeNotification(); + void ApplicationDidChangeActiveNotification(); int major_version_; int minor_version_; @@ -72,6 +70,7 @@ class IOSSystemDataCollector { bool is_extension_; std::string machine_description_; int orientation_; + bool active_; int processor_count_; std::string cpu_vendor_; bool has_next_daylight_saving_time_; @@ -80,6 +79,7 @@ class IOSSystemDataCollector { int daylight_offset_seconds_; std::string standard_name_; std::string daylight_name_; + ActiveApplicationCallback active_application_callback_; }; } // namespace internal diff --git a/external_imported/sentry-native/external/crashpad/util/ios/ios_system_data_collector.mm b/external_imported/sentry-native/external/crashpad/util/ios/ios_system_data_collector.mm index 366be4648..6d39b6d2d 100644 --- a/external_imported/sentry-native/external/crashpad/util/ios/ios_system_data_collector.mm +++ b/external_imported/sentry-native/external/crashpad/util/ios/ios_system_data_collector.mm @@ -49,6 +49,24 @@ return value; } +template +void AddObserver(CFStringRef notification_name, T* observer) { + CFNotificationCenterAddObserver( + CFNotificationCenterGetLocalCenter(), + observer, + [](CFNotificationCenterRef center, + void* observer_vp, + CFNotificationName name, + const void* object, + CFDictionaryRef userInfo) { + T* observer = reinterpret_cast(observer_vp); + (observer->*M)(); + }, + notification_name, + nullptr, + CFNotificationSuspensionBehaviorDeliverImmediately); +} + } // namespace namespace crashpad { @@ -131,35 +149,30 @@ void IOSSystemDataCollector::InstallHandlers() { // Timezone. - CFNotificationCenterAddObserver( - CFNotificationCenterGetLocalCenter(), - this, - IOSSystemDataCollector::SystemTimeZoneDidChangeNotificationHandler, - reinterpret_cast(NSSystemTimeZoneDidChangeNotification), - nullptr, - CFNotificationSuspensionBehaviorDeliverImmediately); + AddObserver( + (__bridge CFStringRef)NSSystemTimeZoneDidChangeNotification, this); SystemTimeZoneDidChangeNotification(); // Orientation. - CFNotificationCenterAddObserver( - CFNotificationCenterGetLocalCenter(), - this, - IOSSystemDataCollector::OrientationDidChangeNotificationHandler, - reinterpret_cast(UIDeviceOrientationDidChangeNotification), - nullptr, - CFNotificationSuspensionBehaviorDeliverImmediately); + AddObserver( + (__bridge CFStringRef)UIDeviceOrientationDidChangeNotification, this); OrientationDidChangeNotification(); -} -// static -void IOSSystemDataCollector::SystemTimeZoneDidChangeNotificationHandler( - CFNotificationCenterRef center, - void* observer, - CFStringRef name, - const void* object, - CFDictionaryRef userInfo) { - static_cast(observer) - ->SystemTimeZoneDidChangeNotification(); + // Foreground/Background. Extensions shouldn't use UIApplication*. + if (!is_extension_) { + AddObserver< + IOSSystemDataCollector, + &IOSSystemDataCollector::ApplicationDidChangeActiveNotification>( + (__bridge CFStringRef)UIApplicationDidBecomeActiveNotification, this); + AddObserver< + IOSSystemDataCollector, + &IOSSystemDataCollector::ApplicationDidChangeActiveNotification>( + (__bridge CFStringRef)UIApplicationDidEnterBackgroundNotification, + this); + ApplicationDidChangeActiveNotification(); + } } void IOSSystemDataCollector::SystemTimeZoneDidChangeNotification() { @@ -197,21 +210,20 @@ } } -// static -void IOSSystemDataCollector::OrientationDidChangeNotificationHandler( - CFNotificationCenterRef center, - void* observer, - CFStringRef name, - const void* object, - CFDictionaryRef userInfo) { - static_cast(observer) - ->OrientationDidChangeNotification(); -} - void IOSSystemDataCollector::OrientationDidChangeNotification() { orientation_ = base::saturated_cast([[UIDevice currentDevice] orientation]); } +void IOSSystemDataCollector::ApplicationDidChangeActiveNotification() { + dispatch_assert_queue_debug(dispatch_get_main_queue()); + bool old_active = active_; + active_ = [UIApplication sharedApplication].applicationState == + UIApplicationStateActive; + if (active_ != old_active && active_application_callback_) { + active_application_callback_(active_); + } +} + } // namespace internal } // namespace crashpad diff --git a/external_imported/sentry-native/external/crashpad/util/ios/raw_logging.cc b/external_imported/sentry-native/external/crashpad/util/ios/raw_logging.cc index f037c4528..821348e5b 100644 --- a/external_imported/sentry-native/external/crashpad/util/ios/raw_logging.cc +++ b/external_imported/sentry-native/external/crashpad/util/ios/raw_logging.cc @@ -14,6 +14,8 @@ #include "util/ios/raw_logging.h" +#include + #include #include #include @@ -23,12 +25,22 @@ namespace crashpad { namespace internal { +namespace { +static_assert(std::atomic::is_always_lock_free, + "std::atomic may not be signal-safe"); +std::atomic g_file_handle = STDERR_FILENO; +} // namespace + +void SetFileHandleForTesting(FileHandle file_handle) { + g_file_handle = file_handle; +} + void RawLogString(const char* message) { const size_t message_len = strlen(message); size_t bytes_written = 0; while (bytes_written < message_len) { int rv = HANDLE_EINTR(write( - STDERR_FILENO, message + bytes_written, message_len - bytes_written)); + g_file_handle, message + bytes_written, message_len - bytes_written)); if (rv < 0) { // Give up, nothing we can do now. break; @@ -51,15 +63,15 @@ void RawLogInt(unsigned int number) { // Prints `path:linenum message:error` (with optional `:error`). void RawLog(const char* file, int line, const char* message, int error) { RawLogString(file); - HANDLE_EINTR(write(STDERR_FILENO, ":", 1)); + HANDLE_EINTR(write(g_file_handle, ":", 1)); RawLogInt(line); - HANDLE_EINTR(write(STDERR_FILENO, " ", 1)); + HANDLE_EINTR(write(g_file_handle, " ", 1)); RawLogString(message); if (error) { RawLogString(": "); RawLogInt(error); } - HANDLE_EINTR(write(STDERR_FILENO, "\n", 1)); + HANDLE_EINTR(write(g_file_handle, "\n", 1)); } } // namespace internal diff --git a/external_imported/sentry-native/external/crashpad/util/ios/raw_logging.h b/external_imported/sentry-native/external/crashpad/util/ios/raw_logging.h index 607528171..16f08d601 100644 --- a/external_imported/sentry-native/external/crashpad/util/ios/raw_logging.h +++ b/external_imported/sentry-native/external/crashpad/util/ios/raw_logging.h @@ -15,6 +15,8 @@ #ifndef CRASHPAD_UTIL_IOS_EXCEPTION_LOGGING_H_ #define CRASHPAD_UTIL_IOS_EXCEPTION_LOGGING_H_ +#include "util/file/file_io.h" + namespace crashpad { namespace internal { @@ -25,6 +27,11 @@ namespace internal { //! Note: RUNS-DURING-CRASH. void RawLog(const char* file, int line, const char* message, int error); +//! \brief Direct RawLog to log to \a file_handle instead of stderr, so tests +//! can confirm certain error conditions during in-process crashes. Call +//! before before any Crashpad is run. +void SetFileHandleForTesting(FileHandle file_handle); + } // namespace internal } // namespace crashpad diff --git a/external_imported/sentry-native/external/crashpad/util/ios/scoped_background_task.h b/external_imported/sentry-native/external/crashpad/util/ios/scoped_background_task.h new file mode 100644 index 000000000..909915b75 --- /dev/null +++ b/external_imported/sentry-native/external/crashpad/util/ios/scoped_background_task.h @@ -0,0 +1,40 @@ +// 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 CRASHPAD_UTIL_IOS_SCOPED_BACKGROUND_TASK_H_ +#define CRASHPAD_UTIL_IOS_SCOPED_BACKGROUND_TASK_H_ + +#include + +namespace crashpad { +namespace internal { + +//! \brief Marks the start of a task that should continue if the application +//! enters the background. +class ScopedBackgroundTask { + public: + //! \param[in] task_name A string used in debugging to indicate the reason the + //! activity began. This parameter must not be nullptr or an empty string. + ScopedBackgroundTask(const char* task_name); + + ScopedBackgroundTask(const ScopedBackgroundTask&) = delete; + ScopedBackgroundTask& operator=(const ScopedBackgroundTask&) = delete; + ~ScopedBackgroundTask(); + + private: + dispatch_semaphore_t task_complete_semaphore_; +}; + +} // namespace internal +} // namespace crashpad + +#endif // CRASHPAD_UTIL_IOS_SCOPED_BACKGROUND_TASK_H_ diff --git a/external_imported/sentry-native/external/crashpad/util/ios/scoped_background_task.mm b/external_imported/sentry-native/external/crashpad/util/ios/scoped_background_task.mm new file mode 100644 index 000000000..fdf2640e2 --- /dev/null +++ b/external_imported/sentry-native/external/crashpad/util/ios/scoped_background_task.mm @@ -0,0 +1,58 @@ +// Copyright 2022 The Crashpad Authors. All rights reserved. +// +// 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. + +#include "util/ios/scoped_background_task.h" + +#import + +#if !defined(__has_feature) || !__has_feature(objc_arc) +#error "This file requires ARC support." +#endif + +namespace crashpad { +namespace internal { + +ScopedBackgroundTask::ScopedBackgroundTask(const char* task_name) + : task_complete_semaphore_(dispatch_semaphore_create(0)) { + __weak dispatch_semaphore_t weak_task_complete_semaphore = + task_complete_semaphore_; + NSString* name = [NSString stringWithUTF8String:task_name]; + [[NSProcessInfo processInfo] + performExpiringActivityWithReason:name + usingBlock:^(BOOL expired) { + if (expired) { + // TODO(crbug.com/crashpad/400): Notify the + // BG task creator that time's up -- this will + // be useful for BackgroundTasks and + // NSURLSessions. + return; + } + __strong dispatch_semaphore_t + strong_task_complete_semaphore = + weak_task_complete_semaphore; + if (!strong_task_complete_semaphore) { + return; + } + dispatch_semaphore_wait( + strong_task_complete_semaphore, + DISPATCH_TIME_FOREVER); + }]; +} + +ScopedBackgroundTask::~ScopedBackgroundTask() { + dispatch_semaphore_signal(task_complete_semaphore_); +} + +} // namespace internal +} // namespace crashpad diff --git a/external_imported/sentry-native/external/crashpad/util/linux/auxiliary_vector_test.cc b/external_imported/sentry-native/external/crashpad/util/linux/auxiliary_vector_test.cc index 75c20d1a0..a230de6f1 100644 --- a/external_imported/sentry-native/external/crashpad/util/linux/auxiliary_vector_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/linux/auxiliary_vector_test.cc @@ -33,7 +33,7 @@ #include "util/numeric/int128.h" #include "util/process/process_memory_linux.h" -#if !defined(OS_ANDROID) +#if !BUILDFLAG(IS_ANDROID) // TODO(jperaza): This symbol isn't defined when building in chromium for // Android. There may be another symbol to use. extern "C" { @@ -72,7 +72,7 @@ void TestAgainstCloneOrSelf(pid_t pid) { ASSERT_TRUE(aux.GetValue(AT_BASE, &interp_base)); EXPECT_TRUE(mappings.FindMapping(interp_base)); -#if !defined(OS_ANDROID) +#if !BUILDFLAG(IS_ANDROID) LinuxVMAddress entry_addr; ASSERT_TRUE(aux.GetValue(AT_ENTRY, &entry_addr)); EXPECT_EQ(entry_addr, FromPointerCast(START_SYMBOL)); diff --git a/external_imported/sentry-native/external/crashpad/util/linux/exception_handler_client.cc b/external_imported/sentry-native/external/crashpad/util/linux/exception_handler_client.cc index 608a199c0..ed1c9fbb2 100644 --- a/external_imported/sentry-native/external/crashpad/util/linux/exception_handler_client.cc +++ b/external_imported/sentry-native/external/crashpad/util/linux/exception_handler_client.cc @@ -30,7 +30,7 @@ #include "util/misc/from_pointer_cast.h" #include "util/posix/signals.h" -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) #include #endif diff --git a/external_imported/sentry-native/external/crashpad/util/linux/exception_handler_protocol.cc b/external_imported/sentry-native/external/crashpad/util/linux/exception_handler_protocol.cc index 27f180c6e..a5530f738 100644 --- a/external_imported/sentry-native/external/crashpad/util/linux/exception_handler_protocol.cc +++ b/external_imported/sentry-native/external/crashpad/util/linux/exception_handler_protocol.cc @@ -14,15 +14,19 @@ #include "util/linux/exception_handler_protocol.h" +#include "build/build_config.h" + namespace crashpad { ExceptionHandlerProtocol::ClientInformation::ClientInformation() : exception_information_address(0), sanitization_information_address(0) -#if defined(OS_LINUX) || defined(OS_CHROMEOS) - , crash_loop_before_time(0) -#endif // OS_LINUX || OS_CHROMEOS -{} +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + , + crash_loop_before_time(0) +#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +{ +} ExceptionHandlerProtocol::ClientToServerMessage::ClientToServerMessage() : version(kVersion), diff --git a/external_imported/sentry-native/external/crashpad/util/linux/exception_handler_protocol.h b/external_imported/sentry-native/external/crashpad/util/linux/exception_handler_protocol.h index cbd24418a..6a38acd54 100644 --- a/external_imported/sentry-native/external/crashpad/util/linux/exception_handler_protocol.h +++ b/external_imported/sentry-native/external/crashpad/util/linux/exception_handler_protocol.h @@ -51,7 +51,7 @@ class ExceptionHandlerProtocol { //! SanitizationInformation struct, or 0 if there is no such struct. VMAddress sanitization_information_address; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) //! \brief Indicates that the client is likely in a crash loop if a crash //! occurs before this timestamp. This value is only used by ChromeOS's //! `/sbin/crash_reporter`. diff --git a/external_imported/sentry-native/external/crashpad/util/linux/memory_map.cc b/external_imported/sentry-native/external/crashpad/util/linux/memory_map.cc index 47eec973f..3e845c4c6 100644 --- a/external_imported/sentry-native/external/crashpad/util/linux/memory_map.cc +++ b/external_imported/sentry-native/external/crashpad/util/linux/memory_map.cc @@ -398,7 +398,7 @@ std::unique_ptr MemoryMap::FindFilePossibleMmapStarts( return std::make_unique(); } -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) // The Android Chromium linker uses ashmem to share RELRO segments between // processes. The original RELRO segment has been unmapped and replaced with a // mapping named "/dev/ashmem/RELRO:" where is the base @@ -427,17 +427,17 @@ std::unique_ptr MemoryMap::FindFilePossibleMmapStarts( } } } -#endif // OS_ANDROID +#endif // BUILDFLAG(IS_ANDROID) for (const auto& candidate : mappings_) { if (candidate.device == mapping.device && candidate.inode == mapping.inode -#if !defined(OS_ANDROID) +#if !BUILDFLAG(IS_ANDROID) // Libraries on Android may be mapped from zipfiles (APKs), in which // case the offset is not 0. && candidate.offset == 0 -#endif // !defined(OS_ANDROID) - ) { +#endif // !BUILDFLAG(IS_ANDROID) + ) { possible_starts.push_back(&candidate); } if (mapping.Equals(candidate)) { diff --git a/external_imported/sentry-native/external/crashpad/util/linux/memory_map_test.cc b/external_imported/sentry-native/external/crashpad/util/linux/memory_map_test.cc index 4ab7b05c4..d77dd0da5 100644 --- a/external_imported/sentry-native/external/crashpad/util/linux/memory_map_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/linux/memory_map_test.cc @@ -101,7 +101,7 @@ TEST(MemoryMap, SelfBasic) { ASSERT_TRUE(mapping); EXPECT_GE(code_address, mapping->range.Base()); EXPECT_LT(code_address, mapping->range.End()); -#if !defined(OS_ANDROID) +#if !BUILDFLAG(IS_ANDROID) // Android Q+ supports execute only memory. EXPECT_TRUE(mapping->readable); #endif @@ -174,7 +174,7 @@ class MapChildTest : public Multiprocess { ASSERT_TRUE(mapping); EXPECT_GE(code_address, mapping->range.Base()); EXPECT_LT(code_address, mapping->range.End()); -#if !defined(OS_ANDROID) +#if !BUILDFLAG(IS_ANDROID) // Android Q+ supports execute only memory. EXPECT_TRUE(mapping->readable); #endif @@ -426,7 +426,7 @@ void ExpectFindFilePossibleMmapStarts(LinuxVMAddress mapping_start, EXPECT_EQ(mappings->Next(), mapping2); mappings = map.FindFilePossibleMmapStarts(*mapping3); -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) EXPECT_EQ(mappings->Count(), 2u); #else ASSERT_EQ(mappings->Count(), 1u); @@ -474,7 +474,7 @@ TEST(MemoryMap, FindFilePossibleMmapStarts) { ASSERT_NE(mapping1, mapping2); ASSERT_NE(mapping2, mapping3); -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) auto mappings = map.FindFilePossibleMmapStarts(*mapping1); EXPECT_EQ(mappings->Count(), 1u); EXPECT_EQ(mappings->Next(), mapping1); @@ -622,7 +622,7 @@ TEST(MemoryMap, FindFilePossibleMmapStarts_MultipleStarts) { auto mapping = map.FindMapping(file_mapping0.addr_as()); ASSERT_TRUE(mapping); auto possible_starts = map.FindFilePossibleMmapStarts(*mapping); -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) EXPECT_EQ(possible_starts->Count(), 1u); #else EXPECT_EQ(possible_starts->Count(), 0u); @@ -631,7 +631,7 @@ TEST(MemoryMap, FindFilePossibleMmapStarts_MultipleStarts) { mapping = map.FindMapping(file_mapping1.addr_as()); ASSERT_TRUE(mapping); possible_starts = map.FindFilePossibleMmapStarts(*mapping); -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) EXPECT_EQ(possible_starts->Count(), 2u); #else EXPECT_EQ(possible_starts->Count(), 1u); @@ -640,7 +640,7 @@ TEST(MemoryMap, FindFilePossibleMmapStarts_MultipleStarts) { mapping = map.FindMapping(file_mapping2.addr_as()); ASSERT_TRUE(mapping); possible_starts = map.FindFilePossibleMmapStarts(*mapping); -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) EXPECT_EQ(possible_starts->Count(), 3u); #else EXPECT_EQ(possible_starts->Count(), 2u); @@ -649,7 +649,7 @@ TEST(MemoryMap, FindFilePossibleMmapStarts_MultipleStarts) { mapping = map.FindMapping(file_mapping3.addr_as()); ASSERT_TRUE(mapping); possible_starts = map.FindFilePossibleMmapStarts(*mapping); -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) EXPECT_EQ(possible_starts->Count(), 4u); #else EXPECT_EQ(possible_starts->Count(), 3u); @@ -658,7 +658,7 @@ TEST(MemoryMap, FindFilePossibleMmapStarts_MultipleStarts) { mapping = map.FindMapping(file_mapping4.addr_as()); ASSERT_TRUE(mapping); possible_starts = map.FindFilePossibleMmapStarts(*mapping); -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) EXPECT_EQ(possible_starts->Count(), 5u); #else EXPECT_EQ(possible_starts->Count(), 4u); diff --git a/external_imported/sentry-native/external/crashpad/util/linux/proc_stat_reader.cc b/external_imported/sentry-native/external/crashpad/util/linux/proc_stat_reader.cc index 878103d9d..04d47f5e4 100644 --- a/external_imported/sentry-native/external/crashpad/util/linux/proc_stat_reader.cc +++ b/external_imported/sentry-native/external/crashpad/util/linux/proc_stat_reader.cc @@ -18,7 +18,8 @@ #include #include -#include "base/cxx17_backports.h" +#include + #include "base/files/file_path.h" #include "base/logging.h" #include "util/file/file_io.h" @@ -48,7 +49,7 @@ bool ProcStatReader::Initialize(PtraceConnection* connection, pid_t tid) { INITIALIZATION_STATE_SET_INITIALIZING(initialized_); char path[32]; - snprintf(path, base::size(path), "/proc/%d/stat", tid); + snprintf(path, std::size(path), "/proc/%d/stat", tid); if (!connection->ReadFileContents(base::FilePath(path), &contents_)) { return false; } diff --git a/external_imported/sentry-native/external/crashpad/util/linux/proc_task_reader.cc b/external_imported/sentry-native/external/crashpad/util/linux/proc_task_reader.cc index ca62db271..0d2fb90b1 100644 --- a/external_imported/sentry-native/external/crashpad/util/linux/proc_task_reader.cc +++ b/external_imported/sentry-native/external/crashpad/util/linux/proc_task_reader.cc @@ -16,7 +16,8 @@ #include -#include "base/cxx17_backports.h" +#include + #include "base/files/file_path.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" @@ -29,7 +30,7 @@ bool ReadThreadIDs(pid_t pid, std::vector* tids) { DCHECK(tids->empty()); char path[32]; - snprintf(path, base::size(path), "/proc/%d/task", pid); + snprintf(path, std::size(path), "/proc/%d/task", pid); DirectoryReader reader; if (!reader.Open(base::FilePath(path))) { return false; diff --git a/external_imported/sentry-native/external/crashpad/util/linux/ptrace_client.cc b/external_imported/sentry-native/external/crashpad/util/linux/ptrace_client.cc index 9a34722ae..1863841f7 100644 --- a/external_imported/sentry-native/external/crashpad/util/linux/ptrace_client.cc +++ b/external_imported/sentry-native/external/crashpad/util/linux/ptrace_client.cc @@ -18,9 +18,9 @@ #include #include +#include #include -#include "base/cxx17_backports.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "util/file/file_io.h" @@ -265,7 +265,7 @@ bool PtraceClient::Threads(std::vector* threads) { threads->push_back(pid_); char path[32]; - snprintf(path, base::size(path), "/proc/%d/task", pid_); + snprintf(path, std::size(path), "/proc/%d/task", pid_); PtraceBroker::Request request = {}; request.type = PtraceBroker::Request::kTypeListDirectory; diff --git a/external_imported/sentry-native/external/crashpad/util/linux/thread_info.h b/external_imported/sentry-native/external/crashpad/util/linux/thread_info.h index 5b55c24a7..d3f3b2c69 100644 --- a/external_imported/sentry-native/external/crashpad/util/linux/thread_info.h +++ b/external_imported/sentry-native/external/crashpad/util/linux/thread_info.h @@ -24,7 +24,7 @@ #include "util/linux/address_types.h" #include "util/numeric/int128.h" -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) #include #endif @@ -261,11 +261,12 @@ union FloatContext { // __ANDROID_API_N__ is a proxy for determining whether unified headers are in // use. It’s only defined by unified headers. Unified headers call this // structure user_fpxregs_struct regardless of API level. -#if defined(OS_ANDROID) && __ANDROID_API__ <= 19 && !defined(__ANDROID_API_N__) +#if BUILDFLAG(IS_ANDROID) && __ANDROID_API__ <= 19 && \ + !defined(__ANDROID_API_N__) using NativeFpxregs = user_fxsr_struct; #else using NativeFpxregs = user_fpxregs_struct; -#endif // OS_ANDROID +#endif // BUILDFLAG(IS_ANDROID) static_assert(sizeof(f32_t::fxsave) == sizeof(NativeFpxregs), "Size mismatch"); #elif defined(ARCH_CPU_X86_64) diff --git a/external_imported/sentry-native/external/crashpad/util/mac/checked_mach_address_range_test.cc b/external_imported/sentry-native/external/crashpad/util/mac/checked_mach_address_range_test.cc index 4ef26fd92..7f26d2559 100644 --- a/external_imported/sentry-native/external/crashpad/util/mac/checked_mach_address_range_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/mac/checked_mach_address_range_test.cc @@ -17,9 +17,9 @@ #include #include +#include #include -#include "base/cxx17_backports.h" #include "base/strings/stringprintf.h" #include "build/build_config.h" #include "gtest/gtest.h" @@ -116,7 +116,7 @@ TEST(CheckedMachAddressRange, IsValid) { {0xffffffffffffffff, 1, kInvalid}, }; - for (size_t index = 0; index < base::size(kTestData); ++index) { + for (size_t index = 0; index < std::size(kTestData); ++index) { const auto& testcase = kTestData[index]; SCOPED_TRACE(base::StringPrintf("index %zu, base 0x%llx, size 0x%llx", index, @@ -166,7 +166,7 @@ TEST(CheckedMachAddressRange, ContainsValue) { CheckedMachAddressRange parent_range_32(false, 0x2000, 0x1000); ASSERT_TRUE(parent_range_32.IsValid()); - for (size_t index = 0; index < base::size(kTestData); ++index) { + for (size_t index = 0; index < std::size(kTestData); ++index) { const auto& testcase = kTestData[index]; SCOPED_TRACE( base::StringPrintf("index %zu, value 0x%llx", index, testcase.value)); @@ -223,7 +223,7 @@ TEST(CheckedMachAddressRange, ContainsRange) { CheckedMachAddressRange parent_range_32(false, 0x2000, 0x1000); ASSERT_TRUE(parent_range_32.IsValid()); - for (size_t index = 0; index < base::size(kTestData); ++index) { + for (size_t index = 0; index < std::size(kTestData); ++index) { const auto& testcase = kTestData[index]; SCOPED_TRACE(base::StringPrintf("index %zu, base 0x%llx, size 0x%llx", index, diff --git a/external_imported/sentry-native/external/crashpad/util/mac/launchd_test.mm b/external_imported/sentry-native/external/crashpad/util/mac/launchd_test.mm index 2e49ee665..21920598f 100644 --- a/external_imported/sentry-native/external/crashpad/util/mac/launchd_test.mm +++ b/external_imported/sentry-native/external/crashpad/util/mac/launchd_test.mm @@ -20,9 +20,9 @@ #include #include +#include #include -#include "base/cxx17_backports.h" #include "base/mac/scoped_launch_data.h" #include "gtest/gtest.h" #include "util/stdlib/objc.h" @@ -58,7 +58,7 @@ @0xfedcba9876543210, }; - for (size_t index = 0; index < base::size(integer_nses); ++index) { + for (size_t index = 0; index < std::size(integer_nses); ++index) { NSNumber* integer_ns = integer_nses[index]; launch_data.reset(CFPropertyToLaunchData(integer_ns)); ASSERT_TRUE(launch_data.get()); @@ -88,7 +88,7 @@ @(std::numeric_limits::signaling_NaN()), }; - for (size_t index = 0; index < base::size(double_nses); ++index) { + for (size_t index = 0; index < std::size(double_nses); ++index) { NSNumber* double_ns = double_nses[index]; launch_data.reset(CFPropertyToLaunchData(double_ns)); ASSERT_TRUE(launch_data.get()); @@ -114,7 +114,7 @@ @YES, }; - for (size_t index = 0; index < base::size(bool_nses); ++index) { + for (size_t index = 0; index < std::size(bool_nses); ++index) { NSNumber* bool_ns = bool_nses[index]; launch_data.reset(CFPropertyToLaunchData(bool_ns)); ASSERT_TRUE(launch_data.get()); @@ -138,7 +138,7 @@ @"Üñîçø∂é", }; - for (size_t index = 0; index < base::size(string_nses); ++index) { + for (size_t index = 0; index < std::size(string_nses); ++index) { NSString* string_ns = string_nses[index]; launch_data.reset(CFPropertyToLaunchData(string_ns)); ASSERT_TRUE(launch_data.get()); diff --git a/external_imported/sentry-native/external/crashpad/util/mach/child_port_handshake.cc b/external_imported/sentry-native/external/crashpad/util/mach/child_port_handshake.cc index 28fdbae6d..d0e58030f 100644 --- a/external_imported/sentry-native/external/crashpad/util/mach/child_port_handshake.cc +++ b/external_imported/sentry-native/external/crashpad/util/mach/child_port_handshake.cc @@ -24,10 +24,10 @@ #include #include +#include #include #include "base/check_op.h" -#include "base/cxx17_backports.h" #include "base/logging.h" #include "base/mac/mach_logging.h" #include "base/mac/scoped_mach_port.h" @@ -167,8 +167,8 @@ mach_port_t ChildPortHandshakeServer::RunServer( 0, 0, nullptr); - int rv = HANDLE_EINTR(kevent( - kq.get(), changelist, base::size(changelist), nullptr, 0, nullptr)); + int rv = HANDLE_EINTR( + kevent(kq.get(), changelist, std::size(changelist), nullptr, 0, nullptr)); PCHECK(rv != -1) << "kevent"; ChildPortServer child_port_server(this); diff --git a/external_imported/sentry-native/external/crashpad/util/mach/child_port_handshake.h b/external_imported/sentry-native/external/crashpad/util/mach/child_port_handshake.h index c61f734ed..54168691b 100644 --- a/external_imported/sentry-native/external/crashpad/util/mach/child_port_handshake.h +++ b/external_imported/sentry-native/external/crashpad/util/mach/child_port_handshake.h @@ -18,9 +18,9 @@ #include #include +#include #include "base/files/scoped_file.h" -#include "base/ignore_result.h" #include "util/mach/child_port_types.h" namespace crashpad { @@ -124,7 +124,7 @@ class ChildPortHandshakeTest; //! // for use in the parent process. //! if (child_port_handshake.RunClient(receive_right.get(), //! MACH_MSG_TYPE_MOVE_RECEIVE)) { -//! ignore_result(receive_right.release()); +//! std::ignore = receive_right.release(); //! } //! \endcode //! diff --git a/external_imported/sentry-native/external/crashpad/util/mach/child_port_server.cc b/external_imported/sentry-native/external/crashpad/util/mach/child_port_server.cc index 927342942..9323723c3 100644 --- a/external_imported/sentry-native/external/crashpad/util/mach/child_port_server.cc +++ b/external_imported/sentry-native/external/crashpad/util/mach/child_port_server.cc @@ -14,7 +14,8 @@ #include "util/mach/child_port_server.h" -#include "base/cxx17_backports.h" +#include + #include "util/mach/child_portServer.h" #include "util/mach/mach_message.h" @@ -90,7 +91,7 @@ std::set ChildPortServer::MachMessageServerRequestIDs() { static constexpr mach_msg_id_t request_ids[] = {kMachMessageIDChildPortCheckIn}; return std::set(&request_ids[0], - &request_ids[base::size(request_ids)]); + &request_ids[std::size(request_ids)]); } mach_msg_size_t ChildPortServer::MachMessageServerRequestSize() { diff --git a/external_imported/sentry-native/external/crashpad/util/mach/composite_mach_message_server_test.cc b/external_imported/sentry-native/external/crashpad/util/mach/composite_mach_message_server_test.cc index 91a3851f2..36fd6ac08 100644 --- a/external_imported/sentry-native/external/crashpad/util/mach/composite_mach_message_server_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/mach/composite_mach_message_server_test.cc @@ -16,7 +16,8 @@ #include -#include "base/cxx17_backports.h" +#include + #include "base/strings/stringprintf.h" #include "gtest/gtest.h" #include "test/gtest_death.h" @@ -198,7 +199,7 @@ TEST(CompositeMachMessageServer, ThreeHandlers) { TestMachMessageHandler handlers[3]; std::set expect_request_ids; - for (size_t index = 0; index < base::size(kRequestIDs0); ++index) { + for (size_t index = 0; index < std::size(kRequestIDs0); ++index) { const mach_msg_id_t request_id = kRequestIDs0[index]; handlers[0].AddRequestID(request_id); expect_request_ids.insert(request_id); @@ -207,7 +208,7 @@ TEST(CompositeMachMessageServer, ThreeHandlers) { handlers[0].SetReplySize(sizeof(mig_reply_error_t)); handlers[0].SetReturnCodes(true, kReturnCode0, false); - for (size_t index = 0; index < base::size(kRequestIDs1); ++index) { + for (size_t index = 0; index < std::size(kRequestIDs1); ++index) { const mach_msg_id_t request_id = kRequestIDs1[index]; handlers[1].AddRequestID(request_id); expect_request_ids.insert(request_id); @@ -216,7 +217,7 @@ TEST(CompositeMachMessageServer, ThreeHandlers) { handlers[1].SetReplySize(200); handlers[1].SetReturnCodes(false, kReturnCode1, true); - for (size_t index = 0; index < base::size(kRequestIDs2); ++index) { + for (size_t index = 0; index < std::size(kRequestIDs2); ++index) { const mach_msg_id_t request_id = kRequestIDs2[index]; handlers[2].AddRequestID(request_id); expect_request_ids.insert(request_id); @@ -254,7 +255,7 @@ TEST(CompositeMachMessageServer, ThreeHandlers) { // Send messages with known request IDs. - for (size_t index = 0; index < base::size(kRequestIDs0); ++index) { + for (size_t index = 0; index < std::size(kRequestIDs0); ++index) { request.header.msgh_id = kRequestIDs0[index]; SCOPED_TRACE(base::StringPrintf( "handler 0, index %zu, id %d", index, request.header.msgh_id)); @@ -265,7 +266,7 @@ TEST(CompositeMachMessageServer, ThreeHandlers) { EXPECT_FALSE(destroy_complex_request); } - for (size_t index = 0; index < base::size(kRequestIDs1); ++index) { + for (size_t index = 0; index < std::size(kRequestIDs1); ++index) { request.header.msgh_id = kRequestIDs1[index]; SCOPED_TRACE(base::StringPrintf( "handler 1, index %zu, id %d", index, request.header.msgh_id)); @@ -276,7 +277,7 @@ TEST(CompositeMachMessageServer, ThreeHandlers) { EXPECT_TRUE(destroy_complex_request); } - for (size_t index = 0; index < base::size(kRequestIDs2); ++index) { + for (size_t index = 0; index < std::size(kRequestIDs2); ++index) { request.header.msgh_id = kRequestIDs2[index]; SCOPED_TRACE(base::StringPrintf( "handler 2, index %zu, id %d", index, request.header.msgh_id)); diff --git a/external_imported/sentry-native/external/crashpad/util/mach/exc_client_variants_test.cc b/external_imported/sentry-native/external/crashpad/util/mach/exc_client_variants_test.cc index aba72052f..700eb5f8d 100644 --- a/external_imported/sentry-native/external/crashpad/util/mach/exc_client_variants_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/mach/exc_client_variants_test.cc @@ -19,7 +19,8 @@ #include #include -#include "base/cxx17_backports.h" +#include + #include "base/strings/stringprintf.h" #include "gtest/gtest.h" #include "test/mac/mach_errors.h" @@ -184,11 +185,11 @@ class TestExcClientVariants : public MachMultiprocess, // These aren’t real flavors, it’s just for testing. flavor = exception_ + 10; flavor_p = &flavor; - for (size_t index = 0; index < base::size(old_state); ++index) { + for (size_t index = 0; index < std::size(old_state); ++index) { old_state[index] = index; } old_state_p = reinterpret_cast(&old_state); - old_state_count = base::size(old_state); + old_state_count = std::size(old_state); // new_state and new_state_count are out parameters that the server should // never see or use, so set them to bogus values. The call to the server @@ -205,7 +206,7 @@ class TestExcClientVariants : public MachMultiprocess, task, exception, code, - base::size(code), + std::size(code), flavor_p, old_state_p, old_state_count, @@ -274,7 +275,7 @@ TEST(ExcClientVariants, UniversalExceptionRaise) { kMachExceptionCodes | EXCEPTION_STATE_IDENTITY, }; - for (size_t index = 0; index < base::size(kBehaviors); ++index) { + for (size_t index = 0; index < std::size(kBehaviors); ++index) { exception_behavior_t behavior = kBehaviors[index]; SCOPED_TRACE(base::StringPrintf("index %zu, behavior %d", index, behavior)); diff --git a/external_imported/sentry-native/external/crashpad/util/mach/exc_server_variants.cc b/external_imported/sentry-native/external/crashpad/util/mach/exc_server_variants.cc index b9357a780..2941cb29e 100644 --- a/external_imported/sentry-native/external/crashpad/util/mach/exc_server_variants.cc +++ b/external_imported/sentry-native/external/crashpad/util/mach/exc_server_variants.cc @@ -18,9 +18,9 @@ #include #include +#include #include -#include "base/cxx17_backports.h" #include "build/build_config.h" #include "util/mac/mac_util.h" #include "util/mach/composite_mach_message_server.h" @@ -246,7 +246,7 @@ class ExcServer : public MachMessageServer::Interface { Traits::kMachMessageIDExceptionRaiseStateIdentity, }; return std::set(&request_ids[0], - &request_ids[base::size(request_ids)]); + &request_ids[std::size(request_ids)]); } mach_msg_size_t MachMessageServerRequestSize() override { @@ -321,7 +321,7 @@ bool ExcServer::MachMessageServerFunction( using Reply = typename Traits::ExceptionRaiseStateReply; Reply* out_reply = reinterpret_cast(out_header); out_reply->flavor = in_request_1->flavor; - out_reply->new_stateCnt = base::size(out_reply->new_state); + out_reply->new_stateCnt = std::size(out_reply->new_state); out_reply->RetCode = interface_->CatchExceptionRaiseState(in_header->msgh_local_port, in_request->exception, @@ -364,7 +364,7 @@ bool ExcServer::MachMessageServerFunction( using Reply = typename Traits::ExceptionRaiseStateIdentityReply; Reply* out_reply = reinterpret_cast(out_header); out_reply->flavor = in_request_1->flavor; - out_reply->new_stateCnt = base::size(out_reply->new_state); + out_reply->new_stateCnt = std::size(out_reply->new_state); out_reply->RetCode = interface_->CatchExceptionRaiseStateIdentity( in_header->msgh_local_port, in_request->thread.name, @@ -686,10 +686,10 @@ kern_return_t ExcServerSuccessfulReturnValue(exception_type_t exception, exception_behavior_t behavior, bool set_thread_state) { if (exception == EXC_CRASH -#if defined(OS_MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_11 +#if BUILDFLAG(IS_MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_11 && MacOSVersionNumber() >= 10'11'00 #endif - ) { + ) { return KERN_SUCCESS; } diff --git a/external_imported/sentry-native/external/crashpad/util/mach/exc_server_variants_test.cc b/external_imported/sentry-native/external/crashpad/util/mach/exc_server_variants_test.cc index d74cbc591..b0fcef092 100644 --- a/external_imported/sentry-native/external/crashpad/util/mach/exc_server_variants_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/mach/exc_server_variants_test.cc @@ -19,7 +19,8 @@ #include #include -#include "base/cxx17_backports.h" +#include + #include "base/strings/stringprintf.h" #include "build/build_config.h" #include "gmock/gmock.h" @@ -31,9 +32,9 @@ #include "util/mach/mach_message.h" #include "util/misc/implicit_cast.h" -#if defined(OS_MAC) +#if BUILDFLAG(IS_MAC) #include "test/mac/mach_multiprocess.h" -#endif // OS_MAC +#endif // BUILDFLAG(IS_MAC) namespace crashpad { namespace test { @@ -232,7 +233,7 @@ struct __attribute__((packed, aligned(4))) ExceptionRaiseStateReply { EXPECT_EQ(memcmp(&NDR, &NDR_record, sizeof(NDR)), 0); EXPECT_EQ(RetCode, KERN_SUCCESS); EXPECT_EQ(flavor, kThreadStateFlavor); - EXPECT_EQ(new_stateCnt, base::size(new_state)); + EXPECT_EQ(new_stateCnt, std::size(new_state)); } mach_msg_header_t Head; @@ -664,7 +665,7 @@ TEST(ExcServerVariants, MockExceptionRaiseState) { AreExceptionCodes(kTestExceptonCodes[0], kTestExceptonCodes[1]), Pointee(Eq(kThreadStateFlavor)), IsThreadStateAndCount(kThreadStateFlavorCount), - IsThreadStateAndCount(base::size(reply.new_state)), + IsThreadStateAndCount(std::size(reply.new_state)), Eq(request.Trailer()))) .WillOnce(Return(KERN_SUCCESS)) .RetiresOnSaturation(); @@ -713,7 +714,7 @@ TEST(ExcServerVariants, MockExceptionRaiseStateIdentity) { AreExceptionCodes(kTestExceptonCodes[0], kTestExceptonCodes[1]), Pointee(Eq(kThreadStateFlavor)), IsThreadStateAndCount(kThreadStateFlavorCount), - IsThreadStateAndCount(base::size(reply.new_state)), + IsThreadStateAndCount(std::size(reply.new_state)), Eq(request.Trailer()))) .WillOnce(Return(KERN_SUCCESS)) .RetiresOnSaturation(); @@ -807,7 +808,7 @@ TEST(ExcServerVariants, MockMachExceptionRaiseState) { kTestMachExceptionCodes[1]), Pointee(Eq(kThreadStateFlavor)), IsThreadStateAndCount(kThreadStateFlavorCount), - IsThreadStateAndCount(base::size(reply.new_state)), + IsThreadStateAndCount(std::size(reply.new_state)), Eq(request.Trailer()))) .WillOnce(Return(KERN_SUCCESS)) .RetiresOnSaturation(); @@ -857,7 +858,7 @@ TEST(ExcServerVariants, MockMachExceptionRaiseStateIdentity) { kTestMachExceptionCodes[1]), Pointee(Eq(kThreadStateFlavor)), IsThreadStateAndCount(kThreadStateFlavorCount), - IsThreadStateAndCount(base::size(reply.new_state)), + IsThreadStateAndCount(std::size(reply.new_state)), Eq(request.Trailer()))) .WillOnce(Return(KERN_SUCCESS)) .RetiresOnSaturation(); @@ -911,7 +912,7 @@ TEST(ExcServerVariants, MockUnknownID) { 2508, }; - for (size_t index = 0; index < base::size(unknown_ids); ++index) { + for (size_t index = 0; index < std::size(unknown_ids); ++index) { mach_msg_id_t id = unknown_ids[index]; SCOPED_TRACE(base::StringPrintf("unknown id %d", id)); @@ -962,7 +963,7 @@ TEST(ExcServerVariants, MachMessageServerRequestIDs) { expect_request_ids); } -#if defined(OS_MAC) +#if BUILDFLAG(IS_MAC) class TestExcServerVariants : public MachMultiprocess, public UniversalMachExcServer::Interface { @@ -1190,7 +1191,7 @@ TEST(ExcServerVariants, ThreadStates) { #endif }; - for (size_t index = 0; index < base::size(test_data); ++index) { + for (size_t index = 0; index < std::size(test_data); ++index) { const auto& test = test_data[index]; SCOPED_TRACE( base::StringPrintf("index %zu, flavor %d", index, test.flavor)); @@ -1203,10 +1204,10 @@ TEST(ExcServerVariants, ThreadStates) { } } -#endif // OS_MAC +#endif // BUILDFLAG(IS_MAC) TEST(ExcServerVariants, ExcServerSuccessfulReturnValue) { -#if defined(OS_IOS) +#if BUILDFLAG(IS_IOS) // iOS 9 ≅ OS X 10.11. const kern_return_t prefer_not_set_thread_state = KERN_SUCCESS; #else @@ -1270,7 +1271,7 @@ TEST(ExcServerVariants, ExcServerSuccessfulReturnValue) { KERN_SUCCESS}, }; - for (size_t index = 0; index < base::size(kTestData); ++index) { + for (size_t index = 0; index < std::size(kTestData); ++index) { const auto& test_data = kTestData[index]; SCOPED_TRACE( base::StringPrintf("index %zu, behavior %d, set_thread_state %s", @@ -1289,8 +1290,8 @@ TEST(ExcServerVariants, ExcServerCopyState) { static constexpr natural_t old_state[] = {1, 2, 3, 4, 5}; natural_t new_state[10] = {}; - constexpr mach_msg_type_number_t old_state_count = base::size(old_state); - mach_msg_type_number_t new_state_count = base::size(new_state); + constexpr mach_msg_type_number_t old_state_count = std::size(old_state); + mach_msg_type_number_t new_state_count = std::size(new_state); // EXCEPTION_DEFAULT (with or without MACH_EXCEPTION_CODES) is not // state-carrying. new_state and new_state_count should be untouched. @@ -1299,8 +1300,8 @@ TEST(ExcServerVariants, ExcServerCopyState) { old_state_count, new_state, &new_state_count); - EXPECT_EQ(new_state_count, base::size(new_state)); - for (size_t i = 0; i < base::size(new_state); ++i) { + EXPECT_EQ(new_state_count, std::size(new_state)); + for (size_t i = 0; i < std::size(new_state); ++i) { EXPECT_EQ(new_state[i], 0u) << "i " << i; } @@ -1309,8 +1310,8 @@ TEST(ExcServerVariants, ExcServerCopyState) { old_state_count, new_state, &new_state_count); - EXPECT_EQ(new_state_count, base::size(new_state)); - for (size_t i = 0; i < base::size(new_state); ++i) { + EXPECT_EQ(new_state_count, std::size(new_state)); + for (size_t i = 0; i < std::size(new_state); ++i) { EXPECT_EQ(new_state[i], 0u) << "i " << i; } @@ -1322,7 +1323,7 @@ TEST(ExcServerVariants, ExcServerCopyState) { for (size_t i = 0; i < copy_limit; ++i) { EXPECT_EQ(new_state[i], old_state[i]) << "i " << i; } - for (size_t i = copy_limit; i < base::size(new_state); ++i) { + for (size_t i = copy_limit; i < std::size(new_state); ++i) { EXPECT_EQ(new_state[i], 0u) << "i " << i; } @@ -1338,23 +1339,23 @@ TEST(ExcServerVariants, ExcServerCopyState) { for (size_t i = 0; i < copy_limit; ++i) { EXPECT_EQ(new_state[i], old_state[i]) << "i " << i; } - for (size_t i = copy_limit; i < base::size(new_state); ++i) { + for (size_t i = copy_limit; i < std::size(new_state); ++i) { EXPECT_EQ(new_state[i], 0u) << "i " << i; } // This is a state-carrying exception where all of old_state is copied to // new_state, which is large enough to receive it and then some. - new_state_count = base::size(new_state); + new_state_count = std::size(new_state); ExcServerCopyState(MACH_EXCEPTION_CODES | EXCEPTION_STATE_IDENTITY, old_state, old_state_count, new_state, &new_state_count); EXPECT_EQ(new_state_count, old_state_count); - for (size_t i = 0; i < base::size(old_state); ++i) { + for (size_t i = 0; i < std::size(old_state); ++i) { EXPECT_EQ(new_state[i], old_state[i]) << "i " << i; } - for (size_t i = base::size(old_state); i < base::size(new_state); ++i) { + for (size_t i = std::size(old_state); i < std::size(new_state); ++i) { EXPECT_EQ(new_state[i], 0u) << "i " << i; } } diff --git a/external_imported/sentry-native/external/crashpad/util/mach/exception_behaviors_test.cc b/external_imported/sentry-native/external/crashpad/util/mach/exception_behaviors_test.cc index e6abd25fb..8e3d0f4b7 100644 --- a/external_imported/sentry-native/external/crashpad/util/mach/exception_behaviors_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/mach/exception_behaviors_test.cc @@ -16,7 +16,8 @@ #include -#include "base/cxx17_backports.h" +#include + #include "base/strings/stringprintf.h" #include "gtest/gtest.h" #include "util/mach/mach_extensions.h" @@ -53,7 +54,7 @@ TEST(ExceptionBehaviors, ExceptionBehaviors) { EXCEPTION_STATE_IDENTITY}, }; - for (size_t index = 0; index < base::size(kTestData); ++index) { + for (size_t index = 0; index < std::size(kTestData); ++index) { const auto& test_data = kTestData[index]; SCOPED_TRACE(base::StringPrintf( "index %zu, behavior %d", index, test_data.behavior)); diff --git a/external_imported/sentry-native/external/crashpad/util/mach/exception_types_test.cc b/external_imported/sentry-native/external/crashpad/util/mach/exception_types_test.cc index 3e777ef24..fb095fab0 100644 --- a/external_imported/sentry-native/external/crashpad/util/mach/exception_types_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/mach/exception_types_test.cc @@ -20,7 +20,8 @@ #include #include -#include "base/cxx17_backports.h" +#include + #include "base/strings/stringprintf.h" #include "build/build_config.h" #include "gtest/gtest.h" @@ -71,7 +72,7 @@ TEST(ExceptionTypes, ExcCrashRecoverOriginalException) { // TODO(macos_arm64): Add arm64 test data. }; - for (size_t index = 0; index < base::size(kTestData); ++index) { + for (size_t index = 0; index < std::size(kTestData); ++index) { const auto& test_data = kTestData[index]; SCOPED_TRACE(base::StringPrintf( "index %zu, code_0 0x%llx", index, test_data.code_0)); @@ -88,7 +89,7 @@ TEST(ExceptionTypes, ExcCrashRecoverOriginalException) { // Now make sure that ExcCrashRecoverOriginalException() properly ignores // optional arguments. - static_assert(base::size(kTestData) >= 1, "must have something to test"); + static_assert(std::size(kTestData) >= 1, "must have something to test"); const auto& test_data = kTestData[0]; EXPECT_EQ( ExcCrashRecoverOriginalException(test_data.code_0, nullptr, nullptr), @@ -248,7 +249,7 @@ TEST(ExceptionTypes, ExceptionCodeForMetrics) { {0x00010000, 0x00010000, static_cast(0xffffffff)}, }; - for (size_t index = 0; index < base::size(kTestData); ++index) { + for (size_t index = 0; index < std::size(kTestData); ++index) { const auto& test_data = kTestData[index]; SCOPED_TRACE(base::StringPrintf("index %zu, exception 0x%x, code_0 0x%llx", index, diff --git a/external_imported/sentry-native/external/crashpad/util/mach/mach_extensions.cc b/external_imported/sentry-native/external/crashpad/util/mach/mach_extensions.cc index 7f8069388..dcff5c2a8 100644 --- a/external_imported/sentry-native/external/crashpad/util/mach/mach_extensions.cc +++ b/external_imported/sentry-native/external/crashpad/util/mach/mach_extensions.cc @@ -44,12 +44,12 @@ exception_mask_t ExcMaskAll() { // 10.9.4 xnu-2422.110.17/osfmk/mach/ipc_host.c and // xnu-2422.110.17/osfmk/mach/ipc_tt.c. -#if defined(OS_IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_7_0 +#if BUILDFLAG(IS_IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_7_0 // iOS 7 ≅ OS X 10.9. #error This code was not ported to iOS versions older than 7 #endif -#if defined(OS_MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_9 +#if BUILDFLAG(IS_MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_9 const int macos_version_number = MacOSVersionNumber(); #endif @@ -66,7 +66,7 @@ exception_mask_t ExcMaskAll() { EXC_MASK_MACH_SYSCALL | EXC_MASK_RPC_ALERT | EXC_MASK_MACHINE; -#if defined(OS_MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_8 +#if BUILDFLAG(IS_MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_8 if (macos_version_number < 10'08'00) { return kExcMaskAll_10_6; } @@ -76,7 +76,7 @@ exception_mask_t ExcMaskAll() { // xnu-2050.48.11/osfmk/mach/exception_types.h. constexpr exception_mask_t kExcMaskAll_10_8 = kExcMaskAll_10_6 | EXC_MASK_RESOURCE; -#if defined(OS_MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_9 +#if BUILDFLAG(IS_MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_9 if (macos_version_number < 10'09'00) { return kExcMaskAll_10_8; } @@ -91,12 +91,12 @@ exception_mask_t ExcMaskAll() { exception_mask_t ExcMaskValid() { const exception_mask_t kExcMaskValid_10_6 = ExcMaskAll() | EXC_MASK_CRASH; -#if defined(OS_IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_9_0 +#if BUILDFLAG(IS_IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_9_0 // iOS 9 ≅ OS X 10.11. #error This code was not ported to iOS versions older than 9 #endif -#if defined(OS_MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_11 +#if BUILDFLAG(IS_MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_11 if (MacOSVersionNumber() < 10'11'00) { return kExcMaskValid_10_6; } diff --git a/external_imported/sentry-native/external/crashpad/util/mach/mach_extensions_test.cc b/external_imported/sentry-native/external/crashpad/util/mach/mach_extensions_test.cc index 4ff53d942..57e03ad15 100644 --- a/external_imported/sentry-native/external/crashpad/util/mach/mach_extensions_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/mach/mach_extensions_test.cc @@ -80,11 +80,11 @@ TEST(MachExtensions, ExcMaskAll) { EXPECT_FALSE(exc_mask_all & EXC_MASK_CRASH); EXPECT_FALSE(exc_mask_all & EXC_MASK_CORPSE_NOTIFY); -#if defined(OS_IOS) +#if BUILDFLAG(IS_IOS) // Assume at least iOS 7 (≅ OS X 10.9). EXPECT_TRUE(exc_mask_all & EXC_MASK_RESOURCE); EXPECT_TRUE(exc_mask_all & EXC_MASK_GUARD); -#else // OS_IOS +#else // BUILDFLAG(IS_IOS) const int macos_version_number = MacOSVersionNumber(); if (macos_version_number >= 10'08'00) { EXPECT_TRUE(exc_mask_all & EXC_MASK_RESOURCE); @@ -97,7 +97,7 @@ TEST(MachExtensions, ExcMaskAll) { } else { EXPECT_FALSE(exc_mask_all & EXC_MASK_GUARD); } -#endif // OS_IOS +#endif // BUILDFLAG(IS_IOS) // Bit 0 should not be set. EXPECT_FALSE(ExcMaskAll() & 1); @@ -112,12 +112,12 @@ TEST(MachExtensions, ExcMaskValid) { EXPECT_TRUE(exc_mask_valid & EXC_MASK_CRASH); -#if defined(OS_IOS) +#if BUILDFLAG(IS_IOS) // Assume at least iOS 9 (≅ OS X 10.11). EXPECT_TRUE(exc_mask_valid & EXC_MASK_RESOURCE); EXPECT_TRUE(exc_mask_valid & EXC_MASK_GUARD); EXPECT_TRUE(exc_mask_valid & EXC_MASK_CORPSE_NOTIFY); -#else // OS_IOS +#else // BUILDFLAG(IS_IOS) const int macos_version_number = MacOSVersionNumber(); if (macos_version_number >= 10'08'00) { EXPECT_TRUE(exc_mask_valid & EXC_MASK_RESOURCE); @@ -136,7 +136,7 @@ TEST(MachExtensions, ExcMaskValid) { } else { EXPECT_FALSE(exc_mask_valid & EXC_MASK_CORPSE_NOTIFY); } -#endif // OS_IOS +#endif // BUILDFLAG(IS_IOS) // Bit 0 should not be set. EXPECT_FALSE(ExcMaskValid() & 1); diff --git a/external_imported/sentry-native/external/crashpad/util/mach/mach_message.cc b/external_imported/sentry-native/external/crashpad/util/mach/mach_message.cc index 00fe116f8..ac76a5386 100644 --- a/external_imported/sentry-native/external/crashpad/util/mach/mach_message.cc +++ b/external_imported/sentry-native/external/crashpad/util/mach/mach_message.cc @@ -20,12 +20,13 @@ #include "base/logging.h" #include "base/mac/mach_logging.h" +#include "build/build_config.h" #include "util/misc/clock.h" #include "util/misc/implicit_cast.h" -#if defined(OS_MAC) +#if BUILDFLAG(IS_MAC) #include -#endif // OS_MAC +#endif // BUILDFLAG(IS_MAC) namespace crashpad { @@ -253,7 +254,7 @@ bool MachMessageDestroyReceivedPort(mach_port_t port, } } -#if defined(OS_MAC) +#if BUILDFLAG(IS_MAC) pid_t AuditPIDFromMachMessageTrailer(const mach_msg_trailer_t* trailer) { if (trailer->msgh_trailer_type != MACH_MSG_TRAILER_FORMAT_0) { @@ -287,6 +288,6 @@ pid_t AuditPIDFromMachMessageTrailer(const mach_msg_trailer_t* trailer) { return audit_pid; } -#endif // OS_MAC +#endif // BUILDFLAG(IS_MAC) } // namespace crashpad diff --git a/external_imported/sentry-native/external/crashpad/util/mach/mach_message.h b/external_imported/sentry-native/external/crashpad/util/mach/mach_message.h index c58b6d05f..e670a13e7 100644 --- a/external_imported/sentry-native/external/crashpad/util/mach/mach_message.h +++ b/external_imported/sentry-native/external/crashpad/util/mach/mach_message.h @@ -183,7 +183,7 @@ const mach_msg_trailer_t* MachMessageTrailerFromHeader( bool MachMessageDestroyReceivedPort(mach_port_t port, mach_msg_type_name_t port_right_type); -#if defined(OS_MAC) || DOXYGEN +#if BUILDFLAG(IS_MAC) || DOXYGEN //! \brief Returns the process ID of a Mach message’s sender from its audit //! trailer. @@ -201,7 +201,7 @@ bool MachMessageDestroyReceivedPort(mach_port_t port, //! audit information. pid_t AuditPIDFromMachMessageTrailer(const mach_msg_trailer_t* trailer); -#endif // OS_MAC +#endif // BUILDFLAG(IS_MAC) } // namespace crashpad diff --git a/external_imported/sentry-native/external/crashpad/util/mach/mach_message_server_test.cc b/external_imported/sentry-native/external/crashpad/util/mach/mach_message_server_test.cc index 6785827b9..51a0b4cab 100644 --- a/external_imported/sentry-native/external/crashpad/util/mach/mach_message_server_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/mach/mach_message_server_test.cc @@ -19,9 +19,9 @@ #include #include +#include #include -#include "base/cxx17_backports.h" #include "base/mac/scoped_mach_port.h" #include "gtest/gtest.h" #include "test/mac/mach_errors.h" @@ -284,7 +284,7 @@ class TestMachMessageServer : public MachMessageServer::Interface, std::set MachMessageServerRequestIDs() override { static constexpr mach_msg_id_t request_ids[] = {kRequestMessageID}; return std::set(&request_ids[0], - &request_ids[base::size(request_ids)]); + &request_ids[std::size(request_ids)]); } mach_msg_size_t MachMessageServerRequestSize() override { diff --git a/external_imported/sentry-native/external/crashpad/util/mach/mach_message_test.cc b/external_imported/sentry-native/external/crashpad/util/mach/mach_message_test.cc index 0bee04b33..587061ff7 100644 --- a/external_imported/sentry-native/external/crashpad/util/mach/mach_message_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/mach/mach_message_test.cc @@ -16,8 +16,10 @@ #include -#include "base/ignore_result.h" +#include + #include "base/mac/scoped_mach_port.h" +#include "build/build_config.h" #include "gtest/gtest.h" #include "test/mac/mach_errors.h" #include "util/mach/mach_extensions.h" @@ -154,11 +156,11 @@ TEST(MachMessage, MachMessageDestroyReceivedPort) { ASSERT_EQ(right_type, implicit_cast(MACH_MSG_TYPE_PORT_SEND)); EXPECT_TRUE(MachMessageDestroyReceivedPort(port, MACH_MSG_TYPE_PORT_RECEIVE)); - ignore_result(receive.release()); + std::ignore = receive.release(); EXPECT_TRUE(MachMessageDestroyReceivedPort(port, MACH_MSG_TYPE_PORT_SEND)); } -#if defined(OS_MAC) +#if BUILDFLAG(IS_MAC) TEST(MachMessage, AuditPIDFromMachMessageTrailer) { base::mac::ScopedMachReceiveRight port(NewMachPort(MACH_PORT_RIGHT_RECEIVE)); @@ -200,7 +202,7 @@ TEST(MachMessage, AuditPIDFromMachMessageTrailer) { EXPECT_EQ(AuditPIDFromMachMessageTrailer(&receive.trailer), getpid()); } -#endif // OS_MAC +#endif // BUILDFLAG(IS_MAC) } // namespace } // namespace test diff --git a/external_imported/sentry-native/external/crashpad/util/mach/mig.py b/external_imported/sentry-native/external/crashpad/util/mach/mig.py index 53a7a5bd1..c7a154352 100755 --- a/external_imported/sentry-native/external/crashpad/util/mach/mig.py +++ b/external_imported/sentry-native/external/crashpad/util/mach/mig.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright 2019 The Crashpad Authors. All rights reserved. # diff --git a/external_imported/sentry-native/external/crashpad/util/mach/mig_fix.py b/external_imported/sentry-native/external/crashpad/util/mach/mig_fix.py index 037746fac..974c58df7 100755 --- a/external_imported/sentry-native/external/crashpad/util/mach/mig_fix.py +++ b/external_imported/sentry-native/external/crashpad/util/mach/mig_fix.py @@ -1,5 +1,4 @@ -#!/usr/bin/env python -# coding: utf-8 +#!/usr/bin/env python3 # Copyright 2019 The Crashpad Authors. All rights reserved. # @@ -23,6 +22,33 @@ from mig_gen import MigInterface +def _make_generated_comments_deterministic(contents): + """Replaces generated code comments with determenistic ones. + + This is what is generated by mig (only in .c files): + /* + * IDENTIFICATION: + * stub generated Mon Jan 17 15:28:03 2022 + * with a MiG generated by bootstrap_cmds-122 + * OPTIONS: + */ + + We look for two specific lines and replace them like so: + /* + * IDENTIFICATION: + * stub generated + * with a MiG generated by + * OPTIONS: + */ + """ + + return re.sub(r'^( \* (?:stub generated|with a MiG generated by) ).+$', + r'\1', + contents, + count=2, + flags=re.MULTILINE) + + def _fix_user_implementation(implementation, fixed_implementation, header, fixed_header): """Rewrites a MIG-generated user implementation (.c) file. @@ -33,7 +59,8 @@ def _fix_user_implementation(implementation, fixed_implementation, header, unused in the user implementation file, and this will trigger a -Wunused-local-typedefs warning in gcc unless removed or marked with the “unused” attribute. Also changes header references to point to the new - header filename, if changed. + header filename, if changed. Replaces generated code comments with + deterministic ones. If |fixed_implementation| is None, overwrites the original; otherwise, puts the result in the file at |fixed_implementation|. @@ -50,6 +77,9 @@ def _fix_user_implementation(implementation, fixed_implementation, header, '#include "%s"' % os.path.basename(header), '#include "%s"' % os.path.basename(fixed_header)) + # Replace generated code comments with determenistic ones. + contents = _make_generated_comments_deterministic(contents) + if fixed_implementation is None: file.seek(0) file.truncate() @@ -71,6 +101,7 @@ def _fix_server_implementation(implementation, fixed_implementation, header, added to a header file, so that other files that include that header file will have access to these declarations from a compilation perspective. Also changes header references to point to the new header filename, if changed. + Replaces generated code comments with deterministic ones. If |fixed_implementation| is None or not provided, overwrites the original; otherwise, puts the result in the file at |fixed_implementation|. @@ -117,6 +148,9 @@ def _fix_server_implementation(implementation, fixed_implementation, header, '#include "%s"' % os.path.basename(header), '#include "%s"' % os.path.basename(fixed_header)) + # Replace generated code comments with determenistic ones. + contents = _make_generated_comments_deterministic(contents) + if fixed_implementation is None: file.seek(0) file.truncate() diff --git a/external_imported/sentry-native/external/crashpad/util/mach/mig_gen.py b/external_imported/sentry-native/external/crashpad/util/mach/mig_gen.py index b3ef614e7..87d02725f 100755 --- a/external_imported/sentry-native/external/crashpad/util/mach/mig_gen.py +++ b/external_imported/sentry-native/external/crashpad/util/mach/mig_gen.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright 2019 The Crashpad Authors. All rights reserved. # diff --git a/external_imported/sentry-native/external/crashpad/util/mach/notify_server.cc b/external_imported/sentry-native/external/crashpad/util/mach/notify_server.cc index e625419e9..b16c6fb3e 100644 --- a/external_imported/sentry-native/external/crashpad/util/mach/notify_server.cc +++ b/external_imported/sentry-native/external/crashpad/util/mach/notify_server.cc @@ -14,7 +14,8 @@ #include "util/mach/notify_server.h" -#include "base/cxx17_backports.h" +#include + #include "util/mach/mach_message.h" #include "util/mach/notifyServer.h" @@ -227,7 +228,7 @@ std::set NotifyServer::MachMessageServerRequestIDs() { MACH_NOTIFY_DEAD_NAME, }; return std::set(&request_ids[0], - &request_ids[base::size(request_ids)]); + &request_ids[std::size(request_ids)]); } mach_msg_size_t NotifyServer::MachMessageServerRequestSize() { diff --git a/external_imported/sentry-native/external/crashpad/util/mach/symbolic_constants_mach.cc b/external_imported/sentry-native/external/crashpad/util/mach/symbolic_constants_mach.cc index 47090086e..457a0ca2b 100644 --- a/external_imported/sentry-native/external/crashpad/util/mach/symbolic_constants_mach.cc +++ b/external_imported/sentry-native/external/crashpad/util/mach/symbolic_constants_mach.cc @@ -17,7 +17,8 @@ #include #include -#include "base/cxx17_backports.h" +#include + #include "base/strings/stringprintf.h" #include "util/mach/exception_behaviors.h" #include "util/mach/mach_extensions.h" @@ -45,7 +46,7 @@ constexpr const char* kExceptionNames[] = { "GUARD", "CORPSE_NOTIFY", }; -static_assert(base::size(kExceptionNames) == EXC_TYPES_COUNT, +static_assert(std::size(kExceptionNames) == EXC_TYPES_COUNT, "kExceptionNames length"); constexpr char kExcPrefix[] = "EXC_"; @@ -170,7 +171,7 @@ std::string ThreadStateFlavorFullToShort(const base::StringPiece& flavor) { {"_STATE32", "32"}, {"_STATE64", "64"}, }; - for (size_t suffix_index = 0; suffix_index < base::size(kStateSuffixes); + for (size_t suffix_index = 0; suffix_index < std::size(kStateSuffixes); ++suffix_index) { const char* suffix = kStateSuffixes[suffix_index].orig; size_t suffix_len = strlen(suffix); @@ -194,7 +195,7 @@ namespace crashpad { std::string ExceptionToString(exception_type_t exception, SymbolicConstantToStringOptions options) { const char* exception_name = - implicit_cast(exception) < base::size(kExceptionNames) + implicit_cast(exception) < std::size(kExceptionNames) ? kExceptionNames[exception] : nullptr; if (!exception_name) { @@ -220,7 +221,7 @@ bool StringToException(const base::StringPiece& string, base::StringPiece short_string = can_match_full ? string.substr(strlen(kExcPrefix)) : string; for (exception_type_t index = 0; - index < implicit_cast(base::size(kExceptionNames)); + index < implicit_cast(std::size(kExceptionNames)); ++index) { const char* exception_name = kExceptionNames[index]; if (!exception_name) { @@ -250,7 +251,7 @@ std::string ExceptionMaskToString(exception_mask_t exception_mask, exception_mask_t local_exception_mask = exception_mask; std::string mask_string; bool has_forbidden_or = false; - for (size_t exception = 0; exception < base::size(kExceptionNames); + for (size_t exception = 0; exception < std::size(kExceptionNames); ++exception) { const char* exception_name = kExceptionNames[exception]; exception_mask_t exception_mask_value = 1 << exception; @@ -324,7 +325,7 @@ bool StringToExceptionMask(const base::StringPiece& string, base::StringPiece short_string = can_match_full ? string.substr(strlen(kExcMaskPrefix)) : string; for (exception_type_t index = 0; - index < implicit_cast(base::size(kExceptionNames)); + index < implicit_cast(std::size(kExceptionNames)); ++index) { const char* exception_name = kExceptionNames[index]; if (!exception_name) { @@ -363,7 +364,7 @@ std::string ExceptionBehaviorToString(exception_behavior_t behavior, const exception_behavior_t basic_behavior = ExceptionBehaviorBasic(behavior); const char* behavior_name = - implicit_cast(basic_behavior) < base::size(kBehaviorNames) + implicit_cast(basic_behavior) < std::size(kBehaviorNames) ? kBehaviorNames[basic_behavior] : nullptr; if (!behavior_name) { @@ -430,8 +431,7 @@ bool StringToExceptionBehavior(const base::StringPiece& string, base::StringPiece short_string = can_match_full ? sp.substr(strlen(kBehaviorPrefix)) : sp; for (exception_behavior_t index = 0; - index < - implicit_cast(base::size(kBehaviorNames)); + index < implicit_cast(std::size(kBehaviorNames)); ++index) { const char* behavior_name = kBehaviorNames[index]; if (!behavior_name) { @@ -467,13 +467,13 @@ bool StringToExceptionBehavior(const base::StringPiece& string, std::string ThreadStateFlavorToString(thread_state_flavor_t flavor, SymbolicConstantToStringOptions options) { const char* flavor_name = - implicit_cast(flavor) < base::size(kFlavorNames) + implicit_cast(flavor) < std::size(kFlavorNames) ? kFlavorNames[flavor] : nullptr; if (!flavor_name) { for (size_t generic_flavor_index = 0; - generic_flavor_index < base::size(kGenericFlavorNames); + generic_flavor_index < std::size(kGenericFlavorNames); ++generic_flavor_index) { if (flavor == kGenericFlavorNames[generic_flavor_index].flavor) { flavor_name = kGenericFlavorNames[generic_flavor_index].name; @@ -500,7 +500,7 @@ bool StringToThreadStateFlavor(const base::StringPiece& string, thread_state_flavor_t* flavor) { if ((options & kAllowFullName) || (options & kAllowShortName)) { for (thread_state_flavor_t index = 0; - index < implicit_cast(base::size(kFlavorNames)); + index < implicit_cast(std::size(kFlavorNames)); ++index) { const char* flavor_name = kFlavorNames[index]; if (!flavor_name) { @@ -520,7 +520,7 @@ bool StringToThreadStateFlavor(const base::StringPiece& string, } for (size_t generic_flavor_index = 0; - generic_flavor_index < base::size(kGenericFlavorNames); + generic_flavor_index < std::size(kGenericFlavorNames); ++generic_flavor_index) { const char* flavor_name = kGenericFlavorNames[generic_flavor_index].name; thread_state_flavor_t flavor_number = diff --git a/external_imported/sentry-native/external/crashpad/util/mach/symbolic_constants_mach_test.cc b/external_imported/sentry-native/external/crashpad/util/mach/symbolic_constants_mach_test.cc index 20c60a0ea..614a45b58 100644 --- a/external_imported/sentry-native/external/crashpad/util/mach/symbolic_constants_mach_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/mach/symbolic_constants_mach_test.cc @@ -18,7 +18,8 @@ #include #include -#include "base/cxx17_backports.h" +#include + #include "base/strings/string_piece.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" @@ -26,7 +27,7 @@ #include "util/misc/implicit_cast.h" #define NUL_TEST_DATA(string) \ - { string, base::size(string) - 1 } + { string, std::size(string) - 1 } namespace crashpad { namespace test { @@ -160,7 +161,7 @@ void TestExceptionToString(exception_type_t value, } TEST(SymbolicConstantsMach, ExceptionToString) { - for (size_t index = 0; index < base::size(kExceptionTestData); ++index) { + for (size_t index = 0; index < std::size(kExceptionTestData); ++index) { SCOPED_TRACE(base::StringPrintf("index %zu", index)); TestExceptionToString(kExceptionTestData[index].exception, kExceptionTestData[index].full_name, @@ -188,11 +189,11 @@ void TestStringToException(const base::StringPiece& string, } TEST(SymbolicConstantsMach, StringToException) { - for (size_t option_index = 0; option_index < base::size(kNormalOptions); + for (size_t option_index = 0; option_index < std::size(kNormalOptions); ++option_index) { SCOPED_TRACE(base::StringPrintf("option_index %zu", option_index)); StringToSymbolicConstantOptions options = kNormalOptions[option_index]; - for (size_t index = 0; index < base::size(kExceptionTestData); ++index) { + for (size_t index = 0; index < std::size(kExceptionTestData); ++index) { SCOPED_TRACE(base::StringPrintf("index %zu", index)); exception_type_t exception = kExceptionTestData[index].exception; { @@ -230,7 +231,7 @@ TEST(SymbolicConstantsMach, StringToException) { "", }; - for (size_t index = 0; index < base::size(kNegativeTestData); ++index) { + for (size_t index = 0; index < std::size(kNegativeTestData); ++index) { SCOPED_TRACE(base::StringPrintf("index %zu", index)); TestStringToException(kNegativeTestData[index], options, false, 0); } @@ -251,7 +252,7 @@ TEST(SymbolicConstantsMach, StringToException) { NUL_TEST_DATA("1\0002"), }; - for (size_t index = 0; index < base::size(kNULTestData); ++index) { + for (size_t index = 0; index < std::size(kNULTestData); ++index) { SCOPED_TRACE(base::StringPrintf("index %zu", index)); base::StringPiece string(kNULTestData[index].string, kNULTestData[index].length); @@ -334,7 +335,7 @@ void TestExceptionMaskToString(exception_mask_t value, } TEST(SymbolicConstantsMach, ExceptionMaskToString) { - for (size_t index = 0; index < base::size(kExceptionMaskTestData); ++index) { + for (size_t index = 0; index < std::size(kExceptionMaskTestData); ++index) { SCOPED_TRACE(base::StringPrintf("index %zu", index)); TestExceptionMaskToString(kExceptionMaskTestData[index].exception_mask, kExceptionMaskTestData[index].full_name, @@ -389,12 +390,11 @@ TEST(SymbolicConstantsMach, StringToExceptionMask) { kAllowFullName | kAllowShortName | kAllowNumber | kAllowOr, }; - for (size_t option_index = 0; option_index < base::size(kOptions); + for (size_t option_index = 0; option_index < std::size(kOptions); ++option_index) { SCOPED_TRACE(base::StringPrintf("option_index %zu", option_index)); StringToSymbolicConstantOptions options = kOptions[option_index]; - for (size_t index = 0; index < base::size(kExceptionMaskTestData); - ++index) { + for (size_t index = 0; index < std::size(kExceptionMaskTestData); ++index) { SCOPED_TRACE(base::StringPrintf("index %zu", index)); exception_mask_t exception_mask = kExceptionMaskTestData[index].exception_mask; @@ -445,7 +445,7 @@ TEST(SymbolicConstantsMach, StringToExceptionMask) { "", }; - for (size_t index = 0; index < base::size(kNegativeTestData); ++index) { + for (size_t index = 0; index < std::size(kNegativeTestData); ++index) { SCOPED_TRACE(base::StringPrintf("index %zu", index)); TestStringToExceptionMask(kNegativeTestData[index], options, false, 0); } @@ -471,7 +471,7 @@ TEST(SymbolicConstantsMach, StringToExceptionMask) { NUL_TEST_DATA("ARITHMETIC|\0EMULATION"), }; - for (size_t index = 0; index < base::size(kNULTestData); ++index) { + for (size_t index = 0; index < std::size(kNULTestData); ++index) { SCOPED_TRACE(base::StringPrintf("index %zu", index)); base::StringPiece string(kNULTestData[index].string, kNULTestData[index].length); @@ -506,7 +506,7 @@ TEST(SymbolicConstantsMach, StringToExceptionMask) { EXC_MASK_SYSCALL | 0x100}, }; - for (size_t index = 0; index < base::size(kNonCanonicalTestData); ++index) { + for (size_t index = 0; index < std::size(kNonCanonicalTestData); ++index) { SCOPED_TRACE(base::StringPrintf("index %zu", index)); TestStringToExceptionMask(kNonCanonicalTestData[index].string, kNonCanonicalTestData[index].options, @@ -577,7 +577,7 @@ void TestExceptionBehaviorToString(exception_behavior_t value, } TEST(SymbolicConstantsMach, ExceptionBehaviorToString) { - for (size_t index = 0; index < base::size(kExceptionBehaviorTestData); + for (size_t index = 0; index < std::size(kExceptionBehaviorTestData); ++index) { SCOPED_TRACE(base::StringPrintf("index %zu", index)); TestExceptionBehaviorToString(kExceptionBehaviorTestData[index].behavior, @@ -607,11 +607,11 @@ void TestStringToExceptionBehavior(const base::StringPiece& string, } TEST(SymbolicConstantsMach, StringToExceptionBehavior) { - for (size_t option_index = 0; option_index < base::size(kNormalOptions); + for (size_t option_index = 0; option_index < std::size(kNormalOptions); ++option_index) { SCOPED_TRACE(base::StringPrintf("option_index %zu", option_index)); StringToSymbolicConstantOptions options = kNormalOptions[option_index]; - for (size_t index = 0; index < base::size(kExceptionBehaviorTestData); + for (size_t index = 0; index < std::size(kExceptionBehaviorTestData); ++index) { SCOPED_TRACE(base::StringPrintf("index %zu", index)); exception_behavior_t behavior = @@ -657,7 +657,7 @@ TEST(SymbolicConstantsMach, StringToExceptionBehavior) { "", }; - for (size_t index = 0; index < base::size(kNegativeTestData); ++index) { + for (size_t index = 0; index < std::size(kNegativeTestData); ++index) { SCOPED_TRACE(base::StringPrintf("index %zu", index)); TestStringToExceptionBehavior( kNegativeTestData[index], options, false, 0); @@ -683,7 +683,7 @@ TEST(SymbolicConstantsMach, StringToExceptionBehavior) { NUL_TEST_DATA("STATE_IDENTITY|\0MACH"), }; - for (size_t index = 0; index < base::size(kNULTestData); ++index) { + for (size_t index = 0; index < std::size(kNULTestData); ++index) { SCOPED_TRACE(base::StringPrintf("index %zu", index)); base::StringPiece string(kNULTestData[index].string, kNULTestData[index].length); @@ -720,7 +720,7 @@ TEST(SymbolicConstantsMach, StringToExceptionBehavior) { implicit_cast(MACH_EXCEPTION_CODES | 0x2)}, }; - for (size_t index = 0; index < base::size(kNonCanonicalTestData); ++index) { + for (size_t index = 0; index < std::size(kNonCanonicalTestData); ++index) { SCOPED_TRACE(base::StringPrintf("index %zu", index)); TestStringToExceptionBehavior(kNonCanonicalTestData[index].string, kNonCanonicalTestData[index].options, @@ -837,7 +837,7 @@ void TestThreadStateFlavorToString(exception_type_t value, } TEST(SymbolicConstantsMach, ThreadStateFlavorToString) { - for (size_t index = 0; index < base::size(kThreadStateFlavorTestData); + for (size_t index = 0; index < std::size(kThreadStateFlavorTestData); ++index) { SCOPED_TRACE(base::StringPrintf("index %zu", index)); TestThreadStateFlavorToString(kThreadStateFlavorTestData[index].flavor, @@ -879,11 +879,11 @@ void TestStringToThreadStateFlavor(const base::StringPiece& string, } TEST(SymbolicConstantsMach, StringToThreadStateFlavor) { - for (size_t option_index = 0; option_index < base::size(kNormalOptions); + for (size_t option_index = 0; option_index < std::size(kNormalOptions); ++option_index) { SCOPED_TRACE(base::StringPrintf("option_index %zu", option_index)); StringToSymbolicConstantOptions options = kNormalOptions[option_index]; - for (size_t index = 0; index < base::size(kThreadStateFlavorTestData); + for (size_t index = 0; index < std::size(kThreadStateFlavorTestData); ++index) { SCOPED_TRACE(base::StringPrintf("index %zu", index)); thread_state_flavor_t flavor = kThreadStateFlavorTestData[index].flavor; @@ -953,7 +953,7 @@ TEST(SymbolicConstantsMach, StringToThreadStateFlavor) { #endif }; - for (size_t index = 0; index < base::size(kNegativeTestData); ++index) { + for (size_t index = 0; index < std::size(kNegativeTestData); ++index) { SCOPED_TRACE(base::StringPrintf("index %zu", index)); TestStringToThreadStateFlavor( kNegativeTestData[index], options, false, 0); @@ -1019,7 +1019,7 @@ TEST(SymbolicConstantsMach, StringToThreadStateFlavor) { #endif }; - for (size_t index = 0; index < base::size(kNULTestData); ++index) { + for (size_t index = 0; index < std::size(kNULTestData); ++index) { SCOPED_TRACE(base::StringPrintf("index %zu", index)); base::StringPiece string(kNULTestData[index].string, kNULTestData[index].length); diff --git a/external_imported/sentry-native/external/crashpad/util/misc/address_types.h b/external_imported/sentry-native/external/crashpad/util/misc/address_types.h index 14942bd8e..8902efb6c 100644 --- a/external_imported/sentry-native/external/crashpad/util/misc/address_types.h +++ b/external_imported/sentry-native/external/crashpad/util/misc/address_types.h @@ -21,13 +21,13 @@ #include "build/build_config.h" -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) #include -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) #include "util/win/address_types.h" -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) #include "util/linux/address_types.h" -#elif defined(OS_FUCHSIA) +#elif BUILDFLAG(IS_FUCHSIA) #include #else #error "Unhandled OS type" @@ -45,22 +45,22 @@ using VMAddress = uint64_t; //! VMAddress), potentially across bitness. using VMSize = uint64_t; -#elif defined(OS_APPLE) +#elif BUILDFLAG(IS_APPLE) using VMAddress = mach_vm_address_t; using VMSize = mach_vm_size_t; -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) using VMAddress = WinVMAddress; using VMSize = WinVMSize; -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) using VMAddress = LinuxVMAddress; using VMSize = LinuxVMSize; -#elif defined(OS_FUCHSIA) +#elif BUILDFLAG(IS_FUCHSIA) using VMAddress = zx_vaddr_t; using VMSize = size_t; diff --git a/external_imported/sentry-native/external/crashpad/util/misc/arm64_bti_note.S b/external_imported/sentry-native/external/crashpad/util/misc/arm64_pac_bti.S similarity index 63% rename from external_imported/sentry-native/external/crashpad/util/misc/arm64_bti_note.S rename to external_imported/sentry-native/external/crashpad/util/misc/arm64_pac_bti.S index 987493be8..ac90f2abe 100644 --- a/external_imported/sentry-native/external/crashpad/util/misc/arm64_bti_note.S +++ b/external_imported/sentry-native/external/crashpad/util/misc/arm64_pac_bti.S @@ -12,16 +12,40 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef CRASHPAD_UTIL_MISC_ARM64_BTI_NOTE_S -#define CRASHPAD_UTIL_MISC_ARM64_BTI_NOTE_S +#ifndef CRASHPAD_UTIL_MISC_ARM64_PAC_BTI_S +#define CRASHPAD_UTIL_MISC_ARM64_PAC_BTI_S -/* Support macros for the Armv8.5-A Branch Target Identification feature which - * requires emitting a .note.gnu.property section with the appropriate +/* Support macros for the Armv8.5-A Branch Target Identification and + * Armv8.3-A Pointer Authentication features which require emitting + * a .note.gnu.property section with the appropriate * architecture-dependent feature bits set. * Read more: "ELF for the Arm® 64-bit Architecture" */ #if defined(__ARM_FEATURE_BTI_DEFAULT) && (__ARM_FEATURE_BTI_DEFAULT == 1) -#define GNU_PROPERTY_AARCH64_BTI (1 << 0) // Has BTI +#define GNU_PROPERTY_AARCH64_BTI 1 // Has BTI +#define CRASHPAD_AARCH64_VALID_JUMP_CALL_TARGET bti jc +#define CRASHPAD_AARCH64_VALID_CALL_TARGET bti c +#define CRASHPAD_AARCH64_VALID_JUMP_TARGET bti j +#else +#define GNU_PROPERTY_AARCH64_BTI 0 // No BTI +#define CRASHPAD_AARCH64_VALID_JUMP_CALL_TARGET +#define CRASHPAD_AARCH64_VALID_CALL_TARGET +#define CRASHPAD_AARCH64_VALID_JUMP_TARGET +#endif + +#if defined(__ARM_FEATURE_PAC_DEFAULT) +#if ((__ARM_FEATURE_PAC_DEFAULT & ((1<<0)|(1<<2))) == 0) +#error Pointer authentication defines no valid key! +#endif +#define GNU_PROPERTY_AARCH64_PAC 1 // Has PAC +#else +#define GNU_PROPERTY_AARCH64_PAC 0 // No PAC +#endif + +/** + * Emit a proper .note.gnu.property section in case of PAC or BTI being enabled. + */ +#if (GNU_PROPERTY_AARCH64_BTI != 0 || GNU_PROPERTY_AARCH64_PAC != 0) .pushsection .note.gnu.property, "a" .balign 4 .long 0x4 /* size of field "GNU" */ @@ -30,17 +54,12 @@ .asciz "GNU" .long 0xc0000000 /* GNU_PROPERTY_AARCH64_FEATURE_1_AND */ .long 0x4 - .long GNU_PROPERTY_AARCH64_BTI + .long ((GNU_PROPERTY_AARCH64_BTI<<0)|(GNU_PROPERTY_AARCH64_PAC<<1)) .long 0x0 .popsection -#define CRASHPAD_AARCH64_VALID_JUMP_CALL_TARGET bti jc -#define CRASHPAD_AARCH64_VALID_CALL_TARGET bti c -#define CRASHPAD_AARCH64_VALID_JUMP_TARGET bti j -#undef GNU_PROPERTY_AARCH64_BTI -#else -#define CRASHPAD_AARCH64_VALID_JUMP_CALL_TARGET -#define CRASHPAD_AARCH64_VALID_CALL_TARGET -#define CRASHPAD_AARCH64_VALID_JUMP_TARGET #endif -#endif /* CRASHPAD_UTIL_MISC_ARM64_BTI_NOTE_S */ +#undef GNU_PROPERTY_AARCH64_BTI +#undef GNU_PROPERTY_AARCH64_PAC + +#endif /* CRASHPAD_UTIL_MISC_ARM64_PAC_BTI_S */ diff --git a/external_imported/sentry-native/external/crashpad/util/misc/arraysize.h b/external_imported/sentry-native/external/crashpad/util/misc/arraysize.h index 93a63882e..63f49768c 100644 --- a/external_imported/sentry-native/external/crashpad/util/misc/arraysize.h +++ b/external_imported/sentry-native/external/crashpad/util/misc/arraysize.h @@ -35,9 +35,9 @@ constexpr size_t ArraySizeHelper() noexcept { //! \brief A way of computing an array’s size. //! -//! Use this only where `base::size()` or `std::size()` won’t work, such as in -//! constant expressions (including `static_assert` expressions) that consider -//! the sizes of non-static data members. +//! Use this only where `std::size()` won’t work, such as in constant +//! expressions (including `static_assert` expressions) that consider the +//! sizes of non-static data members. #define ArraySize(array) crashpad::internal::ArraySizeHelper() #endif // CRASHPAD_UTIL_MISC_ARRAYSIZE_H_ diff --git a/external_imported/sentry-native/external/crashpad/util/misc/arraysize_test.cc b/external_imported/sentry-native/external/crashpad/util/misc/arraysize_test.cc index ad8da0970..5a2106a09 100644 --- a/external_imported/sentry-native/external/crashpad/util/misc/arraysize_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/misc/arraysize_test.cc @@ -14,7 +14,6 @@ #include "util/misc/arraysize.h" -#include "base/compiler_specific.h" #include "gtest/gtest.h" namespace crashpad { @@ -22,37 +21,29 @@ namespace test { namespace { TEST(ArraySize, ArraySize) { - char c1[1]; + [[maybe_unused]] char c1[1]; static_assert(ArraySize(c1) == 1, "c1"); - ALLOW_UNUSED_LOCAL(c1); - char c2[2]; + [[maybe_unused]] char c2[2]; static_assert(ArraySize(c2) == 2, "c2"); - ALLOW_UNUSED_LOCAL(c2); - char c4[4]; + [[maybe_unused]] char c4[4]; static_assert(ArraySize(c4) == 4, "c4"); - ALLOW_UNUSED_LOCAL(c4); - int i1[1]; + [[maybe_unused]] int i1[1]; static_assert(ArraySize(i1) == 1, "i1"); - ALLOW_UNUSED_LOCAL(i1); - int i2[2]; + [[maybe_unused]] int i2[2]; static_assert(ArraySize(i2) == 2, "i2"); - ALLOW_UNUSED_LOCAL(i2); - int i4[4]; + [[maybe_unused]] int i4[4]; static_assert(ArraySize(i4) == 4, "i4"); - ALLOW_UNUSED_LOCAL(i4); - long l8[8]; + [[maybe_unused]] long l8[8]; static_assert(ArraySize(l8) == 8, "l8"); - ALLOW_UNUSED_LOCAL(l8); - int l9[9]; + [[maybe_unused]] int l9[9]; static_assert(ArraySize(l9) == 9, "l9"); - ALLOW_UNUSED_LOCAL(l9); struct S { char c; @@ -61,13 +52,11 @@ TEST(ArraySize, ArraySize) { bool b; }; - S s1[1]; + [[maybe_unused]] S s1[1]; static_assert(ArraySize(s1) == 1, "s1"); - ALLOW_UNUSED_LOCAL(s1); - S s10[10]; + [[maybe_unused]] S s10[10]; static_assert(ArraySize(s10) == 10, "s10"); - ALLOW_UNUSED_LOCAL(s10); } } // namespace diff --git a/external_imported/sentry-native/external/crashpad/util/misc/capture_context.h b/external_imported/sentry-native/external/crashpad/util/misc/capture_context.h index d21a24f19..37ed40021 100644 --- a/external_imported/sentry-native/external/crashpad/util/misc/capture_context.h +++ b/external_imported/sentry-native/external/crashpad/util/misc/capture_context.h @@ -17,30 +17,30 @@ #include "build/build_config.h" -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) #include -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) #include -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) #include -#elif defined(OS_FUCHSIA) +#elif BUILDFLAG(IS_FUCHSIA) #include -#endif // OS_APPLE +#endif // BUILDFLAG(IS_APPLE) namespace crashpad { -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) #if defined(ARCH_CPU_X86_FAMILY) using NativeCPUContext = x86_thread_state; #elif defined(ARCH_CPU_ARM64) using NativeCPUContext = arm_unified_thread_state; #endif -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) using NativeCPUContext = CONTEXT; -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ - defined(OS_FUCHSIA) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ + BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) using NativeCPUContext = ucontext_t; -#endif // OS_APPLE +#endif // BUILDFLAG(IS_APPLE) //! \brief Saves the CPU context. //! diff --git a/external_imported/sentry-native/external/crashpad/util/misc/capture_context_linux.S b/external_imported/sentry-native/external/crashpad/util/misc/capture_context_linux.S index 0ee561f53..96e030d90 100644 --- a/external_imported/sentry-native/external/crashpad/util/misc/capture_context_linux.S +++ b/external_imported/sentry-native/external/crashpad/util/misc/capture_context_linux.S @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "util/misc/arm64_bti_note.S" +#include "util/misc/arm64_pac_bti.S" // namespace crashpad { // void CaptureContext(ucontext_t* context); @@ -316,14 +316,15 @@ CAPTURECONTEXT_SYMBOL2: stp x26, x27, [x0, #0x188] stp x28, x29, [x0, #0x198] - // The original LR can't be recovered. + // The original LR can't be recovered, therefore no need to sign x30 with PAC. str x30, [x0, #0x1a8] // Use x1 as a scratch register. mov x1, SP str x1, [x0, #0x1b0] // context->uc_mcontext.sp - // The link register holds the return address for this function. + // The link register holds the return address for this function and won't be + // recovered, therefore no need to sign x30 with PAC. str x30, [x0, #0x1b8] // context->uc_mcontext.pc // pstate should hold SPSR but NZCV are the only bits we know about. diff --git a/external_imported/sentry-native/external/crashpad/util/misc/capture_context_test.cc b/external_imported/sentry-native/external/crashpad/util/misc/capture_context_test.cc index cf23c2def..a24ea1504 100644 --- a/external_imported/sentry-native/external/crashpad/util/misc/capture_context_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/misc/capture_context_test.cc @@ -28,14 +28,14 @@ namespace crashpad { namespace test { namespace { -#if defined(OS_FUCHSIA) +#if BUILDFLAG(IS_FUCHSIA) // Fuchsia uses -fsanitize=safe-stack by default, which splits local variables // and the call stack into separate regions (see // https://clang.llvm.org/docs/SafeStack.html). Because this test would like to // find an approximately valid stack pointer by comparing locals to the // captured one, disable safe-stack for this function. __attribute__((no_sanitize("safe-stack"))) -#endif // defined(OS_FUCHSIA) +#endif // BUILDFLAG(IS_FUCHSIA) #if defined(MEMORY_SANITIZER) // CaptureContext() calls inline assembly and is incompatible with MSan. diff --git a/external_imported/sentry-native/external/crashpad/util/misc/capture_context_test_util_win.cc b/external_imported/sentry-native/external/crashpad/util/misc/capture_context_test_util_win.cc index d1221956d..dd9d9a683 100644 --- a/external_imported/sentry-native/external/crashpad/util/misc/capture_context_test_util_win.cc +++ b/external_imported/sentry-native/external/crashpad/util/misc/capture_context_test_util_win.cc @@ -13,10 +13,11 @@ // limitations under the License. #include "util/misc/capture_context_test_util.h" -#include "util/win/context_wrappers.h" -#include "base/cxx17_backports.h" +#include + #include "gtest/gtest.h" +#include "util/win/context_wrappers.h" namespace crashpad { namespace test { @@ -59,7 +60,7 @@ void SanityCheckContext(const NativeCPUContext& context) { #if defined(ARCH_CPU_X86) // fxsave doesn’t write these bytes. - for (size_t i = 464; i < base::size(context.ExtendedRegisters); ++i) { + for (size_t i = 464; i < std::size(context.ExtendedRegisters); ++i) { SCOPED_TRACE(i); EXPECT_EQ(context.ExtendedRegisters[i], 0); } @@ -69,7 +70,7 @@ void SanityCheckContext(const NativeCPUContext& context) { EXPECT_EQ(context.FltSave.MxCsr, context.MxCsr); // fxsave doesn’t write these bytes. - for (size_t i = 0; i < base::size(context.FltSave.Reserved4); ++i) { + for (size_t i = 0; i < std::size(context.FltSave.Reserved4); ++i) { SCOPED_TRACE(i); EXPECT_EQ(context.FltSave.Reserved4[i], 0); } @@ -81,7 +82,7 @@ void SanityCheckContext(const NativeCPUContext& context) { EXPECT_EQ(context.P4Home, 0u); EXPECT_EQ(context.P5Home, 0u); EXPECT_EQ(context.P6Home, 0u); - for (size_t i = 0; i < base::size(context.VectorRegister); ++i) { + for (size_t i = 0; i < std::size(context.VectorRegister); ++i) { SCOPED_TRACE(i); EXPECT_EQ(context.VectorRegister[i].Low, 0u); EXPECT_EQ(context.VectorRegister[i].High, 0u); diff --git a/external_imported/sentry-native/external/crashpad/util/misc/clock_posix.cc b/external_imported/sentry-native/external/crashpad/util/misc/clock_posix.cc index a9fe8e585..448f84310 100644 --- a/external_imported/sentry-native/external/crashpad/util/misc/clock_posix.cc +++ b/external_imported/sentry-native/external/crashpad/util/misc/clock_posix.cc @@ -30,7 +30,7 @@ constexpr uint64_t kNanosecondsPerSecond = 1E9; namespace crashpad { -#if !defined(OS_APPLE) +#if !BUILDFLAG(IS_APPLE) uint64_t ClockMonotonicNanoseconds() { timespec now; diff --git a/external_imported/sentry-native/external/crashpad/util/misc/clock_test.cc b/external_imported/sentry-native/external/crashpad/util/misc/clock_test.cc index 443d496b0..8c43d02b5 100644 --- a/external_imported/sentry-native/external/crashpad/util/misc/clock_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/misc/clock_test.cc @@ -17,10 +17,11 @@ #include #include +#include -#include "base/cxx17_backports.h" #include "base/format_macros.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "gtest/gtest.h" namespace crashpad { @@ -41,17 +42,17 @@ TEST(Clock, ClockMonotonicNanoseconds) { EXPECT_GE(now, last); } -#if !defined(OS_WIN) // No SleepNanoseconds implemented on Windows. +#if !BUILDFLAG(IS_WIN) // No SleepNanoseconds implemented on Windows. // SleepNanoseconds() should sleep for at least the value of the clock’s // resolution, so the clock’s value should definitely increase after a sleep. // EXPECT_GT can be used instead of EXPECT_GE after the sleep. SleepNanoseconds(1); now = ClockMonotonicNanoseconds(); EXPECT_GT(now, start); -#endif // OS_WIN +#endif // BUILDFLAG(IS_WIN) } -#if !defined(OS_WIN) // No SleepNanoseconds implemented on Windows. +#if !BUILDFLAG(IS_WIN) // No SleepNanoseconds implemented on Windows. void TestSleepNanoseconds(uint64_t nanoseconds) { uint64_t start = ClockMonotonicNanoseconds(); @@ -82,7 +83,7 @@ TEST(Clock, SleepNanoseconds) { static_cast(5E7), // 50 milliseconds }; - for (size_t index = 0; index < base::size(kTestData); ++index) { + for (size_t index = 0; index < std::size(kTestData); ++index) { const uint64_t nanoseconds = kTestData[index]; SCOPED_TRACE(base::StringPrintf( "index %zu, nanoseconds %" PRIu64, index, nanoseconds)); @@ -91,7 +92,7 @@ TEST(Clock, SleepNanoseconds) { } } -#endif // OS_WIN +#endif // BUILDFLAG(IS_WIN) } // namespace } // namespace test diff --git a/external_imported/sentry-native/external/crashpad/util/misc/initialization_state_dcheck.h b/external_imported/sentry-native/external/crashpad/util/misc/initialization_state_dcheck.h index e04ff234c..659eaa845 100644 --- a/external_imported/sentry-native/external/crashpad/util/misc/initialization_state_dcheck.h +++ b/external_imported/sentry-native/external/crashpad/util/misc/initialization_state_dcheck.h @@ -17,8 +17,9 @@ //! \file +#include + #include "base/check_op.h" -#include "base/compiler_specific.h" #include "build/build_config.h" #include "util/misc/initialization_state.h" @@ -175,11 +176,17 @@ using InitializationStateDcheck = bool[0]; // Avoid triggering warnings by repurposing these macros when DCHECKs are // disabled. #define INITIALIZATION_STATE_SET_INITIALIZING(initialization_state_dcheck) \ - ALLOW_UNUSED_LOCAL(initialization_state_dcheck) + do { \ + std::ignore = initialization_state_dcheck; \ + } while (false) #define INITIALIZATION_STATE_SET_VALID(initialization_state_dcheck) \ - ALLOW_UNUSED_LOCAL(initialization_state_dcheck) + do { \ + std::ignore = initialization_state_dcheck; \ + } while (false) #define INITIALIZATION_STATE_DCHECK_VALID(initialization_state_dcheck) \ - ALLOW_UNUSED_LOCAL(initialization_state_dcheck) + do { \ + std::ignore = initialization_state_dcheck; \ + } while (false) #endif diff --git a/external_imported/sentry-native/external/crashpad/util/misc/metrics.cc b/external_imported/sentry-native/external/crashpad/util/misc/metrics.cc index 47c9f26f3..2e8459c71 100644 --- a/external_imported/sentry-native/external/crashpad/util/misc/metrics.cc +++ b/external_imported/sentry-native/external/crashpad/util/misc/metrics.cc @@ -19,15 +19,15 @@ #include "base/numerics/safe_conversions.h" #include "build/build_config.h" -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) #define METRICS_OS_NAME "Mac" -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) #define METRICS_OS_NAME "Win" -#elif defined(OS_ANDROID) +#elif BUILDFLAG(IS_ANDROID) #define METRICS_OS_NAME "Android" -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #define METRICS_OS_NAME "Linux" -#elif defined(OS_FUCHSIA) +#elif BUILDFLAG(IS_FUCHSIA) #define METRICS_OS_NAME "Fuchsia" #endif @@ -115,7 +115,7 @@ void Metrics::HandlerCrashed(uint32_t exception_code) { "Crashpad.HandlerCrash.ExceptionCode." METRICS_OS_NAME, exception_code); } -#if defined(OS_IOS) +#if BUILDFLAG(IS_IOS) // static void Metrics::MissingIntermediateDumpKey( const internal::IntermediateDumpKey& key) { diff --git a/external_imported/sentry-native/external/crashpad/util/misc/metrics.h b/external_imported/sentry-native/external/crashpad/util/misc/metrics.h index dcd37a6aa..c870b3a22 100644 --- a/external_imported/sentry-native/external/crashpad/util/misc/metrics.h +++ b/external_imported/sentry-native/external/crashpad/util/misc/metrics.h @@ -20,7 +20,7 @@ #include "build/build_config.h" #include "util/file/file_io.h" -#if defined(OS_IOS) +#if BUILDFLAG(IS_IOS) #include "util/ios/ios_intermediate_dump_format.h" #endif @@ -207,7 +207,7 @@ class Metrics { //! This is currently only reported on Windows. static void HandlerCrashed(uint32_t exception_code); -#if defined(OS_IOS) || DOXYGEN +#if BUILDFLAG(IS_IOS) || DOXYGEN //! \brief Records a missing key from an intermediate dump. static void MissingIntermediateDumpKey( const internal::IntermediateDumpKey& key); diff --git a/external_imported/sentry-native/external/crashpad/util/misc/no_cfi_icall.h b/external_imported/sentry-native/external/crashpad/util/misc/no_cfi_icall.h index 80e584ebd..1a5ddc68a 100644 --- a/external_imported/sentry-native/external/crashpad/util/misc/no_cfi_icall.h +++ b/external_imported/sentry-native/external/crashpad/util/misc/no_cfi_icall.h @@ -20,9 +20,9 @@ #include "build/build_config.h" -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) #include -#endif // OS_WIN +#endif // BUILDFLAG(IS_WIN) namespace crashpad { @@ -39,7 +39,7 @@ namespace { #endif // DISABLE_CFI_ICALL -- Disable Control Flow Integrity indirect call checks. -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) // Windows also needs __declspec(guard(nocf)). #define DISABLE_CFI_ICALL NO_SANITIZE("cfi-icall") __declspec(guard(nocf)) #else @@ -65,7 +65,7 @@ struct FunctorTraits { } }; -#if defined(OS_WIN) && defined(ARCH_CPU_X86) +#if BUILDFLAG(IS_WIN) && defined(ARCH_CPU_X86) template struct FunctorTraits { template @@ -74,7 +74,7 @@ struct FunctorTraits { return function(std::forward(args)...); } }; -#endif // OS_WIN && ARCH_CPU_X86 +#endif // BUILDFLAG(IS_WIN) && ARCH_CPU_X86 #if __cplusplus >= 201703L // These specializations match functions which are not explicitly declared @@ -97,7 +97,7 @@ struct FunctorTraits { } }; -#if defined(OS_WIN) && defined(ARCH_CPU_X86) +#if BUILDFLAG(IS_WIN) && defined(ARCH_CPU_X86) template struct FunctorTraits { template @@ -106,7 +106,7 @@ struct FunctorTraits { return function(std::forward(args)...); } }; -#endif // OS_WIN && ARCH_CPU_X86 +#endif // BUILDFLAG(IS_WIN) && ARCH_CPU_X86 #endif // __cplusplus >= 201703L @@ -146,14 +146,14 @@ class NoCfiIcall { explicit NoCfiIcall(PointerType function) : function_(reinterpret_cast(function)) {} -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) //! \see NoCfiIcall template ::type, FARPROC>::value>> explicit NoCfiIcall(FARPROC function) : function_(reinterpret_cast(function)) {} -#endif // OS_WIN +#endif // BUILDFLAG(IS_WIN) ~NoCfiIcall() = default; diff --git a/external_imported/sentry-native/external/crashpad/util/misc/no_cfi_icall_test.cc b/external_imported/sentry-native/external/crashpad/util/misc/no_cfi_icall_test.cc index 5654a2f4a..56a2cacfd 100644 --- a/external_imported/sentry-native/external/crashpad/util/misc/no_cfi_icall_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/misc/no_cfi_icall_test.cc @@ -19,7 +19,7 @@ #include "build/build_config.h" #include "gtest/gtest.h" -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) #include #include "util/win/get_function.h" @@ -49,7 +49,7 @@ TEST(NoCfiIcall, SameDSOICall) { } TEST(NoCfiIcall, CrossDSOICall) { -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) static const NoCfiIcall call( GET_FUNCTION_REQUIRED(L"kernel32.dll", GetCurrentProcessId)); ASSERT_TRUE(call); @@ -62,7 +62,7 @@ TEST(NoCfiIcall, CrossDSOICall) { } TEST(NoCfiIcall, Args) { -#if !defined(OS_WIN) +#if !BUILDFLAG(IS_WIN) static const NoCfiIcall call( dlsym(RTLD_NEXT, "snprintf")); ASSERT_TRUE(call); diff --git a/external_imported/sentry-native/external/crashpad/util/misc/paths_win.cc b/external_imported/sentry-native/external/crashpad/util/misc/paths_win.cc index 8510ccf93..9261718c0 100644 --- a/external_imported/sentry-native/external/crashpad/util/misc/paths_win.cc +++ b/external_imported/sentry-native/external/crashpad/util/misc/paths_win.cc @@ -16,7 +16,8 @@ #include -#include "base/cxx17_backports.h" +#include + #include "base/logging.h" namespace crashpad { @@ -24,14 +25,12 @@ namespace crashpad { // static bool Paths::Executable(base::FilePath* path) { wchar_t executable_path[_MAX_PATH]; - unsigned int len = - GetModuleFileName(nullptr, - executable_path, - static_cast(base::size(executable_path))); + unsigned int len = GetModuleFileName( + nullptr, executable_path, static_cast(std::size(executable_path))); if (len == 0) { PLOG(ERROR) << "GetModuleFileName"; return false; - } else if (len >= base::size(executable_path)) { + } else if (len >= std::size(executable_path)) { LOG(ERROR) << "GetModuleFileName"; return false; } diff --git a/external_imported/sentry-native/external/crashpad/util/misc/random_string_test.cc b/external_imported/sentry-native/external/crashpad/util/misc/random_string_test.cc index fac830f35..15b3a4140 100644 --- a/external_imported/sentry-native/external/crashpad/util/misc/random_string_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/misc/random_string_test.cc @@ -16,9 +16,9 @@ #include +#include #include -#include "base/cxx17_backports.h" #include "gtest/gtest.h" namespace crashpad { @@ -33,7 +33,7 @@ TEST(RandomString, RandomString) { const std::string allowed_characters("ABCDEFGHIJKLMNOPQRSTUVWXYZ"); size_t character_counts[26] = {}; - ASSERT_EQ(allowed_characters.size(), base::size(character_counts)); + ASSERT_EQ(allowed_characters.size(), std::size(character_counts)); std::set strings; @@ -61,7 +61,7 @@ TEST(RandomString, RandomString) { // Make sure every character appears at least once. It is possible, but // extremely unlikely, for a character to not appear at all. for (size_t character_index = 0; - character_index < base::size(character_counts); + character_index < std::size(character_counts); ++character_index) { EXPECT_GT(character_counts[character_index], 0u) << allowed_characters[character_index]; diff --git a/external_imported/sentry-native/external/crashpad/util/misc/scoped_forbid_return_test.cc b/external_imported/sentry-native/external/crashpad/util/misc/scoped_forbid_return_test.cc index 06cb5494b..b728cf4dc 100644 --- a/external_imported/sentry-native/external/crashpad/util/misc/scoped_forbid_return_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/misc/scoped_forbid_return_test.cc @@ -14,7 +14,6 @@ #include "util/misc/scoped_forbid_return.h" -#include "base/compiler_specific.h" #include "gtest/gtest.h" #include "test/gtest_death.h" @@ -43,13 +42,12 @@ void ScopedForbidReturnHelper(ForbidReturnType type) { } } -constexpr char kForbiddenMessage[] = "attempt to exit scope forbidden"; +// kForbiddenMessage may appear to be unused if ASSERT_DEATH_CHECK() throws it +// away. +[[maybe_unused]] constexpr char kForbiddenMessage[] = + "attempt to exit scope forbidden"; TEST(ScopedForbidReturnDeathTest, Default) { - // kForbiddenMessage may appear to be unused if ASSERT_DEATH_CHECK() throws it - // away. - ALLOW_UNUSED_LOCAL(kForbiddenMessage); - ASSERT_DEATH_CHECK(ScopedForbidReturnHelper(kForbidReturnDefault), kForbiddenMessage); } diff --git a/external_imported/sentry-native/external/crashpad/util/misc/time.h b/external_imported/sentry-native/external/crashpad/util/misc/time.h index dc992bdcc..d695f77d2 100644 --- a/external_imported/sentry-native/external/crashpad/util/misc/time.h +++ b/external_imported/sentry-native/external/crashpad/util/misc/time.h @@ -21,7 +21,7 @@ #include "build/build_config.h" -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) #include #endif @@ -45,7 +45,7 @@ bool TimespecToTimeval(const timespec& ts, timeval* tv); //! \brief Convert the timeval \a tv to a timespec \a ts. void TimevalToTimespec(const timeval& tv, timespec* ts); -#if defined(OS_WIN) || DOXYGEN +#if BUILDFLAG(IS_WIN) || DOXYGEN //! \brief Convert a `timespec` to a Windows `FILETIME`, converting from POSIX //! epoch to Windows epoch. @@ -67,15 +67,17 @@ timeval FiletimeToTimevalInterval(const FILETIME& filetime); //! UTC. void GetTimeOfDay(timeval* tv); -#endif // OS_WIN +#endif // BUILDFLAG(IS_WIN) -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || DOXYGEN +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ + DOXYGEN //! \brief Get the kernel boot time. Subsequent calls to this function may //! return different results due to the system clock being changed or //! imprecision in measuring the boot time. //! \return `true` on success. Otherwise, `false` with a message logged. bool GetBootTime(timespec* ts); -#endif // OS_LINUX || OS_CHROMEOS || OS_ANDROID || DOXYGEN +#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || + // BUILDFLAG(IS_ANDROID) || DOXYGEN } // namespace crashpad diff --git a/external_imported/sentry-native/external/crashpad/util/misc/time_test.cc b/external_imported/sentry-native/external/crashpad/util/misc/time_test.cc index 87e28faae..d3ae95663 100644 --- a/external_imported/sentry-native/external/crashpad/util/misc/time_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/misc/time_test.cc @@ -16,6 +16,7 @@ #include +#include "build/build_config.h" #include "gtest/gtest.h" namespace crashpad { @@ -71,7 +72,7 @@ TEST(Time, TimeConversions) { EXPECT_TRUE(TimespecToTimeval(kEndOfTime, &end_of_timeval)); } -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) constexpr uint64_t kBirthdateFiletimeIntervals = 130512285140000324; FILETIME filetime_birthdate; filetime_birthdate.dwLowDateTime = 0xffffffff & kBirthdateFiletimeIntervals; @@ -112,10 +113,10 @@ TEST(Time, TimeConversions) { elapsed_timeval = FiletimeToTimevalInterval(elapsed_filetime); EXPECT_EQ(elapsed_timeval.tv_sec, 429); EXPECT_EQ(elapsed_timeval.tv_usec, 496729); -#endif // OS_WIN +#endif // BUILDFLAG(IS_WIN) } -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) TEST(Time, GetTimeOfDay) { timeval t; @@ -125,7 +126,7 @@ TEST(Time, GetTimeOfDay) { EXPECT_LT(approx_now - 100, t.tv_sec); } -#endif // OS_WIN +#endif // BUILDFLAG(IS_WIN) } // namespace } // namespace test diff --git a/external_imported/sentry-native/external/crashpad/util/misc/uuid.cc b/external_imported/sentry-native/external/crashpad/util/misc/uuid.cc index 4ed383117..6ad7e6727 100644 --- a/external_imported/sentry-native/external/crashpad/util/misc/uuid.cc +++ b/external_imported/sentry-native/external/crashpad/util/misc/uuid.cc @@ -29,10 +29,11 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/sys_byteorder.h" +#include "build/build_config.h" -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) #include -#endif // OS_APPLE +#endif // BUILDFLAG(IS_APPLE) namespace crashpad { @@ -87,20 +88,20 @@ bool UUID::InitializeFromString(const base::StringPiece& string) { return true; } -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) bool UUID::InitializeFromString(const base::WStringPiece& string) { return InitializeFromString(WideToUTF8(string)); } #endif bool UUID::InitializeWithNew() { -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) uuid_t uuid; uuid_generate(uuid); InitializeFromBytes(uuid); return true; -#elif defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ - defined(OS_ANDROID) || defined(OS_FUCHSIA) +#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ + BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) // Linux, Android, and Fuchsia do not provide a UUID generator in a // widely-available system library. On Linux and Android, uuid_generate() // from libuuid is not available everywhere. @@ -115,10 +116,10 @@ bool UUID::InitializeWithNew() { return true; #else #error Port. -#endif // OS_APPLE +#endif // BUILDFLAG(IS_APPLE) } -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) void UUID::InitializeFromSystemUUID(const ::UUID* system_uuid) { static_assert(sizeof(::UUID) == sizeof(UUID), "unexpected system uuid size"); @@ -126,7 +127,7 @@ void UUID::InitializeFromSystemUUID(const ::UUID* system_uuid) { "unexpected system uuid layout"); memcpy(this, system_uuid, sizeof(*this)); } -#endif // OS_WIN +#endif // BUILDFLAG(IS_WIN) std::string UUID::ToString() const { return base::StringPrintf("%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", @@ -143,10 +144,10 @@ std::string UUID::ToString() const { data_5[5]); } -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) std::wstring UUID::ToWString() const { return base::UTF8ToWide(ToString()); } -#endif // OS_WIN +#endif // BUILDFLAG(IS_WIN) } // namespace crashpad diff --git a/external_imported/sentry-native/external/crashpad/util/misc/uuid.h b/external_imported/sentry-native/external/crashpad/util/misc/uuid.h index 7e504a225..574f01dc2 100644 --- a/external_imported/sentry-native/external/crashpad/util/misc/uuid.h +++ b/external_imported/sentry-native/external/crashpad/util/misc/uuid.h @@ -22,7 +22,7 @@ #include "base/strings/string_piece.h" #include "build/build_config.h" -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) #include #endif @@ -63,9 +63,9 @@ struct UUID { //! been initialized with the data. `false` if the string could not be //! parsed, with the object state untouched. bool InitializeFromString(const base::StringPiece& string); -#if defined(OS_WIN) || DOXYGEN +#if BUILDFLAG(IS_WIN) || DOXYGEN bool InitializeFromString(const base::WStringPiece& string); -#endif // OS_WIN +#endif // BUILDFLAG(IS_WIN) //! \brief Initializes the %UUID using a standard system facility to generate //! the value. @@ -74,22 +74,22 @@ struct UUID { //! with a message logged. bool InitializeWithNew(); -#if defined(OS_WIN) || DOXYGEN +#if BUILDFLAG(IS_WIN) || DOXYGEN //! \brief Initializes the %UUID from a system `UUID` or `GUID` structure. //! //! \param[in] system_uuid A system `UUID` or `GUID` structure. void InitializeFromSystemUUID(const ::UUID* system_uuid); -#endif // OS_WIN +#endif // BUILDFLAG(IS_WIN) //! \brief Formats the %UUID per RFC 4122 §3. //! //! \return A string of the form `"00112233-4455-6677-8899-aabbccddeeff"`. std::string ToString() const; -#if defined(OS_WIN) || DOXYGEN +#if BUILDFLAG(IS_WIN) || DOXYGEN //! \brief The same as ToString, but returned as a wstring. std::wstring ToWString() const; -#endif // OS_WIN +#endif // BUILDFLAG(IS_WIN) // These fields are laid out according to RFC 4122 §4.1.2. uint32_t data_1; diff --git a/external_imported/sentry-native/external/crashpad/util/misc/uuid_test.cc b/external_imported/sentry-native/external/crashpad/util/misc/uuid_test.cc index 28d7ce4bd..6c036633d 100644 --- a/external_imported/sentry-native/external/crashpad/util/misc/uuid_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/misc/uuid_test.cc @@ -17,12 +17,13 @@ #include #include +#include #include -#include "base/cxx17_backports.h" #include "base/format_macros.h" #include "base/scoped_generic.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "gtest/gtest.h" namespace crashpad { @@ -109,13 +110,13 @@ TEST(UUID, UUID) { EXPECT_NE(uuid, uuid_2); EXPECT_LT(uuid_2, uuid); --uuid.data_3; - for (size_t index = 0; index < base::size(uuid.data_4); ++index) { + for (size_t index = 0; index < std::size(uuid.data_4); ++index) { ++uuid.data_4[index]; EXPECT_NE(uuid, uuid_2); EXPECT_LT(uuid_2, uuid); --uuid.data_4[index]; } - for (size_t index = 0; index < base::size(uuid.data_5); ++index) { + for (size_t index = 0; index < std::size(uuid.data_5); ++index) { ++uuid.data_5[index]; EXPECT_NE(uuid, uuid_2); EXPECT_LT(uuid_2, uuid); @@ -206,7 +207,7 @@ TEST(UUID, FromString) { uuid_zero.InitializeToZero(); const std::string empty_uuid = uuid_zero.ToString(); - for (size_t index = 0; index < base::size(kCases); ++index) { + for (size_t index = 0; index < std::size(kCases); ++index) { const TestCase& test_case = kCases[index]; SCOPED_TRACE(base::StringPrintf( "index %" PRIuS ": %s", index, test_case.uuid_string)); @@ -231,7 +232,7 @@ TEST(UUID, FromString) { uuid.InitializeFromString("5762C15D-50b5-4171-a2e9-7429C9EC6CAB"); EXPECT_EQ(uuid.ToString(), "5762c15d-50b5-4171-a2e9-7429c9ec6cab"); -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) // Test accepting a StringPiece16 via L"" literals on Windows. EXPECT_TRUE( uuid.InitializeFromString(L"F32E5BDC-2681-4C73-A4E6-444FFD44B444")); @@ -240,10 +241,10 @@ TEST(UUID, FromString) { EXPECT_TRUE( uuid.InitializeFromString(L"5762C15D-50b5-4171-a2e9-5555C5EC5CAB")); EXPECT_EQ(uuid.ToString(), "5762c15d-50b5-4171-a2e9-5555c5ec5cab"); -#endif // OS_WIN +#endif // BUILDFLAG(IS_WIN) } -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) TEST(UUID, FromSystem) { ::GUID system_uuid; @@ -268,7 +269,7 @@ TEST(UUID, FromSystem) { EXPECT_EQ(uuid.ToWString(), reinterpret_cast(system_string)); } -#endif // OS_WIN +#endif // BUILDFLAG(IS_WIN) } // namespace } // namespace test diff --git a/external_imported/sentry-native/external/crashpad/util/net/http_transport_socket.cc b/external_imported/sentry-native/external/crashpad/util/net/http_transport_socket.cc index a9654942a..069c44cad 100644 --- a/external_imported/sentry-native/external/crashpad/util/net/http_transport_socket.cc +++ b/external_imported/sentry-native/external/crashpad/util/net/http_transport_socket.cc @@ -12,23 +12,24 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "util/net/http_transport.h" - #include #include #include #include #include -#include "base/cxx17_backports.h" +#include + #include "base/logging.h" #include "base/numerics/safe_conversions.h" #include "base/posix/eintr_wrapper.h" #include "base/scoped_generic.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "util/file/file_io.h" #include "util/net/http_body.h" +#include "util/net/http_transport.h" #include "util/net/url.h" #include "util/stdlib/string_number_conversion.h" #include "util/string/split_string.h" @@ -127,13 +128,13 @@ class SSLStream : public Stream { return false; } } else { -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) if (SSL_CTX_load_verify_locations( ctx_.get(), nullptr, "/etc/ssl/certs") <= 0) { LOG(ERROR) << "SSL_CTX_load_verify_locations"; return false; } -#elif defined(OS_FUCHSIA) +#elif BUILDFLAG(IS_FUCHSIA) if (SSL_CTX_load_verify_locations( ctx_.get(), "/config/ssl/cert.pem", nullptr) <= 0) { LOG(ERROR) << "SSL_CTX_load_verify_locations"; @@ -374,7 +375,7 @@ bool WriteRequest(Stream* stream, FileOperationResult data_bytes; do { - constexpr size_t kCRLFSize = base::size(kCRLFTerminator) - 1; + constexpr size_t kCRLFSize = std::size(kCRLFTerminator) - 1; struct __attribute__((packed)) { char size[8]; char crlf[2]; diff --git a/external_imported/sentry-native/external/crashpad/util/net/http_transport_test.cc b/external_imported/sentry-native/external/crashpad/util/net/http_transport_test.cc index cf53450ee..6c13bfad0 100644 --- a/external_imported/sentry-native/external/crashpad/util/net/http_transport_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/net/http_transport_test.cc @@ -41,7 +41,7 @@ namespace crashpad { namespace test { namespace { -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) std::string ToUTF8IfWin(const std::wstring& x) { return base::WideToUTF8(x); } @@ -70,7 +70,7 @@ class HTTPTransportTestFixture : public MultiprocessExec { scheme_and_host_() { base::FilePath server_path = TestPaths::Executable().DirName().Append( FILE_PATH_LITERAL("http_transport_test_server") -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) FILE_PATH_LITERAL(".exe") #endif ); @@ -361,7 +361,7 @@ TEST_P(HTTPTransport, Upload33k_LengthUnknown) { } // This should be on for Fuchsia, but DX-382. Debug and re-enabled. -#if defined(CRASHPAD_USE_BORINGSSL) && !defined(OS_FUCHSIA) +#if defined(CRASHPAD_USE_BORINGSSL) && !BUILDFLAG(IS_FUCHSIA) // The test server requires BoringSSL or OpenSSL, so https in tests can only be // enabled where that's readily available. Additionally on Linux, the bots fail // lacking libcrypto.so.1.1, so disabled there for now. On Mac, they could also diff --git a/external_imported/sentry-native/external/crashpad/util/net/http_transport_test_server.cc b/external_imported/sentry-native/external/crashpad/util/net/http_transport_test_server.cc index a3bcc6a5a..4e30cbdc8 100644 --- a/external_imported/sentry-native/external/crashpad/util/net/http_transport_test_server.cc +++ b/external_imported/sentry-native/external/crashpad/util/net/http_transport_test_server.cc @@ -122,13 +122,13 @@ int HttpTransportTestServerMain(int argc, char* argv[]) { } // namespace } // namespace crashpad -#if defined(OS_POSIX) || defined(OS_FUCHSIA) +#if BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) int main(int argc, char* argv[]) { return crashpad::HttpTransportTestServerMain(argc, argv); } -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) int wmain(int argc, wchar_t* argv[]) { return crashpad::ToolSupport::Wmain( argc, argv, crashpad::HttpTransportTestServerMain); } -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) diff --git a/external_imported/sentry-native/external/crashpad/util/net/http_transport_win.cc b/external_imported/sentry-native/external/crashpad/util/net/http_transport_win.cc index cb04c2e93..117b82696 100644 --- a/external_imported/sentry-native/external/crashpad/util/net/http_transport_win.cc +++ b/external_imported/sentry-native/external/crashpad/util/net/http_transport_win.cc @@ -22,7 +22,8 @@ #include #include -#include "base/cxx17_backports.h" +#include + #include "base/logging.h" #include "base/numerics/safe_conversions.h" #include "base/scoped_generic.h" @@ -96,7 +97,7 @@ std::string WinHttpMessage(const char* extra) { error_code, 0, msgbuf, - static_cast(base::size(msgbuf)), + static_cast(std::size(msgbuf)), nullptr); if (!len) { return base::StringPrintf("%s: error 0x%lx while retrieving error 0x%lx", diff --git a/external_imported/sentry-native/external/crashpad/util/numeric/checked_address_range.cc b/external_imported/sentry-native/external/crashpad/util/numeric/checked_address_range.cc index 4ba7ff390..1f5abc27e 100644 --- a/external_imported/sentry-native/external/crashpad/util/numeric/checked_address_range.cc +++ b/external_imported/sentry-native/external/crashpad/util/numeric/checked_address_range.cc @@ -17,16 +17,17 @@ #include "base/check_op.h" #include "base/format_macros.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) #include -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) #include "util/win/address_types.h" -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) #include "util/linux/address_types.h" -#elif defined(OS_FUCHSIA) +#elif BUILDFLAG(IS_FUCHSIA) #include -#endif // OS_APPLE +#endif // BUILDFLAG(IS_APPLE) namespace crashpad { namespace internal { @@ -126,15 +127,15 @@ std::string CheckedAddressRangeGeneric::AsString() const { } // Explicit instantiations for the cases we use. -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) template class CheckedAddressRangeGeneric; -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) template class CheckedAddressRangeGeneric; -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) template class CheckedAddressRangeGeneric; -#elif defined(OS_FUCHSIA) +#elif BUILDFLAG(IS_FUCHSIA) template class CheckedAddressRangeGeneric; -#endif // OS_APPLE +#endif // BUILDFLAG(IS_APPLE) } // namespace internal } // namespace crashpad diff --git a/external_imported/sentry-native/external/crashpad/util/numeric/checked_address_range_test.cc b/external_imported/sentry-native/external/crashpad/util/numeric/checked_address_range_test.cc index aa700e0a0..1a4d93f7a 100644 --- a/external_imported/sentry-native/external/crashpad/util/numeric/checked_address_range_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/numeric/checked_address_range_test.cc @@ -16,9 +16,9 @@ #include +#include #include -#include "base/cxx17_backports.h" #include "base/format_macros.h" #include "base/strings/stringprintf.h" #include "build/build_config.h" @@ -119,7 +119,7 @@ TEST(CheckedAddressRange, IsValid) { {0xffffffffffffffff, 1, kInvalid}, }; - for (size_t index = 0; index < base::size(kTestData); ++index) { + for (size_t index = 0; index < std::size(kTestData); ++index) { const auto& testcase = kTestData[index]; SCOPED_TRACE(base::StringPrintf("index %" PRIuS ", base 0x%" PRIx64 ", size 0x%" PRIx64, @@ -170,7 +170,7 @@ TEST(CheckedAddressRange, ContainsValue) { CheckedAddressRange parent_range_32(false, 0x2000, 0x1000); ASSERT_TRUE(parent_range_32.IsValid()); - for (size_t index = 0; index < base::size(kTestData); ++index) { + for (size_t index = 0; index < std::size(kTestData); ++index) { const auto& testcase = kTestData[index]; SCOPED_TRACE(base::StringPrintf( "index %" PRIuS ", value 0x%" PRIx64, index, testcase.value)); @@ -227,7 +227,7 @@ TEST(CheckedAddressRange, ContainsRange) { CheckedAddressRange parent_range_32(false, 0x2000, 0x1000); ASSERT_TRUE(parent_range_32.IsValid()); - for (size_t index = 0; index < base::size(kTestData); ++index) { + for (size_t index = 0; index < std::size(kTestData); ++index) { const auto& testcase = kTestData[index]; SCOPED_TRACE(base::StringPrintf("index %" PRIuS ", base 0x%" PRIx64 ", size 0x%" PRIx64, diff --git a/external_imported/sentry-native/external/crashpad/util/numeric/checked_range_test.cc b/external_imported/sentry-native/external/crashpad/util/numeric/checked_range_test.cc index ad734ba34..b4e042616 100644 --- a/external_imported/sentry-native/external/crashpad/util/numeric/checked_range_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/numeric/checked_range_test.cc @@ -17,9 +17,9 @@ #include #include +#include #include -#include "base/cxx17_backports.h" #include "base/format_macros.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" @@ -78,7 +78,7 @@ TEST(CheckedRange, IsValid) { {0xffffffff, 0xffffffff, false}, }; - for (size_t index = 0; index < base::size(kUnsignedTestData); ++index) { + for (size_t index = 0; index < std::size(kUnsignedTestData); ++index) { const auto& testcase = kUnsignedTestData[index]; SCOPED_TRACE(base::StringPrintf("unsigned index %" PRIuS ", base 0x%x, size 0x%x", @@ -140,7 +140,7 @@ TEST(CheckedRange, IsValid) { {-1, 0xffffffff, false}, }; - for (size_t index = 0; index < base::size(kSignedTestData); ++index) { + for (size_t index = 0; index < std::size(kSignedTestData); ++index) { const auto& testcase = kSignedTestData[index]; SCOPED_TRACE(base::StringPrintf("signed index %" PRIuS ", base 0x%x, size 0x%x", @@ -186,7 +186,7 @@ TEST(CheckedRange, ContainsValue) { CheckedRange parent_range(0x2000, 0x1000); ASSERT_TRUE(parent_range.IsValid()); - for (size_t index = 0; index < base::size(kTestData); ++index) { + for (size_t index = 0; index < std::size(kTestData); ++index) { const auto& testcase = kTestData[index]; SCOPED_TRACE(base::StringPrintf( "index %" PRIuS ", value 0x%x", index, testcase.value)); @@ -234,7 +234,7 @@ TEST(CheckedRange, ContainsRange) { CheckedRange parent_range(0x2000, 0x1000); ASSERT_TRUE(parent_range.IsValid()); - for (size_t index = 0; index < base::size(kTestData); ++index) { + for (size_t index = 0; index < std::size(kTestData); ++index) { const auto& testcase = kTestData[index]; SCOPED_TRACE(base::StringPrintf("index %" PRIuS ", base 0x%x, size 0x%x", index, @@ -287,7 +287,7 @@ TEST(CheckedRange, OverlapsRange) { CheckedRange first_range(0x2000, 0x1000); ASSERT_TRUE(first_range.IsValid()); - for (size_t index = 0; index < base::size(kTestData); ++index) { + for (size_t index = 0; index < std::size(kTestData); ++index) { const auto& testcase = kTestData[index]; SCOPED_TRACE(base::StringPrintf("index %" PRIuS ", base 0x%x, size 0x%x", index, diff --git a/external_imported/sentry-native/external/crashpad/util/posix/close_multiple.cc b/external_imported/sentry-native/external/crashpad/util/posix/close_multiple.cc index 2e0ad1056..4bafd474b 100644 --- a/external_imported/sentry-native/external/crashpad/util/posix/close_multiple.cc +++ b/external_imported/sentry-native/external/crashpad/util/posix/close_multiple.cc @@ -21,8 +21,8 @@ #include #include +#include -#include "base/cxx17_backports.h" #include "base/files/scoped_file.h" #include "base/logging.h" #include "base/posix/eintr_wrapper.h" @@ -31,7 +31,7 @@ #include "util/file/directory_reader.h" #include "util/misc/implicit_cast.h" -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) #include #endif @@ -51,7 +51,7 @@ namespace { void CloseNowOrOnExec(int fd, bool ebadf_ok) { int rv; -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) // Try to set close-on-exec, to avoid attempting to close a guarded FD with // a close guard set. rv = fcntl(fd, F_SETFD, FD_CLOEXEC); @@ -72,9 +72,9 @@ void CloseNowOrOnExec(int fd, bool ebadf_ok) { // This is an advantage over looping over all possible file descriptors, because // no attempt needs to be made to close file descriptors that are not open. bool CloseMultipleNowOrOnExecUsingFDDir(int min_fd, int preserve_fd) { -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) static constexpr char kFDDir[] = "/dev/fd"; -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) static constexpr char kFDDir[] = "/proc/self/fd"; #endif @@ -128,14 +128,15 @@ void CloseMultipleNowOrOnExec(int fd, int preserve_fd) { // bionic/libc/bionic/ndk_cruft.cpp getdtablesize(). int max_fd = implicit_cast(sysconf(_SC_OPEN_MAX)); -#if !defined(OS_ANDROID) +#if !BUILDFLAG(IS_ANDROID) // getdtablesize() was removed effective Android 5.0.0 (API 21). Since it // returns the same thing as the sysconf() above, just skip it. See // https://android.googlesource.com/platform/bionic/+/462abab12b074c62c0999859e65d5a32ebb41951. max_fd = std::max(max_fd, getdtablesize()); #endif -#if !(defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)) || \ +#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ + BUILDFLAG(IS_ANDROID)) || \ defined(OPEN_MAX) // Linux does not provide OPEN_MAX. See // https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/include/linux/limits.h?id=77293034696e3e0b6c8b8fc1f96be091104b3d2b. @@ -147,14 +148,14 @@ void CloseMultipleNowOrOnExec(int fd, int preserve_fd) { // while the system is running, but it’s still a better upper bound than the // current RLIMIT_NOFILE value. -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) // See 10.11.6 xnu-3248.60.10/bsd/kern/kern_resource.c maxfilesperproc, // referenced by dosetrlimit(). int oid[] = {CTL_KERN, KERN_MAXFILESPERPROC}; int maxfilesperproc; size_t maxfilesperproc_size = sizeof(maxfilesperproc); if (sysctl(oid, - base::size(oid), + std::size(oid), &maxfilesperproc, &maxfilesperproc_size, nullptr, @@ -163,7 +164,7 @@ void CloseMultipleNowOrOnExec(int fd, int preserve_fd) { } else { PLOG(WARNING) << "sysctl"; } -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) // See linux-4.4.27/fs/file.c sysctl_nr_open, referenced by kernel/sys.c // do_prlimit() and kernel/sysctl.c fs_table. Inability to open this file is // not considered an error, because /proc may not be available or usable. diff --git a/external_imported/sentry-native/external/crashpad/util/posix/close_stdio.cc b/external_imported/sentry-native/external/crashpad/util/posix/close_stdio.cc index a8efc81c1..37c40a4a0 100644 --- a/external_imported/sentry-native/external/crashpad/util/posix/close_stdio.cc +++ b/external_imported/sentry-native/external/crashpad/util/posix/close_stdio.cc @@ -18,9 +18,10 @@ #include #include +#include + #include "base/check.h" #include "base/files/scoped_file.h" -#include "base/ignore_result.h" #include "base/posix/eintr_wrapper.h" namespace crashpad { @@ -32,7 +33,7 @@ void CloseStdioStream(int desired_fd, int oflag) { HANDLE_EINTR(open(_PATH_DEVNULL, oflag | O_NOCTTY | O_CLOEXEC))); if (fd == desired_fd) { // Weird, but play along. - ignore_result(fd.release()); + std::ignore = fd.release(); } else { PCHECK(fd.get() >= 0) << "open"; PCHECK(HANDLE_EINTR(dup2(fd.get(), desired_fd)) != -1) << "dup2"; diff --git a/external_imported/sentry-native/external/crashpad/util/posix/drop_privileges.cc b/external_imported/sentry-native/external/crashpad/util/posix/drop_privileges.cc index 75650d5a6..82aa1eba1 100644 --- a/external_imported/sentry-native/external/crashpad/util/posix/drop_privileges.cc +++ b/external_imported/sentry-native/external/crashpad/util/posix/drop_privileges.cc @@ -25,7 +25,7 @@ void DropPrivileges() { gid_t gid = getgid(); uid_t uid = getuid(); -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) // Based on the POSIX.1-2008 2013 edition documentation for setreuid() and // setregid(), setreuid() and setregid() alone should be sufficient to drop // privileges. The standard specifies that the saved ID should be set to the @@ -73,7 +73,7 @@ void DropPrivileges() { CHECK_EQ(setegid(egid), -1); } } -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) PCHECK(setresgid(gid, gid, gid) == 0) << "setresgid"; PCHECK(setresuid(uid, uid, uid) == 0) << "setresuid"; diff --git a/external_imported/sentry-native/external/crashpad/util/posix/process_info.h b/external_imported/sentry-native/external/crashpad/util/posix/process_info.h index 7a58788df..d3f1c992f 100644 --- a/external_imported/sentry-native/external/crashpad/util/posix/process_info.h +++ b/external_imported/sentry-native/external/crashpad/util/posix/process_info.h @@ -27,12 +27,12 @@ #include "util/misc/initialization_state.h" #include "util/misc/initialization_state_dcheck.h" -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) #include #include #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) #include "util/linux/ptrace_connection.h" #endif @@ -47,7 +47,8 @@ class ProcessInfo { ~ProcessInfo(); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || DOXYGEN +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ + DOXYGEN //! \brief Initializes this object with information about the process whose ID //! is \a pid using a PtraceConnection \a connection. //! @@ -62,9 +63,10 @@ class ProcessInfo { //! //! \return `true` on success, `false` on failure with a message logged. bool InitializeWithPtrace(PtraceConnection* connection); -#endif // OS_LINUX || OS_CHROMEOS || OS_ANDROID || DOXYGEN +#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || + // BUILDFLAG(IS_ANDROID) || DOXYGEN -#if defined(OS_APPLE) || DOXYGEN +#if BUILDFLAG(IS_APPLE) || DOXYGEN //! \brief Initializes this object with information about the process whose ID //! is \a pid. //! @@ -169,9 +171,9 @@ class ProcessInfo { bool Arguments(std::vector* argv) const; private: -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) kinfo_proc kern_proc_info_; -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) // Some members are marked mutable so that they can be lazily initialized by // const methods. These are always InitializationState-protected so that // multiple successive calls will always produce the same return value and out diff --git a/external_imported/sentry-native/external/crashpad/util/posix/process_info_mac.cc b/external_imported/sentry-native/external/crashpad/util/posix/process_info_mac.cc index 47d0ff4ae..de056dd5a 100644 --- a/external_imported/sentry-native/external/crashpad/util/posix/process_info_mac.cc +++ b/external_imported/sentry-native/external/crashpad/util/posix/process_info_mac.cc @@ -16,7 +16,8 @@ #include -#include "base/cxx17_backports.h" +#include + #include "base/logging.h" #include "base/mac/mach_logging.h" @@ -33,7 +34,7 @@ bool ProcessInfo::InitializeWithPid(pid_t pid) { int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, pid}; size_t len = sizeof(kern_proc_info_); - if (sysctl(mib, base::size(mib), &kern_proc_info_, &len, nullptr, 0) != 0) { + if (sysctl(mib, std::size(mib), &kern_proc_info_, &len, nullptr, 0) != 0) { PLOG(ERROR) << "sysctl for pid " << pid; return false; } @@ -112,7 +113,7 @@ std::set ProcessInfo::SupplementaryGroups() const { const short ngroups = kern_proc_info_.kp_eproc.e_ucred.cr_ngroups; DCHECK_GE(ngroups, 0); DCHECK_LE(static_cast(ngroups), - base::size(kern_proc_info_.kp_eproc.e_ucred.cr_groups)); + std::size(kern_proc_info_.kp_eproc.e_ucred.cr_groups)); const gid_t* groups = kern_proc_info_.kp_eproc.e_ucred.cr_groups; return std::set(&groups[0], &groups[ngroups]); @@ -169,7 +170,7 @@ bool ProcessInfo::Arguments(std::vector* argv) const { do { int mib[] = {CTL_KERN, KERN_PROCARGS2, pid}; int rv = - sysctl(mib, base::size(mib), nullptr, &args_size_estimate, nullptr, 0); + sysctl(mib, std::size(mib), nullptr, &args_size_estimate, nullptr, 0); if (rv != 0) { PLOG(ERROR) << "sysctl (size) for pid " << pid; return false; @@ -184,7 +185,7 @@ bool ProcessInfo::Arguments(std::vector* argv) const { // for the reasons described above.) args_size = args_size_estimate + 32; args.resize(args_size); - rv = sysctl(mib, base::size(mib), &args[0], &args_size, nullptr, 0); + rv = sysctl(mib, std::size(mib), &args[0], &args_size, nullptr, 0); if (rv != 0) { PLOG(ERROR) << "sysctl (data) for pid " << pid; return false; diff --git a/external_imported/sentry-native/external/crashpad/util/posix/process_info_test.cc b/external_imported/sentry-native/external/crashpad/util/posix/process_info_test.cc index 1d9b06574..8456b72c4 100644 --- a/external_imported/sentry-native/external/crashpad/util/posix/process_info_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/posix/process_info_test.cc @@ -33,7 +33,7 @@ #include "util/misc/implicit_cast.h" #include "util/string/split_string.h" -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) #include "util/linux/direct_ptrace_connection.h" #include "test/linux/fake_ptrace_connection.h" #endif @@ -98,7 +98,7 @@ void TestProcessSelfOrClone(const ProcessInfo& process_info) { const std::vector& expect_argv = GetMainArguments(); -#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) // Prior to Linux 4.2, the kernel only allowed reading a single page from // /proc//cmdline, causing any further arguments to be truncated. Disable // testing arguments in this case. @@ -124,7 +124,8 @@ void TestProcessSelfOrClone(const ProcessInfo& process_info) { argv_size > static_cast(getpagesize())) { return; } -#endif // OS_ANDROID || OS_LINUX || OS_CHROMEOS +#endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) std::vector argv; ASSERT_TRUE(process_info.Arguments(&argv)); @@ -161,18 +162,19 @@ void TestSelfProcess(const ProcessInfo& process_info) { TEST(ProcessInfo, Self) { ProcessInfo process_info; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) FakePtraceConnection connection; ASSERT_TRUE(connection.Initialize(getpid())); ASSERT_TRUE(process_info.InitializeWithPtrace(&connection)); #else ASSERT_TRUE(process_info.InitializeWithPid(getpid())); -#endif // OS_LINUX || OS_ANDROID || OS_CHROMEOS +#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || + // BUILDFLAG(IS_CHROMEOS) TestSelfProcess(process_info); } -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) TEST(ProcessInfo, SelfTask) { ProcessInfo process_info; ASSERT_TRUE(process_info.InitializeWithTask(mach_task_self())); @@ -184,7 +186,7 @@ TEST(ProcessInfo, Pid1) { // PID 1 is expected to be init or the system’s equivalent. This tests reading // information about another process. ProcessInfo process_info; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) FakePtraceConnection connection; ASSERT_TRUE(connection.Initialize(1)); ASSERT_TRUE(process_info.InitializeWithPtrace(&connection)); @@ -216,7 +218,7 @@ class ProcessInfoForkedTest : public Multiprocess { void MultiprocessParent() override { const pid_t pid = ChildPID(); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) DirectPtraceConnection connection; ASSERT_TRUE(connection.Initialize(pid)); @@ -225,7 +227,8 @@ class ProcessInfoForkedTest : public Multiprocess { #else ProcessInfo process_info; ASSERT_TRUE(process_info.InitializeWithPid(pid)); -#endif // OS_LINUX || OS_CHROMEOS || OS_ANDROID +#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || + // BUILDFLAG(IS_ANDROID) EXPECT_EQ(process_info.ProcessID(), pid); EXPECT_EQ(process_info.ParentProcessID(), getpid()); diff --git a/external_imported/sentry-native/external/crashpad/util/posix/scoped_mmap.cc b/external_imported/sentry-native/external/crashpad/util/posix/scoped_mmap.cc index 443839317..1d28581e3 100644 --- a/external_imported/sentry-native/external/crashpad/util/posix/scoped_mmap.cc +++ b/external_imported/sentry-native/external/crashpad/util/posix/scoped_mmap.cc @@ -28,7 +28,7 @@ // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. -#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) #include "third_party/lss/lss.h" #endif @@ -36,7 +36,7 @@ namespace { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. -#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) void* CallMmap(void* addr, size_t len, int prot, diff --git a/external_imported/sentry-native/external/crashpad/util/posix/scoped_mmap_test.cc b/external_imported/sentry-native/external/crashpad/util/posix/scoped_mmap_test.cc index f8307cc69..c171b81d0 100644 --- a/external_imported/sentry-native/external/crashpad/util/posix/scoped_mmap_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/posix/scoped_mmap_test.cc @@ -18,7 +18,8 @@ #include #include -#include "base/cxx17_backports.h" +#include + #include "base/numerics/safe_conversions.h" #include "base/rand_util.h" #include "base/strings/stringprintf.h" @@ -152,7 +153,7 @@ TEST(ScopedMmapDeathTest, ResetAddrLen_Shrink) { EXPECT_EQ(mapping.len(), 3 * kPageSize); TestCookie cookies[3]; - for (size_t index = 0; index < base::size(cookies); ++index) { + for (size_t index = 0; index < std::size(cookies); ++index) { cookies[index].SetUp(reinterpret_cast( mapping.addr_as() + index * kPageSize)); } @@ -187,7 +188,7 @@ TEST(ScopedMmap, ResetAddrLen_Grow) { EXPECT_EQ(mapping.len(), kPageSize); TestCookie cookies[3]; - for (size_t index = 0; index < base::size(cookies); ++index) { + for (size_t index = 0; index < std::size(cookies); ++index) { cookies[index].SetUp(reinterpret_cast( reinterpret_cast(pages) + index * kPageSize)); } @@ -198,7 +199,7 @@ TEST(ScopedMmap, ResetAddrLen_Grow) { EXPECT_EQ(mapping.addr(), pages); EXPECT_EQ(mapping.len(), 3 * kPageSize); - for (size_t index = 0; index < base::size(cookies); ++index) { + for (size_t index = 0; index < std::size(cookies); ++index) { SCOPED_TRACE(base::StringPrintf("index %zu", index)); EXPECT_EQ(cookies[index].Observed(), cookies[index].Expected()); } @@ -219,7 +220,7 @@ TEST(ScopedMmapDeathTest, ResetAddrLen_MoveDownAndGrow) { EXPECT_EQ(mapping.len(), kPageSize); TestCookie cookies[3]; - for (size_t index = 0; index < base::size(cookies); ++index) { + for (size_t index = 0; index < std::size(cookies); ++index) { cookies[index].SetUp(reinterpret_cast( reinterpret_cast(pages) + index * kPageSize)); } @@ -250,7 +251,7 @@ TEST(ScopedMmapDeathTest, ResetAddrLen_MoveUpAndShrink) { EXPECT_EQ(mapping.len(), 2 * kPageSize); TestCookie cookies[3]; - for (size_t index = 0; index < base::size(cookies); ++index) { + for (size_t index = 0; index < std::size(cookies); ++index) { cookies[index].SetUp(reinterpret_cast( reinterpret_cast(pages) + index * kPageSize)); } @@ -348,7 +349,7 @@ TEST(ScopedMmapDeathTest, NotIntegralNumberOfPages) { EXPECT_EQ(mapping.len(), 2 * kPageSize); TestCookie two_cookies[2]; - for (size_t index = 0; index < base::size(two_cookies); ++index) { + for (size_t index = 0; index < std::size(two_cookies); ++index) { two_cookies[index].SetUp(reinterpret_cast( mapping.addr_as() + index * kPageSize)); } @@ -368,7 +369,7 @@ TEST(ScopedMmapDeathTest, NotIntegralNumberOfPages) { EXPECT_NE(mapping.addr(), MAP_FAILED); EXPECT_EQ(mapping.len(), 2 * kPageSize); - for (size_t index = 0; index < base::size(two_cookies); ++index) { + for (size_t index = 0; index < std::size(two_cookies); ++index) { two_cookies[index].SetUp(reinterpret_cast( mapping.addr_as() + index * kPageSize)); } diff --git a/external_imported/sentry-native/external/crashpad/util/posix/signals.cc b/external_imported/sentry-native/external/crashpad/util/posix/signals.cc index cd8b87d86..f53ceb2a2 100644 --- a/external_imported/sentry-native/external/crashpad/util/posix/signals.cc +++ b/external_imported/sentry-native/external/crashpad/util/posix/signals.cc @@ -16,13 +16,14 @@ #include +#include #include #include "base/check_op.h" -#include "base/cxx17_backports.h" #include "base/logging.h" +#include "build/build_config.h" -#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) #include #endif @@ -50,10 +51,10 @@ constexpr int kCrashSignals[] = { #if defined(SIGEMT) SIGEMT, #endif // defined(SIGEMT) -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) SIGXCPU, SIGXFSZ, -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) }; // These are the non-core-generating but terminating signals. @@ -86,13 +87,13 @@ constexpr int kTerminateSignals[] = { #if defined(SIGSTKFLT) SIGSTKFLT, #endif // defined(SIGSTKFLT) -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) SIGXCPU, SIGXFSZ, -#endif // defined(OS_APPLE) -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // BUILDFLAG(IS_APPLE) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) SIGIO, -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) }; bool InstallHandlers(const std::vector& signals, @@ -129,7 +130,7 @@ bool IsSignalInSet(int sig, const int* set, size_t set_size) { struct sigaction* Signals::OldActions::ActionForSignal(int sig) { DCHECK_GT(sig, 0); const size_t slot = sig - 1; - DCHECK_LT(slot, base::size(actions_)); + DCHECK_LT(slot, std::size(actions_)); return &actions_[slot]; } @@ -164,8 +165,7 @@ bool Signals::InstallCrashHandlers(Handler handler, OldActions* old_actions, const std::set* unhandled_signals) { return InstallHandlers( - std::vector(kCrashSignals, - kCrashSignals + base::size(kCrashSignals)), + std::vector(kCrashSignals, kCrashSignals + std::size(kCrashSignals)), handler, flags, old_actions, @@ -178,7 +178,7 @@ bool Signals::InstallTerminateHandlers(Handler handler, OldActions* old_actions) { return InstallHandlers( std::vector(kTerminateSignals, - kTerminateSignals + base::size(kTerminateSignals)), + kTerminateSignals + std::size(kTerminateSignals)), handler, flags, old_actions, @@ -289,7 +289,7 @@ void Signals::RestoreHandlerAndReraiseSignalOnReturn( // signals that do not re-raise autonomously), such as signals delivered via // kill() and asynchronous hardware faults such as SEGV_MTEAERR, which would // otherwise be lost when re-raising the signal via raise(). -#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) int retval = syscall(SYS_rt_tgsigqueueinfo, getpid(), syscall(SYS_gettid), @@ -307,7 +307,8 @@ void Signals::RestoreHandlerAndReraiseSignalOnReturn( if (errno != EPERM) { _exit(kFailureExitCode); } -#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_CHROMEOS) +#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || + // BUILDFLAG(IS_CHROMEOS) // Explicitly re-raise the signal if it will not re-raise itself. Because // signal handlers normally execute with their signal blocked, this raise() @@ -322,12 +323,12 @@ void Signals::RestoreHandlerAndReraiseSignalOnReturn( // static bool Signals::IsCrashSignal(int sig) { - return IsSignalInSet(sig, kCrashSignals, base::size(kCrashSignals)); + return IsSignalInSet(sig, kCrashSignals, std::size(kCrashSignals)); } // static bool Signals::IsTerminateSignal(int sig) { - return IsSignalInSet(sig, kTerminateSignals, base::size(kTerminateSignals)); + return IsSignalInSet(sig, kTerminateSignals, std::size(kTerminateSignals)); } } // namespace crashpad diff --git a/external_imported/sentry-native/external/crashpad/util/posix/signals_test.cc b/external_imported/sentry-native/external/crashpad/util/posix/signals_test.cc index cb29ff50b..94d8e5115 100644 --- a/external_imported/sentry-native/external/crashpad/util/posix/signals_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/posix/signals_test.cc @@ -20,10 +20,9 @@ #include #include +#include #include -#include "base/compiler_specific.h" -#include "base/cxx17_backports.h" #include "base/files/scoped_file.h" #include "base/logging.h" #include "base/strings/stringprintf.h" @@ -34,7 +33,7 @@ #include "test/scoped_temp_dir.h" #include "util/posix/scoped_mmap.h" -#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) #include #include @@ -58,7 +57,8 @@ #define PR_MTE_TCF_ASYNC (1UL << 2) #endif #endif // defined(ARCH_CPU_ARM64) -#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_CHROMEOS) +#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || + // BUILDFLAG(IS_CHROMEOS) namespace crashpad { namespace test { @@ -90,15 +90,16 @@ std::vector TestableSignals() { #endif // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL) signals.push_back({SIGPIPE, 0}); signals.push_back({SIGSEGV, 0}); -#if (defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_CHROMEOS)) && \ +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || \ + BUILDFLAG(IS_CHROMEOS)) && \ defined(ARCH_CPU_ARM64) if (getauxval(AT_HWCAP2) & HWCAP2_MTE) { signals.push_back({SIGSEGV, SEGV_MTEAERR}); } #endif -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) signals.push_back({SIGSYS, 0}); -#endif // OS_APPLE +#endif // BUILDFLAG(IS_APPLE) #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM64) signals.push_back({SIGTRAP, 0}); #endif // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM64) @@ -163,10 +164,9 @@ void CauseSignal(int sig, int code) { * Arm architecture. */ #if defined(ARCH_CPU_X86_FAMILY) - volatile int a = 42; + [[maybe_unused]] volatile int a = 42; volatile int b = 0; a /= b; - ALLOW_UNUSED_LOCAL(a); #endif break; } @@ -209,7 +209,8 @@ void CauseSignal(int sig, int code) { *i = 0; break; } -#if (defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_CHROMEOS)) && \ +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || \ + BUILDFLAG(IS_CHROMEOS)) && \ defined(ARCH_CPU_ARM64) case SEGV_MTEAERR: { ScopedMmap mapping; @@ -231,13 +232,13 @@ void CauseSignal(int sig, int code) { mapping.addr_as()[1ULL << 56] = 0; break; } -#endif // (defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_CHROMEOS)) && - // defined(ARCH_CPU_ARM64) +#endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || + // BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_ARM64) } break; } -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) case SIGSYS: { #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" @@ -249,7 +250,7 @@ void CauseSignal(int sig, int code) { } break; } -#endif // OS_APPLE +#endif // BUILDFLAG(IS_APPLE) #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM64) case SIGTRAP: { @@ -409,7 +410,7 @@ TEST(Signals, WillSignalReraiseAutonomously) { {SIGHUP, SEGV_MAPERR, false}, {SIGINT, SI_USER, false}, }; - for (size_t index = 0; index < base::size(kTestData); ++index) { + for (size_t index = 0; index < std::size(kTestData); ++index) { const auto test_data = kTestData[index]; SCOPED_TRACE(base::StringPrintf( "index %zu, sig %d, code %d", index, test_data.sig, test_data.code)); @@ -522,7 +523,7 @@ TEST(Signals, Raise_HandlerReraisesToDefault) { continue; } -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) if (sig == SIGBUS #if defined(ARCH_CPU_ARM64) || sig == SIGILL || sig == SIGSEGV @@ -535,7 +536,7 @@ TEST(Signals, Raise_HandlerReraisesToDefault) { // test must be skipped. continue; } -#endif // defined(OS_APPLE) +#endif // BUILDFLAG(IS_APPLE) SignalsTest test(SignalsTest::TestType::kHandlerReraisesToDefault, SignalsTest::SignalSource::kRaise, @@ -554,7 +555,7 @@ TEST(Signals, Raise_HandlerReraisesToPrevious) { continue; } -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) if (sig == SIGBUS #if defined(ARCH_CPU_ARM64) || sig == SIGILL || sig == SIGSEGV @@ -567,7 +568,7 @@ TEST(Signals, Raise_HandlerReraisesToPrevious) { // test must be skipped. continue; } -#endif // defined(OS_APPLE) +#endif // BUILDFLAG(IS_APPLE) SignalsTest test(SignalsTest::TestType::kHandlerReraisesToPrevious, SignalsTest::SignalSource::kRaise, diff --git a/external_imported/sentry-native/external/crashpad/util/posix/symbolic_constants_posix.cc b/external_imported/sentry-native/external/crashpad/util/posix/symbolic_constants_posix.cc index 671d96340..686de578c 100644 --- a/external_imported/sentry-native/external/crashpad/util/posix/symbolic_constants_posix.cc +++ b/external_imported/sentry-native/external/crashpad/util/posix/symbolic_constants_posix.cc @@ -18,7 +18,8 @@ #include #include -#include "base/cxx17_backports.h" +#include + #include "base/strings/stringprintf.h" #include "build/build_config.h" #include "util/misc/implicit_cast.h" @@ -29,8 +30,10 @@ namespace { constexpr const char* kSignalNames[] = { nullptr, -#if defined(OS_APPLE) - // sed -Ene 's/^#define[[:space:]]SIG([[:alnum:]]+)[[:space:]]+[[:digit:]]{1,2}([[:space:]]|$).*/ "\1",/p' +#if BUILDFLAG(IS_APPLE) + // sed -Ene + // 's/^#define[[:space:]]SIG([[:alnum:]]+)[[:space:]]+[[:digit:]]{1,2}([[:space:]]|$).*/ + // "\1",/p' // /usr/include/sys/signal.h // and fix up by removing the entry for SIGPOLL. "HUP", @@ -64,7 +67,7 @@ constexpr const char* kSignalNames[] = { "INFO", "USR1", "USR2", -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) #if defined(ARCH_CPU_MIPS_FAMILY) "HUP", "INT", @@ -135,11 +138,11 @@ constexpr const char* kSignalNames[] = { #endif // defined(ARCH_CPU_MIPS_FAMILY) #endif }; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) // NSIG is 64 to account for real-time signals. -static_assert(base::size(kSignalNames) == 32, "kSignalNames length"); +static_assert(std::size(kSignalNames) == 32, "kSignalNames length"); #else -static_assert(base::size(kSignalNames) == NSIG, "kSignalNames length"); +static_assert(std::size(kSignalNames) == NSIG, "kSignalNames length"); #endif constexpr char kSigPrefix[] = "SIG"; @@ -151,7 +154,7 @@ namespace crashpad { std::string SignalToString(int signal, SymbolicConstantToStringOptions options) { const char* signal_name = - implicit_cast(signal) < base::size(kSignalNames) + implicit_cast(signal) < std::size(kSignalNames) ? kSignalNames[signal] : nullptr; if (!signal_name) { @@ -176,7 +179,7 @@ bool StringToSignal(const base::StringPiece& string, string.substr(0, strlen(kSigPrefix)).compare(kSigPrefix) == 0; base::StringPiece short_string = can_match_full ? string.substr(strlen(kSigPrefix)) : string; - for (int index = 0; index < implicit_cast(base::size(kSignalNames)); + for (int index = 0; index < implicit_cast(std::size(kSignalNames)); ++index) { const char* signal_name = kSignalNames[index]; if (!signal_name) { diff --git a/external_imported/sentry-native/external/crashpad/util/posix/symbolic_constants_posix_test.cc b/external_imported/sentry-native/external/crashpad/util/posix/symbolic_constants_posix_test.cc index 61d75e28a..532f7fd2e 100644 --- a/external_imported/sentry-native/external/crashpad/util/posix/symbolic_constants_posix_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/posix/symbolic_constants_posix_test.cc @@ -17,14 +17,15 @@ #include #include -#include "base/cxx17_backports.h" +#include + #include "base/strings/string_piece.h" #include "base/strings/stringprintf.h" #include "build/build_config.h" #include "gtest/gtest.h" #define NUL_TEST_DATA(string) \ - { string, base::size(string) - 1 } + { string, std::size(string) - 1 } namespace crashpad { namespace test { @@ -35,38 +36,23 @@ constexpr struct { const char* full_name; const char* short_name; } kSignalTestData[] = { - {SIGABRT, "SIGABRT", "ABRT"}, - {SIGALRM, "SIGALRM", "ALRM"}, - {SIGBUS, "SIGBUS", "BUS"}, - {SIGCHLD, "SIGCHLD", "CHLD"}, - {SIGCONT, "SIGCONT", "CONT"}, - {SIGFPE, "SIGFPE", "FPE"}, - {SIGHUP, "SIGHUP", "HUP"}, - {SIGILL, "SIGILL", "ILL"}, - {SIGINT, "SIGINT", "INT"}, - {SIGIO, "SIGIO", "IO"}, - {SIGKILL, "SIGKILL", "KILL"}, - {SIGPIPE, "SIGPIPE", "PIPE"}, - {SIGPROF, "SIGPROF", "PROF"}, - {SIGQUIT, "SIGQUIT", "QUIT"}, - {SIGSEGV, "SIGSEGV", "SEGV"}, - {SIGSTOP, "SIGSTOP", "STOP"}, - {SIGSYS, "SIGSYS", "SYS"}, - {SIGTERM, "SIGTERM", "TERM"}, - {SIGTRAP, "SIGTRAP", "TRAP"}, - {SIGTSTP, "SIGTSTP", "TSTP"}, - {SIGTTIN, "SIGTTIN", "TTIN"}, - {SIGTTOU, "SIGTTOU", "TTOU"}, - {SIGURG, "SIGURG", "URG"}, - {SIGUSR1, "SIGUSR1", "USR1"}, - {SIGUSR2, "SIGUSR2", "USR2"}, - {SIGVTALRM, "SIGVTALRM", "VTALRM"}, - {SIGWINCH, "SIGWINCH", "WINCH"}, - {SIGXCPU, "SIGXCPU", "XCPU"}, -#if defined(OS_APPLE) - {SIGEMT, "SIGEMT", "EMT"}, - {SIGINFO, "SIGINFO", "INFO"}, -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) + {SIGABRT, "SIGABRT", "ABRT"}, {SIGALRM, "SIGALRM", "ALRM"}, + {SIGBUS, "SIGBUS", "BUS"}, {SIGCHLD, "SIGCHLD", "CHLD"}, + {SIGCONT, "SIGCONT", "CONT"}, {SIGFPE, "SIGFPE", "FPE"}, + {SIGHUP, "SIGHUP", "HUP"}, {SIGILL, "SIGILL", "ILL"}, + {SIGINT, "SIGINT", "INT"}, {SIGIO, "SIGIO", "IO"}, + {SIGKILL, "SIGKILL", "KILL"}, {SIGPIPE, "SIGPIPE", "PIPE"}, + {SIGPROF, "SIGPROF", "PROF"}, {SIGQUIT, "SIGQUIT", "QUIT"}, + {SIGSEGV, "SIGSEGV", "SEGV"}, {SIGSTOP, "SIGSTOP", "STOP"}, + {SIGSYS, "SIGSYS", "SYS"}, {SIGTERM, "SIGTERM", "TERM"}, + {SIGTRAP, "SIGTRAP", "TRAP"}, {SIGTSTP, "SIGTSTP", "TSTP"}, + {SIGTTIN, "SIGTTIN", "TTIN"}, {SIGTTOU, "SIGTTOU", "TTOU"}, + {SIGURG, "SIGURG", "URG"}, {SIGUSR1, "SIGUSR1", "USR1"}, + {SIGUSR2, "SIGUSR2", "USR2"}, {SIGVTALRM, "SIGVTALRM", "VTALRM"}, + {SIGWINCH, "SIGWINCH", "WINCH"}, {SIGXCPU, "SIGXCPU", "XCPU"}, +#if BUILDFLAG(IS_APPLE) + {SIGEMT, "SIGEMT", "EMT"}, {SIGINFO, "SIGINFO", "INFO"}, +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) {SIGPWR, "SIGPWR", "PWR"}, #if !defined(ARCH_CPU_MIPS_FAMILY) {SIGSTKFLT, "SIGSTKFLT", "STKFLT"}, @@ -116,14 +102,14 @@ void TestSignalToString(int value, } TEST(SymbolicConstantsPOSIX, SignalToString) { - for (size_t index = 0; index < base::size(kSignalTestData); ++index) { + for (size_t index = 0; index < std::size(kSignalTestData); ++index) { SCOPED_TRACE(base::StringPrintf("index %zu", index)); TestSignalToString(kSignalTestData[index].signal, kSignalTestData[index].full_name, kSignalTestData[index].short_name); } -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) // NSIG is 64 to account for real-time signals. constexpr int kSignalCount = 32; #else @@ -171,11 +157,11 @@ TEST(SymbolicConstantsPOSIX, StringToSignal) { kAllowFullName | kAllowShortName | kAllowNumber, }; - for (size_t option_index = 0; option_index < base::size(kOptions); + for (size_t option_index = 0; option_index < std::size(kOptions); ++option_index) { SCOPED_TRACE(base::StringPrintf("option_index %zu", option_index)); StringToSymbolicConstantOptions options = kOptions[option_index]; - for (size_t index = 0; index < base::size(kSignalTestData); ++index) { + for (size_t index = 0; index < std::size(kSignalTestData); ++index) { SCOPED_TRACE(base::StringPrintf("index %zu", index)); int signal = kSignalTestData[index].signal; { @@ -213,7 +199,7 @@ TEST(SymbolicConstantsPOSIX, StringToSignal) { "", }; - for (size_t index = 0; index < base::size(kNegativeTestData); ++index) { + for (size_t index = 0; index < std::size(kNegativeTestData); ++index) { SCOPED_TRACE(base::StringPrintf("index %zu", index)); TestStringToSignal(kNegativeTestData[index], options, false, 0); } @@ -234,7 +220,7 @@ TEST(SymbolicConstantsPOSIX, StringToSignal) { NUL_TEST_DATA("1\0002"), }; - for (size_t index = 0; index < base::size(kNULTestData); ++index) { + for (size_t index = 0; index < std::size(kNULTestData); ++index) { SCOPED_TRACE(base::StringPrintf("index %zu", index)); base::StringPiece string(kNULTestData[index].string, kNULTestData[index].length); diff --git a/external_imported/sentry-native/external/crashpad/util/process/process_id.h b/external_imported/sentry-native/external/crashpad/util/process/process_id.h index 113f6fc63..0d8273cc7 100644 --- a/external_imported/sentry-native/external/crashpad/util/process/process_id.h +++ b/external_imported/sentry-native/external/crashpad/util/process/process_id.h @@ -20,27 +20,27 @@ #include "base/format_macros.h" #include "build/build_config.h" -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) #include -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) #include -#elif defined(OS_FUCHSIA) +#elif BUILDFLAG(IS_FUCHSIA) #include #endif namespace crashpad { -#if defined(OS_POSIX) || DOXYGEN +#if BUILDFLAG(IS_POSIX) || DOXYGEN //! \brief Alias for platform-specific type to represent a process. using ProcessID = pid_t; constexpr ProcessID kInvalidProcessID = -1; static_assert(std::is_same::value, "Port."); #define PRI_PROCESS_ID "d" -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) using ProcessID = DWORD; constexpr ProcessID kInvalidProcessID = 0; #define PRI_PROCESS_ID "lu" -#elif defined(OS_FUCHSIA) +#elif BUILDFLAG(IS_FUCHSIA) using ProcessID = zx_koid_t; constexpr ProcessID kInvalidProcessID = ZX_KOID_INVALID; static_assert(std::is_same::value, "Port."); diff --git a/external_imported/sentry-native/external/crashpad/util/process/process_memory.h b/external_imported/sentry-native/external/crashpad/util/process/process_memory.h index eeb78e97e..d7e65437d 100644 --- a/external_imported/sentry-native/external/crashpad/util/process/process_memory.h +++ b/external_imported/sentry-native/external/crashpad/util/process/process_memory.h @@ -22,10 +22,10 @@ #include "build/build_config.h" #include "util/misc/address_types.h" -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) #include typedef SSIZE_T ssize_t; -#endif // defined(OS_WIN) +#endif // BUILDFLAG(IS_WIN) namespace crashpad { diff --git a/external_imported/sentry-native/external/crashpad/util/process/process_memory_native.h b/external_imported/sentry-native/external/crashpad/util/process/process_memory_native.h index 5a792d76e..c3b94e826 100644 --- a/external_imported/sentry-native/external/crashpad/util/process/process_memory_native.h +++ b/external_imported/sentry-native/external/crashpad/util/process/process_memory_native.h @@ -14,26 +14,26 @@ #include "build/build_config.h" -#if defined(OS_FUCHSIA) +#if BUILDFLAG(IS_FUCHSIA) #include "util/process/process_memory_fuchsia.h" -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) #include "util/process/process_memory_linux.h" -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) #include "util/process/process_memory_win.h" -#elif defined(OS_APPLE) +#elif BUILDFLAG(IS_APPLE) #include "util/process/process_memory_mac.h" #endif namespace crashpad { -#if defined(OS_FUCHSIA) || DOXYGEN +#if BUILDFLAG(IS_FUCHSIA) || DOXYGEN //! \brief Alias for platform-specific native implementation of ProcessMemory. using ProcessMemoryNative = ProcessMemoryFuchsia; -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) using ProcessMemoryNative = ProcessMemoryLinux; -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) using ProcessMemoryNative = ProcessMemoryWin; -#elif defined(OS_APPLE) +#elif BUILDFLAG(IS_APPLE) using ProcessMemoryNative = ProcessMemoryMac; #else #error Port. diff --git a/external_imported/sentry-native/external/crashpad/util/process/process_memory_range_test.cc b/external_imported/sentry-native/external/crashpad/util/process/process_memory_range_test.cc index 2e34665fe..381eb0433 100644 --- a/external_imported/sentry-native/external/crashpad/util/process/process_memory_range_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/process/process_memory_range_test.cc @@ -14,16 +14,16 @@ #include "util/process/process_memory_range.h" +#include #include -#include "base/cxx17_backports.h" #include "build/build_config.h" #include "gtest/gtest.h" #include "test/process_type.h" #include "util/misc/from_pointer_cast.h" #include "util/process/process_memory_native.h" -#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #include "test/linux/fake_ptrace_connection.h" #endif @@ -43,14 +43,15 @@ TEST(ProcessMemoryRange, Basic) { constexpr bool is_64_bit = false; #endif // ARCH_CPU_64_BITS -#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) FakePtraceConnection connection; ASSERT_TRUE(connection.Initialize(GetSelfProcess())); ProcessMemoryLinux memory(&connection); #else ProcessMemoryNative memory; ASSERT_TRUE(memory.Initialize(GetSelfProcess())); -#endif // OS_ANDROID || OS_LINUX || OS_CHROMEOS +#endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) ProcessMemoryRange range; ASSERT_TRUE(range.Initialize(&memory, is_64_bit)); @@ -68,28 +69,28 @@ TEST(ProcessMemoryRange, Basic) { auto string1_addr = FromPointerCast(kTestObject.string1); auto string2_addr = FromPointerCast(kTestObject.string2); ASSERT_TRUE(range.ReadCStringSizeLimited( - string1_addr, base::size(kTestObject.string1), &string)); + string1_addr, std::size(kTestObject.string1), &string)); EXPECT_STREQ(string.c_str(), kTestObject.string1); ASSERT_TRUE(range.ReadCStringSizeLimited( - string2_addr, base::size(kTestObject.string2), &string)); + string2_addr, std::size(kTestObject.string2), &string)); EXPECT_STREQ(string.c_str(), kTestObject.string2); // Limit the range to remove access to string2. ProcessMemoryRange range2; ASSERT_TRUE(range2.Initialize(range)); ASSERT_TRUE( - range2.RestrictRange(string1_addr, base::size(kTestObject.string1))); + range2.RestrictRange(string1_addr, std::size(kTestObject.string1))); EXPECT_TRUE(range2.ReadCStringSizeLimited( - string1_addr, base::size(kTestObject.string1), &string)); + string1_addr, std::size(kTestObject.string1), &string)); EXPECT_FALSE(range2.ReadCStringSizeLimited( - string2_addr, base::size(kTestObject.string2), &string)); + string2_addr, std::size(kTestObject.string2), &string)); EXPECT_FALSE(range2.Read(object_addr, sizeof(object), &object)); // String reads fail if the NUL terminator is outside the range. ASSERT_TRUE(range2.RestrictRange(string1_addr, strlen(kTestObject.string1))); EXPECT_FALSE(range2.ReadCStringSizeLimited( - string1_addr, base::size(kTestObject.string1), &string)); + string1_addr, std::size(kTestObject.string1), &string)); // New range outside the old range. EXPECT_FALSE(range2.RestrictRange(string1_addr - 1, 1)); diff --git a/external_imported/sentry-native/external/crashpad/util/process/process_memory_sanitized_test.cc b/external_imported/sentry-native/external/crashpad/util/process/process_memory_sanitized_test.cc index b88eab132..03eee9192 100644 --- a/external_imported/sentry-native/external/crashpad/util/process/process_memory_sanitized_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/process/process_memory_sanitized_test.cc @@ -14,12 +14,13 @@ #include "util/process/process_memory_sanitized.h" +#include "build/build_config.h" #include "gtest/gtest.h" #include "test/process_type.h" #include "util/misc/from_pointer_cast.h" #include "util/process/process_memory_native.h" -#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #include "test/linux/fake_ptrace_connection.h" #endif @@ -28,14 +29,15 @@ namespace test { namespace { TEST(ProcessMemorySanitized, DenyDisallowedMemory) { -#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) FakePtraceConnection connection; ASSERT_TRUE(connection.Initialize(GetSelfProcess())); ProcessMemoryLinux memory(&connection); #else ProcessMemoryNative memory; ASSERT_TRUE(memory.Initialize(GetSelfProcess())); -#endif // OS_ANDROID || OS_LINUX || OS_CHROMEOS +#endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) char c = 42; char out; @@ -51,14 +53,15 @@ TEST(ProcessMemorySanitized, DenyDisallowedMemory) { } TEST(ProcessMemorySanitized, AllowedMemory) { -#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) FakePtraceConnection connection; ASSERT_TRUE(connection.Initialize(GetSelfProcess())); ProcessMemoryLinux memory(&connection); #else ProcessMemoryNative memory; ASSERT_TRUE(memory.Initialize(GetSelfProcess())); -#endif // OS_ANDROID || OS_LINUX || OS_CHROMEOS +#endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) char str[4] = "ABC"; char out[4]; diff --git a/external_imported/sentry-native/external/crashpad/util/process/process_memory_test.cc b/external_imported/sentry-native/external/crashpad/util/process/process_memory_test.cc index fe9971bcc..17df85ded 100644 --- a/external_imported/sentry-native/external/crashpad/util/process/process_memory_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/process/process_memory_test.cc @@ -30,14 +30,15 @@ #include "util/misc/from_pointer_cast.h" #include "util/process/process_memory_native.h" -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) #include "test/mac/mach_multiprocess.h" -#endif // defined(OS_APPLE) +#endif // BUILDFLAG(IS_APPLE) -#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #include "test/linux/fake_ptrace_connection.h" #include "util/linux/direct_ptrace_connection.h" -#endif // OS_ANDROID || OS_LINUX || OS_CHROMEOS +#endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) namespace crashpad { namespace test { @@ -47,7 +48,7 @@ namespace { // port which requires root or a code signing entitlement. To account for this // we implement an adaptor class that wraps MachMultiprocess on macOS, because // it shares the child's task port, and makes it behave like MultiprocessExec. -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) class MultiprocessAdaptor : public MachMultiprocess { public: void SetChildTestMainFunction(const std::string& function_name) { @@ -102,7 +103,7 @@ class MultiprocessAdaptor : public MultiprocessExec { void MultiprocessParent() override { Parent(); } }; -#endif // defined(OS_APPLE) +#endif // BUILDFLAG(IS_APPLE) void DoChildReadTestSetup(size_t* region_size, std::unique_ptr* region) { @@ -156,14 +157,15 @@ class ReadTest : public MultiprocessAdaptor { } void DoTest(ProcessType process, size_t region_size, VMAddress address) { -#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) FakePtraceConnection connection; ASSERT_TRUE(connection.Initialize(process)); ProcessMemoryLinux memory(&connection); #else ProcessMemoryNative memory; ASSERT_TRUE(memory.Initialize(process)); -#endif // OS_ANDROID || OS_LINUX || OS_CHROMEOS +#endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) std::unique_ptr result(new char[region_size]); @@ -343,14 +345,15 @@ class ReadCStringTest : public MultiprocessAdaptor { VMAddress local_empty_address, VMAddress local_short_address, VMAddress long_string_address) { -#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) FakePtraceConnection connection; ASSERT_TRUE(connection.Initialize(process)); ProcessMemoryLinux memory(&connection); #else ProcessMemoryNative memory; ASSERT_TRUE(memory.Initialize(process)); -#endif // OS_ANDROID || OS_LINUX || OS_CHROMEOS +#endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) Compare(memory, const_empty_address, kConstCharEmpty); Compare(memory, const_short_address, kConstCharShort); @@ -421,14 +424,15 @@ class ReadUnmappedTest : public MultiprocessAdaptor { } void DoTest(ProcessType process, VMAddress address) { -#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) DirectPtraceConnection connection; ASSERT_TRUE(connection.Initialize(process)); ProcessMemoryLinux memory(&connection); #else ProcessMemoryNative memory; ASSERT_TRUE(memory.Initialize(process)); -#endif // OS_ANDROID || OS_LINUX || OS_CHROMEOS +#endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) VMAddress page_addr1 = address; VMAddress page_addr2 = page_addr1 + base::GetPageSize(); @@ -554,14 +558,15 @@ class ReadCStringUnmappedTest : public MultiprocessAdaptor { void DoTest(ProcessType process, const std::vector& strings) { -#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) DirectPtraceConnection connection; ASSERT_TRUE(connection.Initialize(process)); ProcessMemoryLinux memory(&connection); #else ProcessMemoryNative memory; ASSERT_TRUE(memory.Initialize(process)); -#endif // OS_ANDROID || OS_LINUX || OS_CHROMEOS +#endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) std::string result; result.reserve(kChildProcessStringLength + 1); diff --git a/external_imported/sentry-native/external/crashpad/util/stdlib/aligned_allocator.cc b/external_imported/sentry-native/external/crashpad/util/stdlib/aligned_allocator.cc index 1cbf7d2a5..7e1c1abc9 100644 --- a/external_imported/sentry-native/external/crashpad/util/stdlib/aligned_allocator.cc +++ b/external_imported/sentry-native/external/crashpad/util/stdlib/aligned_allocator.cc @@ -18,12 +18,12 @@ #include "build/build_config.h" -#if defined(OS_POSIX) || defined(_LIBCPP_STD_VER) || defined(__MINGW32__) +#if BUILDFLAG(IS_POSIX) || defined(_LIBCPP_STD_VER) || defined(__MINGW32__) #include -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) #include #include -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) namespace { @@ -31,12 +31,12 @@ namespace { // library to do so. This works even if C++ exceptions are disabled, causing // program termination if uncaught. void ThrowBadAlloc() { -#if defined(OS_POSIX) || defined(_LIBCPP_STD_VER) || defined(__MINGW32__) +#if BUILDFLAG(IS_POSIX) || defined(_LIBCPP_STD_VER) || defined(__MINGW32__) // This works with both libc++ and libstdc++. std::__throw_bad_alloc(); -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) std::_Xbad_alloc(); -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) } } // namespace @@ -44,7 +44,7 @@ void ThrowBadAlloc() { namespace crashpad { void* AlignedAllocate(size_t alignment, size_t size) { -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) // posix_memalign() requires that alignment be at least sizeof(void*), so the // power-of-2 check needs to happen before potentially changing the alignment. if (alignment == 0 || alignment & (alignment - 1)) { @@ -55,22 +55,22 @@ void* AlignedAllocate(size_t alignment, size_t size) { if (posix_memalign(&pointer, std::max(alignment, sizeof(void*)), size) != 0) { ThrowBadAlloc(); } -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) void* pointer = _aligned_malloc(size, alignment); if (pointer == nullptr) { ThrowBadAlloc(); } -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) return pointer; } void AlignedFree(void* pointer) { -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) free(pointer); -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) _aligned_free(pointer); -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) } } // namespace crashpad diff --git a/external_imported/sentry-native/external/crashpad/util/stdlib/aligned_allocator_test.cc b/external_imported/sentry-native/external/crashpad/util/stdlib/aligned_allocator_test.cc index 1c16dcc5e..ed58d2b95 100644 --- a/external_imported/sentry-native/external/crashpad/util/stdlib/aligned_allocator_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/stdlib/aligned_allocator_test.cc @@ -16,11 +16,11 @@ #include -#include "base/compiler_specific.h" +#include "build/build_config.h" #include "gtest/gtest.h" #include "test/gtest_death.h" -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) #include #endif @@ -91,21 +91,19 @@ TEST(AlignedAllocator, AlignedVector) { } void BadAlignmentTest() { -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) // Suppress the assertion MessageBox() normally displayed by the CRT in debug - // mode. - int previous = _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG); - - // In release mode, _CrtSetReportMode() is #defined to ((int)0), so |previous| - // would appear unused. - ALLOW_UNUSED_LOCAL(previous); + // mode. In release mode, _CrtSetReportMode() is #defined to ((int)0), so + // |previous| would appear unused, thus the [[maybe_unused]]. + [[maybe_unused]] int previous = + _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG); #endif // Alignment constraints must be powers of 2. 7 is not valid. AlignedVector bad_aligned_vector; bad_aligned_vector.push_back(0); -#if defined(OS_WIN) +#if BUILDFLAG(IS_WIN) _CrtSetReportMode(_CRT_ASSERT, previous); #endif } diff --git a/external_imported/sentry-native/external/crashpad/util/stdlib/string_number_conversion_test.cc b/external_imported/sentry-native/external/crashpad/util/stdlib/string_number_conversion_test.cc index 90b67757f..9f4dcbeb0 100644 --- a/external_imported/sentry-native/external/crashpad/util/stdlib/string_number_conversion_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/stdlib/string_number_conversion_test.cc @@ -17,10 +17,10 @@ #include #include +#include #include #include -#include "base/cxx17_backports.h" #include "gtest/gtest.h" #define STRINGIFY(a) STR(a) @@ -277,7 +277,7 @@ TEST(StringNumberConversion, StringToInt) { // "decimal digit terminates octal escape sequence". int output; std::string kEmbeddedNullInput(kEmbeddedNullInputRaw, - base::size(kEmbeddedNullInputRaw) - 1); + std::size(kEmbeddedNullInputRaw) - 1); EXPECT_FALSE(StringToNumber(kEmbeddedNullInput, &output)); } @@ -307,7 +307,7 @@ TEST(StringNumberConversion, StringToUnsignedInt) { // "decimal digit terminates octal escape sequence". unsigned int output; std::string kEmbeddedNullInput(kEmbeddedNullInputRaw, - base::size(kEmbeddedNullInputRaw) - 1); + std::size(kEmbeddedNullInputRaw) - 1); EXPECT_FALSE(StringToNumber(kEmbeddedNullInput, &output)); } diff --git a/external_imported/sentry-native/external/crashpad/util/stdlib/strlcpy_test.cc b/external_imported/sentry-native/external/crashpad/util/stdlib/strlcpy_test.cc index b729c2424..4cb933694 100644 --- a/external_imported/sentry-native/external/crashpad/util/stdlib/strlcpy_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/stdlib/strlcpy_test.cc @@ -18,9 +18,9 @@ #include #include +#include #include -#include "base/cxx17_backports.h" #include "base/format_macros.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" @@ -53,7 +53,7 @@ TEST(strlcpy, c16lcpy) { static constexpr char16_t test_characters[] = { 0x4d, 0xe9, 0x100, 0x151, 0x1e18}; - for (size_t index = 0; index < base::size(test_characters); ++index) { + for (size_t index = 0; index < std::size(test_characters); ++index) { char16_t test_character = test_characters[index]; SCOPED_TRACE(base::StringPrintf( "character index %" PRIuS ", character 0x%x", index, test_character)); @@ -67,13 +67,13 @@ TEST(strlcpy, c16lcpy) { EXPECT_EQ(c16lcpy(destination.data, test_string.c_str(), - base::size(destination.data)), + std::size(destination.data)), length); // Make sure that the destination buffer is NUL-terminated, and that as // much of the test string was copied as could fit. size_t expected_destination_length = - std::min(length, base::size(destination.data) - 1); + std::min(length, std::size(destination.data) - 1); EXPECT_EQ(destination.data[expected_destination_length], '\0'); EXPECT_EQ(C16Len(destination.data), expected_destination_length); @@ -86,15 +86,15 @@ TEST(strlcpy, c16lcpy) { // of the buffer passed to c16lcpy. EXPECT_TRUE(C16Memcmp(expected_untouched.lead_guard, destination.lead_guard, - base::size(destination.lead_guard)) == 0); + std::size(destination.lead_guard)) == 0); size_t expected_untouched_length = - base::size(destination.data) - expected_destination_length - 1; + std::size(destination.data) - expected_destination_length - 1; EXPECT_TRUE(C16Memcmp(expected_untouched.data, &destination.data[expected_destination_length + 1], expected_untouched_length) == 0); EXPECT_TRUE(C16Memcmp(expected_untouched.trail_guard, destination.trail_guard, - base::size(destination.trail_guard)) == 0); + std::size(destination.trail_guard)) == 0); } } } diff --git a/external_imported/sentry-native/external/crashpad/util/stdlib/strnlen.cc b/external_imported/sentry-native/external/crashpad/util/stdlib/strnlen.cc index 872c0eb47..296b13106 100644 --- a/external_imported/sentry-native/external/crashpad/util/stdlib/strnlen.cc +++ b/external_imported/sentry-native/external/crashpad/util/stdlib/strnlen.cc @@ -14,7 +14,9 @@ #include "util/stdlib/strnlen.h" -#if defined(OS_MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_7 +#include "build/build_config.h" + +#if BUILDFLAG(IS_MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_7 #if __MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_10_7 // Redeclare a method only available on Mac OS X 10.7 and later to suppress a diff --git a/external_imported/sentry-native/external/crashpad/util/stdlib/strnlen.h b/external_imported/sentry-native/external/crashpad/util/stdlib/strnlen.h index 59253b751..9fa447c22 100644 --- a/external_imported/sentry-native/external/crashpad/util/stdlib/strnlen.h +++ b/external_imported/sentry-native/external/crashpad/util/stdlib/strnlen.h @@ -20,7 +20,7 @@ #include "build/build_config.h" -#if defined(OS_MAC) +#if BUILDFLAG(IS_MAC) #include #endif @@ -38,7 +38,7 @@ namespace crashpad { //! and not all systems’ standard libraries provide an implementation. size_t strnlen(const char* string, size_t max_length); -#if !defined(OS_MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_7 +#if !BUILDFLAG(IS_MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_7 inline size_t strnlen(const char* string, size_t max_length) { return ::strnlen(string, max_length); } diff --git a/external_imported/sentry-native/external/crashpad/util/stdlib/thread_safe_vector_test.cc b/external_imported/sentry-native/external/crashpad/util/stdlib/thread_safe_vector_test.cc index 896243041..6558fc15a 100644 --- a/external_imported/sentry-native/external/crashpad/util/stdlib/thread_safe_vector_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/stdlib/thread_safe_vector_test.cc @@ -14,7 +14,8 @@ #include "util/stdlib/thread_safe_vector.h" -#include "base/cxx17_backports.h" +#include + #include "gtest/gtest.h" #include "util/thread/thread.h" @@ -57,12 +58,12 @@ TEST(ThreadSafeVector, ThreadSafeVector) { EXPECT_TRUE(vector.empty()); ThreadSafeVectorTestThread threads[100]; - for (size_t index = 0; index < base::size(threads); ++index) { + for (size_t index = 0; index < std::size(threads); ++index) { threads[index].SetTestParameters( &thread_safe_vector, static_cast(index * kElementsPerThread)); } - for (size_t index = 0; index < base::size(threads); ++index) { + for (size_t index = 0; index < std::size(threads); ++index) { threads[index].Start(); if (index % 10 == 0) { @@ -79,8 +80,8 @@ TEST(ThreadSafeVector, ThreadSafeVector) { std::vector drained = thread_safe_vector.Drain(); vector.insert(vector.end(), drained.begin(), drained.end()); - bool found[base::size(threads) * kElementsPerThread] = {}; - EXPECT_EQ(vector.size(), base::size(found)); + bool found[std::size(threads) * kElementsPerThread] = {}; + EXPECT_EQ(vector.size(), std::size(found)); for (int element : vector) { EXPECT_FALSE(found[element]) << element; found[element] = true; diff --git a/external_imported/sentry-native/external/crashpad/util/stream/base94_output_stream_test.cc b/external_imported/sentry-native/external/crashpad/util/stream/base94_output_stream_test.cc index d0a298557..34c1b434c 100644 --- a/external_imported/sentry-native/external/crashpad/util/stream/base94_output_stream_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/stream/base94_output_stream_test.cc @@ -17,9 +17,9 @@ #include #include +#include #include -#include "base/cxx17_backports.h" #include "base/rand_util.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" @@ -237,7 +237,7 @@ TEST_F(Base94OutputStreamTest, WriteDeterministicLongDataMultipleTimes) { 4, 96, 40, kLongDataLength - 4 - 96 - 40}; size_t offset = 0; - for (size_t index = 0; index < base::size(kWriteLengths); ++index) { + for (size_t index = 0; index < std::size(kWriteLengths); ++index) { const size_t write_length = kWriteLengths[index]; SCOPED_TRACE(base::StringPrintf( "offset %zu, write_length %zu", offset, write_length)); diff --git a/external_imported/sentry-native/external/crashpad/util/stream/file_encoder.cc b/external_imported/sentry-native/external/crashpad/util/stream/file_encoder.cc index 5cebbfcc5..d39b5b09a 100644 --- a/external_imported/sentry-native/external/crashpad/util/stream/file_encoder.cc +++ b/external_imported/sentry-native/external/crashpad/util/stream/file_encoder.cc @@ -15,8 +15,8 @@ #include "util/stream/file_encoder.h" #include +#include -#include "base/ignore_result.h" #include "util/file/file_io.h" #include "util/file/file_reader.h" #include "util/file/scoped_remove_file.h" @@ -77,7 +77,7 @@ bool FileEncoder::Process() { if (!output->Flush()) return false; - ignore_result(file_remover.release()); + std::ignore = file_remover.release(); return true; } diff --git a/external_imported/sentry-native/external/crashpad/util/stream/zlib_output_stream.cc b/external_imported/sentry-native/external/crashpad/util/stream/zlib_output_stream.cc index 3ae7d9129..153adbe0f 100644 --- a/external_imported/sentry-native/external/crashpad/util/stream/zlib_output_stream.cc +++ b/external_imported/sentry-native/external/crashpad/util/stream/zlib_output_stream.cc @@ -14,8 +14,9 @@ #include "util/stream/zlib_output_stream.h" +#include + #include "base/check.h" -#include "base/cxx17_backports.h" #include "base/logging.h" #include "base/numerics/safe_conversions.h" #include "util/misc/zlib.h" @@ -65,7 +66,7 @@ bool ZlibOutputStream::Write(const uint8_t* data, size_t size) { } } zlib_stream_.next_out = buffer_; - zlib_stream_.avail_out = base::saturated_cast(base::size(buffer_)); + zlib_stream_.avail_out = base::saturated_cast(std::size(buffer_)); initialized_.set_valid(); } @@ -127,12 +128,12 @@ bool ZlibOutputStream::Flush() { } bool ZlibOutputStream::WriteOutputStream() { - auto valid_size = base::size(buffer_) - zlib_stream_.avail_out; + auto valid_size = std::size(buffer_) - zlib_stream_.avail_out; if (valid_size > 0 && !output_stream_->Write(buffer_, valid_size)) return false; zlib_stream_.next_out = buffer_; - zlib_stream_.avail_out = base::saturated_cast(base::size(buffer_)); + zlib_stream_.avail_out = base::saturated_cast(std::size(buffer_)); return true; } diff --git a/external_imported/sentry-native/external/crashpad/util/stream/zlib_output_stream_test.cc b/external_imported/sentry-native/external/crashpad/util/stream/zlib_output_stream_test.cc index 306a61b1e..528800e38 100644 --- a/external_imported/sentry-native/external/crashpad/util/stream/zlib_output_stream_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/stream/zlib_output_stream_test.cc @@ -17,8 +17,8 @@ #include #include +#include -#include "base/cxx17_backports.h" #include "base/rand_util.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" @@ -102,7 +102,7 @@ TEST_F(ZlibOutputStreamTest, WriteDeterministicLongDataMultipleTimes) { 4, 96, 40, kLongDataLength - 4 - 96 - 40}; size_t offset = 0; - for (size_t index = 0; index < base::size(kWriteLengths); ++index) { + for (size_t index = 0; index < std::size(kWriteLengths); ++index) { const size_t write_length = kWriteLengths[index]; SCOPED_TRACE(base::StringPrintf( "offset %zu, write_length %zu", offset, write_length)); diff --git a/external_imported/sentry-native/external/crashpad/util/synchronization/semaphore.h b/external_imported/sentry-native/external/crashpad/util/synchronization/semaphore.h index 308b29b03..1bb9e2184 100644 --- a/external_imported/sentry-native/external/crashpad/util/synchronization/semaphore.h +++ b/external_imported/sentry-native/external/crashpad/util/synchronization/semaphore.h @@ -19,11 +19,11 @@ #include "build/build_config.h" -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) #include -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) #include -#elif defined(OS_ANDROID) +#elif BUILDFLAG(IS_ANDROID) #include #include #else @@ -76,11 +76,11 @@ class Semaphore { void Signal(); private: -#if defined(OS_APPLE) +#if BUILDFLAG(IS_APPLE) dispatch_semaphore_t semaphore_; -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) HANDLE semaphore_; -#elif defined(OS_ANDROID) +#elif BUILDFLAG(IS_ANDROID) std::condition_variable cv_; std::mutex mutex_; int value_; diff --git a/external_imported/sentry-native/external/crashpad/util/synchronization/semaphore_posix.cc b/external_imported/sentry-native/external/crashpad/util/synchronization/semaphore_posix.cc index ebe62a4f4..9e55ede72 100644 --- a/external_imported/sentry-native/external/crashpad/util/synchronization/semaphore_posix.cc +++ b/external_imported/sentry-native/external/crashpad/util/synchronization/semaphore_posix.cc @@ -23,11 +23,12 @@ #include "base/check_op.h" #include "base/logging.h" #include "base/posix/eintr_wrapper.h" +#include "build/build_config.h" #include "util/misc/time.h" namespace crashpad { -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) Semaphore::Semaphore(int value) : cv_(), mutex_(), value_(value) {} @@ -63,7 +64,7 @@ void Semaphore::Signal() { cv_.notify_one(); } -#elif !defined(OS_APPLE) +#elif !BUILDFLAG(IS_APPLE) Semaphore::Semaphore(int value) { PCHECK(sem_init(&semaphore_, 0, value) == 0) << "sem_init"; @@ -104,6 +105,6 @@ void Semaphore::Signal() { PCHECK(sem_post(&semaphore_) == 0) << "sem_post"; } -#endif // OS_ANDROID +#endif // BUILDFLAG(IS_ANDROID) } // namespace crashpad diff --git a/external_imported/sentry-native/external/crashpad/util/synchronization/semaphore_test.cc b/external_imported/sentry-native/external/crashpad/util/synchronization/semaphore_test.cc index 5cb91e489..9a6b6dec3 100644 --- a/external_imported/sentry-native/external/crashpad/util/synchronization/semaphore_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/synchronization/semaphore_test.cc @@ -16,12 +16,14 @@ #include -#include "base/cxx17_backports.h" +#include + +#include "build/build_config.h" #include "gtest/gtest.h" -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) #include -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) namespace crashpad { namespace test { @@ -60,50 +62,50 @@ TEST(Semaphore, TimedWaitInfinite_1) { } struct ThreadMainInfo { -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) pthread_t pthread; -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) HANDLE thread; #endif Semaphore* semaphore; size_t iterations; }; -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) void* -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) DWORD WINAPI -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) ThreadMain(void* argument) { ThreadMainInfo* info = reinterpret_cast(argument); for (size_t iteration = 0; iteration < info->iterations; ++iteration) { info->semaphore->Wait(); } -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) return nullptr; -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) return 0; -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) } void StartThread(ThreadMainInfo* info) { -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) int rv = pthread_create(&info->pthread, nullptr, ThreadMain, info); ASSERT_EQ(rv, 0) << "pthread_create"; -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) info->thread = CreateThread(nullptr, 0, ThreadMain, info, 0, nullptr); ASSERT_NE(info->thread, nullptr) << "CreateThread"; -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) } void JoinThread(ThreadMainInfo* info) { -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) int rv = pthread_join(info->pthread, nullptr); EXPECT_EQ(rv, 0) << "pthread_join"; -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) DWORD result = WaitForSingleObject(info->thread, INFINITE); EXPECT_EQ(result, WAIT_OBJECT_0) << "WaitForSingleObject"; -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) } TEST(Semaphore, Threaded) { @@ -126,7 +128,7 @@ TEST(Semaphore, TenThreaded) { Semaphore semaphore(5); ThreadMainInfo info[10]; size_t iterations = 0; - for (size_t index = 0; index < base::size(info); ++index) { + for (size_t index = 0; index < std::size(info); ++index) { info[index].semaphore = &semaphore; info[index].iterations = index; iterations += info[index].iterations; @@ -138,7 +140,7 @@ TEST(Semaphore, TenThreaded) { semaphore.Signal(); } - for (size_t index = 0; index < base::size(info); ++index) { + for (size_t index = 0; index < std::size(info); ++index) { JoinThread(&info[index]); } } diff --git a/external_imported/sentry-native/external/crashpad/util/thread/thread.h b/external_imported/sentry-native/external/crashpad/util/thread/thread.h index e06ca3c9d..6f93ed096 100644 --- a/external_imported/sentry-native/external/crashpad/util/thread/thread.h +++ b/external_imported/sentry-native/external/crashpad/util/thread/thread.h @@ -17,11 +17,14 @@ #include "build/build_config.h" -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) #include -#elif defined(OS_WIN) +#include +#elif BUILDFLAG(IS_WIN) #include -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) + +#include "build/build_config.h" namespace crashpad { @@ -44,21 +47,26 @@ class Thread { //! Must paired with a call to Start(). void Join(); +#if BUILDFLAG(IS_APPLE) + //! \brief Returns the thread id of the Thread pthread_t. + uint64_t GetThreadIdForTesting(); +#endif // BUILDFLAG(IS_APPLE) + private: //! \brief The thread entry point to be implemented by the subclass. virtual void ThreadMain() = 0; static -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) void* -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) DWORD WINAPI -#endif // OS_POSIX +#endif // BUILDFLAG(IS_POSIX) ThreadEntryThunk(void* argument); -#if defined(OS_POSIX) +#if BUILDFLAG(IS_POSIX) pthread_t platform_thread_; -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) HANDLE platform_thread_; #endif }; diff --git a/external_imported/sentry-native/external/crashpad/util/thread/thread_log_messages_test.cc b/external_imported/sentry-native/external/crashpad/util/thread/thread_log_messages_test.cc index f3dc1a665..efd6b53a5 100644 --- a/external_imported/sentry-native/external/crashpad/util/thread/thread_log_messages_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/thread/thread_log_messages_test.cc @@ -17,7 +17,8 @@ #include #include -#include "base/cxx17_backports.h" +#include + #include "base/logging.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" @@ -65,8 +66,8 @@ TEST(ThreadLogMessages, Basic) { const std::vector& log_messages = thread_log_messages.log_messages(); - EXPECT_EQ(log_messages.size(), base::size(kMessages)); - for (size_t index = 0; index < base::size(kMessages); ++index) { + EXPECT_EQ(log_messages.size(), std::size(kMessages)); + for (size_t index = 0; index < std::size(kMessages); ++index) { ASSERT_NO_FATAL_FAILURE( ExpectLogMessage(log_messages[index], kMessages[index])) << "index " << index; @@ -149,7 +150,7 @@ TEST(ThreadLogMessages, Multithreaded) { LoggingTestThread threads[20]; int start = 0; - for (size_t index = 0; index < base::size(threads); ++index) { + for (size_t index = 0; index < std::size(threads); ++index) { threads[index].Initialize( index, static_cast(start), static_cast(index)); start += static_cast(index); diff --git a/external_imported/sentry-native/external/crashpad/util/thread/thread_posix.cc b/external_imported/sentry-native/external/crashpad/util/thread/thread_posix.cc index fe50050c7..8e00c210c 100644 --- a/external_imported/sentry-native/external/crashpad/util/thread/thread_posix.cc +++ b/external_imported/sentry-native/external/crashpad/util/thread/thread_posix.cc @@ -19,6 +19,7 @@ #include #include "base/check.h" +#include "build/build_config.h" namespace crashpad { @@ -35,6 +36,15 @@ void Thread::Join() { platform_thread_ = 0; } +#if BUILDFLAG(IS_APPLE) +uint64_t Thread::GetThreadIdForTesting() { + uint64_t thread_self; + errno = pthread_threadid_np(pthread_self(), &thread_self); + PCHECK(errno == 0) << "pthread_threadid_np"; + return thread_self; +} +#endif // BUILDFLAG(IS_APPLE) + // static void* Thread::ThreadEntryThunk(void* argument) { Thread* self = reinterpret_cast(argument); diff --git a/external_imported/sentry-native/external/crashpad/util/thread/worker_thread_test.cc b/external_imported/sentry-native/external/crashpad/util/thread/worker_thread_test.cc index 811d09c37..86f847427 100644 --- a/external_imported/sentry-native/external/crashpad/util/thread/worker_thread_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/thread/worker_thread_test.cc @@ -14,6 +14,7 @@ #include "util/thread/worker_thread.h" +#include "build/build_config.h" #include "gtest/gtest.h" #include "util/misc/clock.h" #include "util/synchronization/semaphore.h" @@ -78,7 +79,7 @@ TEST(WorkerThread, DoWork) { // also somewhat useful. The expected time "should" be ~40-50ms with a work // interval of 0.05s, but on Fuchsia, 1200ms was observed. So, on Fuchsia, use a // much larger timeout. See https://crashpad.chromium.org/bug/231. -#if defined(OS_FUCHSIA) +#if BUILDFLAG(IS_FUCHSIA) constexpr uint64_t kUpperBoundTime = 10; #else constexpr uint64_t kUpperBoundTime = 1; diff --git a/external_imported/sentry-native/external/crashpad/util/win/command_line_test.cc b/external_imported/sentry-native/external/crashpad/util/win/command_line_test.cc index 28b950418..6fd4b31be 100644 --- a/external_imported/sentry-native/external/crashpad/util/win/command_line_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/win/command_line_test.cc @@ -18,7 +18,8 @@ #include #include -#include "base/cxx17_backports.h" +#include + #include "base/scoped_generic.h" #include "gtest/gtest.h" #include "test/errors.h" @@ -64,7 +65,7 @@ TEST(CommandLine, AppendCommandLineArgument) { L"argument 1", L"argument 2", }; - AppendCommandLineArgumentTest(base::size(kArguments), kArguments); + AppendCommandLineArgumentTest(std::size(kArguments), kArguments); } { @@ -76,7 +77,7 @@ TEST(CommandLine, AppendCommandLineArgument) { L"argument 2", L"\\some\\path with\\spaces", }; - AppendCommandLineArgumentTest(base::size(kArguments), kArguments); + AppendCommandLineArgumentTest(std::size(kArguments), kArguments); } { @@ -88,7 +89,7 @@ TEST(CommandLine, AppendCommandLineArgument) { L"she said, \"you had me at hello\"", L"\\some\\path with\\spaces", }; - AppendCommandLineArgumentTest(base::size(kArguments), kArguments); + AppendCommandLineArgumentTest(std::size(kArguments), kArguments); } { @@ -101,7 +102,7 @@ TEST(CommandLine, AppendCommandLineArgument) { L"argument3", L"argument4", }; - AppendCommandLineArgumentTest(base::size(kArguments), kArguments); + AppendCommandLineArgumentTest(std::size(kArguments), kArguments); } { @@ -112,7 +113,7 @@ TEST(CommandLine, AppendCommandLineArgument) { L"\\some\\directory with\\spaces\\", L"argument2", }; - AppendCommandLineArgumentTest(base::size(kArguments), kArguments); + AppendCommandLineArgumentTest(std::size(kArguments), kArguments); } { @@ -123,7 +124,7 @@ TEST(CommandLine, AppendCommandLineArgument) { L"", L"argument2", }; - AppendCommandLineArgumentTest(base::size(kArguments), kArguments); + AppendCommandLineArgumentTest(std::size(kArguments), kArguments); } { @@ -158,7 +159,7 @@ TEST(CommandLine, AppendCommandLineArgument) { L"\"\"", L" \t\n\v\"", }; - AppendCommandLineArgumentTest(base::size(kArguments), kArguments); + AppendCommandLineArgumentTest(std::size(kArguments), kArguments); } } diff --git a/external_imported/sentry-native/external/crashpad/util/win/exception_codes.h b/external_imported/sentry-native/external/crashpad/util/win/exception_codes.h new file mode 100644 index 000000000..eca940c3a --- /dev/null +++ b/external_imported/sentry-native/external/crashpad/util/win/exception_codes.h @@ -0,0 +1,37 @@ +// Copyright 2022 The Crashpad Authors. All rights reserved. +// +// 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 CRASHPAD_UTIL_WIN_EXCEPTION_CODES_H_ +#define CRASHPAD_UTIL_WIN_EXCEPTION_CODES_H_ + +#include + +namespace crashpad { + +//! \brief Crashpad-specific exception codes that are used as arguments to +//! `RaiseException()` in unusual circumstances. +enum ExceptionCodes : uint32_t { + //! \brief The exception code (roughly "Client called") used when + //! DumpAndCrashTargetProcess() triggers an exception in a target + //! process. + //! + //! \note This value does not have any bits of the top nibble set, to avoid + //! confusion with real exception codes which tend to have those bits + //! set. + kTriggeredExceptionCode = 0xcca11ed, +}; + +} // namespace crashpad + +#endif // CRASHPAD_UTIL_WIN_EXCEPTION_CODES_H_ diff --git a/external_imported/sentry-native/external/crashpad/util/win/exception_handler_server.cc b/external_imported/sentry-native/external/crashpad/util/win/exception_handler_server.cc index 92d5c5d47..6890a01cc 100644 --- a/external_imported/sentry-native/external/crashpad/util/win/exception_handler_server.cc +++ b/external_imported/sentry-native/external/crashpad/util/win/exception_handler_server.cc @@ -18,9 +18,9 @@ #include #include +#include #include -#include "base/cxx17_backports.h" #include "base/logging.h" #include "base/numerics/safe_conversions.h" #include "base/rand_util.h" @@ -306,7 +306,7 @@ void ExceptionHandlerServer::InitializeWithInheritedDataForInitialClient( void ExceptionHandlerServer::Run(Delegate* delegate) { uint64_t shutdown_token = base::RandUint64(); ScopedKernelHANDLE thread_handles[kPipeInstances]; - for (size_t i = 0; i < base::size(thread_handles); ++i) { + for (size_t i = 0; i < std::size(thread_handles); ++i) { HANDLE pipe; if (first_pipe_instance_.is_valid()) { pipe = first_pipe_instance_.release(); @@ -358,7 +358,7 @@ void ExceptionHandlerServer::Run(Delegate* delegate) { } // Signal to the named pipe instances that they should terminate. - for (size_t i = 0; i < base::size(thread_handles); ++i) { + for (size_t i = 0; i < std::size(thread_handles); ++i) { ClientToServerMessage message; memset(&message, 0, sizeof(message)); message.type = ClientToServerMessage::kShutdown; diff --git a/external_imported/sentry-native/external/crashpad/util/win/ntstatus_logging.cc b/external_imported/sentry-native/external/crashpad/util/win/ntstatus_logging.cc index 7a1341952..9c2630c94 100644 --- a/external_imported/sentry-native/external/crashpad/util/win/ntstatus_logging.cc +++ b/external_imported/sentry-native/external/crashpad/util/win/ntstatus_logging.cc @@ -14,9 +14,9 @@ #include "util/win/ntstatus_logging.h" +#include #include -#include "base/cxx17_backports.h" #include "base/strings/stringprintf.h" namespace { @@ -30,7 +30,7 @@ std::string FormatNtstatus(DWORD ntstatus) { ntstatus, 0, msgbuf, - static_cast(base::size(msgbuf)), + static_cast(std::size(msgbuf)), nullptr); if (len) { // Most system messages end in a period and a space. Remove the space if diff --git a/external_imported/sentry-native/external/crashpad/util/win/registration_protocol_win.cc b/external_imported/sentry-native/external/crashpad/util/win/registration_protocol_win.cc index e3d55c665..61dbd3d99 100644 --- a/external_imported/sentry-native/external/crashpad/util/win/registration_protocol_win.cc +++ b/external_imported/sentry-native/external/crashpad/util/win/registration_protocol_win.cc @@ -19,7 +19,8 @@ #include #include -#include "base/cxx17_backports.h" +#include + #include "base/logging.h" #include "util/win/exception_handler_server.h" #include "util/win/loader_lock.h" @@ -209,8 +210,7 @@ const void* GetFallbackSecurityDescriptorForNamedPipeInstance(size_t* size) { ACL_REVISION, // AclRevision. 0, // Sbz1. sizeof(kSecDescBlob.sacl), // AclSize. - static_cast( - base::size(kSecDescBlob.sacl.ace)), // AceCount. + static_cast(std::size(kSecDescBlob.sacl.ace)), // AceCount. 0, // Sbz2. }, @@ -231,8 +231,8 @@ const void* GetFallbackSecurityDescriptorForNamedPipeInstance(size_t* size) { { SID_REVISION, // Revision. // SubAuthorityCount. - static_cast(base::size( - kSecDescBlob.sacl.ace[0].sid.SubAuthority)), + static_cast( + std::size(kSecDescBlob.sacl.ace[0].sid.SubAuthority)), // IdentifierAuthority. {SECURITY_MANDATORY_LABEL_AUTHORITY}, {SECURITY_MANDATORY_UNTRUSTED_RID}, // SubAuthority. diff --git a/external_imported/sentry-native/external/crashpad/util/win/safe_terminate_process_test.cc b/external_imported/sentry-native/external/crashpad/util/win/safe_terminate_process_test.cc index 6ca5aa6d3..30a9a32da 100644 --- a/external_imported/sentry-native/external/crashpad/util/win/safe_terminate_process_test.cc +++ b/external_imported/sentry-native/external/crashpad/util/win/safe_terminate_process_test.cc @@ -16,11 +16,11 @@ #include -#include +#include #include +#include #include "base/check.h" -#include "base/cxx17_backports.h" #include "base/files/file_path.h" #include "build/build_config.h" #include "gtest/gtest.h" @@ -150,7 +150,7 @@ TEST(SafeTerminateProcess, PatchBadly) { }; void* target = reinterpret_cast(TerminateProcess); - ScopedExecutablePatch executable_patch(target, patch, base::size(patch)); + ScopedExecutablePatch executable_patch(target, patch, std::size(patch)); // Make sure that SafeTerminateProcess() can be called. Since it’s been // patched with a no-op stub, GetLastError() shouldn’t be modified. diff --git a/external_imported/sentry-native/include/sentry.h b/external_imported/sentry-native/include/sentry.h index 619ef9427..6552e42ff 100644 --- a/external_imported/sentry-native/include/sentry.h +++ b/external_imported/sentry-native/include/sentry.h @@ -23,8 +23,14 @@ extern "C" { #endif /* SDK Version */ -#define SENTRY_SDK_NAME "sentry.native" -#define SENTRY_SDK_VERSION "0.4.13" +#ifndef SENTRY_SDK_NAME +# ifdef __ANDROID__ +# define SENTRY_SDK_NAME "sentry.native.android" +# else +# define SENTRY_SDK_NAME "sentry.native" +# endif +#endif +#define SENTRY_SDK_VERSION "0.4.17" #define SENTRY_SDK_USER_AGENT SENTRY_SDK_NAME "/" SENTRY_SDK_VERSION /* common platform detection */ @@ -554,13 +560,21 @@ typedef struct sentry_envelope_s sentry_envelope_t; SENTRY_API void sentry_envelope_free(sentry_envelope_t *envelope); /** - * Given an envelope returns the embedded event if there is one. + * Given an Envelope, returns the embedded Event if there is one. * - * This returns a borrowed value to the event in the envelope. + * This returns a borrowed value to the Event in the Envelope. */ SENTRY_API sentry_value_t sentry_envelope_get_event( const sentry_envelope_t *envelope); +/** + * Given an Envelope, returns the embedded Transaction if there is one. + * + * This returns a borrowed value to the Transaction in the Envelope. + */ +SENTRY_EXPERIMENTAL_API sentry_value_t sentry_envelope_get_transaction( + const sentry_envelope_t *envelope); + /** * Serializes the envelope. * @@ -606,13 +620,16 @@ typedef struct sentry_options_s sentry_options_t; * * `startup_func`: This hook will be called by sentry inside of `sentry_init` * and instructs the transport to initialize itself. Failures will bubble up * to `sentry_init`. + * * `flush_func`: Instructs the transport to flush its queue. + * This hook receives a millisecond-resolution `timeout` parameter and should + * return `0` if the transport queue is flushed within the timeout. * * `shutdown_func`: Instructs the transport to flush its queue and shut down. * This hook receives a millisecond-resolution `timeout` parameter and should - * return `true` when the transport was flushed and shut down successfully. - * In case of `false`, sentry will log an error, but continue with freeing the - * transport. + * return `0` if the transport is flushed and shut down successfully. + * In case of a non-zero return value, sentry will log an error, but continue + * with freeing the transport. * * `free_func`: Frees the transports `state`. This hook might be called even - * though `shutdown_func` returned `false` previously. + * though `shutdown_func` returned a failure code previously. * * The transport interface might be extended in the future with hooks to flush * its internal queue without shutting down, and to dump its internal queue to @@ -652,6 +669,16 @@ SENTRY_API void sentry_transport_set_free_func( SENTRY_API void sentry_transport_set_startup_func(sentry_transport_t *transport, int (*startup_func)(const sentry_options_t *options, void *state)); +/** + * Sets the transport flush hook. + * + * This hook will receive a millisecond-resolution timeout. + * It should return `0` if all the pending envelopes are + * sent within the timeout, or `1` if the timeout is hit. + */ +SENTRY_API void sentry_transport_set_flush_func(sentry_transport_t *transport, + int (*flush_func)(uint64_t timeout, void *state)); + /** * Sets the transport shutdown hook. * @@ -1036,6 +1063,15 @@ SENTRY_API uint64_t sentry_options_get_shutdown_timeout(sentry_options_t *opts); */ SENTRY_API int sentry_init(sentry_options_t *options); +/** + * Instructs the transport to flush its send queue. + * + * The `timeout` parameter is in milliseconds. + * + * Returns 0 on success, or a non-zero return value in case the timeout is hit. + */ +SENTRY_API int sentry_flush(uint64_t timeout); + /** * Shuts down the sentry client and forces transports to flush out. * @@ -1104,6 +1140,10 @@ SENTRY_API sentry_user_consent_t sentry_user_consent_get(void); /** * Sends a sentry event. + * + * If returns a nil UUID if the event being passed in is a transaction, and the + * transaction will not be sent nor consumed. `sentry_transaction_finish` should + * be used to send transactions. */ SENTRY_API sentry_uuid_t sentry_capture_event(sentry_value_t event); @@ -1178,11 +1218,6 @@ SENTRY_API void sentry_remove_fingerprint(void); */ SENTRY_API void sentry_set_transaction(const char *transaction); -/** - * Removes the transaction. - */ -SENTRY_API void sentry_remove_transaction(void); - /** * Sets the event level. */ @@ -1226,6 +1261,484 @@ SENTRY_EXPERIMENTAL_API void sentry_options_set_traces_sample_rate( SENTRY_EXPERIMENTAL_API double sentry_options_get_traces_sample_rate( sentry_options_t *opts); +/* -- Performance Monitoring/Tracing APIs -- */ + +/** + * A sentry Transaction Context. + * + * See Transaction Interface under + * https://develop.sentry.dev/sdk/performance/#new-span-and-transaction-classes + */ +struct sentry_transaction_context_s; +typedef struct sentry_transaction_context_s sentry_transaction_context_t; + +/** + * A sentry Transaction. + * + * See https://develop.sentry.dev/sdk/event-payloads/transaction/ + */ +struct sentry_transaction_s; +typedef struct sentry_transaction_s sentry_transaction_t; + +/** + * A sentry Span. + * + * See https://develop.sentry.dev/sdk/event-payloads/span/ + */ +struct sentry_span_s; +typedef struct sentry_span_s sentry_span_t; + +/** + * Constructs a new Transaction Context. The returned value needs to be passed + * into `sentry_transaction_start` in order to be recorded and sent to sentry. + * + * See + * https://docs.sentry.io/platforms/native/enriching-events/transaction-name/ + * for an explanation of a Transaction's `name`, and + * https://develop.sentry.dev/sdk/performance/span-operations/ for conventions + * around an `operation`'s value. + * + * Also see https://develop.sentry.dev/sdk/event-payloads/transaction/#anatomy + * for an explanation of `operation`, in addition to other properties and + * actions that can be performed on a Transaction. + * + * The returned value is not thread-safe. Users are expected to ensure that + * appropriate locking mechanisms are implemented over the Transaction Context + * if it needs to be mutated across threads. Methods operating on the + * Transaction Context will mention what kind of expectations they carry if they + * need to mutate or access the object in a thread-safe way. + */ +SENTRY_EXPERIMENTAL_API sentry_transaction_context_t * +sentry_transaction_context_new(const char *name, const char *operation); + +/** + * Sets the `name` on a Transaction Context, which will be used in the + * Transaction constructed off of the context. + * + * The Transaction Context should not be mutated by other functions while + * setting a name on it. + */ +SENTRY_EXPERIMENTAL_API void sentry_transaction_context_set_name( + sentry_transaction_context_t *tx_cxt, const char *name); + +/** + * Sets the `operation` on a Transaction Context, which will be used in the + * Transaction constructed off of the context + * + * See https://develop.sentry.dev/sdk/performance/span-operations/ for + * conventions on `operation`s. + * + * The Transaction Context should not be mutated by other functions while + * setting an operation on it. + */ +SENTRY_EXPERIMENTAL_API void sentry_transaction_context_set_operation( + sentry_transaction_context_t *tx_cxt, const char *operation); + +/** + * Sets the `sampled` field on a Transaction Context, which will be used in the + * Transaction constructed off of the context. + * + * When passed any value above 0, the Transaction will bypass all sampling + * options and always be sent to sentry. If passed 0, this Transaction and its + * child spans will never be sent to sentry. + * + * The Transaction Context should not be mutated by other functions while + * setting `sampled` on it. + */ +SENTRY_EXPERIMENTAL_API void sentry_transaction_context_set_sampled( + sentry_transaction_context_t *tx_cxt, int sampled); + +/** + * Removes the `sampled` field on a Transaction Context, which will be used in + * the Transaction constructed off of the context. + * + * The Transaction will use the sampling rate as defined in `sentry_options`. + * + * The Transaction Context should not be mutated by other functions while + * removing `sampled`. + */ +SENTRY_EXPERIMENTAL_API void sentry_transaction_context_remove_sampled( + sentry_transaction_context_t *tx_cxt); + +/** + * Update the Transaction Context with the given HTTP header key/value pair. + * + * This is used to propagate distributed tracing metadata from upstream + * services. Therefore, the headers of incoming requests should be fed into this + * function so that sentry is able to continue a trace that was started by an + * upstream service. + */ +SENTRY_EXPERIMENTAL_API void sentry_transaction_context_update_from_header( + sentry_transaction_context_t *tx_cxt, const char *key, const char *value); + +/** + * Starts a new Transaction based on the provided context, restored from an + * external integration (i.e. a span from a different SDK) or manually + * constructed by a user. + * + * The second parameter is a custom Sampling Context to be used with a Traces + * Sampler to make a more informed sampling decision. The SDK does not currently + * support a custom Traces Sampler and this parameter is ignored for the time + * being but needs to be provided. + * + * Returns a Transaction, which is expected to be manually managed by the + * caller. Manual management involves ensuring that `sentry_transaction_finish` + * is invoked for the Transaction, and that the caller manually starts and + * finishes any child Spans as needed on the Transaction. + * + * Not invoking `sentry_transaction_finish` with the returned Transaction means + * it will be discarded, and will not be sent to sentry. + * + * To ensure that any Events or Message Events are associated with this + * Transaction while it is active, invoke and pass in the Transaction returned + * by this function to `sentry_set_transaction_object`. Further documentation on + * this can be found in `sentry_set_transaction_object`'s docstring. + * + * Takes ownership of `transaction_context`. A Transaction Context cannot be + * modified or re-used after it is used to start a Transaction. + * + * The returned value is not thread-safe. Users are expected to ensure that + * appropriate locking mechanisms are implemented over the Transaction if it + * needs to be mutated across threads. Methods operating on the Transaction will + * mention what kind of expectations they carry if they need to mutate or access + * the object in a thread-safe way. + */ +SENTRY_EXPERIMENTAL_API sentry_transaction_t *sentry_transaction_start( + sentry_transaction_context_t *tx_cxt, sentry_value_t sampling_ctx); + +/** + * Finishes and sends a Transaction to sentry. The event ID of the Transaction + * will be returned if this was successful; A nil UUID will be returned + * otherwise. + * + * Always takes ownership of `transaction`, regardless of whether the operation + * was successful or not. A Transaction cannot be modified or re-used after it + * is finished. + */ +SENTRY_EXPERIMENTAL_API sentry_uuid_t sentry_transaction_finish( + sentry_transaction_t *tx); + +/** + * Sets the Transaction so any Events sent while the Transaction + * is active will be associated with the Transaction. + * + * If the Transaction being passed in is unsampled, it will still be associated + * with any new Events. This will lead to some Events pointing to orphan or + * missing traces in sentry, see + * https://docs.sentry.io/product/sentry-basics/tracing/trace-view/#orphan-traces-and-broken-subtraces + * + * This increases the number of references pointing to the Transaction. Invoke + * `sentry_transaction_finish` to remove the Transaction set by this function as + * well as its reference by passing in the same Transaction as the one passed + * into this function. + */ +SENTRY_EXPERIMENTAL_API void sentry_set_transaction_object( + sentry_transaction_t *tx); + +/** + * Sets the Span so any Events sent while the Span + * is active will be associated with the Span. + * + * This increases the number of references pointing to the Span. Invoke + * `sentry_span_finish` to remove the Span set by this function as well + * as its reference by passing in the same Span as the one passed into + * this function. + */ +SENTRY_EXPERIMENTAL_API void sentry_set_span(sentry_span_t *span); + +/** + * Starts a new Span. + * + * The return value of `sentry_transaction_start` should be passed in as + * `parent`. + * + * Both `operation` and `description` can be null, but it is recommended to + * supply the former. See + * https://develop.sentry.dev/sdk/performance/span-operations/ for conventions + * around operations. + * + * See https://develop.sentry.dev/sdk/event-payloads/span/ for a description of + * the created Span's properties and expectations for `operation` and + * `description`. + * + * Returns a value that should be passed into `sentry_span_finish`. Not + * finishing the Span means it will be discarded, and will not be sent to + * sentry. `sentry_value_null` will be returned if the child Span could not be + * created. + * + * To ensure that any Events or Message Events are associated with this + * Span while it is active, invoke and pass in the Span returned + * by this function to `sentry_set_span`. Further documentation on this can be + * found in `sentry_set_span`'s docstring. + * + * This increases the number of references pointing to the Transaction. + * + * The returned value is not thread-safe. Users are expected to ensure that + * appropriate locking mechanisms are implemented over the Span if it needs + * to be mutated across threads. Methods operating on the Span will mention what + * kind of expectations they carry if they need to mutate or access the object + * in a thread-safe way. + */ +SENTRY_EXPERIMENTAL_API sentry_span_t *sentry_transaction_start_child( + sentry_transaction_t *parent, char *operation, char *description); + +/** + * Starts a new Span. + * + * The return value of `sentry_span_start_child` may be passed in as `parent`. + * + * Both `operation` and `description` can be null, but it is recommended to + * supply the former. See + * https://develop.sentry.dev/sdk/performance/span-operations/ for conventions + * around operations. + * + * See https://develop.sentry.dev/sdk/event-payloads/span/ for a description of + * the created Span's properties and expectations for `operation` and + * `description`. + * + * Returns a value that should be passed into `sentry_span_finish`. Not + * finishing the Span means it will be discarded, and will not be sent to + * sentry. `sentry_value_null` will be returned if the child Span could not be + * created. + * + * To ensure that any Events or Message Events are associated with this + * Span while it is active, invoke and pass in the Span returned + * by this function to `sentry_set_span`. Further documentation on this can be + * found in `sentry_set_span`'s docstring. + * + * The returned value is not thread-safe. Users are expected to ensure that + * appropriate locking mechanisms are implemented over the Span if it needs + * to be mutated across threads. Methods operating on the Span will mention what + * kind of expectations they carry if they need to mutate or access the object + * in a thread-safe way. + */ +SENTRY_EXPERIMENTAL_API sentry_span_t *sentry_span_start_child( + sentry_span_t *parent, char *operation, char *description); + +/** + * Finishes a Span. + * + * This takes ownership of `span`. A Span cannot be modified or re-used after it + * is finished. + * + * This will mutate the `span`'s containing Transaction, so the containing + * Transaction should also not be mutated by other functions when finishing a + * span. + */ +SENTRY_EXPERIMENTAL_API void sentry_span_finish(sentry_span_t *span); + +/** + * Sets a tag on a Transaction to the given string value. + * + * Tags longer than 200 bytes will be truncated. + * + * The Transaction should not be mutated by other functions while a tag is being + * set on it. + */ +SENTRY_EXPERIMENTAL_API void sentry_transaction_set_tag( + sentry_transaction_t *transaction, const char *tag, const char *value); + +/** + * Removes a tag from a Transaction. + * + * The Transaction should not be mutated by other functions while a tag is being + * removed from it. + */ +SENTRY_EXPERIMENTAL_API void sentry_transaction_remove_tag( + sentry_transaction_t *transaction, const char *tag); + +/** + * Sets the given key in a Transaction's "data" section to the given value. + * + * The Transaction should not be mutated by other functions while data is being + * set on it. + */ +SENTRY_EXPERIMENTAL_API void sentry_transaction_set_data( + sentry_transaction_t *transaction, const char *key, sentry_value_t value); + +/** + * Removes a key from a Transaction's "data" section. + * + * The Transaction should not be mutated by other functions while data is being + * removed from it. + */ +SENTRY_EXPERIMENTAL_API void sentry_transaction_remove_data( + sentry_transaction_t *transaction, const char *key); + +/** + * Sets a tag on a Span to the given string value. + * + * Tags longer than 200 bytes will be truncated. + * + * The Span should not be mutated by other functions while a tag is being set on + * it. + */ +SENTRY_EXPERIMENTAL_API void sentry_span_set_tag( + sentry_span_t *span, const char *tag, const char *value); + +/** + * Removes a tag from a Span. + * + * The Span should not be mutated by other functions while a tag is being + * removed from it. + */ +SENTRY_EXPERIMENTAL_API void sentry_span_remove_tag( + sentry_span_t *span, const char *tag); + +/** + * Sets the given key in a Span's "data" section to the given value. + * + * The Span should not be mutated by other functions while data is being set on + * it. + */ +SENTRY_EXPERIMENTAL_API void sentry_span_set_data( + sentry_span_t *span, const char *key, sentry_value_t value); + +/** + * Removes a key from a Span's "data" section. + * + * The Span should not be mutated by other functions while data is being removed + * from it. + */ +SENTRY_EXPERIMENTAL_API void sentry_span_remove_data( + sentry_span_t *span, const char *key); + +/** + * Sets a Transaction's name. + * + * The Transaction should not be mutated by other functions while setting its + * name. + */ +SENTRY_EXPERIMENTAL_API void sentry_transaction_set_name( + sentry_transaction_t *transaction, const char *name); + +/** + * The status of a Span or Transaction. + * + * See https://develop.sentry.dev/sdk/event-payloads/span/ for documentation. + */ +typedef enum { + // The operation completed successfully. + // HTTP status 100..299 + successful redirects from the 3xx range. + SENTRY_SPAN_STATUS_OK, + // The operation was cancelled (typically by the user). + SENTRY_SPAN_STATUS_CANCELLED, + // Unknown. Any non-standard HTTP status code. + // "We do not know whether the transaction failed or succeeded." + SENTRY_SPAN_STATUS_UNKNOWN, + // Client specified an invalid argument. 4xx. + // Note that this differs from FailedPrecondition. InvalidArgument + // indicates arguments that are problematic regardless of the + // state of the system. + SENTRY_SPAN_STATUS_INVALID_ARGUMENT, + // Deadline expired before operation could complete. + // For operations that change the state of the system, this error may be + // returned even if the operation has been completed successfully. + // HTTP redirect loops and 504 Gateway Timeout. + SENTRY_SPAN_STATUS_DEADLINE_EXCEEDED, + // 404 Not Found. Some requested entity (file or directory) was not found. + SENTRY_SPAN_STATUS_NOT_FOUND, + // Already exists (409) + // Some entity that we attempted to create already exists. + SENTRY_SPAN_STATUS_ALREADY_EXISTS, + // 403 Forbidden + // The caller does not have permission to execute the specified operation. + SENTRY_SPAN_STATUS_PERMISSION_DENIED, + // 429 Too Many Requests + // Some resource has been exhausted, perhaps a per-user quota or perhaps + // the entire file system is out of space. + SENTRY_SPAN_STATUS_RESOURCE_EXHAUSTED, + // Operation was rejected because the system is not in a state required for + // the operation's execution. + SENTRY_SPAN_STATUS_FAILED_PRECONDITION, + // The operation was aborted, typically due to a concurrency issue. + SENTRY_SPAN_STATUS_ABORTED, + // Operation was attempted past the valid range. + SENTRY_SPAN_STATUS_OUT_OF_RANGE, + // 501 Not Implemented + // Operation is not implemented or not enabled. + SENTRY_SPAN_STATUS_UNIMPLEMENTED, + // Other/generic 5xx + SENTRY_SPAN_STATUS_INTERNAL_ERROR, + // 503 Service Unavailable + SENTRY_SPAN_STATUS_UNAVAILABLE, + // Unrecoverable data loss or corruption + SENTRY_SPAN_STATUS_DATA_LOSS, + // 401 Unauthorized (actually does mean unauthenticated according to RFC + // 7235) + // Prefer PermissionDenied if a user is logged in. + SENTRY_SPAN_STATUS_UNAUTHENTICATED, +} sentry_span_status_t; + +/** + * Sets a Span's status. + * + * The Span should not be mutated by other functions while setting its status. + */ +SENTRY_EXPERIMENTAL_API void sentry_span_set_status( + sentry_span_t *span, sentry_span_status_t status); + +/** + * Sets a Transaction's status. + * + * The Transaction should not be mutated by other functions while setting its + * status. + */ +SENTRY_EXPERIMENTAL_API void sentry_transaction_set_status( + sentry_transaction_t *tx, sentry_span_status_t status); + +/** + * Type of the `iter_headers` callback. + * + * The callback is being called with HTTP header key/value pairs. + * These headers can be attached to outgoing HTTP requests to propagate + * distributed tracing metadata to downstream services. + * + */ +typedef void (*sentry_iter_headers_function_t)( + const char *key, const char *value, void *userdata); + +/** + * Iterates the distributed tracing HTTP headers for the given span. + */ +SENTRY_EXPERIMENTAL_API void sentry_span_iter_headers(sentry_span_t *span, + sentry_iter_headers_function_t callback, void *userdata); + +/** + * Iterates the distributed tracing HTTP headers for the given transaction. + */ +SENTRY_EXPERIMENTAL_API void sentry_transaction_iter_headers( + sentry_transaction_t *tx, sentry_iter_headers_function_t callback, + void *userdata); + +/** + * Returns whether the application has crashed on the last run. + * + * Notes: + * * The underlying value is set by sentry_init() - it must be called first. + * * Call sentry_clear_crashed_last_run() to reset for the next app run. + * + * Possible return values: + * 1 = the last run was a crash + * 0 = no crash recognized + * -1 = sentry_init() hasn't been called yet + */ +SENTRY_EXPERIMENTAL_API int sentry_get_crashed_last_run(); + +/** + * Clear the status of the "crashed-last-run". You should explicitly call + * this after sentry_init() if you're using sentry_get_crashed_last_run(). + * Otherwise, the same information is reported on any subsequent runs. + * + * Notes: + * * This doesn't change the value of sentry_get_crashed_last_run() yet. + * However, if sentry_init() is called again, the value will change. + * * This may only be called after sentry_init() and before sentry_close(). + * + * Returns 0 on success, 1 on error. + */ +SENTRY_EXPERIMENTAL_API int sentry_clear_crashed_last_run(); + #ifdef __cplusplus } #endif diff --git a/external_imported/sentry-native/src/CMakeLists.txt b/external_imported/sentry-native/src/CMakeLists.txt index 6dc330f8f..a8175dc3d 100644 --- a/external_imported/sentry-native/src/CMakeLists.txt +++ b/external_imported/sentry-native/src/CMakeLists.txt @@ -42,6 +42,8 @@ sentry_target_sources_cwd(sentry sentry_uuid.h sentry_value.c sentry_value.h + sentry_tracing.c + sentry_tracing.h path/sentry_path.c transports/sentry_disk_transport.c transports/sentry_disk_transport.h diff --git a/external_imported/sentry-native/src/backends/sentry_backend_crashpad.cpp b/external_imported/sentry-native/src/backends/sentry_backend_crashpad.cpp index dcebd9c7e..c3b20a95f 100644 --- a/external_imported/sentry-native/src/backends/sentry_backend_crashpad.cpp +++ b/external_imported/sentry-native/src/backends/sentry_backend_crashpad.cpp @@ -31,6 +31,7 @@ extern "C" { #include "client/crash_report_database.h" #include "client/crashpad_client.h" #include "client/crashpad_info.h" +#include "client/prune_crash_reports.h" #include "client/settings.h" #if defined(__GNUC__) @@ -426,6 +427,22 @@ sentry__crashpad_backend_last_crash(sentry_backend_t *backend) return crash_time; } +static void +sentry__crashpad_backend_prune_database(sentry_backend_t *backend) +{ + crashpad_state_t *data = (crashpad_state_t *)backend->data; + + // We want to eagerly clean up reports older than 2 days, and limit the + // complete database to a maximum of 8M. That might still be a lot for + // an embedded use-case, but minidumps on desktop can sometimes be quite + // large. + data->db->CleanDatabase(60 * 60 * 24 * 2); + crashpad::BinaryPruneCondition condition(crashpad::BinaryPruneCondition::OR, + new crashpad::DatabaseSizePruneCondition(1024 * 8), + new crashpad::AgePruneCondition(2)); + crashpad::PruneCrashReportDatabase(data->db, &condition); +} + sentry_backend_t * sentry__backend_new(void) { @@ -451,6 +468,7 @@ sentry__backend_new(void) backend->user_consent_changed_func = sentry__crashpad_backend_user_consent_changed; backend->get_last_crash_func = sentry__crashpad_backend_last_crash; + backend->prune_database_func = sentry__crashpad_backend_prune_database; backend->data = data; backend->can_capture_after_shutdown = true; diff --git a/external_imported/sentry-native/src/backends/sentry_backend_inproc.c b/external_imported/sentry-native/src/backends/sentry_backend_inproc.c index c15493dab..2318e2774 100644 --- a/external_imported/sentry-native/src/backends/sentry_backend_inproc.c +++ b/external_imported/sentry-native/src/backends/sentry_backend_inproc.c @@ -260,6 +260,8 @@ handle_ucontext(const sentry_ucontext_t *uctx) sentry_envelope_t *envelope = sentry__prepare_event(options, event, NULL); + // TODO(tracing): Revisit when investigating transaction flushing during + // hard crashes. sentry_session_t *session = sentry__end_current_session_with_status( SENTRY_SESSION_STATUS_CRASHED); diff --git a/external_imported/sentry-native/src/modulefinder/sentry_modulefinder_linux.c b/external_imported/sentry-native/src/modulefinder/sentry_modulefinder_linux.c index 9629912b0..b37722de4 100644 --- a/external_imported/sentry-native/src/modulefinder/sentry_modulefinder_linux.c +++ b/external_imported/sentry-native/src/modulefinder/sentry_modulefinder_linux.c @@ -13,6 +13,8 @@ #include #include #include +#include +#include #include #include #include @@ -41,6 +43,50 @@ static sentry_value_t g_modules = { 0 }; static sentry_slice_t LINUX_GATE = { "linux-gate.so", 13 }; +bool +sentry__mmap_file(sentry_mmap_t *rv, const char *path) +{ + int fd = open(path, O_RDONLY); + if (fd < 0) { + goto fail; + } + + struct stat sb; + if (stat(path, &sb) != 0 || !S_ISREG(sb.st_mode)) { + goto fail; + } + + rv->len = sb.st_size; + if (rv->len == 0) { + goto fail; + } + + rv->ptr = mmap(NULL, rv->len, PROT_READ, MAP_PRIVATE, fd, 0); + if (rv->ptr == MAP_FAILED) { + goto fail; + } + + close(fd); + + return true; + +fail: + if (fd > 0) { + close(fd); + } + rv->ptr = NULL; + rv->len = 0; + return false; +} + +void +sentry__mmap_close(sentry_mmap_t *m) +{ + munmap(m->ptr, m->len); + m->ptr = NULL; + m->len = 0; +} + /** * Checks that `start_offset` + `size` is a valid contiguous mapping in the * mapped regions, and returns the translated pointer corresponding to @@ -87,14 +133,17 @@ read_safely(void *dst, void *src, size_t size) ssize_t nread = process_vm_readv(pid, local, 1, remote, 1, 0); bool rv = nread == (ssize_t)size; - // The syscall is only available in Linux 3.2, meaning Android 17. - // If that is the case, just fall back to an unsafe memcpy. -#if defined(__ANDROID_API__) && __ANDROID_API__ < 17 - if (!rv && errno == EINVAL) { + // The syscall can fail with `EPERM` if we lack permissions for this syscall + // (which is the case when running in Docker for example, + // See https://github.com/getsentry/sentry-native/issues/578). + // Also, the syscall is only available in Linux 3.2, meaning Android 17. + // In that case we get an `EINVAL`. + // + // In either of these cases, just fall back to an unsafe `memcpy`. + if (!rv && (errno == EPERM || errno == EINVAL)) { memcpy(dst, src, size); rv = true; } -#endif return rv; } @@ -109,6 +158,10 @@ sentry__module_read_safely(void *dst, const sentry_module_t *module, if (!src) { return false; } + if (module->is_mmapped) { + memcpy(dst, src, (size_t)size); + return true; + } return read_safely(dst, src, (size_t)size); } @@ -315,15 +368,15 @@ get_code_id_from_text_fallback(const sentry_module_t *module) elf.e_shoff + elf.e_shentsize * elf.e_shstrndx, sizeof(Elf64_Shdr))); - const char *names = sentry__module_get_addr( - module, strheader.sh_offset, strheader.sh_entsize); - ENSURE(names); for (int i = 0; i < elf.e_shnum; i++) { Elf64_Shdr header; ENSURE(sentry__module_read_safely(&header, module, elf.e_shoff + elf.e_shentsize * i, sizeof(Elf64_Shdr))); - const char *name = names + header.sh_name; + char name[6]; + ENSURE(sentry__module_read_safely(name, module, + strheader.sh_offset + header.sh_name, sizeof(name))); + name[5] = '\0'; if (header.sh_type == SHT_PROGBITS && strcmp(name, ".text") == 0) { text = sentry__module_get_addr( module, header.sh_offset, header.sh_size); @@ -341,15 +394,15 @@ get_code_id_from_text_fallback(const sentry_module_t *module) elf.e_shoff + elf.e_shentsize * elf.e_shstrndx, sizeof(Elf32_Shdr))); - const char *names = sentry__module_get_addr( - module, strheader.sh_offset, strheader.sh_entsize); - ENSURE(names); for (int i = 0; i < elf.e_shnum; i++) { Elf32_Shdr header; ENSURE(sentry__module_read_safely(&header, module, elf.e_shoff + elf.e_shentsize * i, sizeof(Elf32_Shdr))); - const char *name = names + header.sh_name; + char name[6]; + ENSURE(sentry__module_read_safely(name, module, + strheader.sh_offset + header.sh_name, sizeof(name))); + name[5] = '\0'; if (header.sh_type == SHT_PROGBITS && strcmp(name, ".text") == 0) { text = sentry__module_get_addr( module, header.sh_offset, header.sh_size); @@ -419,13 +472,46 @@ sentry__procmaps_module_to_value(const sentry_module_t *module) const sentry_mapped_region_t *first_mapping = &module->mappings[0]; const sentry_mapped_region_t *last_mapping = &module->mappings[module->num_mappings - 1]; + uint64_t module_size + = last_mapping->addr + last_mapping->size - first_mapping->addr; + sentry_value_set_by_key( mod_val, "image_addr", sentry__value_new_addr(first_mapping->addr)); - sentry_value_set_by_key(mod_val, "image_size", - sentry_value_new_int32( - last_mapping->addr + last_mapping->size - first_mapping->addr)); + sentry_value_set_by_key( + mod_val, "image_size", sentry_value_new_int32(module_size)); + + // At least on the android API-16, x86 simulator, the linker apparently + // does not load the complete file into memory. Or at least, the section + // headers which are located at the end of the file are not loaded, and + // we would be poking into invalid memory. To be safe, we mmap the + // complete file from disk, so we have the on-disk layout, and are + // independent of how the runtime linker would load or re-order any + // sections. The exception here is the linux-gate, which is not an + // actual file on disk, so we actually poke at its memory. + if (sentry__slice_eq(module->file, LINUX_GATE)) { + sentry__procmaps_read_ids_from_elf(mod_val, module); + } else { + char *filename = sentry__slice_to_owned(module->file); + sentry_mmap_t mm; + if (!sentry__mmap_file(&mm, filename)) { + sentry_free(filename); + sentry_value_decref(mod_val); + return sentry_value_new_null(); + } + sentry_free(filename); + + sentry_module_t mmapped_module; + memset(&mmapped_module, 0, sizeof(sentry_module_t)); + mmapped_module.is_mmapped = true; + mmapped_module.num_mappings = 1; + mmapped_module.mappings[0].addr + = (uint64_t)mm.ptr + module->offset_in_inode; + mmapped_module.mappings[0].size = mm.len - module->offset_in_inode; - sentry__procmaps_read_ids_from_elf(mod_val, module); + sentry__procmaps_read_ids_from_elf(mod_val, &mmapped_module); + + sentry__mmap_close(&mm); + } return mod_val; } diff --git a/external_imported/sentry-native/src/modulefinder/sentry_modulefinder_linux.h b/external_imported/sentry-native/src/modulefinder/sentry_modulefinder_linux.h index 5204158c0..7894f918e 100644 --- a/external_imported/sentry-native/src/modulefinder/sentry_modulefinder_linux.h +++ b/external_imported/sentry-native/src/modulefinder/sentry_modulefinder_linux.h @@ -27,8 +27,14 @@ typedef struct { uint64_t offset_in_inode; uint64_t mappings_inode; uint8_t num_mappings; + bool is_mmapped; } sentry_module_t; +typedef struct { + void *ptr; + size_t len; +} sentry_mmap_t; + #ifdef SENTRY_UNITTEST bool sentry__procmaps_read_ids_from_elf( sentry_value_t value, const sentry_module_t *module); diff --git a/external_imported/sentry-native/src/sentry_backend.h b/external_imported/sentry-native/src/sentry_backend.h index bb954272a..0c6969278 100644 --- a/external_imported/sentry-native/src/sentry_backend.h +++ b/external_imported/sentry-native/src/sentry_backend.h @@ -25,6 +25,7 @@ struct sentry_backend_s { const sentry_options_t *options); void (*user_consent_changed_func)(sentry_backend_t *); uint64_t (*get_last_crash_func)(sentry_backend_t *); + void (*prune_database_func)(sentry_backend_t *); void *data; bool can_capture_after_shutdown; }; diff --git a/external_imported/sentry-native/src/sentry_core.c b/external_imported/sentry-native/src/sentry_core.c index 2904ce7c2..b476a6693 100644 --- a/external_imported/sentry-native/src/sentry_core.c +++ b/external_imported/sentry-native/src/sentry_core.c @@ -16,6 +16,7 @@ #include "sentry_session.h" #include "sentry_string.h" #include "sentry_sync.h" +#include "sentry_tracing.h" #include "sentry_transport.h" #include "sentry_value.h" @@ -26,6 +27,9 @@ static sentry_options_t *g_options = NULL; static sentry_mutex_t g_options_lock = SENTRY__MUTEX_INIT; +/// see sentry_get_crashed_last_run() for the possible values +static int g_last_crash = -1; + const sentry_options_t * sentry__options_getref(void) { @@ -157,6 +161,7 @@ sentry_init(sentry_options_t *options) last_crash = backend->get_last_crash_func(backend); } + g_last_crash = sentry__has_crash_marker(options); g_options = options; // *after* setting the global options, trigger a scope and consent flush, @@ -177,7 +182,11 @@ sentry_init(sentry_options_t *options) // after initializing the transport, we will submit all the unsent envelopes // and handle remaining sessions. + SENTRY_TRACE("processing and pruning old runs"); sentry__process_old_runs(options, last_crash); + if (backend && backend->prune_database_func) { + backend->prune_database_func(backend); + } if (options->auto_session_tracking) { sentry_start_session(); @@ -196,6 +205,16 @@ sentry_init(sentry_options_t *options) return 1; } +int +sentry_flush(uint64_t timeout) +{ + int rv = 0; + SENTRY_WITH_OPTIONS (options) { + rv = sentry__transport_flush(options->transport, timeout); + } + return rv; +} + int sentry_close(void) { @@ -353,36 +372,83 @@ event_is_considered_error(sentry_value_t event) return false; } +bool +sentry__event_is_transaction(sentry_value_t event) +{ + sentry_value_t event_type = sentry_value_get_by_key(event, "type"); + return sentry__string_eq("transaction", sentry_value_as_string(event_type)); +} + sentry_uuid_t sentry_capture_event(sentry_value_t event) +{ + if (sentry__event_is_transaction(event)) { + return sentry_uuid_nil(); + } else { + return sentry__capture_event(event); + } +} + +sentry_uuid_t +sentry__capture_event(sentry_value_t event) { sentry_uuid_t event_id; sentry_envelope_t *envelope = NULL; bool was_captured = false; + bool was_sent = false; SENTRY_WITH_OPTIONS (options) { was_captured = true; - envelope = sentry__prepare_event(options, event, &event_id); + + if (sentry__event_is_transaction(event)) { + envelope = sentry__prepare_transaction(options, event, &event_id); + } else { + envelope = sentry__prepare_event(options, event, &event_id); + } if (envelope) { if (options->session) { - SENTRY_WITH_OPTIONS_MUT (mut_options) { - sentry__envelope_add_session( - envelope, mut_options->session); - // we're assuming that if a session is added to an envelope - // it will be sent onwards. This means we now need to set - // the init flag to false because we're no longer the - // initial session update. - mut_options->session->init = false; - } + sentry_options_t *mut_options = sentry__options_lock(); + sentry__envelope_add_session(envelope, mut_options->session); + // we're assuming that if a session is added to an envelope + // it will be sent onwards. This means we now need to set + // the init flag to false because we're no longer the + // initial session update. + mut_options->session->init = false; + sentry__options_unlock(); } - sentry__capture_envelope(options->transport, envelope); + was_sent = true; } } if (!was_captured) { sentry_value_decref(event); } - return was_captured ? event_id : sentry_uuid_nil(); + return was_sent ? event_id : sentry_uuid_nil(); +} + +bool +sentry__roll_dice(double probability) +{ + uint64_t rnd; + return probability >= 1.0 || sentry__getrandom(&rnd, sizeof(rnd)) + || ((double)rnd / (double)UINT64_MAX) <= probability; +} + +bool +sentry__should_send_transaction(sentry_value_t tx_cxt) +{ + sentry_value_t context_setting = sentry_value_get_by_key(tx_cxt, "sampled"); + if (!sentry_value_is_null(context_setting)) { + return sentry_value_is_true(context_setting); + } + + bool send = false; + SENTRY_WITH_OPTIONS (options) { + send = sentry__roll_dice(options->traces_sample_rate); + // TODO(tracing): Run through traces sampler function if rate is + // unavailable. + } + return send; } sentry_envelope_t * @@ -395,9 +461,8 @@ sentry__prepare_event(const sentry_options_t *options, sentry_value_t event, sentry__record_errors_on_current_session(1); } - uint64_t rnd; - if (options->sample_rate < 1.0 && !sentry__getrandom(&rnd, sizeof(rnd)) - && ((double)rnd / (double)UINT64_MAX) > options->sample_rate) { + bool should_skip = !sentry__roll_dice(options->sample_rate); + if (should_skip) { SENTRY_DEBUG("throwing away event due to sample rate"); goto fail; } @@ -452,6 +517,37 @@ sentry__prepare_event(const sentry_options_t *options, sentry_value_t event, return NULL; } +sentry_envelope_t * +sentry__prepare_transaction(const sentry_options_t *options, + sentry_value_t transaction, sentry_uuid_t *event_id) +{ + sentry_envelope_t *envelope = NULL; + + SENTRY_WITH_SCOPE (scope) { + SENTRY_TRACE("merging scope into transaction"); + // Don't include debugging info + sentry_scope_mode_t mode = SENTRY_SCOPE_ALL & ~SENTRY_SCOPE_MODULES + & ~SENTRY_SCOPE_STACKTRACES; + sentry__scope_apply_to_event(scope, options, transaction, mode); + } + + sentry__ensure_event_id(transaction, event_id); + envelope = sentry__envelope_new(); + if (!envelope || !sentry__envelope_add_transaction(envelope, transaction)) { + goto fail; + } + + // TODO(tracing): Revisit when adding attachment support for transactions. + + return envelope; + +fail: + SENTRY_WARN("dropping transaction"); + sentry_envelope_free(envelope); + sentry_value_decref(transaction); + return NULL; +} + void sentry_handle_exception(const sentry_ucontext_t *uctx) { @@ -493,12 +589,12 @@ void sentry_set_user(sentry_value_t user) { if (!sentry_value_is_null(user)) { - SENTRY_WITH_OPTIONS_MUT (options) { - if (options->session) { - sentry__session_sync_user(options->session, user); - sentry__run_write_session(options->run, options->session); - } + sentry_options_t *options = sentry__options_lock(); + if (options && options->session) { + sentry__session_sync_user(options->session, user); + sentry__run_write_session(options->run, options->session); } + sentry__options_unlock(); } SENTRY_WITH_SCOPE_MUT (scope) { @@ -617,19 +713,315 @@ sentry_set_transaction(const char *transaction) SENTRY_WITH_SCOPE_MUT (scope) { sentry_free(scope->transaction); scope->transaction = sentry__string_clone(transaction); + + if (scope->transaction_object) { + sentry_transaction_set_name(scope->transaction_object, transaction); + } + } +} + +void +sentry_set_level(sentry_level_t level) +{ + SENTRY_WITH_SCOPE_MUT (scope) { + scope->level = level; + } +} + +sentry_transaction_t * +sentry_transaction_start( + sentry_transaction_context_t *opaque_tx_cxt, sentry_value_t sampling_ctx) +{ + // Just free this immediately until we implement proper support for + // traces_sampler. + sentry_value_decref(sampling_ctx); + + sentry_value_t tx_cxt = opaque_tx_cxt->inner; + + // If the parent span ID is some empty-ish value, just remove it + sentry_value_t parent_span + = sentry_value_get_by_key(tx_cxt, "parent_span_id"); + if (sentry_value_get_length(parent_span) < 1) { + sentry_value_remove_by_key(tx_cxt, "parent_span_id"); + } + + // The ending timestamp is stripped to avoid misleading ourselves later + // down the line, as it is the only way to determine whether a transaction + // has ended or not. + sentry_value_t tx = sentry_value_new_event(); + sentry_value_remove_by_key(tx, "timestamp"); + + sentry__value_merge_objects(tx, tx_cxt); + + bool should_sample = sentry__should_send_transaction(tx_cxt); + sentry_value_set_by_key( + tx, "sampled", sentry_value_new_bool(should_sample)); + + sentry_value_set_by_key(tx, "start_timestamp", + sentry__value_new_string_owned( + sentry__msec_time_to_iso8601(sentry__msec_time()))); + + sentry__transaction_context_free(opaque_tx_cxt); + return sentry__transaction_new(tx); +} + +sentry_uuid_t +sentry_transaction_finish(sentry_transaction_t *opaque_tx) +{ + if (!opaque_tx || sentry_value_is_null(opaque_tx->inner)) { + SENTRY_DEBUG("no transaction available to finish"); + goto fail; } + + sentry_value_t tx = sentry__value_clone(opaque_tx->inner); + + SENTRY_WITH_SCOPE_MUT (scope) { + if (scope->transaction_object) { + sentry_value_t scope_tx = scope->transaction_object->inner; + + const char *tx_id = sentry_value_as_string( + sentry_value_get_by_key(tx, "span_id")); + const char *scope_tx_id = sentry_value_as_string( + sentry_value_get_by_key(scope_tx, "span_id")); + if (sentry__string_eq(tx_id, scope_tx_id)) { + sentry__transaction_decref(scope->transaction_object); + scope->transaction_object = NULL; + } + } + } + // The sampling decision should already be made for transactions + // during their construction. No need to recalculate here. See + // `sentry__should_skip_transaction`. + sentry_value_t sampled = sentry_value_get_by_key(tx, "sampled"); + if (!sentry_value_is_true(sampled)) { + SENTRY_DEBUG("throwing away transaction due to sample rate or " + "user-provided sampling value in transaction context"); + sentry_value_decref(tx); + goto fail; + } + sentry_value_remove_by_key(tx, "sampled"); + + sentry_value_set_by_key(tx, "type", sentry_value_new_string("transaction")); + sentry_value_set_by_key(tx, "timestamp", + sentry__value_new_string_owned( + sentry__msec_time_to_iso8601(sentry__msec_time()))); + // TODO: This might not actually be necessary. Revisit after talking to + // the relay team about this. + sentry_value_set_by_key(tx, "level", sentry_value_new_string("info")); + + sentry_value_t name = sentry_value_get_by_key(tx, "transaction"); + if (sentry_value_is_null(name) || sentry_value_get_length(name) == 0) { + sentry_value_set_by_key(tx, "transaction", + sentry_value_new_string("")); + } + + // TODO: add tracestate + sentry_value_t trace_context + = sentry__value_get_trace_context(opaque_tx->inner); + sentry_value_t contexts = sentry_value_new_object(); + sentry_value_set_by_key(contexts, "trace", trace_context); + sentry_value_set_by_key(tx, "contexts", contexts); + + // clean up trace context fields + sentry_value_remove_by_key(tx, "trace_id"); + sentry_value_remove_by_key(tx, "span_id"); + sentry_value_remove_by_key(tx, "parent_span_id"); + sentry_value_remove_by_key(tx, "op"); + sentry_value_remove_by_key(tx, "description"); + sentry_value_remove_by_key(tx, "status"); + + sentry__transaction_decref(opaque_tx); + + // This takes ownership of the transaction, generates an event ID, merges + // scope + return sentry__capture_event(tx); +fail: + sentry__transaction_decref(opaque_tx); + return sentry_uuid_nil(); } void -sentry_remove_transaction(void) +sentry_set_transaction_object(sentry_transaction_t *tx) { - sentry_set_transaction(NULL); + SENTRY_WITH_SCOPE_MUT (scope) { + sentry__span_decref(scope->span); + scope->span = NULL; + sentry__transaction_decref(scope->transaction_object); + sentry__transaction_incref(tx); + scope->transaction_object = tx; + } } void -sentry_set_level(sentry_level_t level) +sentry_set_span(sentry_span_t *span) { SENTRY_WITH_SCOPE_MUT (scope) { - scope->level = level; + sentry__transaction_decref(scope->transaction_object); + scope->transaction_object = NULL; + sentry__span_decref(scope->span); + sentry__span_incref(span); + scope->span = span; + } +} + +sentry_span_t * +sentry_transaction_start_child( + sentry_transaction_t *opaque_parent, char *operation, char *description) +{ + if (!opaque_parent || sentry_value_is_null(opaque_parent->inner)) { + SENTRY_DEBUG("no transaction available to create a child under"); + return NULL; + } + sentry_value_t parent = opaque_parent->inner; + + // TODO: consider snapshotting this value during tx creation and storing in + // tx and span + size_t max_spans = SENTRY_SPANS_MAX; + SENTRY_WITH_OPTIONS (options) { + max_spans = options->max_spans; + } + + sentry_value_t span + = sentry__value_span_new(max_spans, parent, operation, description); + return sentry__span_new(opaque_parent, span); +} + +sentry_span_t * +sentry_span_start_child( + sentry_span_t *opaque_parent, char *operation, char *description) +{ + if (!opaque_parent || sentry_value_is_null(opaque_parent->inner)) { + SENTRY_DEBUG("no parent span available to create a child span under"); + return NULL; + } + if (!opaque_parent->transaction) { + SENTRY_DEBUG("no root transaction to create a child span under"); + return NULL; + } + sentry_value_t parent = opaque_parent->inner; + + // TODO: consider snapshotting this value during tx creation and storing in + // tx and span + size_t max_spans = SENTRY_SPANS_MAX; + SENTRY_WITH_OPTIONS (options) { + max_spans = options->max_spans; + } + + sentry_value_t span + = sentry__value_span_new(max_spans, parent, operation, description); + + return sentry__span_new(opaque_parent->transaction, span); +} + +void +sentry_span_finish(sentry_span_t *opaque_span) +{ + if (!opaque_span || sentry_value_is_null(opaque_span->inner)) { + SENTRY_DEBUG("no span to finish"); + goto fail; + } + + sentry_transaction_t *opaque_root_transaction = opaque_span->transaction; + if (!opaque_root_transaction + || sentry_value_is_null(opaque_root_transaction->inner)) { + SENTRY_DEBUG( + "no root transaction to finish span on, aborting span finish"); + goto fail; + } + + sentry_value_t root_transaction = opaque_root_transaction->inner; + + if (!sentry_value_is_true( + sentry_value_get_by_key(root_transaction, "sampled"))) { + SENTRY_DEBUG("root transaction is unsampled, dropping span"); + goto fail; + } + + if (!sentry_value_is_null( + sentry_value_get_by_key(root_transaction, "timestamp"))) { + SENTRY_DEBUG("span's root transaction is already finished, aborting " + "span finish"); + goto fail; + } + + sentry_value_t span = sentry__value_clone(opaque_span->inner); + + SENTRY_WITH_SCOPE_MUT (scope) { + if (scope->span) { + sentry_value_t scope_span = scope->span->inner; + + const char *span_id = sentry_value_as_string( + sentry_value_get_by_key(span, "span_id")); + const char *scope_span_id = sentry_value_as_string( + sentry_value_get_by_key(scope_span, "span_id")); + if (sentry__string_eq(span_id, scope_span_id)) { + sentry__span_decref(scope->span); + scope->span = NULL; + } + } + } + + // Note that the current API makes it impossible to set a sampled value + // that's different from the span's root transaction, but let's just be safe + // here. + if (!sentry_value_is_true(sentry_value_get_by_key(span, "sampled"))) { + SENTRY_DEBUG("span is unsampled, dropping span"); + sentry_value_decref(span); + goto fail; + } + + if (!sentry_value_is_null(sentry_value_get_by_key(span, "timestamp"))) { + SENTRY_DEBUG("span is already finished, aborting span finish"); + sentry_value_decref(span); + goto fail; + } + + sentry_value_set_by_key(span, "timestamp", + sentry__value_new_string_owned( + sentry__msec_time_to_iso8601(sentry__msec_time()))); + sentry_value_remove_by_key(span, "sampled"); + + size_t max_spans = SENTRY_SPANS_MAX; + SENTRY_WITH_OPTIONS (options) { + max_spans = options->max_spans; + } + + sentry_value_t spans = sentry_value_get_by_key(root_transaction, "spans"); + + if (sentry_value_get_length(spans) >= max_spans) { + SENTRY_DEBUG("reached maximum number of spans for transaction, " + "discarding span"); + sentry_value_decref(span); + goto fail; + } + + if (sentry_value_is_null(spans)) { + spans = sentry_value_new_list(); + sentry_value_set_by_key(root_transaction, "spans", spans); + } + sentry_value_append(spans, span); + sentry__span_free(opaque_span); + return; + +fail: + sentry__span_free(opaque_span); + return; +} + +int +sentry_get_crashed_last_run() +{ + return g_last_crash; +} + +int +sentry_clear_crashed_last_run() +{ + bool success = false; + sentry_options_t *options = sentry__options_lock(); + if (options) { + success = sentry__clear_crash_marker(options); } + sentry__options_unlock(); + return success ? 0 : 1; } diff --git a/external_imported/sentry-native/src/sentry_core.h b/external_imported/sentry-native/src/sentry_core.h index 8040ef140..18037fbf0 100644 --- a/external_imported/sentry-native/src/sentry_core.h +++ b/external_imported/sentry-native/src/sentry_core.h @@ -5,6 +5,7 @@ #include "sentry_logger.h" #define SENTRY_BREADCRUMBS_MAX 100 +#define SENTRY_SPANS_MAX 1000 #if defined(__GNUC__) && (__GNUC__ >= 4) # define MUST_USE __attribute__((warn_unused_result)) @@ -29,7 +30,14 @@ bool sentry__should_skip_upload(void); /** - * Convert the given event into an envelope. + * Given a well-formed event, returns whether an event is a transaction or not. + * Defaults to false, which will also be returned if the event is malformed. + */ +bool sentry__event_is_transaction(sentry_value_t event); + +/** + * Convert the given event into an envelope. This assumes that the event + * being passed in is not a transaction. * * More specifically, it will do the following things: * - sample the event, possibly discarding it, @@ -45,6 +53,29 @@ bool sentry__should_skip_upload(void); sentry_envelope_t *sentry__prepare_event(const sentry_options_t *options, sentry_value_t event, sentry_uuid_t *event_id); +/** + * Sends a sentry event, regardless of its type. + */ +sentry_uuid_t sentry__capture_event(sentry_value_t event); + +/** + * Convert the given transaction into an envelope. This assumes that the + * event being passed in is a transaction. + * + * It will do the following things: + * - discard the transaction if it is unsampled + * - apply the scope to the transaction + * - add the transaction to a new envelope + * - add any attachments to the envelope + * + * The function will ensure the transaction has a UUID and write it into the + * `event_id` out-parameter. This takes ownership of the transaction, which + * means that the caller no longer needs to call `sentry_value_decref` on the + * transaction. + */ +sentry_envelope_t *sentry__prepare_transaction(const sentry_options_t *options, + sentry_value_t transaction, sentry_uuid_t *event_id); + /** * This function will submit the `envelope` to the given `transport`, first * checking for consent. @@ -84,8 +115,10 @@ void sentry__options_unlock(void); for (const sentry_options_t *Options = sentry__options_getref(); Options; \ sentry_options_free((sentry_options_t *)Options), Options = NULL) -#define SENTRY_WITH_OPTIONS_MUT(Options) \ - for (sentry_options_t *Options = sentry__options_lock(); Options; \ - sentry__options_unlock(), Options = NULL) +// these for now are only needed outside of core for tests +#ifdef SENTRY_UNITTEST +bool sentry__roll_dice(double probability); +bool sentry__should_send_transaction(sentry_value_t tx_cxt); +#endif #endif diff --git a/external_imported/sentry-native/src/sentry_database.c b/external_imported/sentry-native/src/sentry_database.c index a2c146358..62a619d8a 100644 --- a/external_imported/sentry-native/src/sentry_database.c +++ b/external_imported/sentry-native/src/sentry_database.c @@ -235,6 +235,8 @@ sentry__process_old_runs(const sentry_options_t *options, uint64_t last_crash) sentry__capture_envelope(options->transport, session_envelope); } +static const char *g_last_crash_filename = "last_crash"; + bool sentry__write_crash_marker(const sentry_options_t *options) { @@ -244,7 +246,7 @@ sentry__write_crash_marker(const sentry_options_t *options) } sentry_path_t *marker_path - = sentry__path_join_str(options->database_path, "last_crash"); + = sentry__path_join_str(options->database_path, g_last_crash_filename); if (!marker_path) { sentry_free(iso_time); return false; @@ -260,3 +262,34 @@ sentry__write_crash_marker(const sentry_options_t *options) } return !rv; } + +bool +sentry__has_crash_marker(const sentry_options_t *options) +{ + sentry_path_t *marker_path + = sentry__path_join_str(options->database_path, g_last_crash_filename); + if (!marker_path) { + return false; + } + + bool result = sentry__path_is_file(marker_path); + sentry__path_free(marker_path); + return result; +} + +bool +sentry__clear_crash_marker(const sentry_options_t *options) +{ + sentry_path_t *marker_path + = sentry__path_join_str(options->database_path, g_last_crash_filename); + if (!marker_path) { + return false; + } + + int rv = sentry__path_remove(marker_path); + sentry__path_free(marker_path); + if (rv) { + SENTRY_DEBUG("removing the crash timestamp file has failed"); + } + return !rv; +} diff --git a/external_imported/sentry-native/src/sentry_database.h b/external_imported/sentry-native/src/sentry_database.h index 086ebab8e..2d99bedb0 100644 --- a/external_imported/sentry-native/src/sentry_database.h +++ b/external_imported/sentry-native/src/sentry_database.h @@ -75,4 +75,14 @@ void sentry__process_old_runs( */ bool sentry__write_crash_marker(const sentry_options_t *options); +/** + * This will check whether the `/last_crash` file exists. + */ +bool sentry__has_crash_marker(const sentry_options_t *options); + +/** + * This will remove the `/last_crash` file. + */ +bool sentry__clear_crash_marker(const sentry_options_t *options); + #endif diff --git a/external_imported/sentry-native/src/sentry_envelope.c b/external_imported/sentry-native/src/sentry_envelope.c index 71cef6ed6..cfcf5af82 100644 --- a/external_imported/sentry-native/src/sentry_envelope.c +++ b/external_imported/sentry-native/src/sentry_envelope.c @@ -41,6 +41,9 @@ envelope_add_item(sentry_envelope_t *envelope) if (envelope->contents.items.item_count >= SENTRY_MAX_ENVELOPE_ITEMS) { return NULL; } + // TODO: Envelopes may have at most one event item or one transaction item, + // and not one of both. Some checking should be done here or in + // `sentry__envelope_add_[transaction|event]` to ensure this can't happen. sentry_envelope_item_t *rv = &envelope->contents.items @@ -197,7 +200,26 @@ sentry_envelope_get_event(const sentry_envelope_t *envelope) return sentry_value_new_null(); } for (size_t i = 0; i < envelope->contents.items.item_count; i++) { - if (!sentry_value_is_null(envelope->contents.items.items[i].event)) { + + if (!sentry_value_is_null(envelope->contents.items.items[i].event) + && !sentry__event_is_transaction( + envelope->contents.items.items[i].event)) { + return envelope->contents.items.items[i].event; + } + } + return sentry_value_new_null(); +} + +sentry_value_t +sentry_envelope_get_transaction(const sentry_envelope_t *envelope) +{ + if (envelope->is_raw) { + return sentry_value_new_null(); + } + for (size_t i = 0; i < envelope->contents.items.item_count; i++) { + if (!sentry_value_is_null(envelope->contents.items.items[i].event) + && sentry__event_is_transaction( + envelope->contents.items.items[i].event)) { return envelope->contents.items.items[i].event; } } @@ -234,6 +256,45 @@ sentry__envelope_add_event(sentry_envelope_t *envelope, sentry_value_t event) return item; } +sentry_envelope_item_t * +sentry__envelope_add_transaction( + sentry_envelope_t *envelope, sentry_value_t transaction) +{ + sentry_envelope_item_t *item = envelope_add_item(envelope); + if (!item) { + return NULL; + } + + sentry_jsonwriter_t *jw = sentry__jsonwriter_new(NULL); + if (!jw) { + return NULL; + } + + sentry_value_t event_id = sentry__ensure_event_id(transaction, NULL); + + item->event = transaction; + sentry__jsonwriter_write_value(jw, transaction); + item->payload = sentry__jsonwriter_into_string(jw, &item->payload_len); + + sentry__envelope_item_set_header( + item, "type", sentry_value_new_string("transaction")); + sentry_value_t length = sentry_value_new_int32((int32_t)item->payload_len); + sentry__envelope_item_set_header(item, "length", length); + + sentry_value_incref(event_id); + sentry__envelope_set_header(envelope, "event_id", event_id); + +#ifdef SENTRY_UNITTEST + sentry_value_t now = sentry_value_new_string("2021-12-16T05:53:59.343Z"); +#else + sentry_value_t now = sentry__value_new_string_owned( + sentry__msec_time_to_iso8601(sentry__msec_time())); +#endif + sentry__envelope_set_header(envelope, "sent_at", now); + + return item; +} + sentry_envelope_item_t * sentry__envelope_add_session( sentry_envelope_t *envelope, const sentry_session_t *session) diff --git a/external_imported/sentry-native/src/sentry_envelope.h b/external_imported/sentry-native/src/sentry_envelope.h index ac5c69136..b5a8f1ab0 100644 --- a/external_imported/sentry-native/src/sentry_envelope.h +++ b/external_imported/sentry-native/src/sentry_envelope.h @@ -36,6 +36,12 @@ sentry_uuid_t sentry__envelope_get_event_id(const sentry_envelope_t *envelope); sentry_envelope_item_t *sentry__envelope_add_event( sentry_envelope_t *envelope, sentry_value_t event); +/** + * Add a transaction to this envelope. + */ +sentry_envelope_item_t *sentry__envelope_add_transaction( + sentry_envelope_t *envelope, sentry_value_t transaction); + /** * Add a session to this envelope. */ diff --git a/external_imported/sentry-native/src/sentry_json.c b/external_imported/sentry-native/src/sentry_json.c index 316868256..cf02c7f1b 100644 --- a/external_imported/sentry-native/src/sentry_json.c +++ b/external_imported/sentry-native/src/sentry_json.c @@ -101,13 +101,49 @@ write_str(sentry_jsonwriter_t *jw, const char *str) sentry__stringbuilder_append(jw->sb, str); } +// The Lookup table and algorithm below are adapted from: +// https://github.com/serde-rs/json/blob/977975ee650829a1f3c232cd5f641a7011bdce1d/src/ser.rs#L2079-L2145 + +// Lookup table of escape sequences. `0` means no need to escape, and `1` means +// that escaping is needed. +static unsigned char needs_escaping[256] = { + // 1 2 3 4 5 6 7 8 9 A B C D E F + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 1 + 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 3 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 4 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, // 5 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 6 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 7 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 8 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 9 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // A + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // B + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // C + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // D + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // E + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // F +}; + static void write_json_str(sentry_jsonwriter_t *jw, const char *str) { // using unsigned here because utf-8 is > 127 :-) const unsigned char *ptr = (const unsigned char *)str; write_char(jw, '"'); + + const unsigned char *start = ptr; for (; *ptr; ptr++) { + if (!needs_escaping[*ptr]) { + continue; + } + + size_t len = ptr - start; + if (len) { + sentry__stringbuilder_append_buf(jw->sb, (const char *)start, len); + } + switch (*ptr) { case '\\': write_str(jw, "\\\\"); @@ -142,7 +178,15 @@ write_json_str(sentry_jsonwriter_t *jw, const char *str) write_char(jw, *ptr); } } + + start = ptr + 1; } + + size_t len = ptr - start; + if (len) { + sentry__stringbuilder_append_buf(jw->sb, (const char *)start, len); + } + write_char(jw, '"'); } diff --git a/external_imported/sentry-native/src/sentry_options.c b/external_imported/sentry-native/src/sentry_options.c index 55bb518af..43531118e 100644 --- a/external_imported/sentry-native/src/sentry_options.c +++ b/external_imported/sentry-native/src/sentry_options.c @@ -51,9 +51,9 @@ sentry_options_new(void) opts->sample_rate = 1.0; opts->refcount = 1; opts->shutdown_timeout = SENTRY_DEFAULT_SHUTDOWN_TIMEOUT; - opts->traces_sample_rate = 0.0; opts->max_spans = 0; + return opts; } @@ -411,6 +411,10 @@ sentry_options_set_traces_sample_rate( sample_rate = 1.0; } opts->traces_sample_rate = sample_rate; + + if (sample_rate > 0 && opts->max_spans == 0) { + opts->max_spans = SENTRY_SPANS_MAX; + } } /** diff --git a/external_imported/sentry-native/src/sentry_os.c b/external_imported/sentry-native/src/sentry_os.c index 977261eba..fde706684 100644 --- a/external_imported/sentry-native/src/sentry_os.c +++ b/external_imported/sentry-native/src/sentry_os.c @@ -1,9 +1,28 @@ #include "sentry_os.h" #include "sentry_string.h" +#include "sentry_utils.h" #ifdef SENTRY_PLATFORM_WINDOWS # include +# define CURRENT_VERSION "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion" + +void * +sentry__try_file_version(LPCWSTR filename) +{ + + DWORD size = GetFileVersionInfoSizeW(filename, NULL); + if (!size) { + return NULL; + } + + void *ffibuf = sentry_malloc(size); + if (!GetFileVersionInfoW(filename, 0, size, ffibuf)) { + sentry_free(ffibuf); + return NULL; + } + return ffibuf; +} sentry_value_t sentry__get_os_context(void) @@ -15,15 +34,11 @@ sentry__get_os_context(void) sentry_value_set_by_key(os, "name", sentry_value_new_string("Windows")); - void *ffibuf = NULL; - - DWORD size = GetFileVersionInfoSizeW(L"kernel32.dll", NULL); - if (!size) { - goto fail; + void *ffibuf = sentry__try_file_version(L"ntoskrnl.exe"); + if (!ffibuf) { + ffibuf = sentry__try_file_version(L"kernel32.dll"); } - - ffibuf = sentry_malloc(size); - if (!GetFileVersionInfoW(L"kernel32.dll", 0, size, ffibuf)) { + if (!ffibuf) { goto fail; } @@ -34,17 +49,55 @@ sentry__get_os_context(void) } ffi->dwFileFlags &= ffi->dwFileFlagsMask; + uint32_t major_version = ffi->dwFileVersionMS >> 16; + uint32_t minor_version = ffi->dwFileVersionMS & 0xffff; + uint32_t build_version = ffi->dwFileVersionLS >> 16; + uint32_t ubr = ffi->dwFileVersionLS & 0xffff; + char buf[32]; - snprintf(buf, sizeof(buf), "%u.%u.%u", ffi->dwFileVersionMS >> 16, - ffi->dwFileVersionMS & 0xffff, ffi->dwFileVersionLS >> 16); + snprintf(buf, sizeof(buf), "%u.%u.%u.%lu", major_version, minor_version, + build_version, ubr); + sentry_value_set_by_key(os, "kernel_version", sentry_value_new_string(buf)); - sentry_value_set_by_key(os, "version", sentry_value_new_string(buf)); + sentry_free(ffibuf); - snprintf(buf, sizeof(buf), "%lu", ffi->dwFileVersionLS & 0xffff); + // The `CurrentMajorVersionNumber`, `CurrentMinorVersionNumber` and `UBR` + // are DWORD, while `CurrentBuild` is a SZ (text). - sentry_value_set_by_key(os, "build", sentry_value_new_string(buf)); + uint32_t reg_version = 0; + DWORD buf_size = sizeof(uint32_t); + if (RegGetValueA(HKEY_LOCAL_MACHINE, CURRENT_VERSION, + "CurrentMajorVersionNumber", RRF_RT_REG_DWORD, NULL, ®_version, + &buf_size) + == ERROR_SUCCESS) { + major_version = reg_version; + } + buf_size = sizeof(uint32_t); + if (RegGetValueA(HKEY_LOCAL_MACHINE, CURRENT_VERSION, + "CurrentMinorVersionNumber", RRF_RT_REG_DWORD, NULL, ®_version, + &buf_size) + == ERROR_SUCCESS) { + minor_version = reg_version; + } + buf_size = sizeof(buf); + if (RegGetValueA(HKEY_LOCAL_MACHINE, CURRENT_VERSION, "CurrentBuild", + RRF_RT_REG_SZ, NULL, buf, &buf_size) + == ERROR_SUCCESS) { + build_version = (uint32_t)sentry__strtod_c(buf, NULL); + } + buf_size = sizeof(uint32_t); + if (RegGetValueA(HKEY_LOCAL_MACHINE, CURRENT_VERSION, "UBR", + RRF_RT_REG_DWORD, NULL, ®_version, &buf_size) + == ERROR_SUCCESS) { + ubr = reg_version; + } - sentry_free(ffibuf); + snprintf(buf, sizeof(buf), "%u.%u.%u", major_version, minor_version, + build_version); + sentry_value_set_by_key(os, "version", sentry_value_new_string(buf)); + + snprintf(buf, sizeof(buf), "%lu", ubr); + sentry_value_set_by_key(os, "build", sentry_value_new_string(buf)); sentry_value_freeze(os); return os; diff --git a/external_imported/sentry-native/src/sentry_ratelimiter.c b/external_imported/sentry-native/src/sentry_ratelimiter.c index e1dd8c855..67cddb3e5 100644 --- a/external_imported/sentry-native/src/sentry_ratelimiter.c +++ b/external_imported/sentry-native/src/sentry_ratelimiter.c @@ -82,6 +82,14 @@ sentry__rate_limiter_update_from_http_retry_after( return true; } +bool +sentry__rate_limiter_update_from_429(sentry_rate_limiter_t *rl) +{ + rl->disabled_until[SENTRY_RL_CATEGORY_ANY] + = sentry__monotonic_time() + 60 * 1000; + return true; +} + bool sentry__rate_limiter_is_disabled(const sentry_rate_limiter_t *rl, int category) { diff --git a/external_imported/sentry-native/src/sentry_ratelimiter.h b/external_imported/sentry-native/src/sentry_ratelimiter.h index 58a666121..b7d4c5575 100644 --- a/external_imported/sentry-native/src/sentry_ratelimiter.h +++ b/external_imported/sentry-native/src/sentry_ratelimiter.h @@ -34,6 +34,12 @@ bool sentry__rate_limiter_update_from_header( bool sentry__rate_limiter_update_from_http_retry_after( sentry_rate_limiter_t *rl, const char *retry_after); +/** + * This will update the rate limiters internal state based on receiving a 429 + * status code. + */ +bool sentry__rate_limiter_update_from_429(sentry_rate_limiter_t *rl); + /** * This will return `true` if the specified `category` is currently rate * limited. diff --git a/external_imported/sentry-native/src/sentry_scope.c b/external_imported/sentry-native/src/sentry_scope.c index 5f8992e7e..321b8f41e 100644 --- a/external_imported/sentry-native/src/sentry_scope.c +++ b/external_imported/sentry-native/src/sentry_scope.c @@ -7,6 +7,9 @@ #include "sentry_string.h" #include "sentry_symbolizer.h" #include "sentry_sync.h" +#include "sentry_tracing.h" +#include "sentry_value.h" + #include #ifdef SENTRY_BACKEND_CRASHPAD @@ -73,6 +76,8 @@ get_scope(void) g_scope.breadcrumbs = sentry_value_new_list(); g_scope.level = SENTRY_LEVEL_ERROR; g_scope.client_sdk = get_client_sdk(); + g_scope.transaction_object = NULL; + g_scope.span = NULL; g_scope_initialized = true; @@ -93,6 +98,8 @@ sentry__scope_cleanup(void) sentry_value_decref(g_scope.contexts); sentry_value_decref(g_scope.breadcrumbs); sentry_value_decref(g_scope.client_sdk); + sentry__transaction_decref(g_scope.transaction_object); + sentry__span_decref(g_scope.span); } sentry__mutex_unlock(&g_lock); } @@ -115,7 +122,7 @@ sentry__scope_flush_unlock() { sentry__scope_unlock(); SENTRY_WITH_OPTIONS (options) { - // we try to unlock the scope/session lock as soon as possible. The + // we try to unlock the scope as soon as possible. The // backend will do its own `WITH_SCOPE` internally. if (options->backend && options->backend->flush_scope_func) { options->backend->flush_scope_func(options->backend, options); @@ -224,6 +231,29 @@ sentry__symbolize_stacktrace(sentry_value_t stacktrace) } } +sentry_value_t +sentry__get_span_or_transaction(const sentry_scope_t *scope) +{ + if (scope->span) { + return scope->span->inner; + } else if (scope->transaction_object) { + return scope->transaction_object->inner; + } else { + return sentry_value_new_null(); + } +} + +#ifdef SENTRY_UNITTEST +sentry_value_t +sentry__scope_get_span_or_transaction() +{ + SENTRY_WITH_SCOPE (scope) { + return sentry__get_span_or_transaction(scope); + } + return sentry_value_new_null(); +} +#endif + void sentry__scope_apply_to_event(const sentry_scope_t *scope, const sentry_options_t *options, sentry_value_t event, @@ -257,7 +287,8 @@ sentry__scope_apply_to_event(const sentry_scope_t *scope, PLACE_STRING("dist", options->dist); PLACE_STRING("environment", options->environment); - if (IS_NULL("level")) { + // is not transaction and has no level + if (IS_NULL("type") && IS_NULL("level")) { SET("level", sentry__value_new_level(scope->level)); } @@ -266,10 +297,44 @@ sentry__scope_apply_to_event(const sentry_scope_t *scope, PLACE_STRING("transaction", scope->transaction); PLACE_VALUE("sdk", scope->client_sdk); - // TODO: these should merge - PLACE_CLONED_VALUE("tags", scope->tags); - PLACE_CLONED_VALUE("extra", scope->extra); - PLACE_CLONED_VALUE("contexts", scope->contexts); + sentry_value_t event_tags = sentry_value_get_by_key(event, "tags"); + if (sentry_value_is_null(event_tags)) { + if (!sentry_value_is_null(scope->tags)) { + PLACE_CLONED_VALUE("tags", scope->tags); + } + } else { + sentry__value_merge_objects(event_tags, scope->tags); + } + sentry_value_t event_extra = sentry_value_get_by_key(event, "extra"); + if (sentry_value_is_null(event_extra)) { + if (!sentry_value_is_null(scope->extra)) { + PLACE_CLONED_VALUE("extra", scope->extra); + } + } else { + sentry__value_merge_objects(event_extra, scope->extra); + } + + sentry_value_t contexts = sentry__value_clone(scope->contexts); + + // prep contexts sourced from scope; data about transaction on scope needs + // to be extracted and inserted + sentry_value_t scope_trace = sentry__value_get_trace_context( + sentry__get_span_or_transaction(scope)); + if (!sentry_value_is_null(scope_trace)) { + if (sentry_value_is_null(contexts)) { + contexts = sentry_value_new_object(); + } + sentry_value_set_by_key(contexts, "trace", scope_trace); + } + + // merge contexts sourced from scope into the event + sentry_value_t event_contexts = sentry_value_get_by_key(event, "contexts"); + if (sentry_value_is_null(event_contexts)) { + PLACE_VALUE("contexts", contexts); + } else { + sentry__value_merge_objects(event_contexts, contexts); + } + sentry_value_decref(contexts); if (mode & SENTRY_SCOPE_BREADCRUMBS) { PLACE_CLONED_VALUE("breadcrumbs", scope->breadcrumbs); @@ -288,7 +353,9 @@ sentry__scope_apply_to_event(const sentry_scope_t *scope, sentry__foreach_stacktrace(event, sentry__symbolize_stacktrace); } +#undef PLACE_CLONED_VALUE +#undef PLACE_VALUE #undef PLACE_STRING -#undef IS_NULL #undef SET +#undef IS_NULL } diff --git a/external_imported/sentry-native/src/sentry_scope.h b/external_imported/sentry-native/src/sentry_scope.h index 250ff8200..207b1a995 100644 --- a/external_imported/sentry-native/src/sentry_scope.h +++ b/external_imported/sentry-native/src/sentry_scope.h @@ -19,6 +19,17 @@ typedef struct sentry_scope_s { sentry_value_t breadcrumbs; sentry_level_t level; sentry_value_t client_sdk; + + // The span attached to this scope, if any. + // + // Conceptually, every transaction is a span, so it should be possible to + // attach spans or transactions to a scope. But sentry_span_t and + // sentry_transaction_t are unrelated types in the native SDK, so we need + // two distinct pointers. At most one of them should ever be non-null. + // Whenever possible, `transaction` should pull its value from the + // `name` property nested in transaction_object or span. + sentry_transaction_t *transaction_object; + sentry_span_t *span; } sentry_scope_t; /** @@ -84,3 +95,8 @@ void sentry__scope_apply_to_event(const sentry_scope_t *scope, sentry__scope_unlock(), Scope = NULL) #endif + +// this is only used in unit tests +#ifdef SENTRY_UNITTEST +sentry_value_t sentry__scope_get_span_or_transaction(); +#endif diff --git a/external_imported/sentry-native/src/sentry_session.c b/external_imported/sentry-native/src/sentry_session.c index f58a88e88..1aa7dc796 100644 --- a/external_imported/sentry-native/src/sentry_session.c +++ b/external_imported/sentry-native/src/sentry_session.c @@ -215,35 +215,39 @@ sentry_start_session(void) { sentry_end_session(); SENTRY_WITH_SCOPE (scope) { - SENTRY_WITH_OPTIONS_MUT (options) { + sentry_options_t *options = sentry__options_lock(); + if (options) { options->session = sentry__session_new(); if (options->session) { sentry__session_sync_user(options->session, scope->user); sentry__run_write_session(options->run, options->session); } } + sentry__options_unlock(); } } void sentry__record_errors_on_current_session(uint32_t error_count) { - SENTRY_WITH_OPTIONS_MUT (options) { - if (options->session) { - options->session->errors += error_count; - } + sentry_options_t *options = sentry__options_lock(); + if (options && options->session) { + options->session->errors += error_count; } + sentry__options_unlock(); } static sentry_session_t * sentry__end_session_internal(void) { sentry_session_t *session = NULL; - SENTRY_WITH_OPTIONS_MUT (options) { + sentry_options_t *options = sentry__options_lock(); + if (options) { session = options->session; options->session = NULL; sentry__run_clear_session(options->run); } + sentry__options_unlock(); if (session && session->status == SENTRY_SESSION_STATUS_OK) { session->status = SENTRY_SESSION_STATUS_EXITED; diff --git a/external_imported/sentry-native/src/sentry_string.c b/external_imported/sentry-native/src/sentry_string.c index a1581c752..f745f6ad7 100644 --- a/external_imported/sentry-native/src/sentry_string.c +++ b/external_imported/sentry-native/src/sentry_string.c @@ -39,49 +39,6 @@ sentry__stringbuilder_reserve(sentry_stringbuilder_t *sb, size_t len) return &sb->buf[sb->len]; } -static int -append(sentry_stringbuilder_t *sb, const char *s, size_t len) -{ - char *buf = sentry__stringbuilder_reserve(sb, len + 1); - if (!buf) { - return 1; - } - memcpy(buf, s, len); - sb->len += len; - - // make sure we're always zero terminated - sb->buf[sb->len] = '\0'; - - return 0; -} - -int -sentry__stringbuilder_append(sentry_stringbuilder_t *sb, const char *s) -{ - return append(sb, s, strlen(s)); -} - -int -sentry__stringbuilder_append_buf( - sentry_stringbuilder_t *sb, const char *s, size_t len) -{ - return append(sb, s, len); -} - -int -sentry__stringbuilder_append_char(sentry_stringbuilder_t *sb, char c) -{ - return append(sb, &c, 1); -} - -int -sentry__stringbuilder_append_char32(sentry_stringbuilder_t *sb, uint32_t c) -{ - char buf[4]; - size_t len = sentry__unichar_to_utf8(c, buf); - return sentry__stringbuilder_append_buf(sb, buf, len); -} - char * sentry_stringbuilder_take_string(sentry_stringbuilder_t *sb) { @@ -121,24 +78,6 @@ sentry__stringbuilder_set_len(sentry_stringbuilder_t *sb, size_t len) sb->len = len; } -char * -sentry__string_clone(const char *str) -{ - return str ? sentry__string_clonen(str, strlen(str)) : NULL; -} - -char * -sentry__string_clonen(const char *str, size_t n) -{ - size_t len = n + 1; - char *rv = sentry_malloc(len); - if (rv) { - memcpy(rv, str, n); - rv[n] = 0; - } - return rv; -} - #ifdef SENTRY_PLATFORM_WINDOWS char * sentry__string_from_wstr(const wchar_t *s) diff --git a/external_imported/sentry-native/src/sentry_string.h b/external_imported/sentry-native/src/sentry_string.h index feeff3678..255d55d17 100644 --- a/external_imported/sentry-native/src/sentry_string.h +++ b/external_imported/sentry-native/src/sentry_string.h @@ -22,25 +22,55 @@ typedef struct sentry_stringbuilder_s { void sentry__stringbuilder_init(sentry_stringbuilder_t *sb); /** - * Appends a zero terminated string to the builder. + * Resizes the stringbuilder buffer to make sure there is at least `len` bytes + * available at the end, and returns a pointer *to the reservation*. */ -int sentry__stringbuilder_append(sentry_stringbuilder_t *sb, const char *s); +char *sentry__stringbuilder_reserve(sentry_stringbuilder_t *sb, size_t len); /** * Appends a sized buffer. */ -int sentry__stringbuilder_append_buf( - sentry_stringbuilder_t *sb, const char *s, size_t len); +static inline int +sentry__stringbuilder_append_buf( + sentry_stringbuilder_t *sb, const char *s, size_t len) +{ + size_t needed = sb->len + len + 1; + char *buf = sb->buf; + if (!sb->buf || needed > sb->allocated) { + buf = sentry__stringbuilder_reserve(sb, len + 1); + if (!buf) { + return 1; + } + } else { + buf = buf + sb->len; + } + + memcpy(buf, s, len); + sb->len += len; + + // make sure we're always zero terminated + sb->buf[sb->len] = '\0'; + + return 0; +} /** - * Appends a single character. + * Appends a zero terminated string to the builder. */ -int sentry__stringbuilder_append_char(sentry_stringbuilder_t *sb, char c); +static inline int +sentry__stringbuilder_append(sentry_stringbuilder_t *sb, const char *s) +{ + return sentry__stringbuilder_append_buf(sb, s, strlen(s)); +} /** - * Appends a utf-32 character. + * Appends a single character. */ -int sentry__stringbuilder_append_char32(sentry_stringbuilder_t *sb, uint32_t c); +static inline int +sentry__stringbuilder_append_char(sentry_stringbuilder_t *sb, char c) +{ + return sentry__stringbuilder_append_buf(sb, &c, 1); +} /** * Appends an int64 value. @@ -73,12 +103,6 @@ void sentry__stringbuilder_cleanup(sentry_stringbuilder_t *sb); */ size_t sentry__stringbuilder_len(const sentry_stringbuilder_t *sb); -/** - * Resizes the stringbuilder buffer to make sure there is at least `len` bytes - * available at the end, and returns a pointer *to the reservation*. - */ -char *sentry__stringbuilder_reserve(sentry_stringbuilder_t *sb, size_t len); - /** * Sets the number of used bytes in the string builder, to be used together with * `sentry__stringbuilder_reserve` to avoid copying from an intermediate buffer. @@ -86,14 +110,28 @@ char *sentry__stringbuilder_reserve(sentry_stringbuilder_t *sb, size_t len); void sentry__stringbuilder_set_len(sentry_stringbuilder_t *sb, size_t len); /** - * Duplicates a zero terminated string. + * Duplicates a zero terminated string with a length limit. */ -char *sentry__string_clone(const char *str); +static inline char * +sentry__string_clonen(const char *str, size_t n) +{ + size_t len = n + 1; + char *rv = (char *)sentry_malloc(len); + if (rv) { + memcpy(rv, str, n); + rv[n] = 0; + } + return rv; +} /** - * Duplicates a zero terminated string with a length limit. + * Duplicates a zero terminated string. */ -char *sentry__string_clonen(const char *str, size_t n); +static inline char * +sentry__string_clone(const char *str) +{ + return str ? sentry__string_clonen(str, strlen(str)) : NULL; +} /** * Converts a string to lowercase. diff --git a/external_imported/sentry-native/src/sentry_sync.c b/external_imported/sentry-native/src/sentry_sync.c index b2e566c4b..a6b6380a1 100644 --- a/external_imported/sentry-native/src/sentry_sync.c +++ b/external_imported/sentry-native/src/sentry_sync.c @@ -281,6 +281,78 @@ sentry__bgworker_start(sentry_bgworker_t *bgw) return 0; } +typedef struct { + long refcount; + bool was_flushed; + sentry_cond_t signal; + sentry_mutex_t lock; +} sentry_flush_task_t; + +static void +sentry__flush_task(void *task_data, void *UNUSED(state)) +{ + sentry_flush_task_t *flush_task = (sentry_flush_task_t *)task_data; + + sentry__mutex_lock(&flush_task->lock); + flush_task->was_flushed = true; + sentry__cond_wake(&flush_task->signal); + sentry__mutex_unlock(&flush_task->lock); +} + +static void +sentry__flush_task_decref(sentry_flush_task_t *task) +{ + if (sentry__atomic_fetch_and_add(&task->refcount, -1) == 1) { + sentry__mutex_free(&task->lock); + sentry_free(task); + } +} + +int +sentry__bgworker_flush(sentry_bgworker_t *bgw, uint64_t timeout) +{ + if (!sentry__atomic_fetch(&bgw->running)) { + SENTRY_WARN("trying to flush non-running thread"); + return 0; + } + SENTRY_TRACE("flushing background worker thread"); + + sentry_flush_task_t *flush_task + = sentry_malloc(sizeof(sentry_flush_task_t)); + if (!flush_task) { + return 1; + } + memset(flush_task, 0, sizeof(sentry_flush_task_t)); + flush_task->refcount = 2; // this thread + background worker + flush_task->was_flushed = false; + sentry__cond_init(&flush_task->signal); + sentry__mutex_init(&flush_task->lock); + + sentry__mutex_lock(&flush_task->lock); + + /* submit the task that triggers our condvar once it runs */ + sentry__bgworker_submit(bgw, sentry__flush_task, + (void (*)(void *))sentry__flush_task_decref, flush_task); + + uint64_t started = sentry__monotonic_time(); + bool was_flushed = false; + while (true) { + was_flushed = flush_task->was_flushed; + + uint64_t now = sentry__monotonic_time(); + if (was_flushed || (now > started && now - started > timeout)) { + sentry__mutex_unlock(&flush_task->lock); + sentry__flush_task_decref(flush_task); + + // return `0` on success + return !was_flushed; + } + + // this will implicitly release the lock, and re-acquire on wake + sentry__cond_wait_timeout(&flush_task->signal, &flush_task->lock, 250); + } +} + static void shutdown_task(void *task_data, void *UNUSED(state)) { diff --git a/external_imported/sentry-native/src/sentry_sync.h b/external_imported/sentry-native/src/sentry_sync.h index 96e353b86..11915536a 100644 --- a/external_imported/sentry-native/src/sentry_sync.h +++ b/external_imported/sentry-native/src/sentry_sync.h @@ -394,6 +394,12 @@ void sentry__bgworker_decref(sentry_bgworker_t *bgw); */ int sentry__bgworker_start(sentry_bgworker_t *bgw); +/** + * This will try to flush the background worker thread queue, with a `timeout`. + * Returns 0 on success. + */ +int sentry__bgworker_flush(sentry_bgworker_t *bgw, uint64_t timeout); + /** * This will try to shut down the background worker thread, with a `timeout`. * Returns 0 on success. diff --git a/external_imported/sentry-native/src/sentry_tracing.c b/external_imported/sentry-native/src/sentry_tracing.c new file mode 100644 index 000000000..49b607f1e --- /dev/null +++ b/external_imported/sentry-native/src/sentry_tracing.c @@ -0,0 +1,520 @@ +#include "sentry_tracing.h" +#include "sentry_alloc.h" +#include "sentry_logger.h" +#include "sentry_string.h" +#include "sentry_utils.h" +#include "sentry_value.h" +#include + +sentry_value_t +sentry__value_new_span(sentry_value_t parent, const char *operation) +{ + sentry_value_t span = sentry_value_new_object(); + + sentry_value_set_by_key(span, "op", sentry_value_new_string(operation)); + + sentry_uuid_t span_id = sentry_uuid_new_v4(); + sentry_value_set_by_key( + span, "span_id", sentry__value_new_span_uuid(&span_id)); + + sentry_value_set_by_key(span, "status", sentry_value_new_string("ok")); + + if (!sentry_value_is_null(parent)) { + sentry_value_set_by_key(span, "trace_id", + sentry_value_get_by_key_owned(parent, "trace_id")); + sentry_value_set_by_key(span, "parent_span_id", + sentry_value_get_by_key_owned(parent, "span_id")); + sentry_value_set_by_key( + span, "sampled", sentry_value_get_by_key_owned(parent, "sampled")); + } + + return span; +} + +sentry_value_t +sentry__value_transaction_context_new(const char *name, const char *operation) +{ + sentry_value_t transaction_context + = sentry__value_new_span(sentry_value_new_null(), operation); + + sentry_uuid_t trace_id = sentry_uuid_new_v4(); + sentry_value_set_by_key(transaction_context, "trace_id", + sentry__value_new_internal_uuid(&trace_id)); + + sentry_value_set_by_key( + transaction_context, "transaction", sentry_value_new_string(name)); + + return transaction_context; +} + +sentry_transaction_context_t * +sentry_transaction_context_new(const char *name, const char *operation) +{ + sentry_transaction_context_t *tx_cxt + = SENTRY_MAKE(sentry_transaction_context_t); + if (!tx_cxt) { + return NULL; + } + memset(tx_cxt, 0, sizeof(sentry_transaction_context_t)); + + sentry_value_t inner + = sentry__value_transaction_context_new(name, operation); + + if (sentry_value_is_null(inner)) { + return NULL; + } + + tx_cxt->inner = inner; + + return tx_cxt; +} + +void +sentry__transaction_context_free(sentry_transaction_context_t *tx_cxt) +{ + if (!tx_cxt) { + return; + } + if (sentry_value_refcount(tx_cxt->inner) <= 1) { + sentry_value_decref(tx_cxt->inner); + sentry_free(tx_cxt); + } else { + sentry_value_decref(tx_cxt->inner); + }; +} + +void +sentry_transaction_context_set_name( + sentry_transaction_context_t *tx_cxt, const char *name) +{ + sentry_value_set_by_key( + tx_cxt->inner, "transaction", sentry_value_new_string(name)); +} + +void +sentry_transaction_context_set_operation( + sentry_transaction_context_t *tx_cxt, const char *operation) +{ + sentry_value_set_by_key( + tx_cxt->inner, "op", sentry_value_new_string(operation)); +} + +void +sentry_transaction_context_set_sampled( + sentry_transaction_context_t *tx_cxt, int sampled) +{ + sentry_value_set_by_key( + tx_cxt->inner, "sampled", sentry_value_new_bool(sampled)); +} + +void +sentry_transaction_context_remove_sampled(sentry_transaction_context_t *tx_cxt) +{ + sentry_value_remove_by_key(tx_cxt->inner, "sampled"); +} + +void +sentry_transaction_context_update_from_header( + sentry_transaction_context_t *tx_cxt, const char *key, const char *value) +{ + // do case-insensitive header key comparison + const char sentry_trace[] = "sentry-trace"; + for (size_t i = 0; i < sizeof(sentry_trace); i++) { + if (tolower(key[i]) != sentry_trace[i]) { + return; + } + } + + // https://develop.sentry.dev/sdk/performance/#header-sentry-trace + // sentry-trace = traceid-spanid(-sampled)? + const char *trace_id_start = value; + const char *trace_id_end = strchr(trace_id_start, '-'); + if (!trace_id_end) { + return; + } + + sentry_value_t inner = tx_cxt->inner; + + char *s + = sentry__string_clonen(trace_id_start, trace_id_end - trace_id_start); + sentry_value_t trace_id = sentry__value_new_string_owned(s); + sentry_value_set_by_key(inner, "trace_id", trace_id); + + const char *span_id_start = trace_id_end + 1; + const char *span_id_end = strchr(span_id_start, '-'); + if (!span_id_end) { + // no sampled flag + sentry_value_t parent_span_id = sentry_value_new_string(span_id_start); + sentry_value_set_by_key(inner, "parent_span_id", parent_span_id); + return; + } + // else: we have a sampled flag + + s = sentry__string_clonen(span_id_start, span_id_end - span_id_start); + sentry_value_t parent_span_id = sentry__value_new_string_owned(s); + sentry_value_set_by_key(inner, "parent_span_id", parent_span_id); + + bool sampled = *(span_id_end + 1) == '1'; + sentry_value_set_by_key(inner, "sampled", sentry_value_new_bool(sampled)); +} + +sentry_transaction_t * +sentry__transaction_new(sentry_value_t inner) +{ + if (sentry_value_is_null(inner)) { + return NULL; + } + + sentry_transaction_t *tx = SENTRY_MAKE(sentry_transaction_t); + if (!tx) { + return NULL; + } + memset(tx, 0, sizeof(sentry_transaction_t)); + + tx->inner = inner; + + return tx; +} + +void +sentry__transaction_incref(sentry_transaction_t *tx) +{ + sentry_value_incref(tx->inner); +} + +void +sentry__transaction_decref(sentry_transaction_t *tx) +{ + if (!tx) { + return; + } + + if (sentry_value_refcount(tx->inner) <= 1) { + sentry_value_decref(tx->inner); + sentry_free(tx); + } else { + sentry_value_decref(tx->inner); + }; +} + +void +sentry__span_incref(sentry_span_t *span) +{ + sentry_value_incref(span->inner); +} + +void +sentry__span_decref(sentry_span_t *span) +{ + if (!span) { + return; + } + + if (sentry_value_refcount(span->inner) <= 1) { + sentry_value_decref(span->inner); + sentry_free(span); + } else { + sentry_value_decref(span->inner); + }; +} + +sentry_span_t * +sentry__span_new(sentry_transaction_t *tx, sentry_value_t inner) +{ + if (!tx || sentry_value_is_null(inner)) { + return NULL; + } + + sentry_span_t *span = SENTRY_MAKE(sentry_span_t); + if (!span) { + return NULL; + } + memset(span, 0, sizeof(sentry_span_t)); + + span->inner = inner; + + sentry__transaction_incref(tx); + span->transaction = tx; + + return span; +} + +sentry_value_t +sentry__value_span_new( + size_t max_spans, sentry_value_t parent, char *operation, char *description) +{ + if (!sentry_value_is_null(sentry_value_get_by_key(parent, "timestamp"))) { + SENTRY_DEBUG("span's parent is already finished, not creating span"); + goto fail; + } + + sentry_value_t spans = sentry_value_get_by_key(parent, "spans"); + // This only checks that the number of _completed_ spans matches the + // number of max spans. This means that the number of in-flight spans + // can exceed the max number of spans. + if (sentry_value_get_length(spans) >= max_spans) { + SENTRY_DEBUG("reached maximum number of spans for transaction, not " + "creating span"); + goto fail; + } + + sentry_value_t child = sentry__value_new_span(parent, operation); + sentry_value_set_by_key( + child, "description", sentry_value_new_string(description)); + sentry_value_set_by_key(child, "start_timestamp", + sentry__value_new_string_owned( + sentry__msec_time_to_iso8601(sentry__msec_time()))); + + return child; +fail: + return sentry_value_new_null(); +} + +// TODO: for now, don't allow multiple references to spans. this should be +// revisited when sentry_transaction_t stores a list of sentry_span_t's +// instead of a list of sentry_value_t's. +void +sentry__span_free(sentry_span_t *span) +{ + if (!span) { + return; + } + sentry_value_decref(span->inner); + sentry__transaction_decref(span->transaction); + sentry_free(span); +} + +sentry_value_t +sentry__value_get_trace_context(sentry_value_t span) +{ + if (sentry_value_is_null(span)) { + return sentry_value_new_null(); + } + + if (sentry_value_is_null(sentry_value_get_by_key(span, "trace_id")) + || sentry_value_is_null(sentry_value_get_by_key(span, "span_id"))) { + return sentry_value_new_null(); + } + + sentry_value_t trace_context = sentry_value_new_object(); + +#define PLACE_VALUE(Key, Source) \ + do { \ + sentry_value_t src = sentry_value_get_by_key(Source, Key); \ + if (!sentry_value_is_null(src)) { \ + sentry_value_incref(src); \ + sentry_value_set_by_key(trace_context, Key, src); \ + } \ + } while (0) + + PLACE_VALUE("trace_id", span); + PLACE_VALUE("span_id", span); + PLACE_VALUE("parent_span_id", span); + PLACE_VALUE("op", span); + PLACE_VALUE("description", span); + PLACE_VALUE("status", span); + + // TODO: freeze this + return trace_context; + +#undef PLACE_VALUE +} + +void +sentry_transaction_set_name(sentry_transaction_t *tx, const char *name) +{ + sentry_value_set_by_key( + tx->inner, "transaction", sentry_value_new_string(name)); +} + +static void +set_tag(sentry_value_t item, const char *tag, const char *value) +{ + sentry_value_t tags = sentry_value_get_by_key(item, "tags"); + if (sentry_value_is_null(tags)) { + tags = sentry_value_new_object(); + sentry_value_set_by_key(item, "tags", tags); + } + + char *s = sentry__string_clonen(value, 200); + if (s) { + sentry_value_set_by_key(tags, tag, sentry__value_new_string_owned(s)); + } else { + sentry_value_set_by_key(tags, tag, sentry_value_new_null()); + } +} + +void +sentry_transaction_set_tag( + sentry_transaction_t *tx, const char *tag, const char *value) +{ + set_tag(tx->inner, tag, value); +} + +void +sentry_span_set_tag(sentry_span_t *span, const char *tag, const char *value) +{ + set_tag(span->inner, tag, value); +} + +static void +remove_tag(sentry_value_t item, const char *tag) +{ + sentry_value_t tags = sentry_value_get_by_key(item, "tags"); + if (!sentry_value_is_null(tags)) { + sentry_value_remove_by_key(tags, tag); + } +} + +void +sentry_transaction_remove_tag(sentry_transaction_t *tx, const char *tag) +{ + remove_tag(tx->inner, tag); +} + +void +sentry_span_remove_tag(sentry_span_t *span, const char *tag) +{ + remove_tag(span->inner, tag); +} + +static void +set_data(sentry_value_t item, const char *key, sentry_value_t value) +{ + sentry_value_t data = sentry_value_get_by_key(item, "data"); + if (sentry_value_is_null(data)) { + data = sentry_value_new_object(); + sentry_value_set_by_key(item, "data", data); + } + sentry_value_set_by_key(data, key, value); +} + +void +sentry_transaction_set_data( + sentry_transaction_t *tx, const char *key, sentry_value_t value) +{ + set_data(tx->inner, key, value); +} + +void +sentry_span_set_data(sentry_span_t *span, const char *key, sentry_value_t value) +{ + set_data(span->inner, key, value); +} + +static void +remove_data(sentry_value_t item, const char *key) +{ + sentry_value_t data = sentry_value_get_by_key(item, "data"); + if (!sentry_value_is_null(data)) { + sentry_value_remove_by_key(data, key); + } +} + +void +sentry_transaction_remove_data(sentry_transaction_t *tx, const char *key) +{ + remove_data(tx->inner, key); +} + +void +sentry_span_remove_data(sentry_span_t *span, const char *key) +{ + remove_data(span->inner, key); +} + +sentry_value_t +sentry_status_to_string(sentry_span_status_t status) +{ + switch (status) { + case SENTRY_SPAN_STATUS_OK: + return sentry_value_new_string("ok"); + case SENTRY_SPAN_STATUS_CANCELLED: + return sentry_value_new_string("cancelled"); + case SENTRY_SPAN_STATUS_UNKNOWN: + return sentry_value_new_string("unknown"); + case SENTRY_SPAN_STATUS_INVALID_ARGUMENT: + return sentry_value_new_string("invalid_argument"); + case SENTRY_SPAN_STATUS_DEADLINE_EXCEEDED: + return sentry_value_new_string("deadline_exceeded"); + case SENTRY_SPAN_STATUS_NOT_FOUND: + return sentry_value_new_string("not_found"); + case SENTRY_SPAN_STATUS_ALREADY_EXISTS: + return sentry_value_new_string("already_exists"); + case SENTRY_SPAN_STATUS_PERMISSION_DENIED: + return sentry_value_new_string("permission_denied"); + case SENTRY_SPAN_STATUS_RESOURCE_EXHAUSTED: + return sentry_value_new_string("resource_exhausted"); + case SENTRY_SPAN_STATUS_FAILED_PRECONDITION: + return sentry_value_new_string("failed_precondition"); + case SENTRY_SPAN_STATUS_ABORTED: + return sentry_value_new_string("aborted"); + case SENTRY_SPAN_STATUS_OUT_OF_RANGE: + return sentry_value_new_string("out_of_range"); + case SENTRY_SPAN_STATUS_UNIMPLEMENTED: + return sentry_value_new_string("unimplemented"); + case SENTRY_SPAN_STATUS_INTERNAL_ERROR: + return sentry_value_new_string("internal_error"); + case SENTRY_SPAN_STATUS_UNAVAILABLE: + return sentry_value_new_string("unavailable"); + case SENTRY_SPAN_STATUS_DATA_LOSS: + return sentry_value_new_string("data_loss"); + case SENTRY_SPAN_STATUS_UNAUTHENTICATED: + return sentry_value_new_string("unauthenticated"); + default: + return sentry_value_new_null(); + } +} + +void +set_status(sentry_value_t item, sentry_span_status_t status) +{ + sentry_value_set_by_key(item, "status", sentry_status_to_string(status)); +} + +void +sentry_span_set_status(sentry_span_t *span, sentry_span_status_t status) +{ + set_status(span->inner, status); +} + +void +sentry_transaction_set_status( + sentry_transaction_t *tx, sentry_span_status_t status) +{ + set_status(tx->inner, status); +} + +static void +sentry__span_iter_headers(sentry_value_t span, + sentry_iter_headers_function_t callback, void *userdata) +{ + sentry_value_t trace_id = sentry_value_get_by_key(span, "trace_id"); + sentry_value_t span_id = sentry_value_get_by_key(span, "span_id"); + sentry_value_t sampled = sentry_value_get_by_key(span, "sampled"); + + if (sentry_value_is_null(trace_id) || sentry_value_is_null(span_id)) { + return; + } + + char buf[64]; + snprintf(buf, sizeof(buf), "%s-%s-%s", sentry_value_as_string(trace_id), + sentry_value_as_string(span_id), + sentry_value_is_true(sampled) ? "1" : "0"); + + callback("sentry-trace", buf, userdata); +} + +void +sentry_span_iter_headers(sentry_span_t *span, + sentry_iter_headers_function_t callback, void *userdata) +{ + sentry__span_iter_headers(span->inner, callback, userdata); +} + +void +sentry_transaction_iter_headers(sentry_transaction_t *tx, + sentry_iter_headers_function_t callback, void *userdata) +{ + sentry__span_iter_headers(tx->inner, callback, userdata); +} diff --git a/external_imported/sentry-native/src/sentry_tracing.h b/external_imported/sentry-native/src/sentry_tracing.h new file mode 100644 index 000000000..bccc9bc78 --- /dev/null +++ b/external_imported/sentry-native/src/sentry_tracing.h @@ -0,0 +1,51 @@ +#ifndef SENTRY_TRACING_H_INCLUDED +#define SENTRY_TRACING_H_INCLUDED + +#include "sentry_value.h" + +/** + * A span. + */ +typedef struct sentry_span_s { + sentry_value_t inner; + // The transaction the span is contained in. + sentry_transaction_t *transaction; +} sentry_span_t; + +/** + * A transaction context. + */ +typedef struct sentry_transaction_context_s { + sentry_value_t inner; +} sentry_transaction_context_t; + +/** + * A transaction. + */ +typedef struct sentry_transaction_s { + sentry_value_t inner; +} sentry_transaction_t; + +void sentry__transaction_context_free(sentry_transaction_context_t *tx_cxt); + +sentry_transaction_t *sentry__transaction_new(sentry_value_t inner); +void sentry__transaction_incref(sentry_transaction_t *tx); +void sentry__transaction_decref(sentry_transaction_t *tx); + +void sentry__span_incref(sentry_span_t *span); +void sentry__span_decref(sentry_span_t *span); + +sentry_value_t sentry__value_span_new(size_t max_spans, sentry_value_t parent, + char *operation, char *description); +sentry_span_t *sentry__span_new( + sentry_transaction_t *parent_tx, sentry_value_t inner); +void sentry__span_free(sentry_span_t *span); + +/** + * Returns an object containing tracing information extracted from a + * transaction / span which should be included in an event. + * See https://develop.sentry.dev/sdk/event-payloads/transaction/#examples + */ +sentry_value_t sentry__value_get_trace_context(sentry_value_t span); + +#endif diff --git a/external_imported/sentry-native/src/sentry_transport.c b/external_imported/sentry-native/src/sentry_transport.c index 351ddca0b..4ff909e03 100644 --- a/external_imported/sentry-native/src/sentry_transport.c +++ b/external_imported/sentry-native/src/sentry_transport.c @@ -3,6 +3,7 @@ #include "sentry_envelope.h" #include "sentry_options.h" #include "sentry_ratelimiter.h" +#include "sentry_string.h" #define ENVELOPE_MIME "application/x-sentry-envelope" // The headers we use are: `x-sentry-auth`, `content-type`, `content-length` @@ -12,6 +13,7 @@ typedef struct sentry_transport_s { void (*send_envelope_func)(sentry_envelope_t *envelope, void *state); int (*startup_func)(const sentry_options_t *options, void *state); int (*shutdown_func)(uint64_t timeout, void *state); + int (*flush_func)(uint64_t timeout, void *state); void (*free_func)(void *state); size_t (*dump_func)(sentry_run_t *run, void *state); void *state; @@ -57,6 +59,13 @@ sentry_transport_set_shutdown_func(sentry_transport_t *transport, transport->shutdown_func = shutdown_func; } +void +sentry_transport_set_flush_func(sentry_transport_t *transport, + int (*flush_func)(uint64_t timeout, void *state)) +{ + transport->flush_func = flush_func; +} + void sentry__transport_send_envelope( sentry_transport_t *transport, sentry_envelope_t *envelope) @@ -86,6 +95,16 @@ sentry__transport_startup( return 0; } +int +sentry__transport_flush(sentry_transport_t *transport, uint64_t timeout) +{ + if (transport->flush_func && transport->running) { + SENTRY_TRACE("flushing transport"); + return transport->flush_func(timeout, transport->state); + } + return 0; +} + int sentry__transport_shutdown(sentry_transport_t *transport, uint64_t timeout) { diff --git a/external_imported/sentry-native/src/sentry_transport.h b/external_imported/sentry-native/src/sentry_transport.h index 2ab786d10..f30788107 100644 --- a/external_imported/sentry-native/src/sentry_transport.h +++ b/external_imported/sentry-native/src/sentry_transport.h @@ -31,6 +31,13 @@ void sentry__transport_send_envelope( int sentry__transport_startup( sentry_transport_t *transport, const sentry_options_t *options); +/** + * Instructs the transport to flush its queue. + * + * Returns 0 on success. + */ +int sentry__transport_flush(sentry_transport_t *transport, uint64_t timeout); + /** * Instructs the transport to shut down. * diff --git a/external_imported/sentry-native/src/sentry_utils.c b/external_imported/sentry-native/src/sentry_utils.c index 65f2a2415..569fa0833 100644 --- a/external_imported/sentry-native/src/sentry_utils.c +++ b/external_imported/sentry-native/src/sentry_utils.c @@ -218,8 +218,7 @@ sentry__dsn_new(const char *raw_dsn) sentry_url_t url; memset(&url, 0, sizeof(sentry_url_t)); size_t path_len; - char *tmp; - char *end; + char *project_id; sentry_dsn_t *dsn = SENTRY_MAKE(sentry_dsn_t); if (!dsn) { @@ -255,16 +254,14 @@ sentry__dsn_new(const char *raw_dsn) path_len--; } - tmp = strrchr(url.path, '/'); - if (!tmp) { + project_id = strrchr(url.path, '/'); + if (!project_id || strlen(project_id + 1) == 0) { goto exit; } - dsn->project_id = (uint64_t)strtoll(tmp + 1, &end, 10); - if (end != tmp + strlen(tmp)) { - goto exit; - } - *tmp = 0; + dsn->project_id = sentry__string_clone(project_id + 1); + *project_id = 0; + dsn->path = url.path; url.path = NULL; @@ -299,6 +296,7 @@ sentry__dsn_decref(sentry_dsn_t *dsn) sentry_free(dsn->path); sentry_free(dsn->public_key); sentry_free(dsn->secret_key); + sentry_free(dsn->project_id); sentry_free(dsn); } } @@ -329,7 +327,7 @@ init_string_builder_for_url(sentry_stringbuilder_t *sb, const sentry_dsn_t *dsn) sentry__stringbuilder_append_int64(sb, (int64_t)dsn->port); sentry__stringbuilder_append(sb, dsn->path); sentry__stringbuilder_append(sb, "/api/"); - sentry__stringbuilder_append_int64(sb, (int64_t)dsn->project_id); + sentry__stringbuilder_append(sb, dsn->project_id); } char * diff --git a/external_imported/sentry-native/src/sentry_utils.h b/external_imported/sentry-native/src/sentry_utils.h index cb79c08f1..8b19e65c2 100644 --- a/external_imported/sentry-native/src/sentry_utils.h +++ b/external_imported/sentry-native/src/sentry_utils.h @@ -49,7 +49,7 @@ typedef struct sentry_dsn_s { char *path; char *secret_key; char *public_key; - uint64_t project_id; + char *project_id; int port; long refcount; bool is_valid; diff --git a/external_imported/sentry-native/src/sentry_uuid.h b/external_imported/sentry-native/src/sentry_uuid.h index 00a17a27d..c16b943fa 100644 --- a/external_imported/sentry-native/src/sentry_uuid.h +++ b/external_imported/sentry-native/src/sentry_uuid.h @@ -13,6 +13,7 @@ void sentry__internal_uuid_as_string(const sentry_uuid_t *uuid, char str[37]); * Converts a sentry UUID to a string representation used for span IDs. */ void sentry__span_uuid_as_string(const sentry_uuid_t *uuid, char str[17]); +#endif #ifdef SENTRY_PLATFORM_WINDOWS /** @@ -20,5 +21,3 @@ void sentry__span_uuid_as_string(const sentry_uuid_t *uuid, char str[17]); */ sentry_uuid_t sentry__uuid_from_native(const GUID *guid); #endif - -#endif diff --git a/external_imported/sentry-native/src/sentry_value.c b/external_imported/sentry-native/src/sentry_value.c index c45ce748b..b8757a538 100644 --- a/external_imported/sentry-native/src/sentry_value.c +++ b/external_imported/sentry-native/src/sentry_value.c @@ -806,6 +806,41 @@ sentry_value_is_null(sentry_value_t value) return value._bits == CONST_NULL; } +int +sentry__value_merge_objects(sentry_value_t dst, sentry_value_t src) +{ + if (sentry_value_is_null(src)) { + return 0; + } + if (sentry_value_get_type(dst) != SENTRY_VALUE_TYPE_OBJECT + || sentry_value_get_type(src) != SENTRY_VALUE_TYPE_OBJECT + || sentry_value_is_frozen(dst)) { + return 1; + } + thing_t *thing = value_as_thing(src); + if (!thing) { + return 1; + } + obj_t *obj = thing->payload._ptr; + for (size_t i = 0; i < obj->len; i++) { + char *key = obj->pairs[i].k; + sentry_value_t src_val = obj->pairs[i].v; + sentry_value_t dst_val = sentry_value_get_by_key(dst, key); + if (sentry_value_get_type(dst_val) == SENTRY_VALUE_TYPE_OBJECT + && sentry_value_get_type(src_val) == SENTRY_VALUE_TYPE_OBJECT) { + if (sentry__value_merge_objects(dst_val, src_val) != 0) { + return 1; + } + } else { + if (sentry_value_set_by_key(dst, key, src_val) != 0) { + return 1; + } + sentry_value_incref(src_val); + } + } + return 0; +} + void sentry__jsonwriter_write_value(sentry_jsonwriter_t *jw, sentry_value_t value) { diff --git a/external_imported/sentry-native/src/sentry_value.h b/external_imported/sentry-native/src/sentry_value.h index 2eb5004f1..437789940 100644 --- a/external_imported/sentry-native/src/sentry_value.h +++ b/external_imported/sentry-native/src/sentry_value.h @@ -89,6 +89,22 @@ sentry_value_t sentry__value_clone(sentry_value_t value); int sentry__value_append_bounded( sentry_value_t value, sentry_value_t v, size_t max); +/** + * Deep-merges object src into dst. + * + * For each key-value pair in the src object the same key in the dst object + * will be set to the value from src. If both the dst value and the src value + * are objects themselves they are stepped into recursively instead of + * overriding the entire dst object. + * + * If src is null nothing needs to be merged and this is handled gracefully, + * otherwise if dst is any other type than an object or src is neither an + * object nor null an error is returned. + * + * Returns 0 on success. + */ +int sentry__value_merge_objects(sentry_value_t dst, sentry_value_t src); + /** * Parse the given JSON string into a new Value. */ @@ -102,4 +118,7 @@ typedef struct sentry_jsonwriter_s sentry_jsonwriter_t; void sentry__jsonwriter_write_value( sentry_jsonwriter_t *jw, sentry_value_t value); +sentry_value_t sentry__value_new_span_uuid(const sentry_uuid_t *uuid); + +sentry_value_t sentry__value_new_internal_uuid(const sentry_uuid_t *uuid); #endif diff --git a/external_imported/sentry-native/src/transports/sentry_transport_curl.c b/external_imported/sentry-native/src/transports/sentry_transport_curl.c index 7ef2806ae..31605073f 100644 --- a/external_imported/sentry-native/src/transports/sentry_transport_curl.c +++ b/external_imported/sentry-native/src/transports/sentry_transport_curl.c @@ -89,6 +89,13 @@ sentry__curl_transport_start( return sentry__bgworker_start(bgworker); } +static int +sentry__curl_transport_flush(uint64_t timeout, void *transport_state) +{ + sentry_bgworker_t *bgworker = (sentry_bgworker_t *)transport_state; + return sentry__bgworker_flush(bgworker, timeout); +} + static int sentry__curl_transport_shutdown(uint64_t timeout, void *transport_state) { @@ -185,12 +192,17 @@ sentry__curl_send_task(void *_envelope, void *_state) CURLcode rv = curl_easy_perform(curl); if (rv == CURLE_OK) { + long response_code; + curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response_code); + if (info.x_sentry_rate_limits) { sentry__rate_limiter_update_from_header( state->ratelimiter, info.x_sentry_rate_limits); } else if (info.retry_after) { sentry__rate_limiter_update_from_http_retry_after( state->ratelimiter, info.retry_after); + } else if (response_code == 429) { + sentry__rate_limiter_update_from_429(state->ratelimiter); } } else { SENTRY_WARNF( @@ -253,6 +265,7 @@ sentry__transport_new_default(void) sentry_transport_set_free_func( transport, (void (*)(void *))sentry__bgworker_decref); sentry_transport_set_startup_func(transport, sentry__curl_transport_start); + sentry_transport_set_flush_func(transport, sentry__curl_transport_flush); sentry_transport_set_shutdown_func( transport, sentry__curl_transport_shutdown); sentry__transport_set_dump_func(transport, sentry__curl_dump_queue); diff --git a/external_imported/sentry-native/src/transports/sentry_transport_winhttp.c b/external_imported/sentry-native/src/transports/sentry_transport_winhttp.c index afb6e7c52..ef9e74b67 100644 --- a/external_imported/sentry-native/src/transports/sentry_transport_winhttp.c +++ b/external_imported/sentry-native/src/transports/sentry_transport_winhttp.c @@ -107,6 +107,13 @@ sentry__winhttp_transport_start( return sentry__bgworker_start(bgworker); } +static int +sentry__winhttp_transport_flush(uint64_t timeout, void *transport_state) +{ + sentry_bgworker_t *bgworker = (sentry_bgworker_t *)transport_state; + return sentry__bgworker_shutdown(bgworker, timeout); +} + static int sentry__winhttp_transport_shutdown(uint64_t timeout, void *transport_state) { @@ -234,6 +241,10 @@ sentry__winhttp_send_task(void *_envelope, void *_state) // lets just assume we won’t have headers > 2k wchar_t buf[2048]; DWORD buf_size = sizeof(buf); + + DWORD status_code = 0; + DWORD status_code_size = sizeof(status_code); + if (WinHttpQueryHeaders(state->request, WINHTTP_QUERY_CUSTOM, L"x-sentry-rate-limits", buf, &buf_size, WINHTTP_NO_HEADER_INDEX)) { @@ -251,6 +262,12 @@ sentry__winhttp_send_task(void *_envelope, void *_state) state->ratelimiter, h); sentry_free(h); } + } else if (WinHttpQueryHeaders(state->request, + WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, + WINHTTP_HEADER_NAME_BY_INDEX, &status_code, + &status_code_size, WINHTTP_NO_HEADER_INDEX) + && status_code == 429) { + sentry__rate_limiter_update_from_429(state->ratelimiter); } } else { SENTRY_DEBUGF( @@ -322,6 +339,7 @@ sentry__transport_new_default(void) transport, (void (*)(void *))sentry__bgworker_decref); sentry_transport_set_startup_func( transport, sentry__winhttp_transport_start); + sentry_transport_set_flush_func(transport, sentry__winhttp_transport_flush); sentry_transport_set_shutdown_func( transport, sentry__winhttp_transport_shutdown); sentry__transport_set_dump_func(transport, sentry__winhttp_dump_queue); diff --git a/external_imported/sentry-native/tests/__init__.py b/external_imported/sentry-native/tests/__init__.py index 02f614664..b34e1c2ea 100644 --- a/external_imported/sentry-native/tests/__init__.py +++ b/external_imported/sentry-native/tests/__init__.py @@ -5,6 +5,8 @@ import sys import urllib import pytest +import pprint +import textwrap sourcedir = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) @@ -165,6 +167,19 @@ def deserialize( # type: (...) -> Envelope return cls.deserialize_from(io.BytesIO(bytes)) + def print_verbose(self, indent=0): + """Pretty prints the envelope.""" + print(" " * indent + "Envelope:") + indent += 2 + print(" " * indent + "Headers:") + indent += 2 + print(textwrap.indent(pprint.pformat(self.headers), " " * indent)) + indent -= 2 + print(" " * indent + "Items:") + indent += 2 + for item in self.items: + item.print_verbose(indent) + def __repr__(self): # type: (...) -> str return "" % (self.headers, self.items) @@ -180,6 +195,21 @@ def __init__( self.json = json self.bytes = bytes + def print_verbose(self, indent=0): + """Pretty prints the item.""" + print(" " * indent + "Payload:") + indent += 2 + if self.bytes: + payload = self.bytes.encode("utf-8", errors="replace") + if self.json: + payload = pprint.pformat(self.json) + try: + print(textwrap.indent(payload, " " * indent)) + except UnicodeEncodeError: + # Windows CI appears fickle, and we put emojis in the json + payload = payload.encode("ascii", errors="replace").decode() + print(textwrap.indent(payload, " " * indent)) + def __repr__(self): # type: (...) -> str return "" % (self.bytes, self.json) @@ -205,7 +235,11 @@ def __init__( def get_event(self): # type: (...) -> Optional[Event] - if self.headers.get("type") == "event" and self.payload.json is not None: + # Transactions are events with a few extra fields, so return them as well. + if ( + self.headers.get("type") in ["event", "transaction"] + and self.payload.json is not None + ): return self.payload.json return None @@ -220,7 +254,7 @@ def deserialize_from( headers = json.loads(line) length = headers["length"] payload = f.read(length) - if headers.get("type") == "event" or headers.get("type") == "session": + if headers.get("type") in ["event", "session", "transaction"]: rv = cls(headers=headers, payload=PayloadRef(json=json.loads(payload))) else: rv = cls(headers=headers, payload=payload) @@ -234,6 +268,18 @@ def deserialize( # type: (...) -> Optional[Item] return cls.deserialize_from(io.BytesIO(bytes)) + def print_verbose(self, indent=0): + """Pretty prints the item.""" + item_type = self.headers.get("type", "?").capitalize() + print(" " * indent + f"{item_type}:") + indent += 2 + print(" " * indent + "Headers:") + indent += 2 + headers = pprint.pformat(self.headers) + print(textwrap.indent(headers, " " * indent)) + indent -= 2 + self.payload.print_verbose(indent) + def __repr__(self): # type: (...) -> str return "" % ( diff --git a/external_imported/sentry-native/tests/assertions.py b/external_imported/sentry-native/tests/assertions.py index 379686f2e..1e4120bac 100644 --- a/external_imported/sentry-native/tests/assertions.py +++ b/external_imported/sentry-native/tests/assertions.py @@ -14,6 +14,11 @@ def matches(actual, expected): return {k: v for (k, v) in actual.items() if k in expected.keys()} == expected +def assert_matches(actual, expected): + """Assert two objects for equality, ignoring extra keys in ``actual``.""" + assert {k: v for (k, v) in actual.items() if k in expected.keys()} == expected + + def assert_session(envelope, extra_assertion=None): session = None for item in envelope: @@ -27,10 +32,16 @@ def assert_session(envelope, extra_assertion=None): "environment": "development", } if extra_assertion: - assert matches(session, extra_assertion) + assert_matches(session, extra_assertion) -def assert_meta(envelope, release="test-example-release", integration=None): +def assert_meta( + envelope, + release="test-example-release", + integration=None, + transaction="test-transaction", + sdk_override=None, +): event = envelope.get_event() expected = { @@ -38,20 +49,22 @@ def assert_meta(envelope, release="test-example-release", integration=None): "environment": "development", "release": release, "user": {"id": 42, "username": "some_name"}, - "transaction": "test-transaction", + "transaction": transaction, "tags": {"expected-tag": "some value"}, "extra": {"extra stuff": "some value", "…unicode key…": "őá…–🤮🚀¿ 한글 테스트"}, } expected_sdk = { "name": "sentry.native", - "version": "0.4.13", + "version": "0.4.17", "packages": [ - {"name": "github:getsentry/sentry-native", "version": "0.4.13"}, + {"name": "github:getsentry/sentry-native", "version": "0.4.17"}, ], } - if not is_android: + if is_android: + expected_sdk["name"] = "sentry.native.android" + else: if sys.platform == "win32": - assert matches( + assert_matches( event["contexts"]["os"], {"name": "Windows", "version": platform.version()}, ) @@ -62,7 +75,7 @@ def assert_meta(envelope, release="test-example-release", integration=None): version = match.group(1) build = match.group(2) - assert matches( + assert_matches( event["contexts"]["os"], {"name": "Linux", "version": version, "build": build}, ) @@ -72,7 +85,7 @@ def assert_meta(envelope, release="test-example-release", integration=None): version.append("0") version = ".".join(version) - assert matches( + assert_matches( event["contexts"]["os"], { "name": "macOS", @@ -82,9 +95,12 @@ def assert_meta(envelope, release="test-example-release", integration=None): ) assert event["contexts"]["os"]["build"] is not None - assert matches(event, expected) - assert matches(event["sdk"], expected_sdk) - assert matches( + if sdk_override != None: + expected_sdk["name"] = sdk_override + + assert_matches(event, expected) + assert_matches(event["sdk"], expected_sdk) + assert_matches( event["contexts"], {"runtime": {"type": "runtime", "name": "testing-runtime"}} ) @@ -92,10 +108,11 @@ def assert_meta(envelope, release="test-example-release", integration=None): assert event["sdk"].get("integrations") is None else: assert event["sdk"]["integrations"] == [integration] - assert any( - "sentry_example" in image["code_file"] - for image in event["debug_meta"]["images"] - ) + if event.get("type") == "event": + assert any( + "sentry_example" in image["code_file"] + for image in event["debug_meta"]["images"] + ) def assert_stacktrace(envelope, inside_exception=False, check_size=True): @@ -155,7 +172,7 @@ def assert_event(envelope): "logger": "my-logger", "message": {"formatted": "Hello World!"}, } - assert matches(event, expected) + assert_matches(event, expected) assert_timestamp(event["timestamp"]) @@ -165,13 +182,13 @@ def assert_exception(envelope): "type": "ParseIntError", "value": "invalid digit found in string", } - assert matches(event["exception"]["values"][0], exception) + assert_matches(event["exception"]["values"][0], exception) assert_timestamp(event["timestamp"]) def assert_crash(envelope): event = envelope.get_event() - assert matches(event, {"level": "fatal"}) + assert_matches(event, {"level": "fatal"}) # depending on the unwinder, we currently don’t get any stack frames from # a `ucontext` assert_stacktrace(envelope, inside_exception=True, check_size=False) diff --git a/external_imported/sentry-native/tests/requirements.txt b/external_imported/sentry-native/tests/requirements.txt index fcbf849f6..dd2fd18e8 100644 --- a/external_imported/sentry-native/tests/requirements.txt +++ b/external_imported/sentry-native/tests/requirements.txt @@ -1,3 +1,3 @@ -black==21.9b0 +black==22.3.0 pytest==6.2.5 pytest-httpserver==1.0.1 diff --git a/external_imported/sentry-native/tests/test_integration_http.py b/external_imported/sentry-native/tests/test_integration_http.py index 1e5f6f46d..631dae12d 100644 --- a/external_imported/sentry-native/tests/test_integration_http.py +++ b/external_imported/sentry-native/tests/test_integration_http.py @@ -1,9 +1,11 @@ +import time import pytest import subprocess import sys import os import time import itertools +import uuid import json from . import make_dsn, check_output, run, Envelope from .conditions import has_http, has_breakpad, has_files @@ -21,7 +23,7 @@ pytestmark = pytest.mark.skipif(not has_http, reason="tests need http") -auth_header = "Sentry sentry_key=uiaeosnrtdy, sentry_version=7, sentry_client=sentry.native/0.4.13" +auth_header = "Sentry sentry_key=uiaeosnrtdy, sentry_version=7, sentry_client=sentry.native/0.4.17" def test_capture_http(cmake, httpserver): @@ -413,3 +415,60 @@ def delayed(req): run(tmp_path, "sentry_example", ["log", "no-setup"], check=True, env=env) assert len(httpserver.log) == 10 + + +def test_transaction_only(cmake, httpserver): + tmp_path = cmake(["sentry_example"], {"SENTRY_BACKEND": "none"}) + + httpserver.expect_oneshot_request( + "/api/123456/envelope/", + headers={"x-sentry-auth": auth_header}, + ).respond_with_data("OK") + env = dict(os.environ, SENTRY_DSN=make_dsn(httpserver), SENTRY_RELEASE="🤮🚀") + + run( + tmp_path, + "sentry_example", + ["log", "capture-transaction"], + check=True, + env=env, + ) + + assert len(httpserver.log) == 1 + output = httpserver.log[0][0].get_data() + envelope = Envelope.deserialize(output) + + # Show what the envelope looks like if the test fails. + envelope.print_verbose() + + # The transaction is overwritten. + assert_meta(envelope, transaction="little.teapot") + + # Extract the one-and-only-item + (event,) = envelope.items + + assert event.headers["type"] == "transaction" + json = event.payload.json + + # See https://develop.sentry.dev/sdk/performance/trace-context/#trace-context + trace_context = json["contexts"]["trace"] + + assert ( + trace_context["op"] == "Short and stout here is my handle and here is my spout" + ) + + assert trace_context["trace_id"] + trace_id = uuid.UUID(hex=trace_context["trace_id"]) + assert trace_id + + # TODO: currently missing + # assert trace_context['public_key'] + + assert trace_context["span_id"] + assert trace_context["status"] == "ok" + + RFC3339_FORMAT = "%Y-%m-%dT%H:%M:%S.%fZ" + start_timestamp = time.strptime(json["start_timestamp"], RFC3339_FORMAT) + assert start_timestamp + timestamp = time.strptime(json["timestamp"], RFC3339_FORMAT) + assert timestamp >= start_timestamp diff --git a/external_imported/sentry-native/tests/test_integration_ratelimits.py b/external_imported/sentry-native/tests/test_integration_ratelimits.py index cacb29586..713a9b650 100644 --- a/external_imported/sentry-native/tests/test_integration_ratelimits.py +++ b/external_imported/sentry-native/tests/test_integration_ratelimits.py @@ -42,3 +42,15 @@ def test_rate_limits(cmake, httpserver): ) run(tmp_path, "sentry_example", ["log", "capture-multiple"], check=True, env=env) assert len(httpserver.log) == 2 + + +def test_only_429(cmake, httpserver): + tmp_path = cmake(["sentry_example"], {"SENTRY_BACKEND": "none"}) + + env = dict(os.environ, SENTRY_DSN=make_dsn(httpserver)) + + httpserver.expect_oneshot_request("/api/123456/envelope/").respond_with_data( + "OK", 429 + ) + run(tmp_path, "sentry_example", ["log", "capture-multiple"], check=True, env=env) + assert len(httpserver.log) == 1 diff --git a/external_imported/sentry-native/tests/test_integration_stdout.py b/external_imported/sentry-native/tests/test_integration_stdout.py index 8998fefba..710dea63a 100644 --- a/external_imported/sentry-native/tests/test_integration_stdout.py +++ b/external_imported/sentry-native/tests/test_integration_stdout.py @@ -42,6 +42,28 @@ def test_capture_stdout(cmake): assert_event(envelope) +def test_sdk_name_override(cmake): + sdk_name = "cUsToM.SDK" + tmp_path = cmake( + ["sentry_example"], + { + "SENTRY_BACKEND": "none", + "SENTRY_TRANSPORT": "none", + "SENTRY_SDK_NAME": sdk_name, + }, + ) + + output = check_output( + tmp_path, + "sentry_example", + ["stdout", "capture-event"], + ) + envelope = Envelope.deserialize(output) + + assert_meta(envelope, sdk_override=sdk_name) + assert_event(envelope) + + @pytest.mark.skipif(not has_files, reason="test needs a local filesystem") def test_multi_process(cmake): # NOTE: It would have been nice to do *everything* in a unicode-named diff --git a/external_imported/sentry-native/tests/unit/CMakeLists.txt b/external_imported/sentry-native/tests/unit/CMakeLists.txt index 86ffecaff..db18b0f95 100644 --- a/external_imported/sentry-native/tests/unit/CMakeLists.txt +++ b/external_imported/sentry-native/tests/unit/CMakeLists.txt @@ -29,10 +29,12 @@ add_executable(sentry_test_unit test_mpack.c test_path.c test_ratelimiter.c + test_sampling.c test_session.c test_slice.c test_symbolizer.c test_sync.c + test_tracing.c test_uninit.c test_unwinder.c test_utils.c diff --git a/external_imported/sentry-native/tests/unit/fuzz.c b/external_imported/sentry-native/tests/unit/fuzz.c index 1b79da7e5..b0de75e3e 100644 --- a/external_imported/sentry-native/tests/unit/fuzz.c +++ b/external_imported/sentry-native/tests/unit/fuzz.c @@ -24,8 +24,6 @@ afl-fuzz -i fuzzing-examples -o fuzzing-results -- fuzzing/sentry_fuzz_json @@ # define _CRT_SECURE_NO_WARNINGS #endif -#include "sentry.h" - #include #include diff --git a/external_imported/sentry-native/tests/unit/test_attachments.c b/external_imported/sentry-native/tests/unit/test_attachments.c index 4b3a6bbdd..bd4d2d065 100644 --- a/external_imported/sentry-native/tests/unit/test_attachments.c +++ b/external_imported/sentry-native/tests/unit/test_attachments.c @@ -2,7 +2,6 @@ #include "sentry_path.h" #include "sentry_string.h" #include "sentry_testsupport.h" -#include typedef struct { uint64_t called; diff --git a/external_imported/sentry-native/tests/unit/test_basic.c b/external_imported/sentry-native/tests/unit/test_basic.c index 342ef0037..ca257f59d 100644 --- a/external_imported/sentry-native/tests/unit/test_basic.c +++ b/external_imported/sentry-native/tests/unit/test_basic.c @@ -1,6 +1,7 @@ #include "sentry_core.h" +#include "sentry_database.h" #include "sentry_testsupport.h" -#include +#include "sentry_utils.h" static void send_envelope_test_basic(const sentry_envelope_t *envelope, void *data) @@ -97,3 +98,70 @@ SENTRY_TEST(sampling_before_send) // well, its random after all TEST_CHECK(called_beforesend > 50 && called_beforesend < 100); } + +SENTRY_TEST(crash_marker) +{ + sentry_options_t *options = sentry_options_new(); + + // clear returns true, regardless if the file exists + TEST_CHECK(sentry__clear_crash_marker(options)); + + // write should normally be true, even when called multiple times + TEST_CHECK(!sentry__has_crash_marker(options)); + TEST_CHECK(sentry__write_crash_marker(options)); + TEST_CHECK(sentry__has_crash_marker(options)); + TEST_CHECK(sentry__write_crash_marker(options)); + TEST_CHECK(sentry__has_crash_marker(options)); + + TEST_CHECK(sentry__clear_crash_marker(options)); + TEST_CHECK(!sentry__has_crash_marker(options)); + TEST_CHECK(sentry__clear_crash_marker(options)); + + sentry_options_free(options); +} + +SENTRY_TEST(crashed_last_run) +{ + // fails before init() is called + TEST_CHECK_INT_EQUAL(sentry_clear_crashed_last_run(), 1); + + // clear any leftover from previous test runs + sentry_options_t *options = sentry_options_new(); + TEST_CHECK(sentry__clear_crash_marker(options)); + sentry_options_free(options); + + // -1 before sentry_init() + TEST_CHECK_INT_EQUAL(sentry_get_crashed_last_run(), -1); + + options = sentry_options_new(); + sentry_options_set_dsn(options, "https://foo@sentry.invalid/42"); + TEST_CHECK_INT_EQUAL(sentry_init(options), 0); + sentry_close(); + + TEST_CHECK_INT_EQUAL(sentry_get_crashed_last_run(), 0); + + options = sentry_options_new(); + sentry_options_set_dsn(options, "https://foo@sentry.invalid/42"); + + // simulate a crash + TEST_CHECK(sentry__write_crash_marker(options)); + + TEST_CHECK_INT_EQUAL(sentry_init(options), 0); + + TEST_CHECK_INT_EQUAL(sentry_get_crashed_last_run(), 1); + + // clear the status and re-init + TEST_CHECK_INT_EQUAL(sentry_clear_crashed_last_run(), 0); + + sentry_close(); + + // no change yet before sentry_init() is called + TEST_CHECK_INT_EQUAL(sentry_get_crashed_last_run(), 1); + + options = sentry_options_new(); + sentry_options_set_dsn(options, "https://foo@sentry.invalid/42"); + TEST_CHECK_INT_EQUAL(sentry_init(options), 0); + sentry_close(); + + TEST_CHECK_INT_EQUAL(sentry_get_crashed_last_run(), 0); +} diff --git a/external_imported/sentry-native/tests/unit/test_concurrency.c b/external_imported/sentry-native/tests/unit/test_concurrency.c index e2c1446bf..946081dba 100644 --- a/external_imported/sentry-native/tests/unit/test_concurrency.c +++ b/external_imported/sentry-native/tests/unit/test_concurrency.c @@ -1,6 +1,6 @@ #include "sentry_core.h" #include "sentry_testsupport.h" -#include + #include static void @@ -95,3 +95,30 @@ SENTRY_TEST(concurrent_init) TEST_CHECK(called >= THREADS_NUM * 1); TEST_CHECK(called <= THREADS_NUM * 3); } + +SENTRY_THREAD_FN +thread_breadcrumb(void *UNUSED(arg)) +{ + sentry_value_t breadcrumb = sentry_value_new_breadcrumb("foo", "bar"); + sentry_add_breadcrumb(breadcrumb); + + return 0; +} + +SENTRY_TEST(concurrent_uninit) +{ + sentry_value_t user = sentry_value_new_object(); + sentry_set_user(user); + + sentry_threadid_t thread; + sentry__thread_init(&thread); + sentry__thread_spawn(&thread, &thread_breadcrumb, NULL); + + sentry_value_t breadcrumb = sentry_value_new_breadcrumb("foo", "bar"); + sentry_add_breadcrumb(breadcrumb); + + sentry__thread_join(thread); + sentry__thread_free(&thread); + + sentry_close(); +} diff --git a/external_imported/sentry-native/tests/unit/test_consent.c b/external_imported/sentry-native/tests/unit/test_consent.c index 2d1845fb2..f26af345b 100644 --- a/external_imported/sentry-native/tests/unit/test_consent.c +++ b/external_imported/sentry-native/tests/unit/test_consent.c @@ -1,6 +1,5 @@ #include "sentry_path.h" #include "sentry_testsupport.h" -#include static void init_consenting_sentry(void) diff --git a/external_imported/sentry-native/tests/unit/test_envelopes.c b/external_imported/sentry-native/tests/unit/test_envelopes.c index a579afa3e..2e6128a9c 100644 --- a/external_imported/sentry-native/tests/unit/test_envelopes.c +++ b/external_imported/sentry-native/tests/unit/test_envelopes.c @@ -3,7 +3,6 @@ #include "sentry_transport.h" #include "sentry_utils.h" #include "sentry_value.h" -#include SENTRY_TEST(basic_http_request_preparation_for_event) { @@ -32,6 +31,38 @@ SENTRY_TEST(basic_http_request_preparation_for_event) sentry__dsn_decref(dsn); } +SENTRY_TEST(basic_http_request_preparation_for_transaction) +{ + sentry_dsn_t *dsn = sentry__dsn_new("https://foo@sentry.invalid/42"); + + sentry_uuid_t event_id + = sentry_uuid_from_string("c993afb6-b4ac-48a6-b61b-2558e601d65d"); + sentry_envelope_t *envelope = sentry__envelope_new(); + sentry_value_t transaction = sentry_value_new_object(); + sentry_value_set_by_key( + transaction, "event_id", sentry__value_new_uuid(&event_id)); + sentry_value_set_by_key( + transaction, "type", sentry_value_new_string("transaction")); + sentry__envelope_add_transaction(envelope, transaction); + + sentry_prepared_http_request_t *req + = sentry__prepare_http_request(envelope, dsn, NULL); + TEST_CHECK_STRING_EQUAL(req->method, "POST"); + TEST_CHECK_STRING_EQUAL( + req->url, "https://sentry.invalid:443/api/42/envelope/"); + TEST_CHECK_STRING_EQUAL(req->body, + "{\"event_id\":\"c993afb6-b4ac-48a6-b61b-2558e601d65d\",\"sent_at\":" + "\"2021-12-16T05:53:59.343Z\"}\n" + "{\"type\":\"transaction\",\"length\":72}\n" + "{\"event_id\":\"c993afb6-b4ac-48a6-b61b-2558e601d65d\",\"type\":" + "\"transaction\"}"); + + sentry__prepared_http_request_free(req); + sentry_envelope_free(envelope); + + sentry__dsn_decref(dsn); +} + SENTRY_TEST(basic_http_request_preparation_for_event_with_attachment) { sentry_dsn_t *dsn = sentry__dsn_new("https://foo@sentry.invalid/42"); diff --git a/external_imported/sentry-native/tests/unit/test_failures.c b/external_imported/sentry-native/tests/unit/test_failures.c index 96483b316..4d8595715 100644 --- a/external_imported/sentry-native/tests/unit/test_failures.c +++ b/external_imported/sentry-native/tests/unit/test_failures.c @@ -1,6 +1,5 @@ #include "sentry_core.h" #include "sentry_testsupport.h" -#include static int transport_startup_fail( diff --git a/external_imported/sentry-native/tests/unit/test_fuzzfailures.c b/external_imported/sentry-native/tests/unit/test_fuzzfailures.c index 109873785..38b4b237d 100644 --- a/external_imported/sentry-native/tests/unit/test_fuzzfailures.c +++ b/external_imported/sentry-native/tests/unit/test_fuzzfailures.c @@ -2,7 +2,7 @@ #include "sentry_path.h" #include "sentry_testsupport.h" #include "sentry_value.h" -#include + #include static void diff --git a/external_imported/sentry-native/tests/unit/test_logger.c b/external_imported/sentry-native/tests/unit/test_logger.c index 18948f2bf..caec1055e 100644 --- a/external_imported/sentry-native/tests/unit/test_logger.c +++ b/external_imported/sentry-native/tests/unit/test_logger.c @@ -1,7 +1,6 @@ #include "sentry_core.h" #include "sentry_logger.h" #include "sentry_testsupport.h" -#include typedef struct { uint64_t called; diff --git a/external_imported/sentry-native/tests/unit/test_modulefinder.c b/external_imported/sentry-native/tests/unit/test_modulefinder.c index 90fc31c06..38440406b 100644 --- a/external_imported/sentry-native/tests/unit/test_modulefinder.c +++ b/external_imported/sentry-native/tests/unit/test_modulefinder.c @@ -1,6 +1,5 @@ #include "sentry_path.h" #include "sentry_testsupport.h" -#include #ifdef SENTRY_PLATFORM_LINUX # include "modulefinder/sentry_modulefinder_linux.h" diff --git a/external_imported/sentry-native/tests/unit/test_mpack.c b/external_imported/sentry-native/tests/unit/test_mpack.c index 391a3d892..28b5d3f87 100644 --- a/external_imported/sentry-native/tests/unit/test_mpack.c +++ b/external_imported/sentry-native/tests/unit/test_mpack.c @@ -1,7 +1,6 @@ #include "sentry_path.h" #include "sentry_scope.h" #include "sentry_testsupport.h" -#include SENTRY_TEST(mpack_removed_tags) { diff --git a/external_imported/sentry-native/tests/unit/test_path.c b/external_imported/sentry-native/tests/unit/test_path.c index c165b47b8..3f25d77a5 100644 --- a/external_imported/sentry-native/tests/unit/test_path.c +++ b/external_imported/sentry-native/tests/unit/test_path.c @@ -1,7 +1,6 @@ #include "sentry_path.h" #include "sentry_string.h" #include "sentry_testsupport.h" -#include SENTRY_TEST(recursive_paths) { diff --git a/external_imported/sentry-native/tests/unit/test_ratelimiter.c b/external_imported/sentry-native/tests/unit/test_ratelimiter.c index c3d596e3c..26c42afe8 100644 --- a/external_imported/sentry-native/tests/unit/test_ratelimiter.c +++ b/external_imported/sentry-native/tests/unit/test_ratelimiter.c @@ -1,7 +1,6 @@ #include "sentry_ratelimiter.h" #include "sentry_testsupport.h" #include "sentry_utils.h" -#include SENTRY_TEST(rate_limit_parsing) { diff --git a/external_imported/sentry-native/tests/unit/test_sampling.c b/external_imported/sentry-native/tests/unit/test_sampling.c new file mode 100644 index 000000000..749c5515f --- /dev/null +++ b/external_imported/sentry-native/tests/unit/test_sampling.c @@ -0,0 +1,37 @@ +#include "sentry_testsupport.h" +#include "sentry_tracing.h" + +SENTRY_TEST(sampling_decision) +{ + TEST_CHECK(sentry__roll_dice(0.0) == false); + TEST_CHECK(sentry__roll_dice(1.0)); + TEST_CHECK(sentry__roll_dice(2.0)); +} + +SENTRY_TEST(sampling_transaction) +{ + sentry_options_t *options = sentry_options_new(); + TEST_CHECK(sentry_init(options) == 0); + + sentry_transaction_context_t *tx_cxt + = sentry_transaction_context_new("honk", NULL); + + sentry_transaction_context_set_sampled(tx_cxt, 0); + TEST_CHECK(sentry__should_send_transaction(tx_cxt->inner) == false); + + sentry_transaction_context_set_sampled(tx_cxt, 1); + TEST_CHECK(sentry__should_send_transaction(tx_cxt->inner)); + + // fall back to default in sentry options (0.0) if sampled isn't there + sentry_transaction_context_remove_sampled(tx_cxt); + TEST_CHECK(sentry__should_send_transaction(tx_cxt->inner) == false); + + options = sentry_options_new(); + sentry_options_set_traces_sample_rate(options, 1.0); + TEST_CHECK(sentry_init(options) == 0); + + TEST_CHECK(sentry__should_send_transaction(tx_cxt->inner)); + + sentry__transaction_context_free(tx_cxt); + sentry_close(); +} diff --git a/external_imported/sentry-native/tests/unit/test_session.c b/external_imported/sentry-native/tests/unit/test_session.c index 5864526f1..3fa4d9766 100644 --- a/external_imported/sentry-native/tests/unit/test_session.c +++ b/external_imported/sentry-native/tests/unit/test_session.c @@ -2,7 +2,6 @@ #include "sentry_session.h" #include "sentry_testsupport.h" #include "sentry_value.h" -#include static void send_envelope(const sentry_envelope_t *envelope, void *data) diff --git a/external_imported/sentry-native/tests/unit/test_slice.c b/external_imported/sentry-native/tests/unit/test_slice.c index af149340d..5052929dc 100644 --- a/external_imported/sentry-native/tests/unit/test_slice.c +++ b/external_imported/sentry-native/tests/unit/test_slice.c @@ -1,6 +1,5 @@ #include "sentry_slice.h" #include "sentry_testsupport.h" -#include SENTRY_TEST(slice) { diff --git a/external_imported/sentry-native/tests/unit/test_symbolizer.c b/external_imported/sentry-native/tests/unit/test_symbolizer.c index 9c18fea7c..0a2f42b45 100644 --- a/external_imported/sentry-native/tests/unit/test_symbolizer.c +++ b/external_imported/sentry-native/tests/unit/test_symbolizer.c @@ -1,6 +1,5 @@ #include "sentry_symbolizer.h" #include "sentry_testsupport.h" -#include TEST_VISIBLE void test_function(void) diff --git a/external_imported/sentry-native/tests/unit/test_sync.c b/external_imported/sentry-native/tests/unit/test_sync.c index a90a86206..aba8e8290 100644 --- a/external_imported/sentry-native/tests/unit/test_sync.c +++ b/external_imported/sentry-native/tests/unit/test_sync.c @@ -131,3 +131,23 @@ SENTRY_TEST(task_queue) // was instructed to shut down TEST_CHECK(executed_after_shutdown); } + +SENTRY_TEST(bgworker_flush) +{ + sentry_bgworker_t *bgw = sentry__bgworker_new(NULL, NULL); + sentry__bgworker_submit(bgw, sleep_task, NULL, NULL); + + sentry__bgworker_start(bgw); + + // first flush times out + int flush = sentry__bgworker_flush(bgw, 500); + TEST_CHECK_INT_EQUAL(flush, 1); + + // second flush succeeds + flush = sentry__bgworker_flush(bgw, 1000); + TEST_CHECK_INT_EQUAL(flush, 0); + + int shutdown = sentry__bgworker_shutdown(bgw, 500); + TEST_CHECK_INT_EQUAL(shutdown, 0); + sentry__bgworker_decref(bgw); +} diff --git a/external_imported/sentry-native/tests/unit/test_tracing.c b/external_imported/sentry-native/tests/unit/test_tracing.c new file mode 100644 index 000000000..052cf7795 --- /dev/null +++ b/external_imported/sentry-native/tests/unit/test_tracing.c @@ -0,0 +1,811 @@ +#include "sentry_testsupport.h" + +#include "sentry_scope.h" +#include "sentry_string.h" +#include "sentry_tracing.h" +#include "sentry_uuid.h" + +#define IS_NULL(Src, Field) \ + sentry_value_is_null(sentry_value_get_by_key(Src, Field)) +#define CHECK_STRING_PROPERTY(Src, Field, Expected) \ + TEST_CHECK_STRING_EQUAL( \ + sentry_value_as_string(sentry_value_get_by_key(Src, Field)), Expected) + +SENTRY_TEST(basic_tracing_context) +{ + sentry_transaction_t *opaque_tx + = sentry__transaction_new(sentry_value_new_null()); + TEST_CHECK(!opaque_tx); + + sentry_value_t tx = sentry_value_new_object(); + opaque_tx = sentry__transaction_new(sentry__value_clone(tx)); + sentry_value_set_by_key(tx, "op", sentry_value_new_string("honk.beep")); + TEST_CHECK(sentry_value_is_null( + sentry__value_get_trace_context(opaque_tx->inner))); + + sentry_uuid_t trace_id = sentry_uuid_new_v4(); + sentry_value_set_by_key( + tx, "trace_id", sentry__value_new_internal_uuid(&trace_id)); + sentry__transaction_decref(opaque_tx); + opaque_tx = sentry__transaction_new(sentry__value_clone(tx)); + TEST_CHECK(sentry_value_is_null( + sentry__value_get_trace_context(opaque_tx->inner))); + + sentry_uuid_t span_id = sentry_uuid_new_v4(); + sentry_value_set_by_key( + tx, "span_id", sentry__value_new_span_uuid(&span_id)); + sentry__transaction_decref(opaque_tx); + opaque_tx = sentry__transaction_new(sentry__value_clone(tx)); + + sentry_value_t trace_context + = sentry__value_get_trace_context(opaque_tx->inner); + TEST_CHECK(!sentry_value_is_null(trace_context)); + TEST_CHECK(!IS_NULL(trace_context, "trace_id")); + TEST_CHECK(!IS_NULL(trace_context, "span_id")); + + CHECK_STRING_PROPERTY(trace_context, "op", "honk.beep"); + + sentry_value_decref(trace_context); + sentry_value_decref(tx); + sentry__transaction_decref(opaque_tx); +} + +SENTRY_TEST(basic_transaction) +{ + sentry_transaction_context_t *opaque_tx_cxt + = sentry_transaction_context_new(NULL, NULL); + sentry_value_t tx_cxt; + if (opaque_tx_cxt != NULL) { + tx_cxt = opaque_tx_cxt->inner; + TEST_CHECK(!sentry_value_is_null(tx_cxt)); + CHECK_STRING_PROPERTY(tx_cxt, "transaction", ""); + CHECK_STRING_PROPERTY(tx_cxt, "op", ""); + TEST_CHECK(!IS_NULL(tx_cxt, "trace_id")); + TEST_CHECK(!IS_NULL(tx_cxt, "span_id")); + } else { + TEST_CHECK(opaque_tx_cxt != NULL); + } + + sentry__transaction_context_free(opaque_tx_cxt); + + opaque_tx_cxt = sentry_transaction_context_new("", ""); + if (opaque_tx_cxt != NULL) { + tx_cxt = opaque_tx_cxt->inner; + TEST_CHECK(!sentry_value_is_null(tx_cxt)); + CHECK_STRING_PROPERTY(tx_cxt, "transaction", ""); + CHECK_STRING_PROPERTY(tx_cxt, "op", ""); + TEST_CHECK(!IS_NULL(tx_cxt, "trace_id")); + TEST_CHECK(!IS_NULL(tx_cxt, "span_id")); + } else { + TEST_CHECK(opaque_tx_cxt != NULL); + } + + sentry__transaction_context_free(opaque_tx_cxt); + + opaque_tx_cxt = sentry_transaction_context_new("honk.beep", "beepbeep"); + if (opaque_tx_cxt != NULL) { + tx_cxt = opaque_tx_cxt->inner; + TEST_CHECK(!sentry_value_is_null(tx_cxt)); + CHECK_STRING_PROPERTY(tx_cxt, "transaction", "honk.beep"); + CHECK_STRING_PROPERTY(tx_cxt, "op", "beepbeep"); + TEST_CHECK(!IS_NULL(tx_cxt, "trace_id")); + TEST_CHECK(!IS_NULL(tx_cxt, "span_id")); + + sentry_transaction_context_set_name(opaque_tx_cxt, ""); + CHECK_STRING_PROPERTY(tx_cxt, "transaction", ""); + + sentry_transaction_context_set_operation(opaque_tx_cxt, ""); + CHECK_STRING_PROPERTY(tx_cxt, "op", ""); + + sentry_transaction_context_set_sampled(opaque_tx_cxt, 1); + TEST_CHECK( + sentry_value_is_true(sentry_value_get_by_key(tx_cxt, "sampled")) + == 1); + } else { + TEST_CHECK(opaque_tx_cxt != NULL); + } + + sentry__transaction_context_free(opaque_tx_cxt); +} + +static void +check_backfilled_name(sentry_envelope_t *envelope, void *data) +{ + uint64_t *called = data; + *called += 1; + + sentry_value_t tx = sentry_envelope_get_transaction(envelope); + TEST_CHECK(!sentry_value_is_null(tx)); + CHECK_STRING_PROPERTY(tx, "transaction", ""); + + sentry_envelope_free(envelope); +} + +SENTRY_TEST(transaction_name_backfill_on_finish) +{ + uint64_t called = 0; + + sentry_options_t *options = sentry_options_new(); + sentry_options_set_dsn(options, "https://foo@sentry.invalid/42"); + + sentry_transport_t *transport = sentry_transport_new(check_backfilled_name); + sentry_transport_set_state(transport, &called); + sentry_options_set_transport(options, transport); + + sentry_options_set_traces_sample_rate(options, 1.0); + sentry_init(options); + + sentry_transaction_context_t *tx_cxt + = sentry_transaction_context_new(NULL, NULL); + sentry_transaction_t *tx + = sentry_transaction_start(tx_cxt, sentry_value_new_null()); + sentry_uuid_t event_id = sentry_transaction_finish(tx); + TEST_CHECK(!sentry_uuid_is_nil(&event_id)); + + tx_cxt = sentry_transaction_context_new("", ""); + tx = sentry_transaction_start(tx_cxt, sentry_value_new_null()); + event_id = sentry_transaction_finish(tx); + TEST_CHECK(!sentry_uuid_is_nil(&event_id)); + + sentry_close(); + TEST_CHECK_INT_EQUAL(called, 2); +} + +static void +send_transaction_envelope_test_basic(sentry_envelope_t *envelope, void *data) +{ + uint64_t *called = data; + *called += 1; + + sentry_value_t tx = sentry_envelope_get_transaction(envelope); + TEST_CHECK(!sentry_value_is_null(tx)); + CHECK_STRING_PROPERTY( + tx, "event_id", "4c035723-8638-4c3a-923f-2ab9d08b4018"); + + if (*called != 1) { + CHECK_STRING_PROPERTY(tx, "type", "transaction"); + CHECK_STRING_PROPERTY(tx, "transaction", "honk"); + } + + sentry_envelope_free(envelope); +} + +SENTRY_TEST(basic_function_transport_transaction) +{ + uint64_t called = 0; + + sentry_options_t *options = sentry_options_new(); + sentry_options_set_dsn(options, "https://foo@sentry.invalid/42"); + + sentry_transport_t *transport + = sentry_transport_new(send_transaction_envelope_test_basic); + sentry_transport_set_state(transport, &called); + sentry_options_set_transport(options, transport); + + sentry_options_set_traces_sample_rate(options, 1.0); + sentry_options_set_require_user_consent(options, true); + sentry_init(options); + + sentry_transaction_context_t *tx_cxt = sentry_transaction_context_new( + "How could you", "Don't capture this."); + sentry_transaction_t *tx + = sentry_transaction_start(tx_cxt, sentry_value_new_null()); + sentry_uuid_t event_id = sentry_transaction_finish(tx); + // TODO: `sentry_capture_event` acts as if the event was sent if user + // consent was not given + TEST_CHECK(!sentry_uuid_is_nil(&event_id)); + sentry_user_consent_give(); + + tx_cxt = sentry_transaction_context_new("honk", "beep"); + tx = sentry_transaction_start(tx_cxt, sentry_value_new_null()); + event_id = sentry_transaction_finish(tx); + TEST_CHECK(!sentry_uuid_is_nil(&event_id)); + + sentry_user_consent_revoke(); + tx_cxt = sentry_transaction_context_new( + "How could you again", "Don't capture this either."); + tx = sentry_transaction_start(tx_cxt, sentry_value_new_null()); + event_id = sentry_transaction_finish(tx); + // TODO: `sentry_capture_event` acts as if the event was sent if user + // consent was not given + TEST_CHECK(!sentry_uuid_is_nil(&event_id)); + + sentry_close(); + + TEST_CHECK_INT_EQUAL(called, 1); +} + +SENTRY_TEST(transport_sampling_transactions) +{ + uint64_t called_transport = 0; + + sentry_options_t *options = sentry_options_new(); + sentry_options_set_dsn(options, "https://foo@sentry.invalid/42"); + + sentry_transport_t *transport + = sentry_transport_new(send_transaction_envelope_test_basic); + sentry_transport_set_state(transport, &called_transport); + sentry_options_set_transport(options, transport); + + sentry_options_set_traces_sample_rate(options, 0.75); + sentry_init(options); + + uint64_t sent_transactions = 0; + for (int i = 0; i < 100; i++) { + sentry_transaction_context_t *tx_cxt + = sentry_transaction_context_new("honk", "beep"); + sentry_transaction_t *tx + = sentry_transaction_start(tx_cxt, sentry_value_new_null()); + sentry_uuid_t event_id = sentry_transaction_finish(tx); + if (!sentry_uuid_is_nil(&event_id)) { + sent_transactions += 1; + } + } + + sentry_close(); + + // exact value is nondeterministic because of rng + TEST_CHECK(called_transport > 50 && called_transport < 100); + TEST_CHECK(called_transport == sent_transactions); +} + +static sentry_value_t +before_send(sentry_value_t event, void *UNUSED(hint), void *data) +{ + uint64_t *called = data; + *called += 1; + + sentry_value_decref(event); + return sentry_value_new_null(); +} + +SENTRY_TEST(transactions_skip_before_send) +{ + uint64_t called_beforesend = 0; + uint64_t called_transport = 0; + + sentry_options_t *options = sentry_options_new(); + sentry_options_set_dsn(options, "https://foo@sentry.invalid/42"); + + sentry_transport_t *transport + = sentry_transport_new(send_transaction_envelope_test_basic); + sentry_transport_set_state(transport, &called_transport); + sentry_options_set_transport(options, transport); + + sentry_options_set_traces_sample_rate(options, 1.0); + sentry_options_set_before_send(options, before_send, &called_beforesend); + sentry_init(options); + + sentry_transaction_context_t *tx_cxt + = sentry_transaction_context_new("honk", "beep"); + sentry_transaction_t *tx + = sentry_transaction_start(tx_cxt, sentry_value_new_null()); + sentry_uuid_t event_id = sentry_transaction_finish(tx); + TEST_CHECK(!sentry_uuid_is_nil(&event_id)); + + sentry_close(); + + TEST_CHECK_INT_EQUAL(called_transport, 1); + TEST_CHECK_INT_EQUAL(called_beforesend, 0); +} + +static void +before_transport(sentry_envelope_t *envelope, void *data) +{ + uint64_t *called = data; + *called += 1; + + sentry_envelope_free(envelope); +} + +SENTRY_TEST(multiple_transactions) +{ + uint64_t called_transport = 0; + + sentry_options_t *options = sentry_options_new(); + sentry_options_set_dsn(options, "https://foo@sentry.invalid/42"); + + sentry_transport_t *transport = sentry_transport_new(before_transport); + sentry_transport_set_state(transport, &called_transport); + sentry_options_set_transport(options, transport); + + sentry_options_set_traces_sample_rate(options, 1.0); + sentry_init(options); + + sentry_transaction_context_t *tx_cxt + = sentry_transaction_context_new("wow!", NULL); + sentry_transaction_t *tx + = sentry_transaction_start(tx_cxt, sentry_value_new_null()); + sentry_set_transaction_object(tx); + + sentry_value_t scope_tx = sentry__scope_get_span_or_transaction(); + CHECK_STRING_PROPERTY(scope_tx, "transaction", "wow!"); + + sentry_uuid_t event_id = sentry_transaction_finish(tx); + scope_tx = sentry__scope_get_span_or_transaction(); + TEST_CHECK(sentry_value_is_null(scope_tx)); + TEST_CHECK(!sentry_uuid_is_nil(&event_id)); + + // Set transaction on scope twice, back-to-back without finishing the first + // one + tx_cxt = sentry_transaction_context_new("whoa!", NULL); + tx = sentry_transaction_start(tx_cxt, sentry_value_new_null()); + sentry_set_transaction_object(tx); + sentry__transaction_decref(tx); + tx_cxt = sentry_transaction_context_new("wowee!", NULL); + tx = sentry_transaction_start(tx_cxt, sentry_value_new_null()); + sentry_set_transaction_object(tx); + scope_tx = sentry__scope_get_span_or_transaction(); + CHECK_STRING_PROPERTY(scope_tx, "transaction", "wowee!"); + event_id = sentry_transaction_finish(tx); + TEST_CHECK(!sentry_uuid_is_nil(&event_id)); + + sentry_close(); + + TEST_CHECK_INT_EQUAL(called_transport, 2); +} + +SENTRY_TEST(basic_spans) +{ + sentry_options_t *options = sentry_options_new(); + sentry_options_set_traces_sample_rate(options, 1.0); + sentry_init(options); + + // Starting a child with no active transaction should fail + sentry_span_t *parentless_child + = sentry_transaction_start_child(NULL, NULL, NULL); + TEST_CHECK(!parentless_child); + + sentry_transaction_context_t *opaque_tx_cxt + = sentry_transaction_context_new("wow!", NULL); + sentry_transaction_t *opaque_tx + = sentry_transaction_start(opaque_tx_cxt, sentry_value_new_null()); + sentry_value_t tx = opaque_tx->inner; + + sentry_span_t *opaque_child + = sentry_transaction_start_child(opaque_tx, "honk", "goose"); + sentry_value_t child = opaque_child->inner; + TEST_CHECK(!sentry_value_is_null(child)); + + // Peek into the transaction's span list and make sure everything is + // good + const char *trace_id + = sentry_value_as_string(sentry_value_get_by_key(tx, "trace_id")); + const char *parent_span_id + = sentry_value_as_string(sentry_value_get_by_key(tx, "span_id")); + // Don't track the span yet + TEST_CHECK(IS_NULL(tx, "spans")); + + // Sanity check that child isn't finished yet + TEST_CHECK(IS_NULL(child, "timestamp")); + // Now finishing + sentry_span_finish(opaque_child); + + TEST_CHECK(!IS_NULL(tx, "spans")); + sentry_value_t spans = sentry_value_get_by_key(tx, "spans"); + TEST_CHECK_INT_EQUAL(sentry_value_get_length(spans), 1); + + sentry_value_t stored_child = sentry_value_get_by_index(spans, 0); + // Make sure the span inherited everything correctly + CHECK_STRING_PROPERTY(stored_child, "trace_id", trace_id); + CHECK_STRING_PROPERTY(stored_child, "parent_span_id", parent_span_id); + CHECK_STRING_PROPERTY(stored_child, "op", "honk"); + CHECK_STRING_PROPERTY(stored_child, "description", "goose"); + // Should be finished + TEST_CHECK(!IS_NULL(stored_child, "timestamp")); + + sentry__transaction_decref(opaque_tx); + + sentry_close(); +} + +SENTRY_TEST(spans_on_scope) +{ + sentry_options_t *options = sentry_options_new(); + sentry_options_set_traces_sample_rate(options, 1.0); + sentry_init(options); + + sentry_transaction_context_t *opaque_tx_cxt + = sentry_transaction_context_new("wow!", NULL); + sentry_transaction_t *opaque_tx + = sentry_transaction_start(opaque_tx_cxt, sentry_value_new_null()); + sentry_set_transaction_object(opaque_tx); + + sentry_span_t *opaque_child + = sentry_transaction_start_child(opaque_tx, "honk", "goose"); + sentry_value_t child = opaque_child->inner; + TEST_CHECK(!sentry_value_is_null(child)); + + // Peek into the transaction's span list and make sure everything is + // good + sentry_value_t scope_tx = sentry__scope_get_span_or_transaction(); + const char *trace_id + = sentry_value_as_string(sentry_value_get_by_key(scope_tx, "trace_id")); + const char *parent_span_id + = sentry_value_as_string(sentry_value_get_by_key(scope_tx, "span_id")); + // Don't track the span yet + TEST_CHECK(IS_NULL(scope_tx, "spans")); + + // Sanity check that child isn't finished yet + TEST_CHECK(IS_NULL(child, "timestamp")); + + sentry_span_finish(opaque_child); + + scope_tx = sentry__scope_get_span_or_transaction(); + TEST_CHECK(!IS_NULL(scope_tx, "spans")); + sentry_value_t spans = sentry_value_get_by_key(scope_tx, "spans"); + TEST_CHECK_INT_EQUAL(sentry_value_get_length(spans), 1); + + sentry_value_t stored_child = sentry_value_get_by_index(spans, 0); + // Make sure the span inherited everything correctly + CHECK_STRING_PROPERTY(stored_child, "trace_id", trace_id); + CHECK_STRING_PROPERTY(stored_child, "parent_span_id", parent_span_id); + CHECK_STRING_PROPERTY(stored_child, "op", "honk"); + CHECK_STRING_PROPERTY(stored_child, "description", "goose"); + // Should be finished + TEST_CHECK(!IS_NULL(stored_child, "timestamp")); + + sentry__transaction_decref(opaque_tx); + + sentry_close(); +} + +SENTRY_TEST(child_spans) +{ + sentry_options_t *options = sentry_options_new(); + sentry_options_set_traces_sample_rate(options, 1.0); + sentry_options_set_max_spans(options, 3); + sentry_init(options); + + sentry_transaction_context_t *opaque_tx_cxt + = sentry_transaction_context_new("wow!", NULL); + sentry_transaction_t *opaque_tx + = sentry_transaction_start(opaque_tx_cxt, sentry_value_new_null()); + sentry_value_t tx = opaque_tx->inner; + + sentry_span_t *opaque_child + = sentry_transaction_start_child(opaque_tx, "honk", "goose"); + sentry_value_t child = opaque_child->inner; + TEST_CHECK(!sentry_value_is_null(child)); + // Shouldn't be added to spans yet + TEST_CHECK(IS_NULL(tx, "spans")); + + sentry_span_t *opaque_grandchild + = sentry_span_start_child(opaque_child, "beep", "car"); + sentry_value_t grandchild = opaque_grandchild->inner; + TEST_CHECK(!sentry_value_is_null(grandchild)); + // Shouldn't be added to spans yet + TEST_CHECK(IS_NULL(tx, "spans")); + + sentry_span_finish(opaque_grandchild); + + // Make sure everything on the transaction looks good, check grandchild + const char *trace_id + = sentry_value_as_string(sentry_value_get_by_key(tx, "trace_id")); + const char *parent_span_id + = sentry_value_as_string(sentry_value_get_by_key(child, "span_id")); + + TEST_CHECK(!IS_NULL(tx, "spans")); + sentry_value_t spans = sentry_value_get_by_key(tx, "spans"); + TEST_CHECK_INT_EQUAL(sentry_value_get_length(spans), 1); + + sentry_value_t stored_grandchild = sentry_value_get_by_index(spans, 0); + CHECK_STRING_PROPERTY(stored_grandchild, "trace_id", trace_id); + CHECK_STRING_PROPERTY(stored_grandchild, "parent_span_id", parent_span_id); + CHECK_STRING_PROPERTY(stored_grandchild, "op", "beep"); + CHECK_STRING_PROPERTY(stored_grandchild, "description", "car"); + // Should be finished + TEST_CHECK(!IS_NULL(stored_grandchild, "timestamp")); + + sentry_span_finish(opaque_child); + spans = sentry_value_get_by_key(tx, "spans"); + TEST_CHECK_INT_EQUAL(sentry_value_get_length(spans), 2); + + sentry__transaction_decref(opaque_tx); + + sentry_close(); +} + +SENTRY_TEST(overflow_spans) +{ + sentry_options_t *options = sentry_options_new(); + sentry_options_set_traces_sample_rate(options, 1.0); + sentry_options_set_max_spans(options, 1); + sentry_init(options); + + sentry_transaction_context_t *opaque_tx_cxt + = sentry_transaction_context_new("wow!", NULL); + sentry_transaction_t *opaque_tx + = sentry_transaction_start(opaque_tx_cxt, sentry_value_new_null()); + sentry_value_t tx = opaque_tx->inner; + + sentry_span_t *opaque_child + = sentry_transaction_start_child(opaque_tx, "honk", "goose"); + sentry_value_t child = opaque_child->inner; + const char *child_span_id + = sentry_value_as_string(sentry_value_get_by_key(child, "span_id")); + + // Shouldn't be added to spans yet + TEST_CHECK(IS_NULL(tx, "spans")); + + sentry_span_t *opaque_drop_on_finish_child + = sentry_span_start_child(opaque_child, "beep", "car"); + sentry_value_t drop_on_finish_child = opaque_drop_on_finish_child->inner; + TEST_CHECK(!sentry_value_is_null(drop_on_finish_child)); + // Shouldn't be added to spans yet + TEST_CHECK(IS_NULL(tx, "spans")); + + sentry_span_finish(opaque_child); + + TEST_CHECK(!IS_NULL(tx, "spans")); + sentry_value_t spans = sentry_value_get_by_key(tx, "spans"); + TEST_CHECK_INT_EQUAL(sentry_value_get_length(spans), 1); + + sentry_value_t stored_child = sentry_value_get_by_index(spans, 0); + CHECK_STRING_PROPERTY(stored_child, "span_id", child_span_id); + + sentry_span_finish(opaque_drop_on_finish_child); + TEST_CHECK_INT_EQUAL(sentry_value_get_length(spans), 1); + + sentry_span_t *opaque_drop_on_start_child + = sentry_transaction_start_child(opaque_tx, "ring", "bicycle"); + TEST_CHECK(!opaque_drop_on_start_child); + TEST_CHECK_INT_EQUAL(sentry_value_get_length(spans), 1); + + sentry__transaction_decref(opaque_tx); + + sentry_close(); +} + +SENTRY_TEST(unsampled_spans) +{ + sentry_options_t *options = sentry_options_new(); + sentry_options_set_traces_sample_rate(options, 1.0); + sentry_init(options); + + sentry_transaction_context_t *opaque_tx_cxt + = sentry_transaction_context_new("noisemakers", NULL); + sentry_transaction_context_set_sampled(opaque_tx_cxt, 0); + sentry_transaction_t *opaque_tx + = sentry_transaction_start(opaque_tx_cxt, sentry_value_new_null()); + sentry_value_t tx = opaque_tx->inner; + TEST_CHECK(!sentry_value_is_true(sentry_value_get_by_key(tx, "sampled"))); + + // check that children and grandchildren inherit the sampling decision, + // i.e. it cascades 1+ levels down + sentry_span_t *opaque_child + = sentry_transaction_start_child(opaque_tx, "honk", "goose"); + sentry_value_t child = opaque_child->inner; + TEST_CHECK(!sentry_value_is_null(child)); + TEST_CHECK( + !sentry_value_is_true(sentry_value_get_by_key(child, "sampled"))); + + sentry_span_t *opaque_grandchild + = sentry_span_start_child(opaque_child, "beep", "car"); + sentry_value_t grandchild = opaque_grandchild->inner; + TEST_CHECK(!sentry_value_is_null(grandchild)); + TEST_CHECK( + !sentry_value_is_true(sentry_value_get_by_key(grandchild, "sampled"))); + + // finishing does not add (grand)children to the spans list + sentry_span_finish(opaque_grandchild); + TEST_CHECK( + 0 == sentry_value_get_length(sentry_value_get_by_key(tx, "spans"))); + + sentry_span_finish(opaque_child); + TEST_CHECK( + 0 == sentry_value_get_length(sentry_value_get_by_key(tx, "spans"))); + + // perform the same checks, but with the transaction on the scope + sentry_set_transaction_object(opaque_tx); + + opaque_child = sentry_transaction_start_child(opaque_tx, "toot", "boat"); + child = opaque_child->inner; + TEST_CHECK(!sentry_value_is_null(child)); + TEST_CHECK( + !sentry_value_is_true(sentry_value_get_by_key(child, "sampled"))); + + opaque_grandchild + = sentry_span_start_child(opaque_child, "vroom", "sportscar"); + grandchild = opaque_grandchild->inner; + TEST_CHECK(!sentry_value_is_null(grandchild)); + TEST_CHECK( + !sentry_value_is_true(sentry_value_get_by_key(grandchild, "sampled"))); + + sentry_span_finish(opaque_grandchild); + TEST_CHECK( + 0 == sentry_value_get_length(sentry_value_get_by_key(tx, "spans"))); + + sentry_span_finish(opaque_child); + TEST_CHECK( + 0 == sentry_value_get_length(sentry_value_get_by_key(tx, "spans"))); + + sentry_transaction_finish(opaque_tx); + + sentry_close(); +} + +static void +check_spans(sentry_envelope_t *envelope, void *data) +{ + uint64_t *called = data; + *called += 1; + + sentry_value_t transaction = sentry_envelope_get_transaction(envelope); + TEST_CHECK(!sentry_value_is_null(transaction)); + + size_t span_count = sentry_value_get_length( + sentry_value_get_by_key(transaction, "spans")); + TEST_CHECK_INT_EQUAL(span_count, 1); + + sentry_envelope_free(envelope); +} + +SENTRY_TEST(drop_unfinished_spans) +{ + uint64_t called_transport = 0; + + sentry_options_t *options = sentry_options_new(); + sentry_options_set_dsn(options, "https://foo@sentry.invalid/42"); + + sentry_transport_t *transport = sentry_transport_new(check_spans); + sentry_transport_set_state(transport, &called_transport); + sentry_options_set_transport(options, transport); + + sentry_options_set_traces_sample_rate(options, 1.0); + sentry_options_set_max_spans(options, 2); + sentry_init(options); + + sentry_transaction_context_t *opaque_tx_cxt + = sentry_transaction_context_new("wow!", NULL); + sentry_transaction_t *opaque_tx + = sentry_transaction_start(opaque_tx_cxt, sentry_value_new_null()); + sentry_value_t tx = opaque_tx->inner; + + sentry_span_t *opaque_child + = sentry_transaction_start_child(opaque_tx, "honk", "goose"); + sentry_value_t child = opaque_child->inner; + TEST_CHECK(!sentry_value_is_null(child)); + + sentry_span_t *opaque_grandchild + = sentry_span_start_child(opaque_child, "beep", "car"); + sentry_value_t grandchild = opaque_grandchild->inner; + TEST_CHECK(!sentry_value_is_null(grandchild)); + sentry_span_finish(opaque_grandchild); + + // spans are only added to transactions upon completion + TEST_CHECK_INT_EQUAL( + sentry_value_get_length(sentry_value_get_by_key(tx, "spans")), 1); + + sentry_uuid_t event_id = sentry_transaction_finish(opaque_tx); + TEST_CHECK(!sentry_uuid_is_nil(&event_id)); + + // check that nothing explodes if you do finish the lingering child + sentry_span_finish(opaque_child); + + sentry_close(); + + TEST_CHECK_INT_EQUAL(called_transport, 1); +} + +static void +forward_headers_to(const char *key, const char *value, void *userdata) +{ + sentry_transaction_context_t *tx_ctx + = (sentry_transaction_context_t *)userdata; + + sentry_transaction_context_update_from_header(tx_ctx, key, value); +} + +SENTRY_TEST(distributed_headers) +{ + sentry_options_t *options = sentry_options_new(); + sentry_options_set_dsn(options, "https://foo@sentry.invalid/42"); + + sentry_options_set_traces_sample_rate(options, 1.0); + sentry_options_set_max_spans(options, 2); + sentry_init(options); + + const char *trace_header + = "2674eb52d5874b13b560236d6c79ce8a-a0f9fdf04f1a63df-1"; + const char *not_expected_header + = "00000000000000000000000000000000-0000000000000000-1"; + const char *expected_trace_id = "2674eb52d5874b13b560236d6c79ce8a"; + + sentry_transaction_context_t *tx_ctx + = sentry_transaction_context_new("wow!", NULL); + + // check case insensitive headers, and bogus header names + sentry_transaction_context_update_from_header( + tx_ctx, "SeNtry-TrAcE", trace_header); + sentry_transaction_context_update_from_header( + tx_ctx, "nop", not_expected_header); + sentry_transaction_context_update_from_header( + tx_ctx, "sentry-trace-but-a-lot-longer", not_expected_header); + + sentry_transaction_t *tx + = sentry_transaction_start(tx_ctx, sentry_value_new_null()); + + const char *trace_id = sentry_value_as_string( + sentry_value_get_by_key(tx->inner, "trace_id")); + TEST_CHECK_STRING_EQUAL(trace_id, expected_trace_id); + + const char *span_id + = sentry_value_as_string(sentry_value_get_by_key(tx->inner, "span_id")); + TEST_CHECK(!sentry__string_eq(span_id, "")); + + // check transaction + tx_ctx = sentry_transaction_context_new("distributed!", NULL); + sentry_transaction_iter_headers(tx, forward_headers_to, (void *)tx_ctx); + sentry_transaction_t *dist_tx + = sentry_transaction_start(tx_ctx, sentry_value_new_null()); + + const char *dist_trace_id = sentry_value_as_string( + sentry_value_get_by_key(dist_tx->inner, "trace_id")); + TEST_CHECK_STRING_EQUAL(dist_trace_id, trace_id); + + const char *parent_span_id = sentry_value_as_string( + sentry_value_get_by_key(dist_tx->inner, "parent_span_id")); + TEST_CHECK_STRING_EQUAL(parent_span_id, span_id); + + sentry__transaction_decref(dist_tx); + + // check span + sentry_span_t *child = sentry_transaction_start_child(tx, "honk", "goose"); + + span_id = sentry_value_as_string( + sentry_value_get_by_key(child->inner, "span_id")); + TEST_CHECK(!sentry__string_eq(span_id, "")); + + tx_ctx = sentry_transaction_context_new("distributed!", NULL); + sentry_span_iter_headers(child, forward_headers_to, (void *)tx_ctx); + dist_tx = sentry_transaction_start(tx_ctx, sentry_value_new_null()); + + dist_trace_id = sentry_value_as_string( + sentry_value_get_by_key(dist_tx->inner, "trace_id")); + TEST_CHECK_STRING_EQUAL(dist_trace_id, trace_id); + + parent_span_id = sentry_value_as_string( + sentry_value_get_by_key(dist_tx->inner, "parent_span_id")); + TEST_CHECK_STRING_EQUAL(parent_span_id, span_id); + + TEST_CHECK(sentry_value_is_true( + sentry_value_get_by_key(dist_tx->inner, "sampled"))); + + sentry__transaction_decref(dist_tx); + sentry__span_free(child); + sentry__transaction_decref(tx); + + // check sampled flag + tx_ctx = sentry_transaction_context_new("wow!", NULL); + sentry_transaction_context_set_sampled(tx_ctx, 0); + tx = sentry_transaction_start(tx_ctx, sentry_value_new_null()); + + tx_ctx = sentry_transaction_context_new("distributed!", NULL); + sentry_transaction_iter_headers(tx, forward_headers_to, (void *)tx_ctx); + dist_tx = sentry_transaction_start(tx_ctx, sentry_value_new_null()); + + TEST_CHECK(!sentry_value_is_true( + sentry_value_get_by_key(dist_tx->inner, "sampled"))); + + child = sentry_transaction_start_child(tx, "honk", "goose"); + TEST_CHECK(!sentry_value_is_true( + sentry_value_get_by_key(child->inner, "sampled"))); + + tx_ctx = sentry_transaction_context_new("distributed from a child!", NULL); + sentry_span_iter_headers(child, forward_headers_to, (void *)tx_ctx); + sentry__transaction_decref(dist_tx); + dist_tx = sentry_transaction_start(tx_ctx, sentry_value_new_null()); + + TEST_CHECK(!sentry_value_is_true( + sentry_value_get_by_key(dist_tx->inner, "sampled"))); + + sentry__transaction_decref(dist_tx); + sentry__span_free(child); + sentry__transaction_decref(tx); + + sentry_close(); +} + +#undef IS_NULL +#undef CHECK_STRING_PROPERTY diff --git a/external_imported/sentry-native/tests/unit/test_uninit.c b/external_imported/sentry-native/tests/unit/test_uninit.c index f9a294c2b..bf9577ce7 100644 --- a/external_imported/sentry-native/tests/unit/test_uninit.c +++ b/external_imported/sentry-native/tests/unit/test_uninit.c @@ -1,5 +1,4 @@ #include "sentry_testsupport.h" -#include SENTRY_TEST(uninitialized) { @@ -25,7 +24,6 @@ SENTRY_TEST(uninitialized) sentry_set_fingerprint("foo", "bar", NULL); sentry_remove_fingerprint(); sentry_set_transaction("foo"); - sentry_remove_transaction(); sentry_set_level(SENTRY_LEVEL_DEBUG); sentry_start_session(); sentry_end_session(); diff --git a/external_imported/sentry-native/tests/unit/test_unwinder.c b/external_imported/sentry-native/tests/unit/test_unwinder.c index a5982ff7c..b3ac88e0e 100644 --- a/external_imported/sentry-native/tests/unit/test_unwinder.c +++ b/external_imported/sentry-native/tests/unit/test_unwinder.c @@ -1,6 +1,5 @@ #include "sentry_symbolizer.h" #include "sentry_testsupport.h" -#include #define MAX_FRAMES 128 diff --git a/external_imported/sentry-native/tests/unit/test_utils.c b/external_imported/sentry-native/tests/unit/test_utils.c index bdc17f2aa..f280f59f7 100644 --- a/external_imported/sentry-native/tests/unit/test_utils.c +++ b/external_imported/sentry-native/tests/unit/test_utils.c @@ -2,7 +2,6 @@ #include "sentry_testsupport.h" #include "sentry_utils.h" #include "sentry_value.h" -#include #ifdef SENTRY_PLATFORM_UNIX # include "sentry_unix_pageallocator.h" @@ -72,7 +71,7 @@ SENTRY_TEST(url_parsing_invalid) SENTRY_TEST(dsn_parsing_complete) { sentry_dsn_t *dsn = sentry__dsn_new( - "http://username:password@example.com/foo/bar/42?x=y#z"); + "http://username:password@example.com/foo/bar/42%21?x=y#z"); TEST_CHECK(!!dsn); if (!dsn) { return; @@ -84,10 +83,10 @@ SENTRY_TEST(dsn_parsing_complete) TEST_CHECK_STRING_EQUAL(dsn->public_key, "username"); TEST_CHECK_STRING_EQUAL(dsn->secret_key, "password"); TEST_CHECK_STRING_EQUAL(dsn->path, "/foo/bar"); - TEST_CHECK_INT_EQUAL((int)dsn->project_id, 42); + TEST_CHECK_STRING_EQUAL(dsn->project_id, "42%21"); sentry__dsn_decref(dsn); - dsn = sentry__dsn_new("https://username@example.com/42"); + dsn = sentry__dsn_new("https://username@example.com/42%21"); TEST_CHECK(!!dsn); if (!dsn) { return; @@ -98,22 +97,24 @@ SENTRY_TEST(dsn_parsing_complete) TEST_CHECK_STRING_EQUAL(dsn->public_key, "username"); TEST_CHECK(!dsn->secret_key); TEST_CHECK_STRING_EQUAL(dsn->path, ""); - TEST_CHECK_INT_EQUAL((int)dsn->project_id, 42); + TEST_CHECK_STRING_EQUAL(dsn->project_id, "42%21"); sentry__dsn_decref(dsn); -} -SENTRY_TEST(dsn_parsing_invalid) -{ - sentry_dsn_t *dsn - = sentry__dsn_new("http://username:password@example.com/foo/bar?x=y#z"); + dsn = sentry__dsn_new("https://username@example.com/pathone/pathtwo/42%21"); TEST_CHECK(!!dsn); - if (dsn) { - TEST_CHECK(!dsn->is_valid); - sentry__dsn_decref(dsn); + if (!dsn) { + return; } + TEST_CHECK(dsn->is_valid); + TEST_CHECK_STRING_EQUAL(dsn->path, "/pathone/pathtwo"); + TEST_CHECK_STRING_EQUAL(dsn->project_id, "42%21"); + sentry__dsn_decref(dsn); +} - dsn = sentry__dsn_new("=https://foo@bar.ingest.sentry.io/" - "1234567"); +SENTRY_TEST(dsn_parsing_invalid) +{ + sentry_dsn_t *dsn = sentry__dsn_new("=https://foo@bar.ingest.sentry.io/" + "1234567"); TEST_CHECK(!!dsn); if (dsn) { TEST_CHECK(!dsn->is_valid); diff --git a/external_imported/sentry-native/tests/unit/test_uuid.c b/external_imported/sentry-native/tests/unit/test_uuid.c index 6be5044f3..2ff38ebd3 100644 --- a/external_imported/sentry-native/tests/unit/test_uuid.c +++ b/external_imported/sentry-native/tests/unit/test_uuid.c @@ -1,6 +1,6 @@ #include "sentry_testsupport.h" -#include -#include + +#include "sentry_uuid.h" SENTRY_TEST(uuid_api) { diff --git a/external_imported/sentry-native/tests/unit/test_value.c b/external_imported/sentry-native/tests/unit/test_value.c index 783567f40..98687b1d3 100644 --- a/external_imported/sentry-native/tests/unit/test_value.c +++ b/external_imported/sentry-native/tests/unit/test_value.c @@ -3,7 +3,6 @@ #include "sentry_value.h" #include #include -#include SENTRY_TEST(value_null) { @@ -229,6 +228,62 @@ SENTRY_TEST(value_object) sentry_value_decref(val); } +SENTRY_TEST(value_object_merge) +{ + sentry_value_t dst = sentry_value_new_object(); + sentry_value_set_by_key(dst, "a", sentry_value_new_int32(1)); + sentry_value_set_by_key(dst, "b", sentry_value_new_int32(2)); + + sentry_value_t src = sentry_value_new_object(); + sentry_value_set_by_key(src, "b", sentry_value_new_int32(20)); + sentry_value_set_by_key(src, "c", sentry_value_new_int32(30)); + + int rv = sentry__value_merge_objects(dst, src); + TEST_CHECK_INT_EQUAL(rv, 0); + sentry_value_decref(src); + + sentry_value_t a = sentry_value_get_by_key(dst, "a"); + sentry_value_t b = sentry_value_get_by_key(dst, "b"); + sentry_value_t c = sentry_value_get_by_key(dst, "c"); + TEST_CHECK_INT_EQUAL(sentry_value_as_int32(a), 1); + TEST_CHECK_INT_EQUAL(sentry_value_as_int32(b), 20); + TEST_CHECK_INT_EQUAL(sentry_value_as_int32(c), 30); + + sentry_value_decref(dst); +} + +SENTRY_TEST(value_object_merge_nested) +{ + sentry_value_t dst = sentry_value_new_object(); + sentry_value_set_by_key(dst, "a", sentry_value_new_int32(1)); + sentry_value_t dst_nested = sentry_value_new_object(); + sentry_value_set_by_key(dst_nested, "ba", sentry_value_new_int32(1)); + sentry_value_set_by_key(dst_nested, "bb", sentry_value_new_int32(2)); + sentry_value_set_by_key(dst, "b", dst_nested); + + sentry_value_t src = sentry_value_new_object(); + sentry_value_t src_nested = sentry_value_new_object(); + sentry_value_set_by_key(src_nested, "bb", sentry_value_new_int32(20)); + sentry_value_set_by_key(src_nested, "bc", sentry_value_new_int32(30)); + sentry_value_set_by_key(src, "b", src_nested); + + int rv = sentry__value_merge_objects(dst, src); + TEST_CHECK_INT_EQUAL(rv, 0); + sentry_value_decref(src); + + sentry_value_t a = sentry_value_get_by_key(dst, "a"); + sentry_value_t nested = sentry_value_get_by_key(dst, "b"); + sentry_value_t ba = sentry_value_get_by_key(nested, "ba"); + sentry_value_t bb = sentry_value_get_by_key(nested, "bb"); + sentry_value_t bc = sentry_value_get_by_key(nested, "bc"); + TEST_CHECK_INT_EQUAL(sentry_value_as_int32(a), 1); + TEST_CHECK_INT_EQUAL(sentry_value_as_int32(ba), 1); + TEST_CHECK_INT_EQUAL(sentry_value_as_int32(bb), 20); + TEST_CHECK_INT_EQUAL(sentry_value_as_int32(bc), 30); + + sentry_value_decref(dst); +} + SENTRY_TEST(value_freezing) { sentry_value_t val = sentry_value_new_list(); diff --git a/external_imported/sentry-native/tests/unit/tests.inc b/external_imported/sentry-native/tests/unit/tests.inc index 51615be37..268010e22 100644 --- a/external_imported/sentry-native/tests/unit/tests.inc +++ b/external_imported/sentry-native/tests/unit/tests.inc @@ -1,13 +1,25 @@ XX(background_worker) XX(basic_consent_tracking) XX(basic_function_transport) +XX(basic_function_transport_transaction) XX(basic_http_request_preparation_for_event) XX(basic_http_request_preparation_for_event_with_attachment) XX(basic_http_request_preparation_for_minidump) +XX(basic_http_request_preparation_for_transaction) +XX(basic_spans) +XX(basic_tracing_context) +XX(basic_transaction) +XX(bgworker_flush) XX(buildid_fallback) +XX(child_spans) XX(concurrent_init) +XX(concurrent_uninit) XX(count_sampled_events) +XX(crash_marker) +XX(crashed_last_run) XX(custom_logger) +XX(distributed_headers) +XX(drop_unfinished_spans) XX(dsn_parsing_complete) XX(dsn_parsing_invalid) XX(dsn_store_url_with_path) @@ -25,7 +37,9 @@ XX(module_finder) XX(mpack_newlines) XX(mpack_removed_tags) XX(multiple_inits) +XX(multiple_transactions) XX(os) +XX(overflow_spans) XX(page_allocator) XX(path_basics) XX(path_current_exe) @@ -37,12 +51,19 @@ XX(procmaps_parser) XX(rate_limit_parsing) XX(recursive_paths) XX(sampling_before_send) +XX(sampling_decision) +XX(sampling_transaction) XX(serialize_envelope) XX(session_basics) XX(slice) +XX(spans_on_scope) XX(symbolizer) XX(task_queue) +XX(transaction_name_backfill_on_finish) +XX(transactions_skip_before_send) +XX(transport_sampling_transactions) XX(uninitialized) +XX(unsampled_spans) XX(unwinder) XX(url_parsing_complete) XX(url_parsing_invalid) @@ -63,6 +84,8 @@ XX(value_json_surrogates) XX(value_list) XX(value_null) XX(value_object) +XX(value_object_merge) +XX(value_object_merge_nested) XX(value_string) XX(value_unicode) XX(value_wrong_type) diff --git a/external_imported/vcpkg/.github/ISSUE_TEMPLATE/other-type-of-bug-report.md b/external_imported/vcpkg/.github/ISSUE_TEMPLATE/other-type-of-bug-report.md index 85c296745..8a12e861d 100644 --- a/external_imported/vcpkg/.github/ISSUE_TEMPLATE/other-type-of-bug-report.md +++ b/external_imported/vcpkg/.github/ISSUE_TEMPLATE/other-type-of-bug-report.md @@ -24,7 +24,7 @@ Repro code when **Expected behavior** A clear and concise description of what you expected to happen. -**Failure logs** +**Failure logs** -(please attached failure logs) **Additional context** 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 785483c36..765f870c1 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 @@ -15,7 +15,7 @@ assignees: '' Steps to reproduce the behavior: `./vcpkg install xxxx` -**Failure logs** +**Failure logs** -Cut and paste the appropriate build messages from the console output. -Please attach any additional failure logs mentioned in the console output. diff --git a/external_imported/vcpkg/.github/pull_request_template.md b/external_imported/vcpkg/.github/pull_request_template.md index 31be625f2..9253eadcb 100644 --- a/external_imported/vcpkg/.github/pull_request_template.md +++ b/external_imported/vcpkg/.github/pull_request_template.md @@ -1,15 +1,15 @@ **Describe the pull request** -- #### What does your PR fix? +- #### What does your PR fix? Fixes #... -- #### Which triplets are supported/not supported? Have you updated the [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)? +- #### Which triplets are supported/not supported? Have you updated the [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)? , -- #### Does your PR follow the [maintainer guide](https://github.com/microsoft/vcpkg/blob/master/docs/maintainers/maintainer-guide.md)? +- #### Does your PR follow the [maintainer guide](https://github.com/microsoft/vcpkg/blob/master/docs/maintainers/maintainer-guide.md)? `Your answer` -- #### If you have added/updated a port: Have you run `./vcpkg x-add-version --all` and committed the result? +- #### If you have added/updated a port: Have you run `./vcpkg x-add-version --all` and committed the result? **If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/** diff --git a/external_imported/vcpkg/.github/workflows/trustedPR.yml b/external_imported/vcpkg/.github/workflows/trustedPR.yml index d45bfeb11..c2d860493 100644 --- a/external_imported/vcpkg/.github/workflows/trustedPR.yml +++ b/external_imported/vcpkg/.github/workflows/trustedPR.yml @@ -17,10 +17,10 @@ jobs: steps: - name: 'Download artifact' - uses: actions/github-script@v3.1.0 + uses: actions/github-script@v6 with: script: | - var artifacts = await github.actions.listWorkflowRunArtifacts({ + var artifacts = await github.rest.actions.listWorkflowRunArtifacts({ owner: context.repo.owner, repo: context.repo.repo, run_id: ${{github.event.workflow_run.id }}, @@ -28,7 +28,7 @@ jobs: var matchArtifact = artifacts.data.artifacts.filter((artifact) => { return artifact.name == "pr" })[0]; - var download = await github.actions.downloadArtifact({ + var download = await github.rest.actions.downloadArtifact({ owner: context.repo.owner, repo: context.repo.repo, artifact_id: matchArtifact.id, @@ -38,7 +38,7 @@ jobs: fs.writeFileSync('${{github.workspace}}/pr.zip', Buffer.from(download.data)); - run: unzip pr.zip - - uses: actions/github-script@v4 + - uses: actions/github-script@v6 with: script: | const { promises: fs } = require('fs') @@ -55,4 +55,4 @@ jobs: if (body !== "") { req.body = body; } - await github.pulls.createReview(req); + await github.rest.pulls.createReview(req); diff --git a/external_imported/vcpkg/.github/workflows/untrustedPR.yml b/external_imported/vcpkg/.github/workflows/untrustedPR.yml index cb77b745f..dc47a1964 100644 --- a/external_imported/vcpkg/.github/workflows/untrustedPR.yml +++ b/external_imported/vcpkg/.github/workflows/untrustedPR.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: # fetch-depth 50 tries to ensure we capture the whole history of the branch fetch-depth: 50 @@ -39,6 +39,7 @@ jobs: git config user.name github-actions@github.com 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 ./vcpkg format-manifest --all --convert-control git diff > .github-pr.format-manifest git add -u @@ -46,18 +47,22 @@ jobs: # HEAD^^ refers to the "main" commit that was merged into git checkout HEAD^^ -- versions git restore --staged versions - ./vcpkg x-add-version --all --skip-formatting-check > .github-pr.x-add-version.out + ./vcpkg x-add-version --all --skip-formatting-check | grep 'instead of "version-string"' | tee .github-pr.version-string.out || true + git checkout -- versions + ./vcpkg x-add-version --all --skip-formatting-check --skip-version-format-check | tee .github-pr.x-add-version.out || true git diff > .github-pr.x-add-version.diff git reset HEAD~ --mixed - - uses: actions/github-script@v4 + - uses: actions/github-script@v6 with: script: | const { promises: fs } = require('fs') const add_version = (await fs.readFile('.github-pr.x-add-version.diff', 'utf8')).trim() const add_version_out = (await fs.readFile('.github-pr.x-add-version.out', 'utf8')).trim() + const version_string_out = (await fs.readFile('.github-pr.version-string.out', 'utf8')).trim() 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() let approve = true; var output = '' @@ -72,9 +77,12 @@ jobs: if (add_version_out !== "") { output += "
PRs must add only one version and must not modify any published versions\n\n" output += "When making any changes to a library, the version or port-version in `vcpkg.json` or `CONTROL` must be modified.\n" - output += "```\n" + add_version_out + "\n```\n
\n" + output += "```\n" + add_version_out + "\n```\n\n\n" approve = false; } + if (version_string_out !== "") { + output += version_string_out + "\n\n" + } if (add_version !== "") { output += "
After committing all other changes, the version database must be updated\n\n" output += "```sh\n" @@ -102,7 +110,16 @@ jobs: output += '{\n "name": "vcpkg-cmake-config",\n "host": true\n}\n' output += "```\n" output += `The following files are affected:\n${cmake}\n` - output += "
\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' + 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" + output += "
\n\n" } if (approve) { @@ -115,7 +132,7 @@ jobs: console.log(output); - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: pr path: pr/ diff --git a/external_imported/vcpkg/CONTRIBUTING_zh.md b/external_imported/vcpkg/CONTRIBUTING_zh.md new file mode 100644 index 000000000..7aef2f5dc --- /dev/null +++ b/external_imported/vcpkg/CONTRIBUTING_zh.md @@ -0,0 +1,33 @@ +# 贡献准则 + +Vcpkg 是一个尝试由社区驱动，旨在构建一个多产的、健壮的本地库生态系统 - 您的贡献价值不可估量！ + +## 报告问题 + +最简单的方法是通过 `vcpkg.exe` 或 [GitHub](https://github.com/Microsoft/vcpkg) 报告已有的包的问题。 当报告 `vcpkg.exe` 的问题时，确保清楚地说明: +- 机器设置: “我用的是Windows 10周年更新。 我的机器正位于fr-fr区域。 我成功地运行了'install boost'。” +- 复现步骤: “运行 'vcpkg list'” +- 预期结果: “我预期看到 'boost:x86-windows'” +- 实际结果: “没有输出” 或 “我得到一个崩溃对话框” + +当报告包的问题时，一定要清楚地说明: +- 机器设置 (上述) +- 您正在构建什么包以及它的版本，例如: “opencv 3.1.0” +- 构建过程中的任何相关错误日志 + +## 贡献 (PR) + +我们很乐意接受关于修复、特性、新包和更新现有包的拉取请求。 为了避免浪费您的时间，我们强烈建议您提交一个问题来讨论您想要制作的PR是否能被接受。 对于特性和新包来说也是如此。 + +### 新包贡献准则 + +我们很高兴您有兴趣来提交一个新的包! 这里有一些指导方针来帮助您编写一个优秀的端口文件: +- 避免功能补丁。 当没有其他方法时，补丁应该被视为实现兼容性的最后手段。 +- 当无法避免补丁时，请不要修改默认行为。 一个补丁的理想生命周期是与上游合并，不再被需要。 在决定如何修补某些内容时，请记住这一目标。 +- 相比原始的 `execute_command` 调用，尽量改为通过 `vcpkg_xyz` 函数实现。这使得在添加新特性(如自定义编译器标志或生成器)时更容易进行长期维护。 + +## 法律声明 + +在您的拉取请求被接受之前，您需要完成一个贡献者许可协议 (CLA)。 本协议证明您允许我们使用您提交的源代码，并且本作品是在合适的许可下提交的，我们可以使用它。 + +您可以通过 https://cla.microsoft.com 上的步骤来完成CLA。 一旦我们收到已签署的CLA，我们将审查请求。 您只需要这样做一次。 diff --git a/external_imported/vcpkg/README_es.md b/external_imported/vcpkg/README_es.md index 098537713..0ffcb3a49 100644 --- a/external_imported/vcpkg/README_es.md +++ b/external_imported/vcpkg/README_es.md @@ -22,8 +22,6 @@ una vez instalado Vcpkg puede ejecutar `vcpkg help`, o * Discord: [\#include \](https://www.includecpp.org), en el canal #🌏vcpkg * Docs: [Documentación](docs/README.md) -[![Estado de compilación](https://dev.azure.com/vcpkg/public/_apis/build/status/microsoft.vcpkg.ci?branchName=master)](https://dev.azure.com/vcpkg/public/_build/latest?definitionId=29&branchName=master) - ## Tabla de contenido - [Vcpkg](#vcpkg) @@ -43,6 +41,7 @@ una vez instalado Vcpkg puede ejecutar `vcpkg help`, o - [Ejemplos](#ejemplos) - [Contribuyendo](#contribuyendo) - [Licencia](#licencia) +- [Seguridad](#seguridad) - [Telemetría](#telemetría) ## Primeros pasos @@ -382,6 +381,16 @@ con cualquier pregunta adicional o comentarios. ## Licencia El código en este repositorio se encuentra licenciado mediante la [Licencia MIT](LICENSE.txt). +Las bibliotecas proveídas por los `ports` están licenciadas mediante los terminos de los autores originales. +Donde estén disponibles, vcpkg almacena las licencias asociadas en la siguiente ubicación `installed//share//copyright`. + +# Seguridad + +La mayoría de los `ports` en vcpkg construyen las bibliotecas usando su sistema de compilación preferido +por los autores originales de las bibliotecas, y descargan el código fuente asi como las herramientas de compilación +de sus ubicaciones de distribucion oficiales. Para aquellos que usan un firewall, el acceso dependerá de cuales `ports` +están siendo instalados. Si tiene que instalarlos en un entorno aislado, puede instalarlos previamente en un entorno +no aislado, generando un [caché del paquete](docs/users/assetcaching.md) compartido con el entorno aislado. ## Telemetría diff --git a/external_imported/vcpkg/README_ko_KR.md b/external_imported/vcpkg/README_ko_KR.md index 69498c9fc..a7a71fa1e 100644 --- a/external_imported/vcpkg/README_ko_KR.md +++ b/external_imported/vcpkg/README_ko_KR.md @@ -1,109 +1,122 @@ # Vcpkg: 개요 [中文总览](README_zh_CN.md) -[Español](README.md) -[English](README_ko_KR.md) +[Español](README_es.md) +[English](README.md) [Français](README_fr.md) -Vcpkg는 Windows, Linux 및 MacOS에서 C 및 C++ 라이브러리를 관리하는 데 도움이 됩니다. -이 툴과 생태계는 지속적으로 진화하고 있으며 항상 기여해 주셔서 감사합니다! +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: 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 채널 -* Docs: [Documentation](docs/README.md) - -[![Build Status](https://dev.azure.com/vcpkg/public/_apis/build/status/microsoft.vcpkg.ci?branchName=master)](https://dev.azure.com/vcpkg/public/_build/latest?definitionId=29&branchName=master) +* 도움말: [Documentation](docs/README.md) # 목차 -- [Vcpkg: 개요 둘러보기](#vcpkg-개요) +- [Vcpkg: 개요](#vcpkg-개요) - [목차](#목차) - [시작하기](#시작하기) - - [빠르게 시작하기: 윈도우](#빠르게-시작하기-윈도우) - - [빠르게 시작하기: 유닉스](#빠르게-시작하기-유닉스) - - [리눅스 개발자 도구 설치하기](#리눅스-개발자-도구-설치하기) + - [빠르게 시작하기: Windows](#빠르게-시작하기-windows) + - [빠르게 시작하기: Unix](#빠르게-시작하기-unix) + - [Linux 개발자 도구 설치하기](#linux-개발자-도구-설치하기) - [macOS 개발자 도구 설치하기](#macos-개발자-도구-설치하기) - [CMake와 함께 vcpkg 사용](#cmake와-함께-vcpkg-사용) - [Visual Studio Code와 CMake Tools](#visual-studio-code와-cmake-tools) - - [Visual Studio CMake 프로젝트와 Vcpkg](#visual-studio-cmake-프로젝트와-vcpkg) + - [Vcpkg와 Visual Studio CMake 프로젝트](#vcpkg와-visual-studio-cmake-프로젝트) - [Vcpkg와 CLion](#vcpkg와-clion) - - [서브모듈로서의 Vcpkg](#서브모듈로서의-vcpkg) + - [서브모듈로 vcpkg 사용하기](#서브모듈로-vcpkg-사용하기) - [탭 완성/자동 완성](#탭-완성자동-완성) -- [예제](#예제) -- [기여](#기여) +- [예시](#예시) +- [기여하기](#기여하기) - [라이선스](#라이선스) +- [보안](#보안) - [데이터 수집](#데이터-수집) # 시작하기 -먼저, 사용하는 운영체제에 따라 빠르게 시작하기 문서를 따라가세요. -[윈도우](#빠르게-시작하기-윈도우) 또는 [macOS 그리고 Linux](#빠르게-시작하기-유닉스). +먼저, 사용하는 운영체제에 따라 +[윈도우](#빠르게-시작하기-windows) 또는 [macOS와 Linux](#빠르게-시작하기-unix) +빠르게 시작하기 가이드를 따라가세요. -더 많은 정보를 얻고 싶다면, [패키지 설치 및 사용][getting-started:using-a-package] 문서를 참고하세요. -만약 필요한 라이브러리가 vcpkg 카탈로그에 없는 경우, vcpkg 팀이나 커뮤니티가 볼 수 있는 -[GitHub 저장소에서 이슈를 열 ​​수 있습니다][contributing:submit-issue] -또한 잠재적으로 vcpkg에 포트가 추가될 것 입니다. +더 자세한 정보는 [패키지 설치 및 사용][getting-started:using-a-package]에 있습니다. +만약 필요한 라이브러리가 vcpkg 카탈로그에 없는 경우, +[GitHub 저장소에서 이슈를 열 ​​수 있습니다][contributing:submit-issue]. +Vcpkg 팀과 커뮤니티가 이슈를 확인하면, 해당하는 port를 추가할 수 있습니다. -vcpkg를 설치하고 작동 한 후, -셸에 [탭 완성/자동 완성](#탭-완성/자동-완성)을 추가 할 수 있습니다. +Vcpkg의 설치가 완료되었다면, +셸에 [탭 완성](#탭-완성자동-완성)을 추가할 수 있습니다. 마지막으로, vcpkg의 미래에 관심이 있다면, [manifest][getting-started:manifest-spec] 가이드를 확인하세요! -이것은 실험적인 기능이며 버그가 있을 수도 있습니다. -시도해보고 문제가 있다면 [이슈을 여세요][contributing:submit-issue]! +이것은 실험적인 기능이며 버그가 있을 가능성이 높습니다. +시도해보고 문제가 있다면 [이슈를 열어주세요][contributing:submit-issue]! -## 빠르게 시작하기: 윈도우 +## 빠르게 시작하기: Windows 필요조건: - Windows 7 이상 - [Git][getting-started:git] - [Visual Studio][getting-started:visual-studio] 영어 언어팩이 설치된 2015 Update 3 버전 이상 - -첫번째로, vcpkg 자체를 다운로드하고 부트스트랩합니다; 어디에나 설치할 수 있습니다, -하지만 일반적으로 CMake 프로젝트의 하위 모듈로 vcpkg를 사용하는 것이 좋습니다. -Visual Studio 프로젝트를 위해 전역적으로 설치합니다. -설치 위치는 `C:\src\vcpkg` 나 `C:\dev\vcpkg`를 사용할것을 권장합니다. -그렇지 않으면 일부 포트 빌드 시스템에서 경로 문제가 발생할 수도 있습니다. + +첫번째로, vcpkg 자체를 다운로드하고 부트스트랩합니다. Vcpkg는 어디에나 설치할 수 있지만, +일반적으로 CMake 프로젝트는 vcpkg를 submodule로 사용하는 것을, +Visual Studio 프로젝트는 시스템에 설치하는 것을 추천합니다. +시스템 설치는 `C:\src\vcpkg` 나 `C:\dev\vcpkg` 등의 위치에 하는 것을 권장하는데, +그렇지 않으면 일부 포트 빌드 시스템에서 경로 문제가 발생할 수도 있기 때문입니다. ```cmd > git clone https://github.com/microsoft/vcpkg > .\vcpkg\bootstrap-vcpkg.bat ``` -당신의 프로젝트에 라이브러리를 설치, 실행 시키려면 다음과 같이 작성하세요: +당신의 프로젝트에 라이브러리를 설치하려면 다음 명령을 실행하세요. ```cmd > .\vcpkg\vcpkg install [packages to install] ``` -다음과 같이 `search` 하위 명령어를 사용하여 필요한 라이브러리를 검색 할 수도 있습니다. +참고로, 위 명령은 x86 라이브러리를 설치하는 것이 기본 설정입니다. 만약 x64 버전을 +설치하고 싶다면, 다음 명령을 실행하세요. + +```cmd +> .\vcpkg\vcpkg install [package name]:x64-windows +``` + +또는 이렇게도 가능합니다. + +```cmd +> .\vcpkg\vcpkg install [packages to install] --triplet=x64-windows +``` + +다음과 같이 `search` 하위 명령어를 사용하여 필요한 라이브러리를 검색할 수도 있습니다. ```cmd > .\vcpkg\vcpkg search [search term] ``` Visual Studio에서 vcpkg를 사용하려면 -다음 명령을 실행합니다 (관리자 권한이 필요할 수도 있습니다): +다음 명령을 실행해야 합니다(관리자 권한이 필요할 수도 있습니다). ```cmd > .\vcpkg\vcpkg integrate install ``` - -그런 다음, 이제 CMake가 아닌 새 프로젝트를 만들 수 있습니다. (또는 기존 프로젝트를 열 수 있습니다) -설치된 모든 라이브러리는 즉시 `# include` 될 준비가 되어 추가 구성없이 프로젝트에서 사용할 수 있습니다. +이제 CMake를 사용하지 않는 프로젝트도 만들 수 (또는 기존 프로젝트를 열 수) 있습니다. +설치한 모든 라이브러리는 추가 설정 없이도 프로젝트에서 즉시 `# include` 및 사용할 수 있습니다. Visual Studio에서 CMake를 사용하는 경우, -[여기를 보세요](#visual-studio-code와-cmake-tools). +[여기를 보세요](#vcpkg와-visual-studio-cmake-프로젝트). IDE 외부에서 CMake와 함께 vcpkg를 사용하려면, -툴체인 파일을 사용할 수 있습니다: +다음과 같이 툴체인 파일을 사용할 수 있습니다. ```cmd > cmake -B [build directory] -S . -DCMAKE_TOOLCH @@ -111,14 +124,14 @@ AIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake > cmake --build [build directory] ``` -CMake와 라이브러리를 사용하려면 `find_package` 등이 필요합니다. -IDE에서 CMake 사용에 대한 자세한 내용은 [CMake 섹션](#cmake와-함께-vcpkg-사용)을 확인하세요. - +CMake에서 라이브러리를 사용하려면 여전히 `find_package` 등이 필요합니다. +CMake를 IDE와 사용하는 방법을 포함한 +자세한 정보는 [CMake 섹션](#cmake와-함께-vcpkg-사용)을 확인하세요. Visual Studio Code를 포함한 다른 툴의 경우 -[통합 가이드][getting-started:integration]을 확인하세요. +[통합 가이드][getting-started:integration]를 확인하세요. -## 빠르게 시작하기: 유닉스 +## 빠르게 시작하기: Unix Linux에서의 필요조건: - [Git][getting-started:git] @@ -127,43 +140,44 @@ Linux에서의 필요조건: macOS에서의 필요조건: - [Apple Developer Tools][getting-started:macos-dev-tools] -첫번째로, vcpkg 자체를 다운로드하고 부트스트랩합니다; 어디에나 설치할 수 있습니다, -하지만 일반적으로 CMake 프로젝트의 하위 모듈로 vcpkg를 사용하는 것이 좋습니다. +우선, vcpkg 자체를 다운로드하고 설치해야 합니다. 어디에나 설치할 수 있지만, +일반적으로 CMake 프로젝트의 하위 모듈로 vcpkg를 사용하는 것이 좋습니다. ```sh $ git clone https://github.com/microsoft/vcpkg $ ./vcpkg/bootstrap-vcpkg.sh ``` -당신의 프로젝트에 라이브러리를 설치, 실행 시키려면 다음과 같이 작성하세요: +프로젝트에 라이브러리를 설치하려면 다음 명령을 실행하세요. ```sh $ ./vcpkg/vcpkg install [packages to install] ``` -다음과 같이 `search` 하위 명령어를 사용하여 필요한 라이브러리를 검색 할 수도 있습니다. +다음과 같이 `search` 하위 명령어를 사용하여 필요한 라이브러리를 검색할 수도 있습니다. ```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 --build [build directory] ``` -CMake와 라이브러리를 사용하려면 `find_package` 등이 필요합니다. -CMake 및 CMake Tools for VSCode에서 vcpkg를 가장 잘 사용하는 방법에 대한 자세한 내용은 -[CMake 섹션](#cmake와-함께-vcpkg-사용)을 확인하세요. +CMake에서 라이브러리를 사용하려면 여전히 `find_package` 등이 필요합니다. +CMake와 VSCode를 위한 CMake Tools를 vcpkg와 함께 사용하는 최선의 방법을 포함한 +자세한 정보는 [CMake 섹션](#cmake와-함께-vcpkg-사용)을 확인하세요. -다른 툴에 대해서는 [통합 가이드][getting-started:integration]을 확인하세요. -## 리눅스 개발자 도구 설치하기 +다른 툴에 대해서는 [통합 가이드][getting-started:integration]를 확인하세요. -리눅스의 다양한 배포판에는 설치해야되는 다양한 패키지가 있습니다: +## Linux 개발자 도구 설치하기 +Linux의 배포판별로 설치해야 하는 개발자 소프트웨어가 다릅니다. -- Debian, Ubuntu, popOS 및 기타 Debian 기반 배포판: +- Debian, Ubuntu, popOS 및 기타 Debian 기반 배포판 ```sh $ sudo apt-get update @@ -178,8 +192,8 @@ $ sudo yum install devtoolset-7 $ scl enable devtoolset-7 bash ``` -다른 배포판의 경우 g++ 6 이상의 버전을 설치해야합니다. -특정 배포판에 대한 지침을 추가하려면 +다른 배포판의 경우, g++ 6 이상의 버전을 설치하여야 합니다. +특정 배포판에 대한 안내를 추가하고 싶은 경우, [PR을 열어주세요][contributing:submit-pr]! ## macOS 개발자 도구 설치하기 @@ -190,18 +204,18 @@ macOS에서는 터미널에서 다음 명령어를 실행하기만 하면 됩니 $ xcode-select --install ``` -그런 다음 나타나는 창에 나타나는 메시지를 따르세요. +그런 다음 나타나는 창의 안내에 따르세요. -그런다음 [빠른 시작 가이드](#빠르게-시작하기-유닉스)와 함께 vcpkg를 부트스트랩 할 수 있습니다. +설치가 끝나면 [빠른 시작 가이드](#빠르게-시작하기-unix)를 참고하여 vcpkg를 설치하세요. ## CMake와 함께 vcpkg 사용 -CMake와 함께 vcpkg를 사용하는 경우, 다음과 같이 따라해 보세요 +CMake와 함께 vcpkg를 사용하는 경우, 다음 내용이 도움이 될 것입니다! ### Visual Studio Code와 CMake Tools -작업 공간 `settings.json` 파일에 다음을 추가하면 -CMake 도구는 라이브러리에 자동으로 vcpkg를 사용합니다. +Workspace `settings.json` 파일에 다음을 추가하면 +CMake Tools는 자동으로 vcpkg의 라이브러리를 사용할 것입니다. ```json { @@ -211,9 +225,9 @@ CMake 도구는 라이브러리에 자동으로 vcpkg를 사용합니다. } ``` -### Visual Studio CMake 프로젝트와 Vcpkg +### Vcpkg와 Visual Studio CMake 프로젝트 -CMake 설정 편집기를 열고 'CMake toolchain file'에서 +CMake 설정 편집기를 열고 `CMake toolchain file`에서 vcpkg 툴체인 파일에 경로를 추가합니다. ``` @@ -224,7 +238,7 @@ vcpkg 툴체인 파일에 경로를 추가합니다. Toolchains settings을 엽니다. (File > Settings on Windows and Linux, CLion > Preferences on macOS), -그리고 Cmake 세팅을 엽니다 (Build, Execution, Deployment > CMake). +그리고 CMake 세팅을 엽니다 (Build, Execution, Deployment > CMake). 마지막으로 `CMake options`에서 다음 줄을 추가합니다. ``` @@ -233,18 +247,20 @@ Toolchains settings을 엽니다. 각 프로필에 이것을 추가해야합니다. -### 서브모듈로서의 Vcpkg +### 서브모듈로 vcpkg 사용하기 -프로젝트의 하위 모듈로 vcpkg를 사용하는 경우 -cmake 호출에`CMAKE_TOOLCHAIN_FILE`을 전달하는 대신 첫 번째 `project ()` 호출 전에 CMakeLists.txt에 다음을 추가 할 수 있습니다. +프로젝트의 서브모듈로 vcpkg를 사용하는 경우, +cmake 실행 시 `CMAKE_TOOLCHAIN_FILE`을 전달하는 대신, +첫 번째 `project()` 호출 전에 CMakeLists.txt에 다음을 추가하는 방법도 있습니다. ```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 @@ -260,43 +276,43 @@ set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/ # 탭 완성/자동 완성 `vcpkg`는 powershell과 bash 모두에서 명령, 패키지 이름 및 옵션의 자동 완성을 지원합니다. -선택한 셸에서 탭 완성을 활성화하려면 다음 명령어를 실행합니다. +선택한 셸에서 탭 완성을 활성화하려면 다음 두 명령어 중 하나를 실행합니다. ```pwsh > .\vcpkg integrate powershell ``` -혹은 - ```sh -$ ./vcpkg integrate bash +$ ./vcpkg integrate bash # or zsh ``` -사용하는 셸에 따라 콘솔을 다시 시작세요. +그 다음 콘솔을 재시작하세요. -# 예제 +# 예시 -구체적인 연습은 [문서](docs/README.md)를 참고하세요, -including [패키지 설치 및 사용](docs/examples/installing-and-using-packages.md), +[패키지 설치 및 사용](docs/examples/installing-and-using-packages.md), [zip 파일에서 새 패키지 추가](docs/examples/packaging-zipfiles.md), -및 [GitHub 저장소에서 새 패키지 추가](docs/examples/packaging-github-repos.md). +[GitHub 저장소에서 새 패키지 추가](docs/examples/packaging-github-repos.md)에 +대한 구체적인 예시는 [문서](docs/README.md)를 참고하세요. -우리의 문서는 이제 웹사이트 https://vcpkg.io/ 에서도 온라인으로 사용할 수 있습니다. 모든 피드백에 진심으로 감사드립니다. https://github.com/vcpkg/vcpkg.github.io/issues 에서 이슈를 제출할 수 있습니다. +문서는 이제 웹사이트 https://vcpkg.io/ 에서도 온라인으로 확인 가능합니다. 모든 피드백에 진심으로 감사드립니다! +https://github.com/vcpkg/vcpkg.github.io/issues 에서 이슈를 제출할 수 있습니다. -[4분짜리 데모 영상을 보세요](https://www.youtube.com/watch?v=y41WFKbQFTw). +[4분짜리 데모 영상도 준비되어 있습니다](https://www.youtube.com/watch?v=y41WFKbQFTw). -# 기여 +# 기여하기 -Vcpkg는 오픈소스 프로젝트입니다, 따라서 여러분의 기여로 만들어 졌습니다. -기여할 수 있는 몇 가지 방법은 다음과 같습니다: +Vcpkg는 오픈소스 프로젝트입니다, 따라서 여러분의 기여를 통해 만들어집니다. +기여할 수 있는 몇 가지 방법은 다음과 같습니다. -* vcpkg 또는 기존 패키지의 [문제 제출][contributing:submit-issue] -* [수정 사항및 새 패키지 제출][contributing:submit-pr] +* Vcpkg 또는 vcpkg에 포함된 패키지의 [이슈 제출][contributing:submit-issue] +* [수정 사항 및 새 패키지 제출][contributing:submit-pr] -자세한 내용은 [컨트리뷰팅 가이드](CONTRIBUTING.md)를 참고하세요. +자세한 내용은 [기여 가이드](CONTRIBUTING.md)를 참고하세요. 이 프로젝트는 [Microsoft Open Source Code of Conduct][contributing:coc]을 채택했습니다. -더 많은 정보를 얻고 싶다면 [Code of Conduct FAQ][contributing:coc-faq] 문서를 참고하거나 추가 질문 또는 의견은 이메일 [opencode@microsoft.com](mailto:opencode@microsoft.com)로 보내주세요. +더 많은 정보를 얻고 싶다면 [Code of Conduct 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 @@ -305,14 +321,26 @@ Vcpkg는 오픈소스 프로젝트입니다, 따라서 여러분의 기여로 # 라이선스 -이 저장소의 코드는 [MIT 라이선스](LICENSE.txt)에 따라 라이선스가 부여됩니다. +이 저장소의 코드는 [MIT 라이선스](LICENSE.txt)에 따라 사용이 허가됩니다. Port로 제공되는 +라이브러리는 각 라이브러리의 원저자가 설정한 라이선스에 따라 제공됩니다. 가능한 경우, vcpkg는 +`installed//share//copyright`에 관련된 라이선스를 저장합니다. + +# 보안 + +Vcpk가 제공하는 대부분의 port는 각각의 라이브러리를 빌드할 때 +원 개발자들이 권장하는 빌드 시스템을 이용하고, +소스 코드와 빌드 도구를 각각의 공식 배포처로부터 다운로드합니다. +방화벽 뒤에서 사용하는 경우, 어떤 port를 설치하느냐에 따라 필요한 접근 권한이 달라질 수 있습니다. +만약 "air gapped" 환경에서 설치해야만 한다면, "air gapped"가 아닌 환경에서 +[asset 캐시](docs/users/assetcaching.md)를 다운로드하고, +이후에 "air gapped" 환경에서 공유하는 것을 고려해 보십시오. # 데이터 수집 vcpkg는 사용자 경험을 개선하는 데 도움이 되도록 사용 데이터를 수집합니다. Microsoft는 이 정보를 익명으로 수집합니다. -다음을 통해 원격 측정을 옵트아웃 할 수 있습니다. -- -disableMetrics를 사용하여 bootstrap-vcpkg 스크립트 실행 +다음을 통해 원격 정보 제공을 비활성화할 수 있습니다. +- -disableMetrics 옵션을 포함하여 bootstrap-vcpkg 스크립트 실행 - 명령줄에서 vcpkg에 --disable-metrics 전달 - VCPKG_DISABLE_METRICS 환경 변수 설정 diff --git a/external_imported/vcpkg/README_zh_CN.md b/external_imported/vcpkg/README_zh_CN.md index 642b81fe6..5c4ddc578 100644 --- a/external_imported/vcpkg/README_zh_CN.md +++ b/external_imported/vcpkg/README_zh_CN.md @@ -5,7 +5,7 @@ Vcpkg 可帮助您在 Windows、 Linux 和 MacOS 上管理 C 和 C++ 库。 这个工具和生态链正在不断发展，我们一直期待您的贡献！ -若您从未使用过vcpkg或希望了解如何使用vcpkg，请查阅[快速开始](#入门)章节。 +若您从未使用过vcpkg，或者您正在尝试了解如何使用vcpkg，请查阅 [入门](#入门) 章节。 如需获取有关可用命令的简短描述，请在编译vcpkg后执行 `vcpkg help` 或执行 `vcpkg help [command]` 来获取具体的帮助信息。 @@ -32,13 +32,13 @@ Vcpkg 可帮助您在 Windows、 Linux 和 MacOS 上管理 C 和 C++ 库。 - [将 vcpkg 作为一个子模块](#将-vcpkg-作为一个子模块) - [Tab补全/自动补全](#tab补全自动补全) - [示例](#示例) - - [贡献者](#贡献者) -- [License](#license) + - [贡献](#贡献) +- [开源协议](#开源协议) - [数据收集](#数据收集) # 入门 -首先，请阅读以下任一方面的快速入门指南： +首先，请阅读以下任一快速入门指南： [Windows](#快速开始-windows) 或 [macOS和Linux](#快速开始-unix)， 这取决于您使用的是什么平台。 @@ -57,7 +57,7 @@ vcpkg团队和贡献者可以看到它的地方， ## 快速开始: Windows -需求: +前置条件: - Windows 7 或更新的版本 - [Git][getting-started:git] - [Visual Studio 2015 Update 3][getting-started:visual-studio] 或更新的版本（**包含英文语言包**） @@ -95,14 +95,14 @@ vcpkg团队和贡献者可以看到它的地方， > .\vcpkg\vcpkg search [search term] ``` -若您希望在 Visual Studio 中使用vcpkg，请运行以下命令 (首次启动需要管理员权限) +若您希望在 Visual Studio 中使用vcpkg，请运行以下命令 (可能需要管理员权限) ```cmd > .\vcpkg\vcpkg integrate install ``` 在此之后，您可以创建一个非cmake项目 (或打开已有的项目)。 -在您的项目中，所有已安装的库均可立即使用 `#include` 包含您需使用的库的头文件且无需添加额外配置。 +在您的项目中，所有已安装的库均可立即使用 `#include` 包含您需使用的库的头文件且无需额外配置。 若您在 Visual Studio 中使用cmake工程，请查阅[这里](#visual-studio-cmake-工程中使用-vcpkg)。 @@ -120,11 +120,11 @@ vcpkg团队和贡献者可以看到它的地方， ## 快速开始: Unix -Linux平台的使用需求: +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 脚本。 @@ -284,7 +284,7 @@ $ ./vcpkg integrate bash # 或 zsh 观看4分钟 [demo视频](https://www.youtube.com/watch?v=y41WFKbQFTw)。 -## 贡献者 +## 贡献 Vcpkg是一个开源项目，并通过您的贡献不断发展。 下面是一些您可以贡献的方式: @@ -292,7 +292,7 @@ Vcpkg是一个开源项目，并通过您的贡献不断发展。 * [提交一个关于vcpkg或已支持包的新issue][contributing:submit-issue] * [提交修复PR和创建新包][contributing:submit-pr] -请参阅我们的 [贡献准则](CONTRIBUTING.md) 了解更多详细信息。 +请参阅我们的 [贡献准则](CONTRIBUTING_zh.md) 了解更多详细信息。 该项目采用了 [Microsoft开源行为准则][contributing:coc]。 获取更多信息请查看 [行为准则FAQ][contributing:coc-faq] 或联系 [opencode@microsoft.com](mailto:opencode@microsoft.com) 提出其他问题或意见。 @@ -302,7 +302,7 @@ Vcpkg是一个开源项目，并通过您的贡献不断发展。 [contributing:coc]: https://opensource.microsoft.com/codeofconduct/ [contributing:coc-faq]: https://opensource.microsoft.com/codeofconduct/ -# License +# 开源协议 在此存储库中使用的代码均遵循 [MIT License](LICENSE.txt)。 diff --git a/external_imported/vcpkg/docs/README.md b/external_imported/vcpkg/docs/README.md index 598cb7eaf..6b770e189 100644 --- a/external_imported/vcpkg/docs/README.md +++ b/external_imported/vcpkg/docs/README.md @@ -29,10 +29,11 @@ Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS. This too ### Maintainer Help -- [Manifest files - vcpkg.json](maintainers/manifest-files.md) -- [Control files](maintainers/control-files.md) -- [Portfile functions](maintainers/portfile-functions.md) -- [Common CMake definitions](maintainers/vcpkg_common_definitions.md) +- [Manifest Files - vcpkg.json](maintainers/manifest-files.md) +- [Control Files](maintainers/control-files.md) +- [Portfile Functions](maintainers/portfile-functions.md) +- [Authoring Script Ports](maintainers/authoring-script-ports.md) +- [Common CMake Definitions](maintainers/vcpkg_common_definitions.md) - [Maintainer Guidelines](maintainers/maintainer-guide.md) - [Creating Registries](maintainers/registries.md) - [CMake Guidelines](maintainers/cmake-guidelines.md) diff --git a/external_imported/vcpkg/docs/examples/packaging-github-repos.md b/external_imported/vcpkg/docs/examples/packaging-github-repos.md index 3a0e81c2f..7091c7e01 100644 --- a/external_imported/vcpkg/docs/examples/packaging-github-repos.md +++ b/external_imported/vcpkg/docs/examples/packaging-github-repos.md @@ -32,15 +32,12 @@ The important parts to update are `REPO` for the GitHub repository path, `REF` f Finally, we configure the project with CMake, install the package, and copy over the license file: ```cmake -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA -) -vcpkg_install_cmake() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libogg RENAME copyright) +vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH}) +vcpkg_cmake_install() +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libogg" RENAME copyright) ``` -Check the documentation for [`vcpkg_configure_cmake`](../maintainers/vcpkg_configure_cmake.md) and [`vcpkg_install_cmake`](../maintainers/vcpkg_install_cmake.md) if your package needs additional options. +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. Now you can run `vcpkg install libogg` to build and install the package. diff --git a/external_imported/vcpkg/docs/examples/patching.md b/external_imported/vcpkg/docs/examples/patching.md index 4afc1ffaf..dc9de1682 100644 --- a/external_imported/vcpkg/docs/examples/patching.md +++ b/external_imported/vcpkg/docs/examples/patching.md @@ -151,7 +151,7 @@ vcpkg_extract_source_archive_ex( "use-abort-on-all-platforms.patch" ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( ... ``` diff --git a/external_imported/vcpkg/docs/examples/vcpkg_android_example_cmake_script/CMakeLists.txt b/external_imported/vcpkg/docs/examples/vcpkg_android_example_cmake_script/CMakeLists.txt index d3218866f..eded6e547 100644 --- a/external_imported/vcpkg/docs/examples/vcpkg_android_example_cmake_script/CMakeLists.txt +++ b/external_imported/vcpkg/docs/examples/vcpkg_android_example_cmake_script/CMakeLists.txt @@ -10,4 +10,4 @@ project(test) find_package(jsoncpp CONFIG REQUIRED) add_library(my_lib my_lib.cpp) -target_link_libraries(my_lib jsoncpp_lib) +target_link_libraries(my_lib JsonCpp::JsonCpp) diff --git a/external_imported/vcpkg/docs/maintainers/authoring-script-ports.md b/external_imported/vcpkg/docs/maintainers/authoring-script-ports.md new file mode 100644 index 000000000..f14eaa440 --- /dev/null +++ b/external_imported/vcpkg/docs/maintainers/authoring-script-ports.md @@ -0,0 +1,45 @@ +# Authoring Script Ports + +Ports can expose functions for other ports to consume during their build. For +example, the `vcpkg-cmake` helper port exposes the `vcpkg_cmake_configure()` +helper function. Packaging common scripts into a shared helper port makes +maintenance easier because all consumers can be updated from a single place. +Because the scripts come from a port, they can be versioned and depended upon +via all the same mechanisms as any other port. + +Script ports are implemented via the `vcpkg-port-config.cmake` extension +mechanism. Before invoking the `portfile.cmake` of a port, vcpkg will first +import `share//vcpkg-port-config.cmake` from each direct dependency. If +the direct dependency is a host dependency, the import will be performed in the +host installed tree (e.g. +`${HOST_INSTALLED_DIR}/share//vcpkg-port-config.cmake`). + +Only direct dependencies are considered for `vcpkg-port-config.cmake` inclusion. +This means that if a script port relies on another script port, it must +explicitly import the `vcpkg-port-config.cmake` of its dependency. + +Script-to-script dependencies should not be marked as host. The dependency from +a target port to a script should be marked host, which means that scripts should +always already be natively compiling. By making script-to-script dependencies +`"host": false`, it ensures that one script can depend upon the other being in +its same install directory. + +Ports should never provide a `vcpkg-port-config.cmake` file under a different +`share/` subdirectory than the current port (`${PORT}`). + +## Example + +```cmake +# ${CURRENT_PACKAGES_DIR}/share/my-helper/vcpkg-port-config.cmake + +# This include guard ensures the file will be loaded only once +include_guard(GLOBAL) + +# This is how you could pull in a transitive dependency +include("${CMAKE_CURRENT_LIST_DIR}/../my-other-helper/vcpkg-port-config.cmake") + +# Finally, it is convention to put each public function into a separate file with a matching name +include("${CMAKE_CURRENT_LIST_DIR}/my_helper_function_01.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/my_helper_function_02.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/my_helper_function_03.cmake") +``` diff --git a/external_imported/vcpkg/docs/maintainers/cmake-guidelines.md b/external_imported/vcpkg/docs/maintainers/cmake-guidelines.md index c0bd5b6a0..fb682f276 100644 --- a/external_imported/vcpkg/docs/maintainers/cmake-guidelines.md +++ b/external_imported/vcpkg/docs/maintainers/cmake-guidelines.md @@ -138,7 +138,7 @@ We hope that they will make both forwards and backwards compatibility easier. - This `cmake_minimum_required` should be bumped every time a new version of CMake is added to `vcpkgTools.xml`, as should the `cmake_minimum_required` in all of the helper `CMakeLists.txt` files. -- `vcpkg.cmake` must assume a version of CMake back to 3.1 in general +- `vcpkg.cmake` must assume a version of CMake back to 3.7.2 in general - Specific functions and options may assume a greater CMake version; if they do, make sure to comment that function or option with the required CMake version. diff --git a/external_imported/vcpkg/docs/maintainers/maintainer-guide.md b/external_imported/vcpkg/docs/maintainers/maintainer-guide.md index 855a3a36c..1bf8e9483 100644 --- a/external_imported/vcpkg/docs/maintainers/maintainer-guide.md +++ b/external_imported/vcpkg/docs/maintainers/maintainer-guide.md @@ -93,6 +93,19 @@ the files installed by `b` must be the same, regardless of influence by the prev In the entire vcpkg system, no two ports a user is expected to use concurrently may provide the same file. If a port tries to install a file already provided by another file, installation will fail. If a port wants to use an extremely common name for a header, for example, it should place those headers in a subdirectory rather than in `include`. +### Add CMake exports in an unofficial- namespace + +A core design ideal of vcpkg is to not create "lock-in" for customers. In the build system, there should be no difference between depending on a library from the system, and depending on a library from vcpkg. To that end, we avoid adding CMake exports or targets to existing libraries with "the obvious name", to allow upstreams to add their own official CMake exports without conflicting with vcpkg. + +To that end, any CMake configs that the port exports, which are not in the upstream library, should have `unofficial-` as a prefix. Any additional targets should be in the `unofficial::::` namespace. + +This means that the user should see: + * `find_package(unofficial- CONFIG)` as the way to get at the unique-to-vcpkg package + * `unofficial::::` as an exported target from that port. + +Examples: + * [`brotli`](https://github.com/microsoft/vcpkg/blob/4f0a640e4c5b74166b759a862d7527c930eff32e/ports/brotli/install.patch) creates the `unofficial-brotli` package, producing target `unofficial::brotli::brotli`. + ## Features ### Do not use features to implement alternatives @@ -166,16 +179,15 @@ Examples: [abseil](../../ports/abseil/portfile.cmake) ### Choose either static or shared binaries -By default, `vcpkg_configure_cmake()` will pass in the appropriate setting for `BUILD_SHARED_LIBS`, +By default, `vcpkg_cmake_configure()` will pass in the appropriate setting for `BUILD_SHARED_LIBS`, however for libraries that don't respect that variable, you can switch on `VCPKG_LIBRARY_LINKAGE`: ```cmake string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" KEYSTONE_BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" KEYSTONE_BUILD_SHARED) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DKEYSTONE_BUILD_STATIC=${KEYSTONE_BUILD_STATIC} -DKEYSTONE_BUILD_SHARED=${KEYSTONE_BUILD_SHARED} @@ -188,17 +200,18 @@ When defining a feature that captures an optional dependency, ensure that the dependency will not be used accidentally when the feature is not explicitly enabled. ```cmake +set(CMAKE_DISABLE_FIND_PACKAGE_ZLIB ON) +set(CMAKE_REQUIRE_FIND_PACKAGE_ZLIB OFF) if ("zlib" IN_LIST FEATURES) set(CMAKE_DISABLE_FIND_PACKAGE_ZLIB OFF) -else() - set(CMAKE_DISABLE_FIND_PACKAGE_ZLIB ON) + set(CMAKE_REQUIRE_FIND_PACKAGE_ZLIB ON) endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=${CMAKE_DISABLE_FIND_PACKAGE_ZLIB} + -DCMAKE_REQUIRE_FIND_PACKAGE_ZLIB=${CMAKE_REQUIRE_FIND_PACKAGE_ZLIB} ) ``` @@ -206,19 +219,20 @@ The snippet below using `vcpkg_check_features()` is equivalent, [see the docume ```cmake vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "zlib" CMAKE_REQUIRE_FIND_PACKAGE_ZLIB INVERTED_FEATURES "zlib" CMAKE_DISABLE_FIND_PACKAGE_ZLIB ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} ) ``` -Note that `ZLIB` in the above is case-sensitive. See the [cmake documentation](https://cmake.org/cmake/help/v3.15/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html) for more details. +Note that `ZLIB` in the above is case-sensitive. See the [CMAKE_DISABLE_FIND_PACKAGE_PackageName](https://cmake.org/cmake/help/v3.22/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html) and [CMAKE_REQUIRE_FIND_PACKAGE_PackageName](https://cmake.org/cmake/help/v3.22/variable/CMAKE_REQUIRE_FIND_PACKAGE_PackageName.html) documnetation for more details. ### Place conflicting libs in a `manual-link` directory @@ -318,6 +332,8 @@ Because of this, it is preferable to patch the buildsystem directly when setting When making changes to a library, strive to minimize the final diff. This means you should _not_ reformat the upstream source code when making changes that affect a region. Also, when disabling a conditional, it is better to add a `AND FALSE` or `&& 0` to the condition than to delete every line of the conditional. +Don't add patches if the port is outdated and updating the port to a newer released version would solve the same issue. vcpkg prefers updating ports over patching outdated versions unless the version bump breaks a considerable amount of dependent ports. + This helps to keep the size of the vcpkg repository down as well as improves the likelihood that the patch will apply to future code versions. ### Do not implement features in patches diff --git a/external_imported/vcpkg/docs/maintainers/manifest-files.md b/external_imported/vcpkg/docs/maintainers/manifest-files.md index a10f5464e..46bd73a97 100644 --- a/external_imported/vcpkg/docs/maintainers/manifest-files.md +++ b/external_imported/vcpkg/docs/maintainers/manifest-files.md @@ -433,6 +433,7 @@ These predefined identifier expressions are computed from standard triplet setti - `static` - `VCPKG_LIBRARY_LINKAGE` == `"static"` - `wasm32` - `VCPKG_TARGET_ARCHITECTURE` == `"wasm32"` - `emscripten` - `VCPKG_CMAKE_SYSTEM_NAME` == `"Emscripten"` +- `staticcrt` - `VCPKG_CRT_LINKAGE` == `"static"` These predefined identifier expressions can be overridden in the triplet file, via the [`VCPKG_DEP_INFO_OVERRIDE_VARS`](../users/triplets.md) option, @@ -452,3 +453,99 @@ This field is optional and defaults to true. ``` This means "doesn't support uwp, nor arm32 (but does support arm64)". + +### `"license"` + +The license of the port. This is an [SPDX license expression], +or `null` for proprietary licenses and other licenses for which +one should "just read the `copyright` file" (e.g., Qt). + +[SPDX license expression]: https://spdx.dev/ids/#how + +Additionally, you can find the list of [recognized license IDs] +and [recognized license exception IDs] in Annex A of the SPDX specification. + +[recognized license IDs]: https://spdx.github.io/spdx-spec/SPDX-license-list/#a1-licenses-with-short-identifiers +[recognized license exception IDs]: https://spdx.github.io/spdx-spec/SPDX-license-list/#a2-exceptions-list + +The following is an EBNF conversion of the ABNF located at +, +and this is what we actually parse in vcpkg. +Note that vcpkg does not support DocumentRefs. + +```ebnf +idchar = ? regex /[-.a-zA-Z0-9]/ ? +idstring = ( idchar ), { idchar } ; + +(* note that unrecognized license and license exception IDs will be warned against *) +license-id = idstring ; +license-exception-id = idstring ; +(* note that DocumentRefs are unsupported by this implementation *) +license-ref = "LicenseRef-", idstring ; + +with = [ whitespace ], "WITH", [ whitespace ] ; +and = [ whitespace ], "AND", [ whitespace ] ; +or = [ whitespace ], "OR", [ whitespace ] ; + +simple-expression = [ whitespace ], ( + | license-id + | license-id, "+" + | license-ref + ), [ whitespace ] ; + +(* the following are split up from compound-expression to make precedence obvious *) +parenthesized-expression = + | simple-expression + | [ whitespace ], "(", or-expression, ")", [ whitespace ] ; + +with-expression = + | parenthesized-expression + | simple-expression, with, license-exception-id, [ whitespace ] ; + +(* note: "a AND b OR c" gets parsed as "(a AND b) OR c" *) +and-expression = with-expression, { and, with-expression } ; +or-expression = and-expression, { or, and-exression } ; + +license-expression = or-expression ; +``` + +#### Examples + +For libraries with simple licensing, +only one license identifier may be needed; + +vcpkg, for example, would use this since it uses the MIT license: + +```json +{ + "license": "MIT" +} +``` + +Many GPL'd projects allow either the GPL 2 or any later versions: + +```json +{ + "license": "GPL-2.0-or-later" +} +``` + +Many Rust projects, in order to make certain they're useable with GPL, +but also desiring the MIT license, will allow licensing under either +the MIT license or Apache 2.0: + +```json +{ + "license": "Apache-2.0 OR MIT" +} +``` + +Some major projects include exceptions; +the Microsoft C++ standard library, and the LLVM project, +are licensed under Apache 2.0 with the LLVM exception: + +```json +{ + "license": "Apache-2.0 WITH LLVM-exception" +} +``` diff --git a/external_imported/vcpkg/docs/maintainers/portfile-functions.md b/external_imported/vcpkg/docs/maintainers/portfile-functions.md index 1c24f8e98..6c7b87fdc 100644 --- a/external_imported/vcpkg/docs/maintainers/portfile-functions.md +++ b/external_imported/vcpkg/docs/maintainers/portfile-functions.md @@ -33,7 +33,7 @@ - [vcpkg\_execute\_required\_process\_repeat](vcpkg_execute_required_process_repeat.md) - [vcpkg\_extract\_source\_archive](vcpkg_extract_source_archive.md) - [vcpkg\_extract\_source\_archive\_ex](vcpkg_extract_source_archive_ex.md) -- [vcpkg\_fail\_port\_install](vcpkg_fail_port_install.md) +- [vcpkg\_fail\_port\_install](vcpkg_fail_port_install.md) (deprecated) - [vcpkg\_find\_acquire\_program](vcpkg_find_acquire_program.md) - [vcpkg\_find\_fortran](vcpkg_find_fortran.md) - [vcpkg\_fixup\_cmake\_targets](vcpkg_fixup_cmake_targets.md) (deprecated, use [vcpkg\_cmake\_config\_fixup](ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md)) diff --git a/external_imported/vcpkg/docs/maintainers/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md b/external_imported/vcpkg/docs/maintainers/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md index e4b486798..469e0b197 100644 --- a/external_imported/vcpkg/docs/maintainers/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md +++ b/external_imported/vcpkg/docs/maintainers/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md @@ -10,6 +10,7 @@ Additionally corrects common issues with targets, such as absolute paths and inc vcpkg_cmake_config_fixup( [PACKAGE_NAME ] [CONFIG_PATH ] + [TOOLS_PATH ] [DO_NOT_DELETE_PARENT_CONFIG_PATH] [NO_PREFIX_CORRECTION] ) @@ -35,11 +36,13 @@ and applies a rather simply correction which in some cases will yield the wrong ## How it Works 1. Moves `/debug//*targets-debug.cmake` to `/share/${PACKAGE_NAME}`. -2. Removes `/debug//*config.cmake`. -3. Transform all references matching `/bin/*.exe` to `/tools//*.exe` on Windows. -4. Transform all references matching `/bin/*` to `/tools//*` on other platforms. -5. Fixes `${_IMPORT_PREFIX}` in auto generated targets. -6. Replace `${CURRENT_INSTALLED_DIR}` with `${_IMPORT_PREFIX}` in configs and targets. +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 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 index 51a96372f..b8f9c3b8a 100644 --- 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 @@ -20,6 +20,8 @@ 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`, 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 index 6053b363c..fd84c2529 100644 --- 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 @@ -87,7 +87,7 @@ This command supplies many common arguments to CMake. To see the full list, exam * [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) +* [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_get_vars.md b/external_imported/vcpkg/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_get_vars.md index 68e51333c..50e7abde7 100644 --- a/external_imported/vcpkg/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_get_vars.md +++ b/external_imported/vcpkg/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_get_vars.md @@ -13,6 +13,16 @@ vcpkg_cmake_get_vars() 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. 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 index 29ac265aa..1d708d3a1 100644 --- 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 @@ -15,7 +15,7 @@ vcpkg_cmake_install( 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.cmake +[`vcpkg_cmake_build()`]: vcpkg_cmake_build.md ## Examples: diff --git a/external_imported/vcpkg/docs/maintainers/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.md b/external_imported/vcpkg/docs/maintainers/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.md index 06299533a..1dbcf37e0 100644 --- a/external_imported/vcpkg/docs/maintainers/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.md +++ b/external_imported/vcpkg/docs/maintainers/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.md @@ -10,6 +10,7 @@ Retrieve required module information from pkgconfig modules x_vcpkg_pkgconfig_get_modules( PREFIX MODULES ... + [CFLAGS] [LIBS] [LIBRARIES] [LIBRARIES_DIRS] diff --git a/external_imported/vcpkg/docs/maintainers/vcpkg_check_features.md b/external_imported/vcpkg/docs/maintainers/vcpkg_check_features.md index a8b90a3cd..c22908589 100644 --- a/external_imported/vcpkg/docs/maintainers/vcpkg_check_features.md +++ b/external_imported/vcpkg/docs/maintainers/vcpkg_check_features.md @@ -56,9 +56,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS secure MI_SECURE ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS # Expands to "-DMI_SEE_ASM=ON;-DMI_OVERRIDE=OFF;-DMI_SECURE=ON" ${FEATURE_OPTIONS} @@ -77,9 +76,8 @@ vcpkg_check_features( websockets CPPREST_EXCLUDE_WEBSOCKETS ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS # Expands to "-DCPPREST_EXCLUDE_BROTLI=ON;-DCPPREST_EXCLUDE_WEBSOCKETS=OFF" ${FEATURE_OPTIONS} @@ -99,9 +97,8 @@ vcpkg_check_features( cuda BUILD_GPU ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS # Expands to "-DWITH_CUDA=ON;-DBUILD_CUDA=ON;-DBUILD_GPU=ON" ${FEATURE_OPTIONS} @@ -121,9 +118,8 @@ vcpkg_check_features( tbb ROCKSDB_IGNORE_PACKAGE_TBB ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS # Expands to "-DWITH_TBB=ON;-DROCKSDB_IGNORE_PACKAGE_TBB=OFF" ${FEATURE_OPTIONS} 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 1d807edc8..69a95a510 100644 --- a/external_imported/vcpkg/docs/maintainers/vcpkg_extract_source_archive.md +++ b/external_imported/vcpkg/docs/maintainers/vcpkg_extract_source_archive.md @@ -19,6 +19,7 @@ The latter is suggested to use for all future `vcpkg_extract_source_archive`s. vcpkg_extract_source_archive( ARCHIVE [NO_REMOVE_ONE_LEVEL] + [SKIP_PATCH_CHECK] [PATCHES ...] [SOURCE_BASE ] [BASE_DIRECTORY | WORKING_DIRECTORY ] @@ -59,6 +60,10 @@ 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`. diff --git a/external_imported/vcpkg/docs/maintainers/vcpkg_fail_port_install.md b/external_imported/vcpkg/docs/maintainers/vcpkg_fail_port_install.md index f729b19a3..1d59fd8c1 100644 --- a/external_imported/vcpkg/docs/maintainers/vcpkg_fail_port_install.md +++ b/external_imported/vcpkg/docs/maintainers/vcpkg_fail_port_install.md @@ -1,5 +1,7 @@ # vcpkg_fail_port_install +**This function has been deprecated in favor of the `supports` field in [`manifest file`](manifest-files.md#supports) et al.** + The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_fail_port_install.md). Checks common requirements and fails the current portfile with a (default) error message diff --git a/external_imported/vcpkg/docs/maintainers/vcpkg_find_fortran.md b/external_imported/vcpkg/docs/maintainers/vcpkg_find_fortran.md index 227c1c837..b02c0c51b 100644 --- a/external_imported/vcpkg/docs/maintainers/vcpkg_find_fortran.md +++ b/external_imported/vcpkg/docs/maintainers/vcpkg_find_fortran.md @@ -15,7 +15,7 @@ vcpkg_find_fortran() ```cmake vcpkg_find_fortran(fortran_args) # ... -vcpkg_configure_cmake(... +vcpkg_cmake_configure(... OPTIONS ${fortran_args} ) diff --git a/external_imported/vcpkg/docs/users/android.md b/external_imported/vcpkg/docs/users/android.md index 45b0cf616..3f5b03ec0 100644 --- a/external_imported/vcpkg/docs/users/android.md +++ b/external_imported/vcpkg/docs/users/android.md @@ -30,10 +30,7 @@ export ANDROID_NDK_HOME=/home/your-account/Android/android-ndk-r21b export VCPKG_ROOT=/path/to/vcpkg ```` -## Create the android triplets - - -### Android ABI and corresponding vcpkg triplets +## vcpkg triplets and their corresponding android ABI There are four different Android ABI, each of which maps to a vcpkg triplet. The following table outlines the mapping from vcpkg architectures to android architectures @@ -45,41 +42,6 @@ a vcpkg triplet. The following table outlines the mapping from vcpkg architectur |x64-android | x86_64 | |x86-android | x86 | -### Create the android triplets -You can copy-paste the script below to populate them, and adjust them to your needs if required. - -````bash -cd $VCPKG_ROOT - -echo " -set(VCPKG_TARGET_ARCHITECTURE arm) -set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE dynamic) -set(VCPKG_CMAKE_SYSTEM_NAME Android) -" > triplets/community/arm-android.cmake - -echo " -set(VCPKG_TARGET_ARCHITECTURE arm64) -set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE dynamic) -set(VCPKG_CMAKE_SYSTEM_NAME Android) -" > triplets/community/arm64-android.cmake - -echo " -set(VCPKG_TARGET_ARCHITECTURE x86) -set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE dynamic) -set(VCPKG_CMAKE_SYSTEM_NAME Android) -" > triplets/community/x86-android.cmake - -echo " -set(VCPKG_TARGET_ARCHITECTURE x64) -set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE dynamic) -set(VCPKG_CMAKE_SYSTEM_NAME Android) -" > triplets/community/x64-android.cmake -```` - ## Install libraries for Android using vcpkg Example for jsoncpp: diff --git a/external_imported/vcpkg/docs/users/authentication.md b/external_imported/vcpkg/docs/users/authentication.md index 727b99617..4c1d1b9f0 100644 --- a/external_imported/vcpkg/docs/users/authentication.md +++ b/external_imported/vcpkg/docs/users/authentication.md @@ -77,3 +77,15 @@ vcpkg_from_github( ``` For private ports, we recommend using `vcpkg_from_git()` instead of `vcpkg_from_github()` and the pre-seeding method above. + +## Pass Jenkins gitUsernamePassword credentials + +The simplest and most secure option to Git authentication to GitHub from Jenkins is using [GitHub App](https://github.com/jenkinsci/github-branch-source-plugin/blob/master/docs/github-app.adoc) and the following: +```groovy +withCredentials([gitUsernamePassword(credentialsId: 'jenkins-github-app')]) { + withEnv(['VCPKG_KEEP_ENV_VARS=GIT_ASKPASS']) { + bat 'cmake' + } +} +``` +This sets the GIT_ASKPASS with a path to helper script which responds with git credentials query and instructs `vcpkg` to keep this environment variable. The password is a [GitHub App token](https://github.blog/2021-04-05-behind-githubs-new-authentication-token-formats/) with 1 hour lifetime. diff --git a/external_imported/vcpkg/docs/users/host-dependencies.md b/external_imported/vcpkg/docs/users/host-dependencies.md index 6521d28dd..4e7cf39a3 100644 --- a/external_imported/vcpkg/docs/users/host-dependencies.md +++ b/external_imported/vcpkg/docs/users/host-dependencies.md @@ -46,12 +46,10 @@ The default host triplets are chosen based on the host architecture and operatin Producing a tool has no special requirements; tools should be authored as a standard port, following all the normal policies and practices. Notably, they should build against `TARGET_TRIPLET`, not `HOST_TRIPLET` within the context of their portfile. -Sometimes, it can be useful to determine whether the current context is a cross-compiling one or not. This should be done by comparing the strings `TARGET_TRIPLET` and `HOST_TRIPLET`. For example: +If the current context is cross-compiling (`TARGET_TRIPLET` is not `HOST_TRIPLET`), then `VCPKG_CROSSCOMPILING` will be set to a truthy value. ```cmake -string(COMPARE EQUAL "${TARGET_TRIPLET}" "${HOST_TRIPLET}" I_AM_NOT_CROSSCOMPILING) - -if(TARGET_TRIPLET STREQUAL HOST_TRIPLET) +if(VCPKG_CROSSCOMPILING) # This is a native build else() # This is a cross build @@ -60,6 +58,8 @@ endif() ## Host-only ports -Some ports are host-only: script ports and tool ports are common examples. -In this case, you can use the `"native"` supports expression to describe this. -This supports expression is true when `TARGET_TRIPLET == HOST_TRIPLET`. +Some ports should only be depended upon via a host dependency; script ports and +tool ports are common examples. In this case, you can use the `"native"` +supports expression to describe this. This supports expression is true when +`VCPKG_CROSSCOMPILING` is false (implying that `TARGET_TRIPLET == +HOST_TRIPLET`). diff --git a/external_imported/vcpkg/docs/users/manifests.md b/external_imported/vcpkg/docs/users/manifests.md index d200ac9b6..387511b65 100644 --- a/external_imported/vcpkg/docs/users/manifests.md +++ b/external_imported/vcpkg/docs/users/manifests.md @@ -344,6 +344,11 @@ If unset, vcpkg will automatically detect an appropriate native triplet (x64-win 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 diff --git a/external_imported/vcpkg/ports/3fd/portfile.cmake b/external_imported/vcpkg/ports/3fd/portfile.cmake index 294b0370c..ae6850929 100644 --- a/external_imported/vcpkg/ports/3fd/portfile.cmake +++ b/external_imported/vcpkg/ports/3fd/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "osx" "linux") - # Check architecture: if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") set(BUILD_ARCH "Win32") diff --git a/external_imported/vcpkg/ports/3fd/vcpkg.json b/external_imported/vcpkg/ports/3fd/vcpkg.json index 286cb8aa3..5ee8f2d4e 100644 --- a/external_imported/vcpkg/ports/3fd/vcpkg.json +++ b/external_imported/vcpkg/ports/3fd/vcpkg.json @@ -1,7 +1,7 @@ { "name": "3fd", "version": "2.6.3", - "port-version": 1, + "port-version": 2, "description": "C++ Framework For Fast Development", "supports": "windows & !static & !arm64", "dependencies": [ diff --git a/external_imported/vcpkg/ports/7zip/7zip-config.cmake.in b/external_imported/vcpkg/ports/7zip/7zip-config.cmake.in new file mode 100644 index 000000000..442821af9 --- /dev/null +++ b/external_imported/vcpkg/ports/7zip/7zip-config.cmake.in @@ -0,0 +1,5 @@ +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/7zip-targets.cmake") + +check_required_components(7zip) diff --git a/external_imported/vcpkg/ports/7zip/CMakeLists.txt b/external_imported/vcpkg/ports/7zip/CMakeLists.txt index 4ed900584..a7fb577bc 100644 --- a/external_imported/vcpkg/ports/7zip/CMakeLists.txt +++ b/external_imported/vcpkg/ports/7zip/CMakeLists.txt @@ -1,23 +1,16 @@ -# Created from 7-zip v19.00 - 7zip/CPP/7zip/Bundles/Format7zF +cmake_minimum_required(VERSION 3.19) -cmake_minimum_required(VERSION 3.11) -cmake_policy(VERSION 3.11) +project(7zip LANGUAGES C CXX) -project(7zip LANGUAGES C CXX ASM_MASM) - -set(SRC_ASM - Asm/x86/AesOpt.asm - Asm/x86/7zCrcOpt.asm - Asm/x86/XzCrc64Opt.asm -) - -if(CMAKE_SIZEOF_VOID_P EQUAL 8) - set_source_files_properties(${SRC_ASM} PROPERTIES COMPILE_FLAGS "-Dx64") -else() - set_source_files_properties(${SRC_ASM} PROPERTIES COMPILE_FLAGS "-safeseh") +if(VCPKG_TARGET_IS_WINDOWS) + enable_language(ASM_MASM) +elseif(VCPKG_TARGET_IS_LINUX) + enable_language(ASM) endif() -set(SRC_COMPRESS +add_library(7zip) + +target_sources(7zip PRIVATE CPP/7zip/Compress/Bcj2Coder.cpp CPP/7zip/Compress/Bcj2Register.cpp CPP/7zip/Compress/BcjCoder.cpp @@ -68,9 +61,7 @@ set(SRC_COMPRESS CPP/7zip/Compress/ZlibEncoder.cpp CPP/7zip/Compress/ZDecoder.cpp CPP/7zip/Compress/CodecExports.cpp -) -set(SRC_CRYPTO CPP/7zip/Crypto/7zAes.cpp CPP/7zip/Crypto/7zAesRegister.cpp CPP/7zip/Crypto/HmacSha1.cpp @@ -85,9 +76,7 @@ set(SRC_CRYPTO CPP/7zip/Crypto/WzAes.cpp CPP/7zip/Crypto/ZipCrypto.cpp CPP/7zip/Crypto/ZipStrong.cpp -) -set(SRC_C C/7zBuf2.c C/7zStream.c C/Alloc.c @@ -106,12 +95,12 @@ set(SRC_C C/Lzma2Dec.c C/Lzma2DecMt.c C/Lzma2Enc.c - C/LzmaDec.c C/LzmaEnc.c C/LzmaLib.c C/MtCoder.c C/MtDec.c C/Ppmd7.c + C/Ppmd7aDec.c C/Ppmd7Dec.c C/Ppmd7Enc.c C/Ppmd8.c @@ -128,27 +117,21 @@ set(SRC_C C/Aes.c C/7zCrc.c C/XzCrc64.c -) - -set_source_files_properties( - ${SRC_COMPRESS} - ${SRC_CRYPTO} - ${SRC_C} - PROPERTIES - COMPILE_FLAGS $<$:"/O2"> -) -set(SRC_OTHER CPP/Common/CRC.cpp CPP/Common/CrcReg.cpp CPP/Common/DynLimBuf.cpp CPP/Common/IntToString.cpp + CPP/Common/LzFindPrepare.cpp CPP/Common/MyMap.cpp CPP/Common/MyString.cpp CPP/Common/MyVector.cpp + CPP/Common/MyWindows.cpp CPP/Common/MyXml.cpp CPP/Common/NewHandler.cpp + CPP/Common/Sha1Prepare.cpp CPP/Common/Sha1Reg.cpp + CPP/Common/Sha256Prepare.cpp CPP/Common/Sha256Reg.cpp CPP/Common/StringConvert.cpp CPP/Common/StringToInt.cpp @@ -192,6 +175,7 @@ set(SRC_OTHER CPP/7zip/Archive/ApmHandler.cpp CPP/7zip/Archive/ArHandler.cpp CPP/7zip/Archive/ArjHandler.cpp + CPP/7zip/Archive/Base64Handler.cpp CPP/7zip/Archive/Bz2Handler.cpp CPP/7zip/Archive/ComHandler.cpp CPP/7zip/Archive/CpioHandler.cpp @@ -303,32 +287,112 @@ set(SRC_OTHER CPP/7zip/Archive/Zip/ZipOut.cpp CPP/7zip/Archive/Zip/ZipUpdate.cpp CPP/7zip/Archive/Zip/ZipRegister.cpp -) -add_library(7zip - ${SRC_ASM} - ${SRC_OTHER} - ${SRC_COMPRESS} - ${SRC_CRYPTO} - ${SRC_C} CPP/7zip/Archive/Archive2.def C/Util/LzmaLib/LzmaLib.def ) +# 7zCrcOpt +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + target_sources(7zip PRIVATE Asm/x86/7zCrcOpt.asm) + set_source_files_properties(Asm/x86/7zCrcOpt.asm PROPERTIES LANGUAGE ASM_MASM) + else() + target_sources(7zip PRIVATE C/7zCrcOpt.c) + endif() +else() + target_sources(7zip PRIVATE C/7zCrcOpt.c) +endif() + +# AesOpt +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + target_sources(7zip PRIVATE Asm/x86/AesOpt.asm) + set_source_files_properties(Asm/x86/AesOpt.asm PROPERTIES LANGUAGE ASM_MASM) + else() + target_sources(7zip PRIVATE C/AesOpt.c) + endif() +else() + target_sources(7zip PRIVATE C/AesOpt.c) +endif() + +# LzFindOpt +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + target_sources(7zip PRIVATE Asm/x86/LzFindOpt.asm) + set_source_files_properties(Asm/x86/LzFindOpt.asm PROPERTIES LANGUAGE ASM_MASM) + else() + target_sources(7zip PRIVATE C/LzFindOpt.c) + endif() +else() + target_sources(7zip PRIVATE C/LzFindOpt.c) +endif() + +# LzmaDecOpt +target_sources(7zip PRIVATE C/LzmaDec.c) +if((VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") OR + (VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + ) + if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + target_sources(7zip PRIVATE Asm/x86/LzmaDecOpt.asm) + set_source_files_properties(Asm/x86/LzmaDecOpt.asm PROPERTIES LANGUAGE ASM_MASM) + elseif(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + target_sources(7zip PRIVATE Asm/arm64/LzmaDecOpt.S) + set_source_files_properties(Asm/x86/LzmaDecOpt.asm PROPERTIES LANGUAGE ASM) + endif() + + get_source_file_property(defs C/LzmaDec.c COMPILE_DEFINITIONS) + list(APPEND defs "_LZMA_DEC_OPT") + set_source_files_properties(C/LzmaDec.c PROPERTIES COMPILE_DEFINITIONS "${defs}") +endif() + +# Sha1Opt +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + target_sources(7zip PRIVATE Asm/x86/Sha1Opt.asm) + set_source_files_properties(Asm/x86/Sha1Opt.asm PROPERTIES LANGUAGE ASM_MASM) + else() + target_sources(7zip PRIVATE C/Sha1Opt.c) + endif() +else() + target_sources(7zip PRIVATE C/Sha1Opt.c) +endif() + +# Sha256Opt +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + target_sources(7zip PRIVATE Asm/x86/Sha256Opt.asm) + set_source_files_properties(Asm/x86/Sha256Opt.asm PROPERTIES LANGUAGE ASM_MASM) + else() + target_sources(7zip PRIVATE C/Sha256Opt.c) + endif() +else() + target_sources(7zip PRIVATE C/Sha256Opt.c) +endif() + +# XzCrc64Opt +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + target_sources(7zip PRIVATE Asm/x86/XzCrc64Opt.asm) + set_source_files_properties(Asm/x86/XzCrc64Opt.asm PROPERTIES LANGUAGE ASM_MASM) + else() + target_sources(7zip PRIVATE C/XzCrc64Opt.c) + endif() +else() + target_sources(7zip PRIVATE C/XzCrc64Opt.c) +endif() + target_compile_definitions(7zip PUBLIC + -D_REENTRANT + -D_FILE_OFFSET_BITS=64 + -D_LARGEFILE_SOURCE -DEXTERNAL_CODECS -D_7ZIP_LARGE_PAGES -DUNICODE -D_UNICODE ) -target_compile_options(7zip - PRIVATE - /wd5043 - $<$:/guard:cf> -) - target_include_directories(7zip INTERFACE $/7zip/CPP @@ -359,7 +423,7 @@ set(PUBLIC_HEADERS install( TARGETS 7zip - EXPORT 7zip + EXPORT 7zip-targets ARCHIVE DESTINATION lib LIBRARY DESTINATION lib RUNTIME DESTINATION bin @@ -375,10 +439,19 @@ foreach(HEADER ${PUBLIC_HEADERS}) ) endforeach() +include(CMakePackageConfigHelpers) +configure_package_config_file( + "${CMAKE_CURRENT_SOURCE_DIR}/7zip-config.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/7zip-config.cmake" + INSTALL_DESTINATION "share/7zip" +) +install( + FILES "${CMAKE_CURRENT_BINARY_DIR}/7zip-config.cmake" + DESTINATION "share/7zip" +) + install( - EXPORT 7zip + EXPORT 7zip-targets DESTINATION share/7zip - FILE 7zipConfig.cmake NAMESPACE 7zip:: - CONFIGURATIONS Release ) diff --git a/external_imported/vcpkg/ports/7zip/License.txt b/external_imported/vcpkg/ports/7zip/License.txt deleted file mode 100644 index e9113842c..000000000 --- a/external_imported/vcpkg/ports/7zip/License.txt +++ /dev/null @@ -1,90 +0,0 @@ - 7-Zip source code - ~~~~~~~~~~~~~~~~~ - License for use and distribution - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - 7-Zip Copyright (C) 1999-2019 Igor Pavlov. - - The licenses for files are: - - 1) CPP/7zip/Compress/Rar* files: the "GNU LGPL" with "unRAR license restriction" - 2) CPP/7zip/Compress/LzfseDecoder.cpp: the "BSD 3-clause License" - 3) Some files are "public domain" files, if "public domain" status is stated in source file. - 4) the "GNU LGPL" for all other files. If there is no license information in - some source file, that file is under the "GNU LGPL". - - The "GNU LGPL" with "unRAR license restriction" means that you must follow both - "GNU LGPL" rules and "unRAR license restriction" rules. - - - - - GNU LGPL information - -------------------- - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - - - - BSD 3-clause License - -------------------- - - The "BSD 3-clause License" is used for the code in LzfseDecoder.cpp that implements LZFSE data decompression. - That code was derived from the code in the "LZFSE compression library" developed by Apple Inc, - that also uses the "BSD 3-clause License": - - ---- - Copyright (c) 2015-2016, Apple Inc. All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer - in the documentation and/or other materials provided with the distribution. - - 3. Neither the name of the copyright holder(s) nor the names of any contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - ---- - - - - - unRAR license restriction - ------------------------- - - The decompression engine for RAR archives was developed using source - code of unRAR program. - All copyrights to original unRAR code are owned by Alexander Roshal. - - The license for original unRAR code has the following restriction: - - The unRAR sources cannot be used to re-create the RAR compression algorithm, - which is proprietary. Distribution of modified unRAR sources in separate form - or as a part of other software is permitted, provided that it is clearly - stated in the documentation and source comments that the code may - not be used to develop a RAR (WinRAR) compatible archiver. - - - -- - Igor Pavlov diff --git a/external_imported/vcpkg/ports/7zip/portfile.cmake b/external_imported/vcpkg/ports/7zip/portfile.cmake index bffb9b4df..5dd58bfdb 100644 --- a/external_imported/vcpkg/ports/7zip/portfile.cmake +++ b/external_imported/vcpkg/ports/7zip/portfile.cmake @@ -1,32 +1,30 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp" "linux" "osx") - -set(7ZIP_VERSION 19.00) +set(7ZIP_VERSION "2107") vcpkg_download_distfile(ARCHIVE - URLS "https://www.7-zip.org/a/7z1900-src.7z" - FILENAME "7z1900-src.7z" - SHA512 d68b308e175224770adc8b1495f1ba3cf3e7f67168a7355000643d3d32560ae01aa34266f0002395181ed91fb5e682b86e0f79c20625b42d6e2c62dd24a5df93 + URLS "https://www.7-zip.org/a/7z${7ZIP_VERSION}-src.7z" + FILENAME "7z${7ZIP_VERSION}-src.7z" + SHA512 c13521a9829ac239a89015e1f5da27eeaa2469754e3f8ca32311d964ea9d0b40a17e4f8ccbd425d3e865aa768be345368f1c36f354d5710ac7cb2749dd6a3ab5 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${7ZIP_VERSION} +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" NO_REMOVE_ONE_LEVEL ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/7zip-config.cmake.in" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() - +vcpkg_cmake_install() vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup() + file( - INSTALL ${CMAKE_CURRENT_LIST_DIR}/License.txt - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + INSTALL "${SOURCE_PATH}/DOC/License.txt" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright ) diff --git a/external_imported/vcpkg/ports/7zip/unRarLicense.txt b/external_imported/vcpkg/ports/7zip/unRarLicense.txt deleted file mode 100644 index 5f78b728d..000000000 --- a/external_imported/vcpkg/ports/7zip/unRarLicense.txt +++ /dev/null @@ -1,41 +0,0 @@ - ****** ***** ****** unRAR - free utility for RAR archives - ** ** ** ** ** ** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ****** ******* ****** License for use and distribution of - ** ** ** ** ** ** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ** ** ** ** ** ** FREE portable version - ~~~~~~~~~~~~~~~~~~~~~ - - The source code of unRAR utility is freeware. This means: - - 1. All copyrights to RAR and the utility unRAR are exclusively - owned by the author - Alexander Roshal. - - 2. The unRAR sources may be used in any software to handle RAR - archives without limitations free of charge, but cannot be used - to re-create the RAR compression algorithm, which is proprietary. - Distribution of modified unRAR sources in separate form or as a - part of other software is permitted, provided that it is clearly - stated in the documentation and source comments that the code may - not be used to develop a RAR (WinRAR) compatible archiver. - - 3. The unRAR utility may be freely distributed. No person or company - may charge a fee for the distribution of unRAR without written - permission from the copyright holder. - - 4. THE RAR ARCHIVER AND THE UNRAR UTILITY ARE DISTRIBUTED "AS IS". - NO WARRANTY OF ANY KIND IS EXPRESSED OR IMPLIED. YOU USE AT - YOUR OWN RISK. THE AUTHOR WILL NOT BE LIABLE FOR DATA LOSS, - DAMAGES, LOSS OF PROFITS OR ANY OTHER KIND OF LOSS WHILE USING - OR MISUSING THIS SOFTWARE. - - 5. Installing and using the unRAR utility signifies acceptance of - these terms and conditions of the license. - - 6. If you don't agree with terms of the license you must remove - unRAR files from your storage devices and cease to use the - utility. - - Thank you for your interest in RAR and unRAR. - - - Alexander L. Roshal \ No newline at end of file diff --git a/external_imported/vcpkg/ports/7zip/vcpkg.json b/external_imported/vcpkg/ports/7zip/vcpkg.json index a8c7b6ce5..542e88c00 100644 --- a/external_imported/vcpkg/ports/7zip/vcpkg.json +++ b/external_imported/vcpkg/ports/7zip/vcpkg.json @@ -1,8 +1,19 @@ { "name": "7zip", - "version-string": "19.00", - "port-version": 3, + "version-string": "21.07", + "port-version": 1, "description": "Library for archiving file with a high compression ratio.", "homepage": "https://www.7-zip.org", - "supports": "!(linux | osx | arm | uwp)" + "license": "LGPL-2.1-or-later", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/ace/portfile.cmake b/external_imported/vcpkg/ports/ace/portfile.cmake index e781fef4b..a9312dcaa 100644 --- a/external_imported/vcpkg/ports/ace/portfile.cmake +++ b/external_imported/vcpkg/ports/ace/portfile.cmake @@ -1,7 +1,7 @@ # 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.5) +set(ACE_VERSION 7.0.6) string(REPLACE "." "_" ACE_VERSION_DIRECTORY ${ACE_VERSION}) if("tao" IN_LIST FEATURES) @@ -10,14 +10,13 @@ if("tao" IN_LIST FEATURES) 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 3ea0cc7b35433d7c41f51137caacd394a976cf4d5c2972a35015901b3ba172bacff0216a3146bf632b929a63853b7123019382c22d14c6d64e43a71a61b88023 + SHA512 faef212f066263f9a87a688d105f15097f6b78fd77baf9e2b7da008027cd9ad0478b1f016892ee2d36fcb5aa6b14cc6fbb8fb906f018db6a1089820d522c65f9 ) else() - # VCPKG_TARGET_IS_LINUX 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 65c6557f72a57dc137882bbf6cbb009ae2e403c9848e3e4c3165f1ed55865c5e08fc0226dcf715b33bfa501b13b3863f5c40403791b0dcd29b7c88fec20a9660 + SHA512 5d0bbeb1f729c3304637a15979303ba6efdbe52bb5d4ac73930fe9b86dbb73a5d74325476809863b26e1a3fc39a205d9d3a9909bce7bbdc5869de3e30f1bc317 ) endif() else() @@ -26,52 +25,51 @@ else() 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 73707c92a0533ab60f090cfb620d508755b8267e2b83fb52d9903c4d780d2e2b504545433fdbe34801d4895cf938ecc5a5f26c34528851080bcce07f5a501ac1 + SHA512 91f35727afc652f537ce242eb0a9e10878b51b63f9c10f72bddd6491481f10eec5d9d8469f79da3b95adeab7d6848eb1e8bad4e43f61db63daf796a2cd205d61 ) - else(VCPKG_TARGET_IS_WINDOWS) - # VCPKG_TARGET_IS_LINUX + else() 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 6e5e43e600763e612c292cb88443e4dce1be94d049e2a784c5a4d4720314b484cccec4f7f05534c6ef824d86bef8bfe4ff5bce5f7998896cdaa599302b5b2562 + SHA512 9770fab3552835803a93c9a234218c9dd961ecde67227ee92e0972cd2e2ff267147b255ab437453a887bc47b20f70c7a64efeada5dde5d3ea2cade54200e8354 ) endif() endif() vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" ) -set(ACE_ROOT ${SOURCE_PATH}) -set(ENV{ACE_ROOT} ${ACE_ROOT}) -set(ACE_SOURCE_PATH ${ACE_ROOT}/ace) +set(ACE_ROOT "${SOURCE_PATH}") +set(ENV{ACE_ROOT} "${ACE_ROOT}") +set(ACE_SOURCE_PATH "${ACE_ROOT}/ace") if("tao" IN_LIST FEATURES) - set(TAO_ROOT ${SOURCE_PATH}/TAO) - set(ENV{TAO_ROOT} ${TAO_ROOT}) - set(WORKSPACE ${TAO_ROOT}/TAO_ACE) + set(TAO_ROOT "${SOURCE_PATH}/TAO") + set(ENV{TAO_ROOT} "${TAO_ROOT}") + set(WORKSPACE "${TAO_ROOT}/TAO_ACE") else() - set(WORKSPACE ${ACE_ROOT}/ace/ace) + set(WORKSPACE "${ACE_ROOT}/ace/ace") endif() if("wchar" IN_LIST FEATURES) list(APPEND ACE_FEATURE_LIST "uses_wchar=1") endif() if("zlib" IN_LIST FEATURES) list(APPEND ACE_FEATURE_LIST "zlib=1") - set(ENV{ZLIB_ROOT} ${CURRENT_INSTALLED_DIR}) + set(ENV{ZLIB_ROOT} "${CURRENT_INSTALLED_DIR}") else() list(APPEND ACE_FEATURE_LIST "zlib=0") endif() if("ssl" IN_LIST FEATURES) list(APPEND ACE_FEATURE_LIST "ssl=1") list(APPEND ACE_FEATURE_LIST "openssl11=1") - set(ENV{SSL_ROOT} ${CURRENT_INSTALLED_DIR}) + set(ENV{SSL_ROOT} "${CURRENT_INSTALLED_DIR}") else() list(APPEND ACE_FEATURE_LIST "ssl=0") endif() if("xml-utils" IN_LIST FEATURES) list(APPEND ACE_FEATURE_LIST "xerces3=1") - set(ENV{XERCESCROOT} ${CURRENT_INSTALLED_DIR}) + set(ENV{XERCESCROOT} "${CURRENT_INSTALLED_DIR}") else() list(APPEND ACE_FEATURE_LIST "xerces3=0") endif() @@ -80,7 +78,7 @@ list(JOIN ACE_FEATURE_LIST "," ACE_FEATURES) # Acquire Perl and add it to PATH (for execution of MPC) 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 (TRIPLET_SYSTEM_ARCH MATCHES "x86") set(MSBUILD_PLATFORM "Win32") @@ -103,16 +101,21 @@ if(VCPKG_TARGET_IS_WINDOWS) if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(MPC_STATIC_FLAG -static) endif() - file(WRITE ${ACE_SOURCE_PATH}/config.h "#include \"ace/config-windows.h\"") + set(config_h_contents "#include \"ace/config-windows.h\"\n") elseif(VCPKG_TARGET_IS_LINUX) set(SOLUTION_TYPE gnuace) - file(WRITE ${ACE_SOURCE_PATH}/config.h "#include \"ace/config-linux.h\"") - file(WRITE ${ACE_ROOT}/include/makeinclude/platform_macros.GNU "include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU") + set(config_h_contents "#include \"ace/config-linux.h\"\n") + file(WRITE "${ACE_ROOT}/include/makeinclude/platform_macros.GNU" "CCFLAGS += -fPIC\ninclude $(ACE_ROOT)/include/makeinclude/platform_linux.GNU") elseif(VCPKG_TARGET_IS_OSX) set(SOLUTION_TYPE gnuace) - file(WRITE ${ACE_SOURCE_PATH}/config.h "#include \"ace/config-macosx.h\"") - file(WRITE ${ACE_ROOT}/include/makeinclude/platform_macros.GNU "include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU") + set(config_h_contents "#include \"ace/config-macosx.h\"\n") + file(WRITE "${ACE_ROOT}/include/makeinclude/platform_macros.GNU" "include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU") +endif() + +if("wchar" IN_LIST FEATURES) + string(APPEND config_h_contents "#define ACE_USES_WCHAR 1\n") endif() +file(WRITE "${ACE_SOURCE_PATH}/config.h" "${config_h_contents}") if(VCPKG_TARGET_IS_UWP) set(MPC_VALUE_TEMPLATE -value_template link_options+=/APPCONTAINER) @@ -120,22 +123,22 @@ endif() # Invoke mwc.pl to generate the necessary solution and project files vcpkg_execute_build_process( - COMMAND ${PERL} ${ACE_ROOT}/bin/mwc.pl -type ${SOLUTION_TYPE} -features "${ACE_FEATURES}" ${WORKSPACE}.mwc ${MPC_STATIC_FLAG} ${MPC_VALUE_TEMPLATE} - WORKING_DIRECTORY ${ACE_ROOT} + COMMAND ${PERL} "${ACE_ROOT}/bin/mwc.pl" -type ${SOLUTION_TYPE} -features "${ACE_FEATURES}" "${WORKSPACE}.mwc" ${MPC_STATIC_FLAG} ${MPC_VALUE_TEMPLATE} + WORKING_DIRECTORY "${ACE_ROOT}" LOGNAME mwc-${TARGET_TRIPLET} ) if("xml" IN_LIST FEATURES) vcpkg_execute_build_process( - COMMAND ${PERL} ${ACE_ROOT}/bin/mwc.pl -type ${SOLUTION_TYPE} -features "${ACE_FEATURES}" ${ACE_ROOT}/ACEXML/ACEXML.mwc ${MPC_STATIC_FLAG} ${MPC_VALUE_TEMPLATE} - WORKING_DIRECTORY ${ACE_ROOT}/ACEXML + COMMAND ${PERL} "${ACE_ROOT}/bin/mwc.pl" -type ${SOLUTION_TYPE} -features "${ACE_FEATURES}" "${ACE_ROOT}/ACEXML/ACEXML.mwc" ${MPC_STATIC_FLAG} ${MPC_VALUE_TEMPLATE} + WORKING_DIRECTORY "${ACE_ROOT}/ACEXML" LOGNAME mwc-xml-${TARGET_TRIPLET} ) endif() if(VCPKG_TARGET_IS_WINDOWS) if("tao" IN_LIST FEATURES OR "xml" IN_LIST FEATURES) - file(WRITE ${SOURCE_PATH}/Directory.Build.props " + file(WRITE "${SOURCE_PATH}/Directory.Build.props" " @@ -149,9 +152,9 @@ if(VCPKG_TARGET_IS_WINDOWS) ") endif() - file(RELATIVE_PATH PROJECT_SUBPATH ${SOURCE_PATH} ${WORKSPACE}.sln) + file(RELATIVE_PATH PROJECT_SUBPATH "${SOURCE_PATH}" "${WORKSPACE}.sln") vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH ${PROJECT_SUBPATH} LICENSE_SUBPATH COPYING PLATFORM ${MSBUILD_PLATFORM} @@ -166,19 +169,19 @@ if(VCPKG_TARGET_IS_WINDOWS) file( GLOB HEADER_FILES - ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.h - ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.hpp - ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.inl - ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.cpp - ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.idl - ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.pidl) + "${ORIGINAL_PATH}/${RELATIVE_PATH}/*.h" + "${ORIGINAL_PATH}/${RELATIVE_PATH}/*.hpp" + "${ORIGINAL_PATH}/${RELATIVE_PATH}/*.inl" + "${ORIGINAL_PATH}/${RELATIVE_PATH}/*.cpp" + "${ORIGINAL_PATH}/${RELATIVE_PATH}/*.idl" + "${ORIGINAL_PATH}/${RELATIVE_PATH}/*.pidl") file(INSTALL ${HEADER_FILES} - DESTINATION ${CURRENT_PACKAGES_DIR}/include/${RELATIVE_PATH}) + DESTINATION "${CURRENT_PACKAGES_DIR}/include/${RELATIVE_PATH}") endforeach() endfunction() get_filename_component(SOURCE_PATH_SUFFIX "${SOURCE_PATH}" NAME) - set(SOURCE_COPY_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${SOURCE_PATH_SUFFIX}) + set(SOURCE_COPY_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${SOURCE_PATH_SUFFIX}") # Install headers in subdirectory set(ACE_INCLUDE_FOLDERS @@ -193,22 +196,22 @@ if(VCPKG_TARGET_IS_WINDOWS) "ace/os_include/net" "ace/os_include/netinet" "ace/os_include/sys") - install_includes(${SOURCE_COPY_PATH} "${ACE_INCLUDE_FOLDERS}") + install_includes("${SOURCE_COPY_PATH}" "${ACE_INCLUDE_FOLDERS}") if("ssl" IN_LIST FEATURES) - install_includes(${SOURCE_COPY_PATH} "ace/SSL") + install_includes("${SOURCE_COPY_PATH}" "ace/SSL") endif() if("tao" IN_LIST FEATURES) set(ACEXML_INCLUDE_FOLDERS "ACEXML/apps/svcconf" "ACEXML/common" "ACEXML/parser/parser") - install_includes(${SOURCE_COPY_PATH} "${ACEXML_INCLUDE_FOLDERS}") + install_includes("${SOURCE_COPY_PATH}" "${ACEXML_INCLUDE_FOLDERS}") set(ACE_PROTOCOLS_INCLUDE_FOLDERS "ace/HTBP" "ace/INet" "ace/RMCast" "ace/TMCast") - install_includes(${SOURCE_COPY_PATH}/protocols "${ACE_PROTOCOLS_INCLUDE_FOLDERS}") + install_includes("${SOURCE_COPY_PATH}/protocols" "${ACE_PROTOCOLS_INCLUDE_FOLDERS}") - install_includes(${SOURCE_COPY_PATH} "Kokyu") + install_includes("${SOURCE_COPY_PATH}" "Kokyu") set(TAO_ORBSVCS_INCLUDE_FOLDERS "orbsvcs" @@ -242,11 +245,11 @@ if(VCPKG_TARGET_IS_WINDOWS) if("ssl" IN_LIST FEATURES) list(APPEND TAO_ORBSVCS_INCLUDE_FOLDERS "orbsvcs/SSLIOP") endif() - install_includes(${SOURCE_COPY_PATH}/TAO/orbsvcs "${TAO_ORBSVCS_INCLUDE_FOLDERS}") + install_includes("${SOURCE_COPY_PATH}/TAO/orbsvcs" "${TAO_ORBSVCS_INCLUDE_FOLDERS}") set(TAO_ROOT_ORBSVCS_INCLUDE_FOLDERS "orbsvcs/FT_ReplicationManager" "orbsvcs/Notify_Service") - install_includes(${SOURCE_COPY_PATH}/TAO "${TAO_ROOT_ORBSVCS_INCLUDE_FOLDERS}") + install_includes("${SOURCE_COPY_PATH}/TAO" "${TAO_ROOT_ORBSVCS_INCLUDE_FOLDERS}") set(TAO_INCLUDE_FOLDERS "tao" @@ -288,13 +291,13 @@ if(VCPKG_TARGET_IS_WINDOWS) if("zlib" IN_LIST FEATURES) list(APPEND TAO_INCLUDE_FOLDERS "tao/Compression/zlib") endif() - install_includes(${SOURCE_COPY_PATH}/TAO "${TAO_INCLUDE_FOLDERS}") + install_includes("${SOURCE_COPY_PATH}/TAO" "${TAO_INCLUDE_FOLDERS}") endif() if("xml" IN_LIST FEATURES) - file(RELATIVE_PATH PROJECT_SUBPATH_XML ${SOURCE_PATH} ${ACE_ROOT}/ACEXML/ACEXML.sln) + file(RELATIVE_PATH PROJECT_SUBPATH_XML "${SOURCE_PATH}" "${ACE_ROOT}/ACEXML/ACEXML.sln") vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH ${PROJECT_SUBPATH_XML} LICENSE_SUBPATH COPYING PLATFORM ${MSBUILD_PLATFORM} @@ -303,17 +306,17 @@ if(VCPKG_TARGET_IS_WINDOWS) set(ACEXML_INCLUDE_FOLDERS "ACEXML/common" "ACEXML/parser/parser") - install_includes(${SOURCE_COPY_PATH} "${ACEXML_INCLUDE_FOLDERS}") + install_includes("${SOURCE_COPY_PATH}" "${ACEXML_INCLUDE_FOLDERS}") endif() # Remove dlls without any export if("tao" IN_LIST FEATURES OR "xml" IN_LIST FEATURES) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(REMOVE - ${CURRENT_PACKAGES_DIR}/bin/ACEXML_XML_Svc_Conf_Parser.dll - ${CURRENT_PACKAGES_DIR}/bin/ACEXML_XML_Svc_Conf_Parser.pdb - ${CURRENT_PACKAGES_DIR}/debug/bin/ACEXML_XML_Svc_Conf_Parserd.dll - ${CURRENT_PACKAGES_DIR}/debug/bin/ACEXML_XML_Svc_Conf_Parserd_dll.pdb) + "${CURRENT_PACKAGES_DIR}/bin/ACEXML_XML_Svc_Conf_Parser.dll" + "${CURRENT_PACKAGES_DIR}/bin/ACEXML_XML_Svc_Conf_Parser.pdb" + "${CURRENT_PACKAGES_DIR}/debug/bin/ACEXML_XML_Svc_Conf_Parserd.dll" + "${CURRENT_PACKAGES_DIR}/debug/bin/ACEXML_XML_Svc_Conf_Parserd_dll.pdb") endif() endif() @@ -332,22 +335,22 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) list(APPEND _ace_makefile_macros "static_libs_only=1") endif() - set(ENV{INSTALL_PREFIX} ${CURRENT_PACKAGES_DIR}) + set(ENV{INSTALL_PREFIX} "${CURRENT_PACKAGES_DIR}") # Set `PWD` environment variable since ACE's `install` make target calculates install dir using this env. set(_prev_env $ENV{PWD}) - get_filename_component(WORKING_DIR ${WORKSPACE} DIRECTORY) - set(ENV{PWD} ${WORKING_DIR}) + get_filename_component(WORKING_DIR "${WORKSPACE}" DIRECTORY) + set(ENV{PWD} "${WORKING_DIR}") message(STATUS "Building ${TARGET_TRIPLET}-dbg") vcpkg_execute_build_process( COMMAND make ${_ace_makefile_macros} "debug=1" "optimize=0" "-j${VCPKG_CONCURRENCY}" - WORKING_DIRECTORY ${WORKING_DIR} + WORKING_DIRECTORY "${WORKING_DIR}" LOGNAME make-${TARGET_TRIPLET}-dbg ) if("xml" IN_LIST FEATURES) vcpkg_execute_build_process( COMMAND make ${_ace_makefile_macros} "debug=1" "optimize=0" "-j${VCPKG_CONCURRENCY}" - WORKING_DIRECTORY ${WORKING_DIR}/ACEXML + WORKING_DIRECTORY "${WORKING_DIR}/ACEXML" LOGNAME make-xml-${TARGET_TRIPLET}-dbg ) endif() @@ -355,20 +358,20 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) message(STATUS "Packaging ${TARGET_TRIPLET}-dbg") vcpkg_execute_build_process( COMMAND make ${_ace_makefile_macros} install - WORKING_DIRECTORY ${WORKING_DIR} + WORKING_DIRECTORY "${WORKING_DIR}" LOGNAME install-${TARGET_TRIPLET}-dbg ) if("xml" IN_LIST FEATURES) vcpkg_execute_build_process( COMMAND make ${_ace_makefile_macros} install - WORKING_DIRECTORY ${WORKING_DIR}/ACEXML + WORKING_DIRECTORY "${WORKING_DIR}/ACEXML" LOGNAME install-xml-${TARGET_TRIPLET}-dbg ) endif() - file(COPY ${CURRENT_PACKAGES_DIR}/lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug) + file(COPY "${CURRENT_PACKAGES_DIR}/lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug") - file(GLOB _pkg_components ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc) + file(GLOB _pkg_components "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc") foreach(_pkg_comp ${_pkg_components}) file(READ ${_pkg_comp} _content) string(REPLACE "libdir=${CURRENT_PACKAGES_DIR}/lib" "libdir=${CURRENT_PACKAGES_DIR}/debug/lib" _content ${_content}) @@ -378,13 +381,13 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) vcpkg_execute_build_process( COMMAND make ${_ace_makefile_macros} realclean - WORKING_DIRECTORY ${WORKING_DIR} + WORKING_DIRECTORY "${WORKING_DIR}" LOGNAME realclean-${TARGET_TRIPLET}-dbg ) if("xml" IN_LIST FEATURES) vcpkg_execute_build_process( COMMAND make ${_ace_makefile_macros} realclean - WORKING_DIRECTORY ${WORKING_DIR}/ACEXML + WORKING_DIRECTORY "${WORKING_DIR}/ACEXML" LOGNAME realclean-xml-${TARGET_TRIPLET}-dbg ) endif() @@ -392,13 +395,13 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) message(STATUS "Building ${TARGET_TRIPLET}-rel") vcpkg_execute_build_process( COMMAND make ${_ace_makefile_macros} "-j${VCPKG_CONCURRENCY}" - WORKING_DIRECTORY ${WORKING_DIR} + WORKING_DIRECTORY "${WORKING_DIR}" LOGNAME make-${TARGET_TRIPLET}-rel ) if("xml" IN_LIST FEATURES) vcpkg_execute_build_process( COMMAND make ${_ace_makefile_macros} "-j${VCPKG_CONCURRENCY}" - WORKING_DIRECTORY ${WORKING_DIR}/ACEXML + WORKING_DIRECTORY "${WORKING_DIR}/ACEXML" LOGNAME make-xml-${TARGET_TRIPLET}-rel ) endif() @@ -406,26 +409,26 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) message(STATUS "Packaging ${TARGET_TRIPLET}-rel") vcpkg_execute_build_process( COMMAND make ${_ace_makefile_macros} install - WORKING_DIRECTORY ${WORKING_DIR} + WORKING_DIRECTORY "${WORKING_DIR}" LOGNAME install-${TARGET_TRIPLET}-rel ) if("xml" IN_LIST FEATURES) vcpkg_execute_build_process( COMMAND make ${_ace_makefile_macros} install - WORKING_DIRECTORY ${WORKING_DIR}/ACEXML + WORKING_DIRECTORY "${WORKING_DIR}/ACEXML" LOGNAME install-xml-${TARGET_TRIPLET}-rel ) endif() if("tao" IN_LIST FEATURES) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/tools/${PORT}) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools") + file(RENAME "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/tools/${PORT}") endif() message(STATUS "Packaging ${TARGET_TRIPLET}-rel done") # Restore `PWD` environment variable set($ENV{PWD} _prev_env) # Handle copyright - file(INSTALL ${ACE_ROOT}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + file(INSTALL "${ACE_ROOT}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/ace/bin/MakeProjectCreator") file(REMOVE "${CURRENT_PACKAGES_DIR}/share/ace/ace-devel.sh") diff --git a/external_imported/vcpkg/ports/ace/vcpkg.json b/external_imported/vcpkg/ports/ace/vcpkg.json index 66037097d..3d2ff0a71 100644 --- a/external_imported/vcpkg/ports/ace/vcpkg.json +++ b/external_imported/vcpkg/ports/ace/vcpkg.json @@ -1,10 +1,11 @@ { "name": "ace", - "version": "7.0.5", - "port-version": 2, + "version": "7.0.6", + "port-version": 3, "maintainers": "Johnny Willemsen ", "description": "The ADAPTIVE Communication Environment", "homepage": "https://www.dre.vanderbilt.edu/~schmidt/ACE.html", + "license": "DOC", "features": { "ssl": { "description": "Enable SSL/TLS features in ACE", diff --git a/external_imported/vcpkg/ports/activemq-cpp/vcpkg.json b/external_imported/vcpkg/ports/activemq-cpp/vcpkg.json index 92041064f..c2bdb9c17 100644 --- a/external_imported/vcpkg/ports/activemq-cpp/vcpkg.json +++ b/external_imported/vcpkg/ports/activemq-cpp/vcpkg.json @@ -1,14 +1,14 @@ { "name": "activemq-cpp", "version-semver": "3.9.5", - "port-version": 7, + "port-version": 8, "description": "Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.", "supports": "!(uwp | osx)", "dependencies": [ "apr", { "name": "libuuid", - "platform": "!windows" + "platform": "!windows & !osx" } ] } diff --git a/external_imported/vcpkg/ports/akali/portfile.cmake b/external_imported/vcpkg/ports/akali/portfile.cmake index e91bbd88f..4c6a52472 100644 --- a/external_imported/vcpkg/ports/akali/portfile.cmake +++ b/external_imported/vcpkg/ports/akali/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/akali diff --git a/external_imported/vcpkg/ports/akali/vcpkg.json b/external_imported/vcpkg/ports/akali/vcpkg.json index fb1cc7851..1977d5a26 100644 --- a/external_imported/vcpkg/ports/akali/vcpkg.json +++ b/external_imported/vcpkg/ports/akali/vcpkg.json @@ -1,7 +1,7 @@ { "name": "akali", "version-string": "1.42", - "port-version": 2, + "port-version": 3, "description": "C++ Common Library.", "homepage": "https://github.com/winsoft666/akali", "supports": "!(arm | arm64 | uwp)" diff --git a/external_imported/vcpkg/ports/alembic/portfile.cmake b/external_imported/vcpkg/ports/alembic/portfile.cmake index 7723a9b34..2415acdce 100644 --- a/external_imported/vcpkg/ports/alembic/portfile.cmake +++ b/external_imported/vcpkg/ports/alembic/portfile.cmake @@ -1,8 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_fail_port_install(ON_ARCH "x86") # see https://github.com/alembic/alembic/issues/372 -endif() - vcpkg_buildpath_length_warning(37) vcpkg_from_github( diff --git a/external_imported/vcpkg/ports/alembic/vcpkg.json b/external_imported/vcpkg/ports/alembic/vcpkg.json index 52a28dae1..cbc9fc27f 100644 --- a/external_imported/vcpkg/ports/alembic/vcpkg.json +++ b/external_imported/vcpkg/ports/alembic/vcpkg.json @@ -1,6 +1,7 @@ { "name": "alembic", "version": "1.8.3", + "port-version": 1, "description": "Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications.", "homepage": "https://alembic.io/", "supports": "!(windows & x86) & !uwp", diff --git a/external_imported/vcpkg/ports/alsa/0001-control-empty-fix-the-static-build.patch b/external_imported/vcpkg/ports/alsa/0001-control-empty-fix-the-static-build.patch deleted file mode 100644 index c5ec3d124..000000000 --- a/external_imported/vcpkg/ports/alsa/0001-control-empty-fix-the-static-build.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 81e7923fbfad45b2f353a4d6e3053af51f5f7d0b Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Tue, 15 Jun 2021 23:21:42 +0200 -Subject: [PATCH] control: empty - fix the static build - -Reported-by: Jan Palus -Fixes: https://github.com/alsa-project/alsa-lib/issues/157 -Signed-off-by: Jaroslav Kysela ---- - src/control/control_empty.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/control/control_empty.c b/src/control/control_empty.c -index 49d1026c..c9b048c1 100644 ---- a/src/control/control_empty.c -+++ b/src/control/control_empty.c -@@ -30,7 +30,7 @@ - - #ifndef PIC - /* entry for static linking */ --const char *_snd_module_ctl_empty = ""; -+const char *_snd_module_control_empty = ""; - #endif - - /*! \page control_plugins --- -2.33.0 - diff --git a/external_imported/vcpkg/ports/alsa/portfile.cmake b/external_imported/vcpkg/ports/alsa/portfile.cmake index c0e6f2f3d..4b998055a 100644 --- a/external_imported/vcpkg/ports/alsa/portfile.cmake +++ b/external_imported/vcpkg/ports/alsa/portfile.cmake @@ -11,11 +11,9 @@ These can be installed on Ubuntu systems via sudo apt install autoconf libtool" vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO alsa-project/alsa-lib - REF v1.2.5.1 - SHA512 1c8613e520bd24ec2332b677a35d1c49171781f6408be61c79ec90d143d424d8df6e1c9e22e082d331022e0fe858145f7ea214a7b731ed5e306762194b49d50e + REF v1.2.6.1 + SHA512 d1de9112ec0d600db6e5a20b558811a7a9f34d00a9b1dfb5332669b73732c1c1b8ddda57368edc199e255eba8bcb8a6767b4d9325c9860ade02d84dcaac6eb47 HEAD_REF master - PATCHES - 0001-control-empty-fix-the-static-build.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) diff --git a/external_imported/vcpkg/ports/alsa/vcpkg.json b/external_imported/vcpkg/ports/alsa/vcpkg.json index 6590e42eb..58535469c 100644 --- a/external_imported/vcpkg/ports/alsa/vcpkg.json +++ b/external_imported/vcpkg/ports/alsa/vcpkg.json @@ -1,7 +1,8 @@ { "name": "alsa", - "version": "1.2.5.1", + "version": "1.2.6.1", "description": "The Advanced Linux Sound Architecture (ALSA) - library", "homepage": "https://www.alsa-project.org/", + "license": "LGPL-2.1-or-later", "supports": "linux" } diff --git a/external_imported/vcpkg/ports/ampl-asl/portfile.cmake b/external_imported/vcpkg/ports/ampl-asl/portfile.cmake index 96af62c25..fb6c664ca 100644 --- a/external_imported/vcpkg/ports/ampl-asl/portfile.cmake +++ b/external_imported/vcpkg/ports/ampl-asl/portfile.cmake @@ -1,7 +1,5 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ampl/asl @@ -15,9 +13,8 @@ vcpkg_from_github( install-targets.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_MCMODELLARGE=OFF -DBUILD_DYNRT_LIBS=OFF # CRT linkage uses C/CXX FLAGS in vcpkg @@ -25,13 +22,13 @@ vcpkg_configure_cmake( -DBUILD_CPP=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-asl TARGET_PATH share/unofficial-asl) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-asl) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # from ampl-mp license -file(INSTALL ${CURRENT_PORT_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${CURRENT_PORT_DIR}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/external_imported/vcpkg/ports/ampl-asl/vcpkg.json b/external_imported/vcpkg/ports/ampl-asl/vcpkg.json index 5a9827dfd..4b5c163b2 100644 --- a/external_imported/vcpkg/ports/ampl-asl/vcpkg.json +++ b/external_imported/vcpkg/ports/ampl-asl/vcpkg.json @@ -1,8 +1,19 @@ { "name": "ampl-asl", - "version-string": "2020-11-11", - "port-version": 1, + "version-date": "2020-11-11", + "port-version": 3, "description": "AMPL Solver Library", "homepage": "https://github.com/ampl/asl", - "supports": "!uwp" + "license": null, + "supports": "!uwp & !(osx & arm64)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/ampl-mp/portfile.cmake b/external_imported/vcpkg/ports/ampl-mp/portfile.cmake index 730e687e6..701298a2f 100644 --- a/external_imported/vcpkg/ports/ampl-mp/portfile.cmake +++ b/external_imported/vcpkg/ports/ampl-mp/portfile.cmake @@ -1,7 +1,5 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ampl/mp @@ -49,4 +47,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ) -configure_file(${SOURCE_PATH}/LICENSE.rst ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) \ No newline at end of file +configure_file(${SOURCE_PATH}/LICENSE.rst ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/external_imported/vcpkg/ports/ampl-mp/vcpkg.json b/external_imported/vcpkg/ports/ampl-mp/vcpkg.json index 8e97a5ce0..bc017ae15 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": 1, + "port-version": 2, "description": "An open-source library for mathematical programming", "homepage": "https://github.com/ampl/mp", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/amqpcpp/portfile.cmake b/external_imported/vcpkg/ports/amqpcpp/portfile.cmake index b4a0a110e..4b616f9b8 100644 --- a/external_imported/vcpkg/ports/amqpcpp/portfile.cmake +++ b/external_imported/vcpkg/ports/amqpcpp/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/external_imported/vcpkg/ports/amqpcpp/vcpkg.json b/external_imported/vcpkg/ports/amqpcpp/vcpkg.json index c34f00848..2fe066c64 100644 --- a/external_imported/vcpkg/ports/amqpcpp/vcpkg.json +++ b/external_imported/vcpkg/ports/amqpcpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "amqpcpp", "version": "4.3.15", + "port-version": 1, "description": "AMQP-CPP is a C++ library for communicating with a RabbitMQ message broker", "homepage": "https://github.com/CopernicaMarketingSoftware/AMQP-CPP", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/anax/osx-arm.patch b/external_imported/vcpkg/ports/anax/osx-arm.patch new file mode 100644 index 000000000..450cd82e2 --- /dev/null +++ b/external_imported/vcpkg/ports/anax/osx-arm.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d427767..80965bc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -154,10 +154,6 @@ set_target_properties(${ANAX_LIBRARY_NAME} PROPERTIES + SOVERSION ${ANAX_VERSION_MAJOR} + ) + +-if(APPLE) +- set_target_properties(${ANAX_LIBRARY_NAME} PROPERTIES OSX_ARCHITECTURES "i386;x86_64;") +-endif() +- + # Library files + install( + TARGETS ${ANAX_LIBRARY_NAME} diff --git a/external_imported/vcpkg/ports/anax/portfile.cmake b/external_imported/vcpkg/ports/anax/portfile.cmake index 411e04830..56c9156b8 100644 --- a/external_imported/vcpkg/ports/anax/portfile.cmake +++ b/external_imported/vcpkg/ports/anax/portfile.cmake @@ -8,20 +8,19 @@ vcpkg_from_github( HEAD_REF master PATCHES Add-bin-output.patch + osx-arm.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/anax) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/anax/LICENSE ${CURRENT_PACKAGES_DIR}/share/anax/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/anax/vcpkg.json b/external_imported/vcpkg/ports/anax/vcpkg.json index 1b44cd38d..fbaeb17bb 100644 --- a/external_imported/vcpkg/ports/anax/vcpkg.json +++ b/external_imported/vcpkg/ports/anax/vcpkg.json @@ -1,7 +1,14 @@ { "name": "anax", - "version-string": "2.1.0", - "port-version": 7, + "version": "2.1.0", + "port-version": 8, "description": "An open source C++ entity system.", - "homepage": "https://github.com/miguelmartin75/anax" + "homepage": "https://github.com/miguelmartin75/anax", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/antlr4/export_guid.patch b/external_imported/vcpkg/ports/antlr4/export_guid.patch index 4974718a7..053a6e236 100644 --- a/external_imported/vcpkg/ports/antlr4/export_guid.patch +++ b/external_imported/vcpkg/ports/antlr4/export_guid.patch @@ -1,22 +1,22 @@ -diff -urN a/runtime/src/support/guid.h b/runtime/src/support/guid.h ---- a/runtime/src/support/guid.h -+++ b/runtime/src/support/guid.h -@@ -38,7 +38,7 @@ +diff -urN a/runtime/src/support/Guid.h b/runtime/src/support/Guid.h +--- a/runtime/src/support/Guid.h ++++ b/runtime/src/support/Guid.h +@@ -42,7 +42,7 @@ namespace antlrcpp { // 16 byte value that can be passed around by value. It also supports // conversion to string (via the stream operator <<) and conversion from a // string via constructor. --class Guid -+class ANTLR4CPP_PUBLIC Guid - { +-class Guid final { ++class ANTLR4CPP_PUBLIC Guid final { public: - -@@ -90,7 +90,7 @@ + using size_type = typename std::array::size_type; + using pointer = typename std::array::pointer; +@@ -131,7 +131,7 @@ private: // function would no longer be cross-platform if we parameterized the android // version. Instead, construction of the GuidGenerator may be different on // each platform, but the use of newGuid is uniform. --class GuidGenerator -+class ANTLR4CPP_PUBLIC GuidGenerator - { +-class GuidGenerator final { ++class ANTLR4CPP_PUBLIC GuidGenerator final { public: #ifdef GUID_ANDROID - \ No newline at end of file + GuidGenerator(JNIEnv *env); + diff --git a/external_imported/vcpkg/ports/antlr4/fix_utfcpp_dependency.patch b/external_imported/vcpkg/ports/antlr4/fix_utfcpp_dependency.patch index 629e12f38..a055df470 100644 --- a/external_imported/vcpkg/ports/antlr4/fix_utfcpp_dependency.patch +++ b/external_imported/vcpkg/ports/antlr4/fix_utfcpp_dependency.patch @@ -1,45 +1,31 @@ -diff --git a/runtime/Cpp/runtime/CMakeLists.txt b/runtime/Cpp/runtime/CMakeLists.txt -index a8503bb61..e7b01b7cb 100644 +diff -urN a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt -@@ -1,17 +1,3 @@ +@@ -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(${CMAKE_ROOT}/Modules/ExternalProject.cmake) +- include_directories( +- ${UTFCPP_DIR}/install/include/utf8cpp +- ${UTFCPP_DIR}/install/include/utf8cpp/utf8 +- ) - --set(THIRDPARTY_DIR ${CMAKE_BINARY_DIR}/runtime/thirdparty) --set(UTFCPP_DIR ${THIRDPARTY_DIR}/utfcpp) --ExternalProject_Add( -- utfcpp -- GIT_REPOSITORY "git://github.com/nemtrif/utfcpp" -- GIT_TAG "v3.1.1" -- SOURCE_DIR ${UTFCPP_DIR} -- UPDATE_DISCONNECTED 1 -- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${UTFCPP_DIR}/install -Dgtest_force_shared_crt=ON -- TEST_AFTER_INSTALL 1 -- STEP_TARGETS build) - - - include_directories( -@@ -23,8 +13,6 @@ include_directories( - ${PROJECT_SOURCE_DIR}/runtime/src/tree - ${PROJECT_SOURCE_DIR}/runtime/src/tree/pattern - ${PROJECT_SOURCE_DIR}/runtime/src/tree/xpath -- ${UTFCPP_DIR}/install/include/utf8cpp -- ${UTFCPP_DIR}/install/include/utf8cpp/utf8 - ) - - -@@ -131,13 +119,6 @@ install(DIRECTORY "${PROJECT_SOURCE_DIR}/runtime/src/" - FILES_MATCHING PATTERN "*.h" - ) - --install(FILES "${UTFCPP_DIR}/source/utf8.h" -- DESTINATION "include/antlr4-runtime") --install(DIRECTORY "${UTFCPP_DIR}/source/utf8" -- DESTINATION "include/antlr4-runtime" -- COMPONENT dev -- FILES_MATCHING PATTERN "*.h" -- ) - - +- add_dependencies(antlr4_shared utf8cpp) +- add_dependencies(antlr4_static utf8cpp) +- set(INSTALL_utf8cpp TRUE) + endif() + endif() diff --git a/external_imported/vcpkg/ports/antlr4/portfile.cmake b/external_imported/vcpkg/ports/antlr4/portfile.cmake index 1770cabfc..312bb6881 100644 --- a/external_imported/vcpkg/ports/antlr4/portfile.cmake +++ b/external_imported/vcpkg/ports/antlr4/portfile.cmake @@ -1,11 +1,9 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - -set(VERSION 4.9.1) +set(VERSION 4.9.3) vcpkg_download_distfile(ARCHIVE - URLS "http://www.antlr.org/download/antlr4-cpp-runtime-${VERSION}-source.zip" + URLS "https://www.antlr.org/download/antlr4-cpp-runtime-${VERSION}-source.zip" FILENAME "antlr4-cpp-runtime-${VERSION}-source.zip" - SHA512 fe33005f73f8d408fcea8ebab62c0def119bbe0c075f04a66404d0df258126eb6caf0a8bbac34d5c4c9e79d4aa8896f32698a560d4be7d71a32dcc3457245cee + SHA512 23995a6fa661ff038142fa7220a195db3a9a26744d516011dedc3192f152b06a8e31f6cc8f969f8927b86392a960d03e89572e753f033f950839a5bd38d4c722 ) # license not exist in antlr folder. @@ -20,21 +18,20 @@ vcpkg_extract_source_archive_ex( ARCHIVE ${ARCHIVE} NO_REMOVE_ONE_LEVEL REF ${VERSION} - PATCHES + PATCHES fixed_build.patch uuid_discovery_fix.patch export_guid.patch fix_utfcpp_dependency.patch ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA 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_install_cmake() +vcpkg_cmake_install() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc ${CURRENT_PACKAGES_DIR}/debug/share diff --git a/external_imported/vcpkg/ports/antlr4/uuid_discovery_fix.patch b/external_imported/vcpkg/ports/antlr4/uuid_discovery_fix.patch index 818a9307b..9221d296c 100644 --- a/external_imported/vcpkg/ports/antlr4/uuid_discovery_fix.patch +++ b/external_imported/vcpkg/ports/antlr4/uuid_discovery_fix.patch @@ -1,9 +1,9 @@ diff -urN a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -40,8 +40,10 @@ +@@ -42,8 +42,10 @@ if(CMAKE_VERSION VERSION_EQUAL "3.3.0" OR endif() - + if(CMAKE_SYSTEM_NAME MATCHES "Linux") - find_package(PkgConfig REQUIRED) - pkg_check_modules(UUID REQUIRED uuid) @@ -14,15 +14,22 @@ diff -urN a/CMakeLists.txt b/CMakeLists.txt endif() if(APPLE) find_library(COREFOUNDATION_LIBRARY CoreFoundation) -diff -urN a/runtime/src/support/guid.cpp b/runtime/src/support/guid.cpp ---- a/runtime/src/support/guid.cpp -+++ b/runtime/src/support/guid.cpp -@@ -22,6 +22,7 @@ - THE SOFTWARE. - */ - +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" - + #include "Guid.h" + #ifdef GUID_LIBUUID - \ No newline at end of file +@@ -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 22a33dc30..442ba9515 100644 --- a/external_imported/vcpkg/ports/antlr4/vcpkg.json +++ b/external_imported/vcpkg/ports/antlr4/vcpkg.json @@ -1,6 +1,6 @@ { "name": "antlr4", - "version-string": "4.9.1", + "version": "4.9.3", "port-version": 1, "description": "ANother Tool for Language Recognition", "homepage": "https://www.antlr.org", @@ -9,6 +9,10 @@ { "name": "libuuid", "platform": "!uwp & !windows & !osx" + }, + { + "name": "vcpkg-cmake", + "host": true } ] } diff --git a/external_imported/vcpkg/ports/approval-tests-cpp/portfile.cmake b/external_imported/vcpkg/ports/approval-tests-cpp/portfile.cmake index aa0ed552e..38eaf3acb 100644 --- a/external_imported/vcpkg/ports/approval-tests-cpp/portfile.cmake +++ b/external_imported/vcpkg/ports/approval-tests-cpp/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_download_distfile(single_header - URLS https://github.com/approvals/ApprovalTests.cpp/releases/download/v.10.12.1/ApprovalTests.v.10.12.1.hpp - FILENAME ApprovalTests.v.10.12.1.hpp - SHA512 80921b8334c4c48380306a285e4f18f55872bced7a5f7f4c1a9db9c4fbd1cebf7c0ed8cca28e80b3024e34e2b41799976b1d36ecbf8d40e2bcfe45efab20d138 + URLS https://github.com/approvals/ApprovalTests.cpp/releases/download/v.10.12.2/ApprovalTests.v.10.12.2.hpp + FILENAME ApprovalTests.v.10.12.2.hpp + SHA512 ed59736f52afff246409dcf435ad12a8f15697ae80962c456ca877fbf8adcb99af1bb71424ebcb214df719506015aac27006c1cfec174700b1833db64efb3568 ) vcpkg_download_distfile(license_file - URLS https://raw.githubusercontent.com/approvals/ApprovalTests.cpp/v.10.12.1/LICENSE - FILENAME ApprovalTestsLicense.v.10.12.1 + URLS https://raw.githubusercontent.com/approvals/ApprovalTests.cpp/v.10.12.2/LICENSE + FILENAME ApprovalTestsLicense.v.10.12.2 SHA512 dc6b68d13b8cf959644b935f1192b02c71aa7a5cf653bd43b4480fa89eec8d4d3f16a2278ec8c3b40ab1fdb233b3173a78fd83590d6f739e0c9e8ff56c282557 ) diff --git a/external_imported/vcpkg/ports/approval-tests-cpp/vcpkg.json b/external_imported/vcpkg/ports/approval-tests-cpp/vcpkg.json index 2af427ab1..a57ee3113 100644 --- a/external_imported/vcpkg/ports/approval-tests-cpp/vcpkg.json +++ b/external_imported/vcpkg/ports/approval-tests-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "approval-tests-cpp", - "version": "10.12.1", + "version": "10.12.2", "description": "Approval Tests allow you to verify a chunk of output (such as a file) in one operation as opposed to writing test assertions for each element.", "homepage": "https://github.com/approvals/ApprovalTests.cpp" } diff --git a/external_imported/vcpkg/ports/apr-util/portfile.cmake b/external_imported/vcpkg/ports/apr-util/portfile.cmake index befefb4fc..d50966c4e 100644 --- a/external_imported/vcpkg/ports/apr-util/portfile.cmake +++ b/external_imported/vcpkg/ports/apr-util/portfile.cmake @@ -1,5 +1,5 @@ vcpkg_download_distfile(ARCHIVE - URLS "http://archive.apache.org/dist/apr/apr-util-1.6.1.tar.bz2" + URLS "https://archive.apache.org/dist/apr/apr-util-1.6.1.tar.bz2" FILENAME "apr-util-1.6.1.tar.bz2" SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d @@ -63,7 +63,6 @@ else() vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" - NO_DEBUG OPTIONS "--prefix=${CURRENT_INSTALLED_DIR}" "--with-apr=${CURRENT_INSTALLED_DIR}/tools/apr" diff --git a/external_imported/vcpkg/ports/apr-util/vcpkg.json b/external_imported/vcpkg/ports/apr-util/vcpkg.json index 7398beb9c..0dbff727e 100644 --- a/external_imported/vcpkg/ports/apr-util/vcpkg.json +++ b/external_imported/vcpkg/ports/apr-util/vcpkg.json @@ -1,7 +1,7 @@ { "name": "apr-util", - "version-string": "1.6.1", - "port-version": 5, + "version": "1.6.1", + "port-version": 7, "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/", "dependencies": [ diff --git a/external_imported/vcpkg/ports/apr/portfile.cmake b/external_imported/vcpkg/ports/apr/portfile.cmake index a7b81a921..eb0fc8708 100644 --- a/external_imported/vcpkg/ports/apr/portfile.cmake +++ b/external_imported/vcpkg/ports/apr/portfile.cmake @@ -64,7 +64,6 @@ else() set(ENV{CFLAGS} "$ENV{CFLAGS} -Wno-error=implicit-function-declaration") vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" - NO_DEBUG OPTIONS "--prefix=${CURRENT_INSTALLED_DIR}" "${CONFIGURE_PARAMETER_1}" diff --git a/external_imported/vcpkg/ports/apr/vcpkg.json b/external_imported/vcpkg/ports/apr/vcpkg.json index 53dcc1a5a..afeff1d23 100644 --- a/external_imported/vcpkg/ports/apr/vcpkg.json +++ b/external_imported/vcpkg/ports/apr/vcpkg.json @@ -1,7 +1,7 @@ { "name": "apr", "version": "1.7.0", - "port-version": 6, + "port-version": 7, "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/", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/apsi/portfile.cmake b/external_imported/vcpkg/ports/apsi/portfile.cmake index 5002c99a0..500089791 100644 --- a/external_imported/vcpkg/ports/apsi/portfile.cmake +++ b/external_imported/vcpkg/ports/apsi/portfile.cmake @@ -1,9 +1,5 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -if("hexl" IN_LIST FEATURES) - vcpkg_fail_port_install(ON_ARCH "x86" "arm" "arm64") -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/APSI diff --git a/external_imported/vcpkg/ports/apsi/vcpkg.json b/external_imported/vcpkg/ports/apsi/vcpkg.json index 97792cc04..29b3035df 100644 --- a/external_imported/vcpkg/ports/apsi/vcpkg.json +++ b/external_imported/vcpkg/ports/apsi/vcpkg.json @@ -1,9 +1,10 @@ { "name": "apsi", "version-semver": "0.7.0", + "port-version": 2, "description": "APSI is a research library for asymmetric private set intersection.", "homepage": "https://github.com/microsoft/APSI", - "supports": "static", + "supports": "static & !(arm & osx)", "dependencies": [ "flatbuffers", "jsoncpp", diff --git a/external_imported/vcpkg/ports/arb/portfile.cmake b/external_imported/vcpkg/ports/arb/portfile.cmake index b6c60304b..62879730a 100644 --- a/external_imported/vcpkg/ports/arb/portfile.cmake +++ b/external_imported/vcpkg/ports/arb/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fredrik-johansson/arb diff --git a/external_imported/vcpkg/ports/arb/vcpkg.json b/external_imported/vcpkg/ports/arb/vcpkg.json index 66b04428a..9cfb617f3 100644 --- a/external_imported/vcpkg/ports/arb/vcpkg.json +++ b/external_imported/vcpkg/ports/arb/vcpkg.json @@ -1,8 +1,10 @@ { "name": "arb", "version": "2.21.1", + "port-version": 1, "description": "a C library for arbitrary-precision interval arithmetic", "homepage": "https://github.com/fredrik-johansson/arb", + "license": "LGPL-2.1", "dependencies": [ "flint", { diff --git a/external_imported/vcpkg/ports/arcus/portfile.cmake b/external_imported/vcpkg/ports/arcus/portfile.cmake index d2777742b..c85b0f73f 100644 --- a/external_imported/vcpkg/ports/arcus/portfile.cmake +++ b/external_imported/vcpkg/ports/arcus/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Ultimaker/libArcus @@ -28,4 +26,4 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME Arcus CONFIG_PATH lib/cmake/Arcus) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) \ No newline at end of file +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/external_imported/vcpkg/ports/arcus/vcpkg.json b/external_imported/vcpkg/ports/arcus/vcpkg.json index bf7b6b4db..356415b52 100644 --- a/external_imported/vcpkg/ports/arcus/vcpkg.json +++ b/external_imported/vcpkg/ports/arcus/vcpkg.json @@ -1,7 +1,7 @@ { "name": "arcus", "version-semver": "4.10.0", - "port-version": 1, + "port-version": 2, "description": "This library contains C++ bindings for creating a socket in a thread and using this socket to send and receive messages based on the Protocol Buffers library.", "homepage": "https://github.com/Ultimaker/libArcus", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/args/portfile.cmake b/external_imported/vcpkg/ports/args/portfile.cmake index d91ae99fb..bf4f674a7 100644 --- a/external_imported/vcpkg/ports/args/portfile.cmake +++ b/external_imported/vcpkg/ports/args/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Taywee/args - REF 6.2.7 - SHA512 a6491b2680979feb2f09e7ffb4f3c939b75057b6b4b90136b6cb72eaf5a462d3079dfb5836744e53bf4946bd575d4449f87129d6e50045732d7fba11c2be57dd + REF 6.3.0 + SHA512 7d554719781d5a096883e37cd5c1706782d06c2c4d7a9598142aec7f2e38d63438e82960b60a705baeb2aa5d31143c83fa6c0d1331a36b16f564a5ea56ad451d HEAD_REF master ) @@ -22,5 +22,3 @@ vcpkg_fixup_pkgconfig() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/args/vcpkg.json b/external_imported/vcpkg/ports/args/vcpkg.json index 720c1be97..01789e2e5 100644 --- a/external_imported/vcpkg/ports/args/vcpkg.json +++ b/external_imported/vcpkg/ports/args/vcpkg.json @@ -1,8 +1,9 @@ { "name": "args", - "version": "6.2.7", + "version": "6.3.0", "description": "A simple header-only C++ argument parser library.", "homepage": "https://github.com/Taywee/args", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/argtable3/portfile.cmake b/external_imported/vcpkg/ports/argtable3/portfile.cmake index 5cb94bc15..428b9fa87 100644 --- a/external_imported/vcpkg/ports/argtable3/portfile.cmake +++ b/external_imported/vcpkg/ports/argtable3/portfile.cmake @@ -1,32 +1,29 @@ -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/argtable/argtable3/releases/download/v3.2.1.52f24e5/argtable-v3.2.1.52f24e5.tar.gz" - FILENAME "argtable-v3.2.1.52f24e5.tar.gz" - SHA512 cec77d56048b38bb7af8553cb660e745972bbd90378eeea4e928579af78190c8a41fdb29c972263e18955e3a497e09c42f705f7c4d548c3c523c5cb104c97a10 -) - -vcpkg_extract_source_archive_ex( +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + REPO argtable/argtable3 + REF 7704006f3cbb556e11da80a5b97469075a32892e # 3.2.1 + minor patches including ARGTABLE3_ENABLE_EXAMPLES support + SHA512 c51aa0a33a247c3801e36ca5d9523acefa31f21a34c1e86965a39290c1b437785e4d7e0ae80a65d811803b8fcbbc3a96ba3d6aefaea9bda15abc0f38bd1f45cc + HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DARGTABLE3_ENABLE_CONAN=OFF -DARGTABLE3_ENABLE_TESTS=OFF + -DARGTABLE3_ENABLE_EXAMPLES=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake) - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) -elseif(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/${PORT}) - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake") + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +elseif(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/${PORT}") + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -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/argtable3/vcpkg.json b/external_imported/vcpkg/ports/argtable3/vcpkg.json index d28ccb745..527cc3bdf 100644 --- a/external_imported/vcpkg/ports/argtable3/vcpkg.json +++ b/external_imported/vcpkg/ports/argtable3/vcpkg.json @@ -1,6 +1,18 @@ { "name": "argtable3", - "version-string": "3.2.1", + "version": "3.2.1", + "port-version": 2, "description": "A single-file, ANSI C, command-line parsing library that parses GNU-style command-line options", - "homepage": "www.argtable.org" + "homepage": "https://www.argtable.org/", + "license": "BSD-2-Clause-FreeBSD", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/armadillo/portfile.cmake b/external_imported/vcpkg/ports/armadillo/portfile.cmake index abc372c54..aa501fc5d 100644 --- a/external_imported/vcpkg/ports/armadillo/portfile.cmake +++ b/external_imported/vcpkg/ports/armadillo/portfile.cmake @@ -41,8 +41,11 @@ if(SHARE_LEN EQUAL 0) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/Armadillo") endif() -if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/armadillo_bits/config.hpp" "#define ARMA_AUX_LIBS ${CURRENT_INSTALLED_DIR}/lib/openblas.lib;${CURRENT_INSTALLED_DIR}/lib/lapack.lib;${CURRENT_INSTALLED_DIR}/lib/openblas.lib" "") +set(filename "${CURRENT_PACKAGES_DIR}/include/armadillo_bits/config.hpp") +if(EXISTS "${filename}") + file(READ "${filename}" contents) + string(REGEX REPLACE "\n#define ARMA_AUX_LIBS [^\n]*\n" "\n" contents "${contents}") + file(WRITE "${filename}" "${contents}") endif() file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/external_imported/vcpkg/ports/armadillo/vcpkg.json b/external_imported/vcpkg/ports/armadillo/vcpkg.json index 8c7aaaad9..27e432049 100644 --- a/external_imported/vcpkg/ports/armadillo/vcpkg.json +++ b/external_imported/vcpkg/ports/armadillo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "armadillo", "version": "10.6.2", - "port-version": 3, + "port-version": 5, "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", "dependencies": [ diff --git a/external_imported/vcpkg/ports/arrow/all.patch b/external_imported/vcpkg/ports/arrow/all.patch index a9b3a2628..45624f168 100644 --- a/external_imported/vcpkg/ports/arrow/all.patch +++ b/external_imported/vcpkg/ports/arrow/all.patch @@ -1,5 +1,5 @@ diff --git a/cpp/cmake_modules/BuildUtils.cmake b/cpp/cmake_modules/BuildUtils.cmake -index cd8290d1b..12c52c184 100644 +index 391c43e0a..50f6d3d3c 100644 --- a/cpp/cmake_modules/BuildUtils.cmake +++ b/cpp/cmake_modules/BuildUtils.cmake @@ -427,7 +427,7 @@ function(ADD_ARROW_LIB LIB_NAME) diff --git a/external_imported/vcpkg/ports/arrow/fix-dependencies.patch b/external_imported/vcpkg/ports/arrow/fix-dependencies.patch index fc1f5a19c..e9b740df9 100644 --- a/external_imported/vcpkg/ports/arrow/fix-dependencies.patch +++ b/external_imported/vcpkg/ports/arrow/fix-dependencies.patch @@ -1,8 +1,8 @@ diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt -index ba8c36e81..eac441dee 100644 +index 2d7baf118..ace45d35b 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt -@@ -689,7 +689,7 @@ endif() +@@ -699,7 +699,7 @@ endif() if(ARROW_WITH_BROTLI) # Order is important for static linking @@ -11,7 +11,7 @@ index ba8c36e81..eac441dee 100644 list(APPEND ARROW_LINK_LIBS ${ARROW_BROTLI_LIBS}) list(APPEND ARROW_STATIC_LINK_LIBS ${ARROW_BROTLI_LIBS}) if(Brotli_SOURCE STREQUAL "SYSTEM") -@@ -705,9 +705,9 @@ if(ARROW_WITH_BZ2) +@@ -715,9 +715,9 @@ if(ARROW_WITH_BZ2) endif() if(ARROW_WITH_LZ4) @@ -23,7 +23,7 @@ index ba8c36e81..eac441dee 100644 endif() endif() -@@ -764,10 +764,10 @@ if(ARROW_S3) +@@ -787,10 +787,10 @@ if(ARROW_WITH_OPENTELEMETRY) endif() if(ARROW_WITH_UTF8PROC) @@ -38,7 +38,7 @@ index ba8c36e81..eac441dee 100644 endif() diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake -index 673a58eed..8c2c1e2fb 100644 +index bc389521b..1b358ce70 100644 --- a/cpp/cmake_modules/ThirdpartyToolchain.cmake +++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -53,7 +53,7 @@ set(ARROW_THIRDPARTY_DEPENDENCIES @@ -50,15 +50,16 @@ index 673a58eed..8c2c1e2fb 100644 BZip2 c-ares gflags -@@ -62,14 +62,14 @@ set(ARROW_THIRDPARTY_DEPENDENCIES +@@ -62,7 +62,7 @@ set(ARROW_THIRDPARTY_DEPENDENCIES gRPC GTest LLVM - Lz4 + lz4 + opentelemetry-cpp ORC re2 - Protobuf +@@ -70,7 +70,7 @@ set(ARROW_THIRDPARTY_DEPENDENCIES RapidJSON Snappy Thrift @@ -67,7 +68,7 @@ index 673a58eed..8c2c1e2fb 100644 xsimd ZLIB zstd) -@@ -872,17 +872,7 @@ set(Boost_ADDITIONAL_VERSIONS +@@ -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}) @@ -86,7 +87,7 @@ index 673a58eed..8c2c1e2fb 100644 set(Thrift_SOURCE "BUNDLED") endif() endif() -@@ -991,7 +981,7 @@ macro(build_snappy) +@@ -1038,7 +1028,7 @@ macro(build_snappy) endmacro() if(ARROW_WITH_SNAPPY) @@ -95,7 +96,7 @@ index 673a58eed..8c2c1e2fb 100644 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}") -@@ -1061,10 +1051,16 @@ macro(build_brotli) +@@ -1108,10 +1098,16 @@ macro(build_brotli) endmacro() if(ARROW_WITH_BROTLI) @@ -115,7 +116,7 @@ index 673a58eed..8c2c1e2fb 100644 include_directories(SYSTEM ${BROTLI_INCLUDE_DIR}) endif() -@@ -1181,7 +1177,7 @@ macro(build_glog) +@@ -1228,7 +1224,7 @@ macro(build_glog) endmacro() if(ARROW_USE_GLOG) @@ -124,7 +125,7 @@ index 673a58eed..8c2c1e2fb 100644 # 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}) -@@ -1255,8 +1251,7 @@ endmacro() +@@ -1302,8 +1298,7 @@ endmacro() if(ARROW_NEED_GFLAGS) set(ARROW_GFLAGS_REQUIRED_VERSION "2.1.0") resolve_dependency(gflags @@ -134,7 +135,7 @@ index 673a58eed..8c2c1e2fb 100644 REQUIRED_VERSION ${ARROW_GFLAGS_REQUIRED_VERSION} IS_RUNTIME_DEPENDENCY -@@ -1355,9 +1350,10 @@ endmacro() +@@ -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. @@ -146,7 +147,7 @@ index 673a58eed..8c2c1e2fb 100644 REQUIRED_VERSION 0.11.0 PC_PACKAGE_NAMES -@@ -1366,6 +1362,14 @@ if(ARROW_WITH_THRIFT) +@@ -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}) @@ -161,7 +162,7 @@ index 673a58eed..8c2c1e2fb 100644 string(REPLACE "." ";" VERSION_LIST ${THRIFT_VERSION}) list(GET VERSION_LIST 0 THRIFT_VERSION_MAJOR) list(GET VERSION_LIST 1 THRIFT_VERSION_MINOR) -@@ -1480,6 +1484,7 @@ if(ARROW_WITH_PROTOBUF) +@@ -1528,6 +1532,7 @@ if(ARROW_WITH_PROTOBUF) set(ARROW_PROTOBUF_REQUIRED_VERSION "2.6.1") endif() resolve_dependency(Protobuf @@ -169,7 +170,7 @@ index 673a58eed..8c2c1e2fb 100644 REQUIRED_VERSION ${ARROW_PROTOBUF_REQUIRED_VERSION} PC_PACKAGE_NAMES -@@ -1490,6 +1495,10 @@ if(ARROW_WITH_PROTOBUF) +@@ -1538,6 +1543,10 @@ if(ARROW_WITH_PROTOBUF) endif() # TODO: Don't use global includes but rather target_include_directories @@ -180,7 +181,7 @@ index 673a58eed..8c2c1e2fb 100644 include_directories(SYSTEM ${PROTOBUF_INCLUDE_DIR}) if(TARGET arrow::protobuf::libprotobuf) -@@ -1538,12 +1547,18 @@ if(ARROW_WITH_PROTOBUF) +@@ -1586,12 +1595,18 @@ if(ARROW_WITH_PROTOBUF) # Log protobuf paths as we often see issues with mixed sources for # the libraries and protoc. @@ -199,7 +200,7 @@ index 673a58eed..8c2c1e2fb 100644 message(STATUS "Found libprotobuf: ${PROTOBUF_LIBRARY}") message(STATUS "Found protobuf headers: ${PROTOBUF_INCLUDE_DIR}") endif() -@@ -1954,7 +1969,7 @@ endmacro() +@@ -2001,7 +2016,7 @@ endmacro() if(ARROW_WITH_RAPIDJSON) set(ARROW_RAPIDJSON_REQUIRED_VERSION "1.1.0") resolve_dependency(RapidJSON @@ -208,7 +209,7 @@ index 673a58eed..8c2c1e2fb 100644 TRUE REQUIRED_VERSION ${ARROW_RAPIDJSON_REQUIRED_VERSION} -@@ -2093,10 +2108,11 @@ macro(build_lz4) +@@ -2140,10 +2155,11 @@ macro(build_lz4) endmacro() if(ARROW_WITH_LZ4) @@ -222,7 +223,7 @@ index 673a58eed..8c2c1e2fb 100644 include_directories(SYSTEM ${LZ4_INCLUDE_DIR}) endif() -@@ -2160,7 +2176,7 @@ endmacro() +@@ -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 @@ -231,7 +232,7 @@ index 673a58eed..8c2c1e2fb 100644 libzstd REQUIRED_VERSION 1.4.0) -@@ -2343,9 +2359,8 @@ macro(build_utf8proc) +@@ -2390,9 +2406,8 @@ macro(build_utf8proc) endmacro() if(ARROW_WITH_UTF8PROC) @@ -243,7 +244,7 @@ index 673a58eed..8c2c1e2fb 100644 PC_PACKAGE_NAMES libutf8proc) -@@ -2353,7 +2368,7 @@ if(ARROW_WITH_UTF8PROC) +@@ -2400,7 +2415,7 @@ if(ARROW_WITH_UTF8PROC) # TODO: Don't use global definitions but rather # target_compile_definitions or target_link_libraries @@ -252,7 +253,7 @@ index 673a58eed..8c2c1e2fb 100644 INTERFACE_COMPILER_DEFINITIONS) if(UTF8PROC_COMPILER_DEFINITIONS) add_definitions(-D${UTF8PROC_COMPILER_DEFINITIONS}) -@@ -2361,7 +2376,7 @@ if(ARROW_WITH_UTF8PROC) +@@ -2408,7 +2423,7 @@ if(ARROW_WITH_UTF8PROC) # TODO: Don't use global includes but rather # target_include_directories or target_link_libraries @@ -261,7 +262,7 @@ index 673a58eed..8c2c1e2fb 100644 INTERFACE_INCLUDE_DIRECTORIES) include_directories(SYSTEM ${UTF8PROC_INCLUDE_DIR}) endif() -@@ -3270,7 +3285,7 @@ endmacro() +@@ -3317,7 +3332,7 @@ endmacro() macro(build_grpc) resolve_dependency(c-ares @@ -270,16 +271,16 @@ index 673a58eed..8c2c1e2fb 100644 TRUE PC_PACKAGE_NAMES libcares) -@@ -3493,7 +3508,7 @@ endmacro() - if(ARROW_WITH_GRPC) - set(ARROW_GRPC_REQUIRED_VERSION "1.17.0") +@@ -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} -@@ -3503,6 +3518,10 @@ if(ARROW_WITH_GRPC) +@@ -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}) @@ -290,7 +291,7 @@ index 673a58eed..8c2c1e2fb 100644 if(GRPC_VENDORED) set(GRPCPP_PP_INCLUDE TRUE) -@@ -4019,7 +4038,8 @@ if(ARROW_S3) +@@ -4315,7 +4334,8 @@ if(ARROW_S3) s3 transfer identity-management @@ -301,10 +302,10 @@ index 673a58eed..8c2c1e2fb 100644 # 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 ca901b07d..4512a175f 100644 +index b1b6847cf..444a45e4e 100644 --- a/cpp/src/arrow/adapters/orc/CMakeLists.txt +++ b/cpp/src/arrow/adapters/orc/CMakeLists.txt -@@ -29,7 +29,7 @@ set(ORC_MIN_TEST_LIBS +@@ -30,7 +30,7 @@ set(ORC_MIN_TEST_LIBS GTest::gtest_main GTest::gtest Snappy::snappy diff --git a/external_imported/vcpkg/ports/arrow/portfile.cmake b/external_imported/vcpkg/ports/arrow/portfile.cmake index b1c7b5af5..972be6641 100644 --- a/external_imported/vcpkg/ports/arrow/portfile.cmake +++ b/external_imported/vcpkg/ports/arrow/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/arrow - REF apache-arrow-6.0.1 - SHA512 211c3238f76dde06383e817aad0cd4bbb4ab710a1c6a822a639e1588864bd574efb199e101469c91e933d6f21d65e79c99d382a9d326b12313779c08ea3163c8 + REF apache-arrow-7.0.0 + SHA512 4df480e03dcd85c1c04f93ca55968cf64eb96b4bdb586d9ad3bd1d5ba6d9ec7cca34fefef43d84b921ba74ceaeb48f8ac9d1d1355f2408ebffd2b2a00a3da2bd HEAD_REF master PATCHES all.patch @@ -32,6 +32,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS orc ARROW_ORC parquet ARROW_PARQUET parquet PARQUET_REQUIRE_ENCRYPTION + plasma ARROW_PLASMA s3 ARROW_S3 ) @@ -109,4 +110,8 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/FindParquet.cmake ${CURRENT_PA file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +if ("plasma" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES plasma-store-server AUTO_CLEAN) +endif () + vcpkg_fixup_pkgconfig() diff --git a/external_imported/vcpkg/ports/arrow/vcpkg.json b/external_imported/vcpkg/ports/arrow/vcpkg.json index 2adf47aff..1c2b84085 100644 --- a/external_imported/vcpkg/ports/arrow/vcpkg.json +++ b/external_imported/vcpkg/ports/arrow/vcpkg.json @@ -1,9 +1,10 @@ { "name": "arrow", - "version": "6.0.1", - "port-version": 1, + "version": "7.0.0", + "port-version": 2, "description": "Cross-language development platform for in-memory analytics", "homepage": "https://arrow.apache.org", + "license": "Apache-2.0", "supports": "x64 | (arm64 & !windows)", "dependencies": [ "boost-filesystem", @@ -74,7 +75,14 @@ ] }, "parquet": { - "description": "Parquet support" + "description": "Parquet support", + "dependencies": [ + "rapidjson" + ] + }, + "plasma": { + "description": "Plasma support", + "supports": "!windows" }, "s3": { "description": "S3 support", diff --git a/external_imported/vcpkg/ports/ashes/fix-cast.patch b/external_imported/vcpkg/ports/ashes/fix-cast.patch deleted file mode 100644 index 27db3d2eb..000000000 --- a/external_imported/vcpkg/ports/ashes/fix-cast.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/source/ashes/renderer/D3D11Renderer/ash_direct3d11.cpp b/source/ashes/renderer/D3D11Renderer/ash_direct3d11.cpp -index fb9a195a..3a97e126 100644 ---- a/source/ashes/renderer/D3D11Renderer/ash_direct3d11.cpp -+++ b/source/ashes/renderer/D3D11Renderer/ash_direct3d11.cpp -@@ -1688,7 +1688,7 @@ namespace ashes::d3d11 - VkPeerMemoryFeatureFlags * pPeerMemoryFeatures ) - { - reportUnsupported( device, "vkGetDeviceGroupPeerMemoryFeatures" ); -- *pPeerMemoryFeatures = VK_NULL_HANDLE; -+ *pPeerMemoryFeatures = static_cast(0); - } - - void VKAPI_CALL vkCmdSetDeviceMask( -diff --git a/source/ashes/renderer/GlRenderer/ash_opengl.cpp b/source/ashes/renderer/GlRenderer/ash_opengl.cpp -index 45a17148..eec2419f 100644 ---- a/source/ashes/renderer/GlRenderer/ash_opengl.cpp -+++ b/source/ashes/renderer/GlRenderer/ash_opengl.cpp -@@ -1700,7 +1700,7 @@ namespace ashes::gl - VkPeerMemoryFeatureFlags* pPeerMemoryFeatures ) - { - reportUnsupported( device, "vkGetDeviceGroupPeerMemoryFeatures" ); -- *pPeerMemoryFeatures = VK_NULL_HANDLE; -+ *pPeerMemoryFeatures = static_cast(0); - } - - void VKAPI_CALL vkCmdSetDeviceMask( -diff --git a/source/ashes/renderer/TestRenderer/ash_test.cpp b/source/ashes/renderer/TestRenderer/ash_test.cpp -index 741dd75c..b34647b8 100644 ---- a/source/ashes/renderer/TestRenderer/ash_test.cpp -+++ b/source/ashes/renderer/TestRenderer/ash_test.cpp -@@ -1735,7 +1735,7 @@ namespace ashes::test - VkPeerMemoryFeatureFlags* pPeerMemoryFeatures ) - { - reportUnsupported( device, "vkGetDeviceGroupPeerMemoryFeatures" ); -- *pPeerMemoryFeatures = VK_NULL_HANDLE; -+ *pPeerMemoryFeatures = static_cast(0); - } - - void VKAPI_CALL vkCmdSetDeviceMask( diff --git a/external_imported/vcpkg/ports/ashes/portfile.cmake b/external_imported/vcpkg/ports/ashes/portfile.cmake index ef2fcf40f..438c62bc9 100644 --- a/external_imported/vcpkg/ports/ashes/portfile.cmake +++ b/external_imported/vcpkg/ports/ashes/portfile.cmake @@ -1,29 +1,36 @@ -vcpkg_fail_port_install(ON_TARGET "UWP" "iOS" "Android" ON_ARCH "x86" "arm") - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO DragonJoker/Ashes - REF 0f4e6d0ea308eb60ae32274acc9a4d345a4977ff - SHA512 0ce74780786d018e7a447c4e49d3cd83ad53b238a79fc484025e2034cd49a64253363cd592d2da367befa7cd5443b90eb1c5dae54b22756f7b4a0cdecb93c588 - PATCHES - fix-cast.patch + OUT_SOURCE_PATH SOURCE_PATH + REPO DragonJoker/Ashes + REF f39ca2db24a9d7a2d586c85c78bb6eacd8d63b49 + HEAD_REF master + SHA512 a45d443797ffe31305acca154640530c6ed767af9982d857b6e59841add3b0a373723f5f7b590512c1b0dd4064dfbae8aa8445fec59a3c3c2b8a3c002b180609 +) + +vcpkg_from_github( + OUT_SOURCE_PATH CMAKE_SOURCE_PATH + REPO DragonJoker/CMakeUtils + REF e2a9d422a02dab0e04f54b3e1bc515eba652a9d1 + HEAD_REF master + SHA512 4ebd6141b9e5aa5283f31892da7108aa09fbd59292f0e98f2c9fe67577856f0af253184d41fdc16bb11094c4635401f181ea2e3abfa560adcf5c029f0d663b24 ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DCMAKE_INSTALL_PREFIX=${CURRENT_INSTALLED_DIR} - -DPROJECTS_USE_PRECOMPILED_HEADERS=OFF - -DVCPKG_PACKAGE_BUILD=ON - -DASHES_BUILD_TEMPLATES=OFF - -DASHES_BUILD_TESTS=OFF - -DASHES_BUILD_INFO=OFF - -DASHES_BUILD_SAMPLES=OFF + +file(REMOVE_RECURSE "${SOURCE_PATH}/CMake") +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 + -DASHES_BUILD_INFO=OFF + -DASHES_BUILD_SAMPLES=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ashes) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ashes) -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/ashes/vcpkg.json b/external_imported/vcpkg/ports/ashes/vcpkg.json index cc2567786..0cee851d9 100644 --- a/external_imported/vcpkg/ports/ashes/vcpkg.json +++ b/external_imported/vcpkg/ports/ashes/vcpkg.json @@ -1,12 +1,21 @@ { "name": "ashes", - "version-date": "2021-06-18", + "version-date": "2022-04-03", "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", "supports": "!osx & !linux & !ios & !android & !uwp & !x86 & !arm & !static", "dependencies": [ "opengl", "spirv-cross", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "vulkan-headers" ] } diff --git a/external_imported/vcpkg/ports/asio-grpc/portfile.cmake b/external_imported/vcpkg/ports/asio-grpc/portfile.cmake index ee8bb3c8e..d20401ff8 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.3.1 - SHA512 c7a9f9c85e0611fd73a827270edf27deefe59b424e6d572efc8b532d305bf41e8fccb24a6507819dca0712f40e1d6abd56a4e6b099dbee729b125b0b610cd4fb + REF v1.5.1 + SHA512 528a790a7414db1b03b20d4d82d510a08cba9fc3c99501955c60c28ce4d768202a4339241b9e99f0199deb379345dc75934f991bad735eda0b32eb6cb3cef587 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/asio-grpc/vcpkg.json b/external_imported/vcpkg/ports/asio-grpc/vcpkg.json index fc67a0f0e..2e2923745 100644 --- a/external_imported/vcpkg/ports/asio-grpc/vcpkg.json +++ b/external_imported/vcpkg/ports/asio-grpc/vcpkg.json @@ -1,8 +1,9 @@ { "name": "asio-grpc", - "version": "1.3.1", + "version": "1.5.1", "description": "Asynchronous gRPC with Asio/unified executors", "homepage": "https://github.com/Tradias/asio-grpc", + "license": "Apache-2.0", "dependencies": [ "grpc", { diff --git a/external_imported/vcpkg/ports/asio/portfile.cmake b/external_imported/vcpkg/ports/asio/portfile.cmake index 53621f4bf..6f83c5f40 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-20-0 - SHA512 dc2def1f2b93866100b5d645f77c4a231fe3feae457010abf4e659df76b08b46870d608cf792a2f82e1b28c69c320055862647fb29aa0677a58d6141d58e76b2 + REF asio-1-22-1 + SHA512 7658293f2be1f5ea659a424614b2f3092954df45802fbb0031b7983d11762f4f68d18eab076e14954df3a24ce89ff26bd4bebea88b9a3dc680387252efec8398 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/asio/vcpkg.json b/external_imported/vcpkg/ports/asio/vcpkg.json index 7dce132e1..ab4d14556 100644 --- a/external_imported/vcpkg/ports/asio/vcpkg.json +++ b/external_imported/vcpkg/ports/asio/vcpkg.json @@ -1,9 +1,9 @@ { "name": "asio", - "version": "1.20.0", + "version": "1.22.1", "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.20.0/doc/", + "documentation": "https://think-async.com/Asio/asio-1.22.1/doc/", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/asiosdk/portfile.cmake b/external_imported/vcpkg/ports/asiosdk/portfile.cmake index 85042eabf..a57601641 100644 --- a/external_imported/vcpkg/ports/asiosdk/portfile.cmake +++ b/external_imported/vcpkg/ports/asiosdk/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "Linux" "OSX" "uwp") - set(VERSION 2.3.3) vcpkg_download_distfile(ARCHIVE diff --git a/external_imported/vcpkg/ports/asiosdk/vcpkg.json b/external_imported/vcpkg/ports/asiosdk/vcpkg.json index d4c04063f..6d3e9ce60 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": 3, + "port-version": 4, "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/asmjit/portfile.cmake b/external_imported/vcpkg/ports/asmjit/portfile.cmake index 2914e4e5f..ffcdcd59a 100644 --- a/external_imported/vcpkg/ports/asmjit/portfile.cmake +++ b/external_imported/vcpkg/ports/asmjit/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO asmjit/asmjit diff --git a/external_imported/vcpkg/ports/asmjit/vcpkg.json b/external_imported/vcpkg/ports/asmjit/vcpkg.json index 93eb16b3e..bf0644109 100644 --- a/external_imported/vcpkg/ports/asmjit/vcpkg.json +++ b/external_imported/vcpkg/ports/asmjit/vcpkg.json @@ -1,6 +1,7 @@ { "name": "asmjit", "version-date": "2021-10-26", + "port-version": 1, "description": "Complete x86/x64 JIT and Remote Assembler for C++", "homepage": "https://github.com/asmjit/asmjit", "supports": "!arm", diff --git a/external_imported/vcpkg/ports/audiofile/fix-cmakeLists.patch b/external_imported/vcpkg/ports/audiofile/fix-cmakeLists.patch index a7551d6ad..a281171a5 100644 --- a/external_imported/vcpkg/ports/audiofile/fix-cmakeLists.patch +++ b/external_imported/vcpkg/ports/audiofile/fix-cmakeLists.patch @@ -1,33 +1,9 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d43c0c7..1bf21cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -4,6 +4,8 @@ cmake_minimum_required (VERSION 3.12) - project ("AudioFile" VERSION 1.0.9 - DESCRIPTION "A simple C++ library for reading and writing audio files." - HOMEPAGE_URL "https://github.com/adamstark/AudioFile") -+option(BUILD_EXAMPLES "Build examples" OFF) -+option(BUILD_TESTS "Build tests" OFF) +@@ -42,3 +42,10 @@ endif () #=============================================================================== - include (GNUInstallDirs) -@@ -21,10 +23,20 @@ target_include_directories ( - target_compile_features (${PROJECT_NAME} INTERFACE cxx_std_11) - - #=============================================================================== -+if(BUILD_EXAMPLES) - add_subdirectory (examples) -+endif() - -+if(BUILD_TESTS) - enable_testing() - add_subdirectory (tests) -- -+endif() - #=============================================================================== --set (CMAKE_SUPPRESS_REGENERATION true) -\ No newline at end of file -+set (CMAKE_SUPPRESS_REGENERATION true) + set (CMAKE_SUPPRESS_REGENERATION true) + +#install and export targets +install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Config) @@ -35,4 +11,3 @@ index d43c0c7..1bf21cf 100644 +install(EXPORT ${PROJECT_NAME}Config DESTINATION share/AudioFile FILE ${PROJECT_NAME}Config.cmake) +#install headers +install(FILES AudioFile.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -\ No newline at end of file diff --git a/external_imported/vcpkg/ports/audiofile/portfile.cmake b/external_imported/vcpkg/ports/audiofile/portfile.cmake index df0fff374..18188b654 100644 --- a/external_imported/vcpkg/ports/audiofile/portfile.cmake +++ b/external_imported/vcpkg/ports/audiofile/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO adamstark/AudioFile - REF b7dd84abd5763f64fcf74e58499c4b5d779a396d # 1.0.9 - SHA512 daadbf7badadee4a189453af137b1ea5a5ba3486780d02664d1516f379c3705155b1036a9f8f7acd49b6a82269a07e510edcd5e9de55c73f47250244a510ccbb + REF 004065d01e9b7338580390d4fdbfbaa46adede4e # 1.1.0 + SHA512 99d31035fc82ca8da3c555c30b6b40ea99e15e1f82002c7f04c567ab7aee1de71deddf6930564c56f3a2e83eea1b5f5e9ca631673ed4a943579732b8d62e9603 HEAD_REF master PATCHES fix-cmakeLists.patch diff --git a/external_imported/vcpkg/ports/audiofile/vcpkg.json b/external_imported/vcpkg/ports/audiofile/vcpkg.json index 8d982a697..e9c294bbe 100644 --- a/external_imported/vcpkg/ports/audiofile/vcpkg.json +++ b/external_imported/vcpkg/ports/audiofile/vcpkg.json @@ -1,9 +1,9 @@ { "name": "audiofile", - "version": "1.0.9", + "version": "1.1.0", "description": "A simple header-only C++ library for reading and writing audio files.", "homepage": "https://github.com/adamstark/AudioFile", - "license": "GPL-3.0", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/avisynthplus/portfile.cmake b/external_imported/vcpkg/ports/avisynthplus/portfile.cmake index af6641c3f..c64088b2e 100644 --- a/external_imported/vcpkg/ports/avisynthplus/portfile.cmake +++ b/external_imported/vcpkg/ports/avisynthplus/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AviSynth/AviSynthPlus diff --git a/external_imported/vcpkg/ports/avisynthplus/vcpkg.json b/external_imported/vcpkg/ports/avisynthplus/vcpkg.json index 88e47ac01..9527fdf40 100644 --- a/external_imported/vcpkg/ports/avisynthplus/vcpkg.json +++ b/external_imported/vcpkg/ports/avisynthplus/vcpkg.json @@ -1,8 +1,8 @@ { "name": "avisynthplus", "version-semver": "3.7.0", - "port-version": 1, + "port-version": 3, "description": "An improved version of the AviSynth frameserver, with improved features and developer friendliness", - "homepage": "http://avs-plus.net/", + "homepage": "https://avs-plus.net/", "supports": "!arm & !uwp" } diff --git a/external_imported/vcpkg/ports/avro-c/avro.patch b/external_imported/vcpkg/ports/avro-c/avro.patch index e91615002..513bbe0bb 100644 --- a/external_imported/vcpkg/ports/avro-c/avro.patch +++ b/external_imported/vcpkg/ports/avro-c/avro.patch @@ -12,7 +12,7 @@ index aa923e1..9ee7937 100644 # Eliminates warning about linker paths when linking both zlib and # liblzma. cmake_policy(SET CMP0003 NEW) -@@ -149,50 +152,60 @@ else (ZLIB_FOUND) +@@ -149,20 +152,25 @@ else (ZLIB_FOUND) message("Disabled deflate codec. zlib not found.") endif (ZLIB_FOUND) @@ -38,24 +38,13 @@ index aa923e1..9ee7937 100644 -find_package(PkgConfig) -pkg_check_modules(LZMA liblzma) --if (LZMA_FOUND) +find_package(LibLZMA REQUIRED) -+if (LibLZMA_FOUND) ++set(LZMA_FOUND 1) ++set(LZMA_LIBRARIES LibLZMA::LibLZMA) + if (LZMA_FOUND) set(LZMA_PKG liblzma) add_definitions(-DLZMA_CODEC) -+ set(LZMA_LIBRARIES LibLZMA::LibLZMA) - include_directories(${LZMA_INCLUDE_DIRS}) - link_directories(${LZMA_LIBRARY_DIRS}) - message("Enabled lzma codec") --else (LZMA_FOUND) -+else (LibLZMA_FOUND) - set(LZMA_PKG "") - set(LZMA_LIBRARIES "") - message("Disabled lzma codec. liblzma not found.") --endif (LZMA_FOUND) -+endif (LibLZMA_FOUND) - - set(CODEC_LIBRARIES ${ZLIB_LIBRARIES} ${LZMA_LIBRARIES} ${SNAPPY_LIBRARIES}) +@@ -179,20 +187,26 @@ set(CODEC_LIBRARIES ${ZLIB_LIBRARIES} ${LZMA_LIBRARIES} ${SNAPPY_LIBRARIES}) set(CODEC_PKG "@ZLIB_PKG@ @LZMA_PKG@ @SNAPPY_PKG@") # Jansson JSON library diff --git a/external_imported/vcpkg/ports/avro-c/portfile.cmake b/external_imported/vcpkg/ports/avro-c/portfile.cmake index f509dbef7..ac0742680 100644 --- a/external_imported/vcpkg/ports/avro-c/portfile.cmake +++ b/external_imported/vcpkg/ports/avro-c/portfile.cmake @@ -1,5 +1,4 @@ vcpkg_buildpath_length_warning(37) -vcpkg_fail_port_install(ON_TARGET "uwp") if(VCPKG_TARGET_IS_WINDOWS) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) endif() @@ -40,4 +39,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND NOT VCPKG_TARGET_IS_WINDOWS) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(INSTALL "${SOURCE_PATH}/lang/c/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/lang/c/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/avro-c/vcpkg.json b/external_imported/vcpkg/ports/avro-c/vcpkg.json index b05dbfe0e..888afb3ba 100644 --- a/external_imported/vcpkg/ports/avro-c/vcpkg.json +++ b/external_imported/vcpkg/ports/avro-c/vcpkg.json @@ -1,9 +1,10 @@ { "name": "avro-c", "version": "1.11.0", - "port-version": 1, + "port-version": 3, "description": "Apache Avro is a data serialization system", "homepage": "https://github.com/apache/avro", + "license": "Apache-2.0", "supports": "!uwp", "dependencies": [ "jansson", diff --git a/external_imported/vcpkg/ports/aws-c-auth/vcpkg.json b/external_imported/vcpkg/ports/aws-c-auth/vcpkg.json index dc8f75e8a..4fa7c1701 100644 --- a/external_imported/vcpkg/ports/aws-c-auth/vcpkg.json +++ b/external_imported/vcpkg/ports/aws-c-auth/vcpkg.json @@ -1,10 +1,10 @@ { "name": "aws-c-auth", "version": "0.6.3", - "port-version": 1, + "port-version": 2, "description": "C99 library implementation of AWS client-side authentication: standard credentials providers and signing.", "homepage": "https://github.com/awslabs/aws-c-auth", - "supports": "!arm & !uwp", + "supports": "!(windows & arm) & !uwp", "dependencies": [ "aws-c-common", "aws-c-http", diff --git a/external_imported/vcpkg/ports/aws-c-cal/vcpkg.json b/external_imported/vcpkg/ports/aws-c-cal/vcpkg.json index 48c7406ce..94b2f1072 100644 --- a/external_imported/vcpkg/ports/aws-c-cal/vcpkg.json +++ b/external_imported/vcpkg/ports/aws-c-cal/vcpkg.json @@ -1,10 +1,10 @@ { "name": "aws-c-cal", "version": "0.5.12", - "port-version": 1, + "port-version": 2, "description": "C99 wrapper for cryptography primitives.", "homepage": "https://github.com/awslabs/aws-c-cal", - "supports": "!arm & !uwp", + "supports": "!(windows & arm) & !uwp", "dependencies": [ "aws-c-common", { diff --git a/external_imported/vcpkg/ports/aws-c-common/vcpkg.json b/external_imported/vcpkg/ports/aws-c-common/vcpkg.json index 67d583207..7d927640d 100644 --- a/external_imported/vcpkg/ports/aws-c-common/vcpkg.json +++ b/external_imported/vcpkg/ports/aws-c-common/vcpkg.json @@ -1,10 +1,10 @@ { "name": "aws-c-common", "version": "0.6.9", - "port-version": 1, + "port-version": 2, "description": "AWS common library for C", "homepage": "https://github.com/awslabs/aws-c-common", - "supports": "!arm & !uwp", + "supports": "!(windows & arm) & !uwp", "dependencies": [ "openssl", { diff --git a/external_imported/vcpkg/ports/aws-c-compression/vcpkg.json b/external_imported/vcpkg/ports/aws-c-compression/vcpkg.json index 8b62d0389..1e994e501 100644 --- a/external_imported/vcpkg/ports/aws-c-compression/vcpkg.json +++ b/external_imported/vcpkg/ports/aws-c-compression/vcpkg.json @@ -1,10 +1,10 @@ { "name": "aws-c-compression", "version": "0.2.14", - "port-version": 1, + "port-version": 2, "description": "C99 implementation of huffman encoding/decoding", "homepage": "https://github.com/awslabs/aws-c-compression", - "supports": "!arm & !uwp", + "supports": "!(windows & arm) & !uwp", "dependencies": [ "aws-c-common", { diff --git a/external_imported/vcpkg/ports/aws-c-event-stream/vcpkg.json b/external_imported/vcpkg/ports/aws-c-event-stream/vcpkg.json index 7018ea0b2..ebabcab6a 100644 --- a/external_imported/vcpkg/ports/aws-c-event-stream/vcpkg.json +++ b/external_imported/vcpkg/ports/aws-c-event-stream/vcpkg.json @@ -1,10 +1,10 @@ { "name": "aws-c-event-stream", "version": "0.2.7", - "port-version": 1, + "port-version": 2, "description": "C99 implementation of the vnd.amazon.event-stream content-type.", "homepage": "https://github.com/awslabs/aws-c-event-stream", - "supports": "!arm & !uwp", + "supports": "!(windows & arm) & !uwp", "dependencies": [ "aws-c-cal", "aws-c-common", diff --git a/external_imported/vcpkg/ports/aws-c-http/vcpkg.json b/external_imported/vcpkg/ports/aws-c-http/vcpkg.json index f7cf65478..34b0ed7ad 100644 --- a/external_imported/vcpkg/ports/aws-c-http/vcpkg.json +++ b/external_imported/vcpkg/ports/aws-c-http/vcpkg.json @@ -1,10 +1,10 @@ { "name": "aws-c-http", "version": "0.6.5", - "port-version": 1, + "port-version": 2, "description": "C99 implementation of the HTTP/1.1 and HTTP/2 specifications", "homepage": "https://github.com/awslabs/aws-c-http", - "supports": "!arm & !uwp", + "supports": "!(windows & arm) & !uwp", "dependencies": [ "aws-c-cal", "aws-c-common", diff --git a/external_imported/vcpkg/ports/aws-c-io/vcpkg.json b/external_imported/vcpkg/ports/aws-c-io/vcpkg.json index 60a1fb934..9fddd3bf3 100644 --- a/external_imported/vcpkg/ports/aws-c-io/vcpkg.json +++ b/external_imported/vcpkg/ports/aws-c-io/vcpkg.json @@ -1,10 +1,10 @@ { "name": "aws-c-io", "version": "0.10.7", - "port-version": 1, + "port-version": 2, "description": "Handles all IO and TLS work for application protocols.", "homepage": "https://github.com/awslabs/aws-c-io", - "supports": "!arm & !uwp", + "supports": "!(windows & arm) & !uwp", "dependencies": [ "aws-c-cal", "aws-c-common", diff --git a/external_imported/vcpkg/ports/aws-c-mqtt/vcpkg.json b/external_imported/vcpkg/ports/aws-c-mqtt/vcpkg.json index de7e464ef..5b0aff0a4 100644 --- a/external_imported/vcpkg/ports/aws-c-mqtt/vcpkg.json +++ b/external_imported/vcpkg/ports/aws-c-mqtt/vcpkg.json @@ -1,11 +1,14 @@ { "name": "aws-c-mqtt", "version": "0.7.6", - "port-version": 1, + "port-version": 3, "description": "C99 implementation of the MQTT 3.1.1 specification.", "homepage": "https://github.com/awslabs/aws-c-mqtt", - "supports": "!arm & !uwp", + "supports": "!(windows & arm) & !uwp", "dependencies": [ + "aws-c-common", + "aws-c-http", + "aws-c-io", { "name": "s2n", "platform": "!uwp & !windows" diff --git a/external_imported/vcpkg/ports/aws-c-s3/vcpkg.json b/external_imported/vcpkg/ports/aws-c-s3/vcpkg.json index 31dba9256..d6fb5f033 100644 --- a/external_imported/vcpkg/ports/aws-c-s3/vcpkg.json +++ b/external_imported/vcpkg/ports/aws-c-s3/vcpkg.json @@ -1,10 +1,10 @@ { "name": "aws-c-s3", "version": "0.1.25", - "port-version": 1, + "port-version": 2, "description": "C99 library implementation for communicating with the S3 service, designed for maximizing throughput on high bandwidth EC2 instances.", "homepage": "https://github.com/awslabs/aws-c-s3", - "supports": "!arm & !uwp", + "supports": "!(windows & arm) & !uwp", "dependencies": [ "aws-c-auth", "aws-c-cal", diff --git a/external_imported/vcpkg/ports/aws-checksums/vcpkg.json b/external_imported/vcpkg/ports/aws-checksums/vcpkg.json index 3cdea4534..c31742e6a 100644 --- a/external_imported/vcpkg/ports/aws-checksums/vcpkg.json +++ b/external_imported/vcpkg/ports/aws-checksums/vcpkg.json @@ -1,10 +1,10 @@ { "name": "aws-checksums", "version": "0.1.11", - "port-version": 2, + "port-version": 3, "description": "Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations.", "homepage": "https://github.com/awslabs/aws-checksums", - "supports": "!arm", + "supports": "!(windows & arm)", "dependencies": [ "aws-c-common", { diff --git a/external_imported/vcpkg/ports/aws-crt-cpp/vcpkg.json b/external_imported/vcpkg/ports/aws-crt-cpp/vcpkg.json index 3b8cfafde..02a962c20 100644 --- a/external_imported/vcpkg/ports/aws-crt-cpp/vcpkg.json +++ b/external_imported/vcpkg/ports/aws-crt-cpp/vcpkg.json @@ -1,10 +1,10 @@ { "name": "aws-crt-cpp", "version": "0.15.1", - "port-version": 2, + "port-version": 3, "description": "Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations.", "homepage": "https://github.com/awslabs/aws-crt-cpp", - "supports": "!arm & !uwp", + "supports": "!(windows & arm) & !uwp", "dependencies": [ "aws-c-auth", "aws-c-cal", diff --git a/external_imported/vcpkg/ports/aws-lambda-cpp/portfile.cmake b/external_imported/vcpkg/ports/aws-lambda-cpp/portfile.cmake index 714296ed1..acebd82a3 100644 --- a/external_imported/vcpkg/ports/aws-lambda-cpp/portfile.cmake +++ b/external_imported/vcpkg/ports/aws-lambda-cpp/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "Windows" "OSX") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-lambda-cpp diff --git a/external_imported/vcpkg/ports/aws-lambda-cpp/vcpkg.json b/external_imported/vcpkg/ports/aws-lambda-cpp/vcpkg.json index 7d65385fe..833eb112e 100644 --- a/external_imported/vcpkg/ports/aws-lambda-cpp/vcpkg.json +++ b/external_imported/vcpkg/ports/aws-lambda-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "aws-lambda-cpp", - "version-string": "0.2.7", + "version": "0.2.7", + "port-version": 1, "description": "C++ Runtime for AWS Lambda.", "supports": "linux", "dependencies": [ diff --git a/external_imported/vcpkg/ports/aws-sdk-cpp/fix-config.patch b/external_imported/vcpkg/ports/aws-sdk-cpp/fix-config.patch deleted file mode 100644 index 8b9e3a76d..000000000 --- a/external_imported/vcpkg/ports/aws-sdk-cpp/fix-config.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cmake/AWSSDKConfig.cmake b/cmake/AWSSDKConfig.cmake ---- a/cmake/AWSSDKConfig.cmake (revision e2d3e09f6f50167bb7886109eb15605eb2a0b578) -+++ b/cmake/AWSSDKConfig.cmake (date 1637856904387) -@@ -129,7 +129,7 @@ - get_filename_component(TEMP_PATH "${AWSSDK_CORE_LIB_FILE}" PATH) - get_filename_component(TEMP_NAME "${TEMP_PATH}" NAME) - --while (NOT TEMP_NAME STREQUAL ${LIB_SEARCH_PREFIX}) -+while (NOT TEMP_NAME STREQUAL "${LIB_SEARCH_PREFIX}") - set(TEMP_PLATFORM_PREFIX "${TEMP_NAME}/${TEMP_PLATFORM_PREFIX}") - get_filename_component(TEMP_PATH "${TEMP_PATH}" PATH) - get_filename_component(TEMP_NAME "${TEMP_PATH}" NAME) diff --git a/external_imported/vcpkg/ports/aws-sdk-cpp/fix-openssl3.patch b/external_imported/vcpkg/ports/aws-sdk-cpp/fix-openssl3.patch new file mode 100644 index 000000000..bd7967892 --- /dev/null +++ b/external_imported/vcpkg/ports/aws-sdk-cpp/fix-openssl3.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/compiler_settings.cmake b/cmake/compiler_settings.cmake +index cae5b92248..1aa728b01c 100644 +--- a/cmake/compiler_settings.cmake ++++ b/cmake/compiler_settings.cmake +@@ -53,7 +53,7 @@ macro(set_gcc_flags) + endmacro() + + macro(set_gcc_warnings) +- list(APPEND AWS_COMPILER_WARNINGS "-Wall" "-Werror" "-pedantic" "-Wextra") ++ list(APPEND AWS_COMPILER_WARNINGS "-Wno-deprecated-declarations" "-Wall" "-Werror" "-pedantic" "-Wextra") + if(COMPILER_CLANG) + if(PLATFORM_ANDROID) + # when using clang with libc and API lower than 21 we need to include Android support headers and ignore the gnu-include-next warning. diff --git a/external_imported/vcpkg/ports/aws-sdk-cpp/portfile.cmake b/external_imported/vcpkg/ports/aws-sdk-cpp/portfile.cmake index 42c09123d..35873a4c9 100644 --- a/external_imported/vcpkg/ports/aws-sdk-cpp/portfile.cmake +++ b/external_imported/vcpkg/ports/aws-sdk-cpp/portfile.cmake @@ -3,12 +3,12 @@ vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aws/aws-sdk-cpp - REF 26fa78673ec93dc703e80b741d8b437237798297 # 1.9.160 - SHA512 dfc6c1017dd1e76196861f0bd7e270736c2e74d55da1e394f7d64d8b1e2d978ad21f273ba4cd5d476d5f7dbe21eb0e3f170017dff97d3c3cca951f3ac68cf6f8 + REF a72b841c91bd421fbb6deb516400b51c06bc596c # 1.9.220 + SHA512 9b7fa80ee155fa3c15e3e86c30b75c6019dc1672df711c4f656133fe005f104e4a30f5a99f1c0a0c6dab42007b5695169cd312bd0938b272c4c7b05765ce3421 PATCHES - fix-config.patch patch-relocatable-rpath.patch fix-aws-root.patch + fix-openssl3.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT) diff --git a/external_imported/vcpkg/ports/aws-sdk-cpp/vcpkg.json b/external_imported/vcpkg/ports/aws-sdk-cpp/vcpkg.json index 64459ef4e..7931c10a5 100644 --- a/external_imported/vcpkg/ports/aws-sdk-cpp/vcpkg.json +++ b/external_imported/vcpkg/ports/aws-sdk-cpp/vcpkg.json @@ -1,10 +1,11 @@ { "$note": "Automatically generated by generateFeatures.ps1", "name": "aws-sdk-cpp", - "version": "1.9.160", + "version": "1.9.220", + "port-version": 1, "description": "AWS SDK for C++", "homepage": "https://github.com/aws/aws-sdk-cpp", - "supports": "!arm & !uwp", + "supports": "!(windows & arm) & !uwp", "dependencies": [ "aws-crt-cpp", { diff --git a/external_imported/vcpkg/ports/azure-c-shared-utility/fix-install-location-preview.patch b/external_imported/vcpkg/ports/azure-c-shared-utility/fix-install-location-preview.patch new file mode 100644 index 000000000..41162fd2e --- /dev/null +++ b/external_imported/vcpkg/ports/azure-c-shared-utility/fix-install-location-preview.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 25bbf383..31ca2da2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -678,7 +678,7 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR) + set(CMAKE_INSTALL_LIBDIR "lib") + endif() + +-set(package_location "cmake") ++set(package_location "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") + + if(${build_as_dynamic}) + set(targets aziotsharedutil aziotsharedutil_dll) diff --git a/external_imported/vcpkg/ports/azure-c-shared-utility/fix-install-location.patch b/external_imported/vcpkg/ports/azure-c-shared-utility/fix-install-location.patch new file mode 100644 index 000000000..56d5b363e --- /dev/null +++ b/external_imported/vcpkg/ports/azure-c-shared-utility/fix-install-location.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index deeaae7d..c0c84275 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -689,7 +689,7 @@ install (TARGETS ${targets} EXPORT aziotsharedutilTargets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot + ) +-install (FILES ${source_h_files} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azure_c_shared_utility) ++install (FILES ${source_h_files} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot/azure_c_shared_utility) + install (FILES ${micromock_h_files_full_path} ${INSTALL_H_FILES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot) + + diff --git a/external_imported/vcpkg/ports/azure-c-shared-utility/improve-dependencies-preview.patch b/external_imported/vcpkg/ports/azure-c-shared-utility/improve-dependencies-preview.patch new file mode 100644 index 000000000..42fe1e658 --- /dev/null +++ b/external_imported/vcpkg/ports/azure-c-shared-utility/improve-dependencies-preview.patch @@ -0,0 +1,68 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 46334c1..aaeea20 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -115,7 +115,6 @@ if(${use_openssl}) + if (NOT TARGET OpenSSL::SSL OR NOT TARGET OpenSSL::Crypto OR NOT ${OPENSSL_INCLUDE_DIR}) + find_package(OpenSSL REQUIRED) + endif() +- include_directories(${OPENSSL_INCLUDE_DIR}) + endif() + + if(${use_applessl}) +@@ -521,8 +520,7 @@ if(${use_http}) + set(CURL_FIND_REQUIRED 1) + find_package_handle_standard_args(CURL DEFAULT_MSG CURL_LIBRARIES) + +- include_directories(${CURL_INCLUDE_DIRS}) +- set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${CURL_LIBRARIES}) ++ set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} CURL::libcurl) + endif(NOT use_builtin_httpapi) + endif() + endif(${use_http}) +@@ -561,7 +559,7 @@ if(${use_bearssl}) + endif() + + if(${use_openssl}) +- set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${OPENSSL_LIBRARIES}) ++ set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} OpenSSL::SSL) + if (WIN32) + set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} crypt32 ws2_32 secur32) + endif() +@@ -703,7 +701,7 @@ write_basic_package_version_file( + + configure_file("configs/${PROJECT_NAME}Config.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake" +- COPYONLY ++ @ONLY + ) + + install(EXPORT aziotsharedutilTargets +@@ -715,7 +713,7 @@ install(EXPORT aziotsharedutilTargets + + install( + FILES +- "configs/${PROJECT_NAME}Config.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake" + "configs/${PROJECT_NAME}Functions.cmake" + "configs/azure_iot_build_rules.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake" +diff --git a/configs/azure_c_shared_utilityConfig.cmake b/configs/azure_c_shared_utilityConfig.cmake +index 52f2c7e1..11e9332b 100644 +--- a/configs/azure_c_shared_utilityConfig.cmake ++++ b/configs/azure_c_shared_utilityConfig.cmake +@@ -1,6 +1,14 @@ + #Copyright (c) Microsoft. All rights reserved. + #Licensed under the MIT license. See LICENSE file in the project root for full license information. + ++include(CMakeFindDependencyMacro) ++if("@use_openssl@") ++ find_dependency(OpenSSL) ++endif() ++if(UNIX AND NOT "@use_builtin_httpapi@") ++ find_dependency(CURL) ++endif() ++ + include("${CMAKE_CURRENT_LIST_DIR}/azure_c_shared_utilityTargets.cmake") + + get_target_property(AZURE_C_SHARED_UTILITY_INCLUDES aziotsharedutil INTERFACE_INCLUDE_DIRECTORIES) diff --git a/external_imported/vcpkg/ports/azure-c-shared-utility/improve-dependencies.patch b/external_imported/vcpkg/ports/azure-c-shared-utility/improve-dependencies.patch new file mode 100644 index 000000000..9afa24d13 --- /dev/null +++ b/external_imported/vcpkg/ports/azure-c-shared-utility/improve-dependencies.patch @@ -0,0 +1,67 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 46334c1..aaeea20 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -115,7 +115,6 @@ if(${use_openssl}) + if (NOT TARGET OpenSSL::SSL OR NOT TARGET OpenSSL::Crypto OR NOT ${OPENSSL_INCLUDE_DIR}) + find_package(OpenSSL REQUIRED) + endif() +- include_directories(${OPENSSL_INCLUDE_DIR}) + endif() + + if(${use_applessl}) +@@ -521,8 +520,7 @@ if(${use_http}) + set(CURL_FIND_REQUIRED 1) + find_package_handle_standard_args(CURL DEFAULT_MSG CURL_LIBRARIES) + +- include_directories(${CURL_INCLUDE_DIRS}) +- set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${CURL_LIBRARIES}) ++ set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} CURL::libcurl) + endif(NOT use_builtin_httpapi) + endif() + endif(${use_http}) +@@ -561,7 +559,7 @@ if(${use_bearssl}) + endif() + + if(${use_openssl}) +- set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${OPENSSL_LIBRARIES}) ++ set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} OpenSSL::SSL) + if (WIN32) + set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} crypt32 ws2_32 secur32) + endif() +@@ -703,7 +701,7 @@ write_basic_package_version_file( + + configure_file("configs/${PROJECT_NAME}Config.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake" +- COPYONLY ++ @ONLY + ) + + install(EXPORT aziotsharedutilTargets +@@ -715,7 +713,7 @@ install(EXPORT aziotsharedutilTargets + + install( + FILES +- "configs/${PROJECT_NAME}Config.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake" + "configs/${PROJECT_NAME}Functions.cmake" + "configs/azure_iot_build_rules.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake" +diff --git a/configs/azure_c_shared_utilityConfig.cmake b/configs/azure_c_shared_utilityConfig.cmake +index 416dd1c..0e1e4d4 100644 +--- a/configs/azure_c_shared_utilityConfig.cmake ++++ b/configs/azure_c_shared_utilityConfig.cmake +@@ -1,8 +1,11 @@ + #Copyright (c) Microsoft. All rights reserved. + #Licensed under the MIT license. See LICENSE file in the project root for full license information. + +-if(UNIX) +- include(CMakeFindDependencyMacro) ++include(CMakeFindDependencyMacro) ++if("@use_openssl@") ++ find_dependency(OpenSSL) ++endif() ++if(UNIX AND NOT "@use_builtin_httpapi@") + find_dependency(CURL) + endif() + diff --git a/external_imported/vcpkg/ports/azure-c-shared-utility/openssl.patch b/external_imported/vcpkg/ports/azure-c-shared-utility/openssl.patch new file mode 100644 index 000000000..bdf46dd1d --- /dev/null +++ b/external_imported/vcpkg/ports/azure-c-shared-utility/openssl.patch @@ -0,0 +1,13 @@ +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 7bdb50aa1..5b9a85d1a 100644 --- a/external_imported/vcpkg/ports/azure-c-shared-utility/portfile.cmake +++ b/external_imported/vcpkg/ports/azure-c-shared-utility/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) if("public-preview" IN_LIST FEATURES) @@ -10,40 +8,46 @@ if("public-preview" IN_LIST FEATURES) SHA512 dfe6ccede4bebdb3a39fbfea1dc55ddca57cced0d2656ee4bed1a5e5c9c434e1f2d892eb4e29bbb424cb9a02f2374a95fb9a020442bea580d39c242efad1b789 HEAD_REF master PATCHES + fix-install-location-preview.patch fix-utilityFunctions-conditions-preview.patch disable-error.patch + improve-dependencies-preview.patch ) else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-c-shared-utility - REF 73a2039cc0de5ececf5755ebe731a6b5b98f85da - SHA512 6374b7b175a5c0206bee148c35eb6a3a79f1b149e87d2b51981a9fd1446809134a1aa0f28f4acf1318719ac5554f7bd8de225a5dca63eb6537012aed6b10e4cc + REF 1a27846886a74702d409a8f0e2d77a38163cefc7 + SHA512 c30cba73692691fe1310b6180e3aeaf4d86b6276981c680cac31d605634e5dedbce3f823142dfebba4ae2f76ccead965a527d95df0e52af638a30ddec9818fbd HEAD_REF master PATCHES + openssl.patch + fix-install-location.patch fix-utilityFunctions-conditions.patch disable-error.patch + improve-dependencies.patch ) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dskip_samples=ON -Duse_installed_dependencies=ON -Duse_default_uuid=ON -Dbuild_as_dynamic=OFF + MAYBE_UNUSED_VARIABLES + build_as_dynamic ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/azure_c_shared_utility) +vcpkg_cmake_config_fixup(PACKAGE_NAME azure_c_shared_utility CONFIG_PATH lib/cmake/azure_c_shared_utility) -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(COPY ${SOURCE_PATH}/configs/azure_iot_build_rules.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(COPY "${SOURCE_PATH}/configs/azure_iot_build_rules.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -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-c-shared-utility/vcpkg.json b/external_imported/vcpkg/ports/azure-c-shared-utility/vcpkg.json index 7fa90c73e..f5f3c1abd 100644 --- a/external_imported/vcpkg/ports/azure-c-shared-utility/vcpkg.json +++ b/external_imported/vcpkg/ports/azure-c-shared-utility/vcpkg.json @@ -1,8 +1,10 @@ { "name": "azure-c-shared-utility", - "version-date": "2021-09-09", + "version-date": "2022-01-21", + "port-version": 3, "description": "Azure C SDKs common code", "homepage": "https://github.com/Azure/azure-c-shared-utility", + "license": "MIT", "supports": "!uwp", "dependencies": [ "azure-macro-utils-c", @@ -14,7 +16,15 @@ "name": "openssl", "platform": "linux" }, - "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-core-cpp/portfile.cmake b/external_imported/vcpkg/ports/azure-core-cpp/portfile.cmake index 82279f8f1..262cdf715 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.3.1 - SHA512 affdd6387b5b40f0362d4151f91b1a0f3d0269189240baf981e31a9a1860b77d7fcfeb7819f93f9b1e5764ab1ba2190cf1c6261f23345e0928453550f8537de1 + REF azure-core_1.5.0 + SHA512 7a0b8ed9345b565e4476cb66c1e7a44350f5cd4f79a9d40a11b77f646eff353d94762803ca5931264689d390255cd9d361c5d4a54ccc89548cf640f76a26e74c ) 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 91bf18181..57bba11bd 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.3.1", + "version-semver": "1.5.0", "description": [ "Microsoft Azure Core SDK for C++", "This library provides shared primitives, abstractions, and helpers for modern Azure SDK client libraries written in the C++." @@ -10,7 +10,8 @@ "dependencies": [ { "name": "openssl", - "platform": "!windows & !uwp" + "platform": "!windows & !uwp", + "version>=": "1.1.1n" }, { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/azure-identity-cpp/portfile.cmake b/external_imported/vcpkg/ports/azure-identity-cpp/portfile.cmake index 417698981..a6b797a23 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.1.0 - SHA512 83893ae2bc5edf7d63615e6017ea0474e9c620171e9320dabbe41d40b5659dca4f6d8a10599ec02054b2d3265eebfbd419ceab43669ba5ba0e04e72a38297a07 + REF azure-identity_1.2.0 + SHA512 f27adda21a7d7b687cae08bed6b9f1e7ef10a9f36a886021c939da570c01fe4ab153bbc5852280bb147c879d6cdb4361d9655656398368814f4842ebc9ddc2dc ) 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 ec0ea4dbb..d88dfb337 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.1.0", + "version-semver": "1.2.0", "description": [ "Microsoft Azure Identity SDK for C++", "This library provides common authentication-related abstractions for Azure SDK." @@ -10,7 +10,8 @@ "dependencies": [ { "name": "azure-core-cpp", - "default-features": false + "default-features": false, + "version>=": "1.4.0" }, { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/azure-iot-sdk-c/fix-cmake.patch b/external_imported/vcpkg/ports/azure-iot-sdk-c/fix-install-location.patch similarity index 83% rename from external_imported/vcpkg/ports/azure-iot-sdk-c/fix-cmake.patch rename to external_imported/vcpkg/ports/azure-iot-sdk-c/fix-install-location.patch index b75b4ca7c..aeb0c817c 100644 --- a/external_imported/vcpkg/ports/azure-iot-sdk-c/fix-cmake.patch +++ b/external_imported/vcpkg/ports/azure-iot-sdk-c/fix-install-location.patch @@ -1,8 +1,8 @@ diff --git a/provisioning_client/CMakeLists.txt b/provisioning_client/CMakeLists.txt -index c39188dca..d4ef43cb3 100644 +index 39f269d51..ff53ca32d 100644 --- a/provisioning_client/CMakeLists.txt +++ b/provisioning_client/CMakeLists.txt -@@ -359,7 +359,7 @@ if(${use_installed_dependencies}) +@@ -357,7 +357,7 @@ if(${use_installed_dependencies}) set(CMAKE_INSTALL_LIBDIR "lib") endif() @@ -10,8 +10,8 @@ index c39188dca..d4ef43cb3 100644 + install(TARGETS ${provisioning_libs} EXPORT azure_iot_sdksTargets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}/../bin -@@ -374,26 +374,6 @@ if(${use_installed_dependencies}) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +@@ -372,26 +372,6 @@ if(${use_installed_dependencies}) VERSION ${PROV_SDK_VERSION} COMPATIBILITY SameMajorVersion ) 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 new file mode 100644 index 000000000..9ccf48e5c --- /dev/null +++ b/external_imported/vcpkg/ports/azure-iot-sdk-c/fix-iothubclient-includes.patch @@ -0,0 +1,13 @@ +diff --git a/iothub_client/CMakeLists.txt b/iothub_client/CMakeLists.txt +index 07ab3b7..9769a08 100644 +--- a/iothub_client/CMakeLists.txt ++++ b/iothub_client/CMakeLists.txt +@@ -441,7 +441,7 @@ add_library(iothub_client + 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/improve-external-deps-preview.patch b/external_imported/vcpkg/ports/azure-iot-sdk-c/improve-external-deps-preview.patch new file mode 100644 index 000000000..8526cd6eb --- /dev/null +++ b/external_imported/vcpkg/ports/azure-iot-sdk-c/improve-external-deps-preview.patch @@ -0,0 +1,112 @@ +diff --git a/configs/azure_iot_sdksConfig.cmake b/configs/azure_iot_sdksConfig.cmake +index b9c62e8..edf5847 100644 +--- a/configs/azure_iot_sdksConfig.cmake ++++ b/configs/azure_iot_sdksConfig.cmake +@@ -1,5 +1,11 @@ + #Copyright (c) Microsoft. All rights reserved. + #Licensed under the MIT license. See LICENSE file in the project root for full license information. ++include(CMakeFindDependencyMacro) ++find_dependency(unofficial-parson) ++find_dependency(uamqp) ++find_dependency(uhttp) ++find_dependency(umqtt) ++find_dependency(azure_c_shared_utility) + + include("${CMAKE_CURRENT_LIST_DIR}/azure_iot_sdksTargets.cmake") + +diff --git a/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt b/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt +index 33b5b8709..45ef7b87a 100644 +--- a/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt ++++ b/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt +@@ -31,12 +31,10 @@ set(${theseTestsName}_c_files + + set(${theseTestsName}_c_files + ../../../certs/certs.c +- ../../../deps/parson/parson.c + ) + + set(${theseTestsName}_h_files + ../../../certs/certs.h +- ../../../deps/parson/parson.h + ../common_dt_e2e/iothubclient_common_dt_e2e.h + ) + +diff --git a/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt b/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt +index d05d654..5872c8d 100644 +--- a/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt ++++ b/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt +@@ -31,12 +31,10 @@ set(${theseTestsName}_nuget_c_files + + set(${theseTestsName}_c_files + ../../../certs/certs.c +- ../../../deps/parson/parson.c + ) + + set(${theseTestsName}_h_files + ../../../certs/certs.h +- ../../../deps/parson/parson.h + ../common_dt_e2e/iothubclient_common_dt_e2e.h + ) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ba2f8e016..19885c8b8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -179,17 +179,6 @@ endif() + # Use solution folders. + set_property(GLOBAL PROPERTY USE_FOLDERS ON) + +-# build the parson library for json parsing +-add_library(parson +- ./deps/parson/parson.c +- ./deps/parson/parson.h +-) +-if (MSVC) +- set_source_files_properties(../deps/parson/parson.c PROPERTIES COMPILE_FLAGS "/wd4244 /wd4232") +-endif() +-set(parson_h_install_files ./deps/parson/parson.h) +-set(parson_install_libs parson) +- + if (IN_OPENWRT) + ADD_DEFINITIONS("$ENV{TARGET_LDFLAGS}" "$ENV{TARGET_CPPFLAGS}" "$ENV{TARGET_CFLAGS}") + INCLUDE_DIRECTORIES("$ENV{TOOLCHAIN_DIR}/usr/include" "$ENV{TARGET_LDFLAGS}" "$ENV{TARGET_CPPFLAGS}" "$ENV{TARGET_CFLAGS}") +@@ -407,7 +396,7 @@ endif() + + if (${use_installed_dependencies}) + # Install azure_iot_sdks +- set(package_location "cmake") ++ set(package_location "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") + + include(CMakePackageConfigHelpers) + +@@ -422,14 +411,10 @@ if (${use_installed_dependencies}) + COPYONLY + ) + +- install(FILES ${parson_h_install_files} +- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot +- ) +- install(TARGETS ${parson_install_libs} EXPORT azure_iot_sdksTargets +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} +- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +- INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot +- ) ++ find_package(unofficial-parson REQUIRED CONFIG) ++ if(NOT TARGET parson) ++ add_library(parson ALIAS unofficial::parson::parson) ++ endif() + + install(EXPORT azure_iot_sdksTargets + FILE +@@ -446,11 +431,5 @@ if (${use_installed_dependencies}) + DESTINATION + ${package_location} + ) +-else() +- install(FILES ${parson_h_install_files} +- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot) +- install(TARGETS ${parson_install_libs} +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} +- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif() + diff --git a/external_imported/vcpkg/ports/azure-iot-sdk-c/improve-external-deps.patch b/external_imported/vcpkg/ports/azure-iot-sdk-c/improve-external-deps.patch index 171964baf..8f6168078 100644 --- a/external_imported/vcpkg/ports/azure-iot-sdk-c/improve-external-deps.patch +++ b/external_imported/vcpkg/ports/azure-iot-sdk-c/improve-external-deps.patch @@ -1,82 +1,29 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a8011fb..9fc05c7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -155,17 +155,6 @@ endif() - # Use solution folders. - set_property(GLOBAL PROPERTY USE_FOLDERS ON) - --# build the parson library for json parsing --add_library(parson -- ./deps/parson/parson.c -- ./deps/parson/parson.h --) --if (MSVC) -- set_source_files_properties(../deps/parson/parson.c PROPERTIES COMPILE_FLAGS "/wd4244 /wd4232") --endif() --set(parson_h_install_files ./deps/parson/parson.h) --set(parson_install_libs parson) -- - if (IN_OPENWRT) - ADD_DEFINITIONS("$ENV{TARGET_LDFLAGS}" "$ENV{TARGET_CPPFLAGS}" "$ENV{TARGET_CFLAGS}") - INCLUDE_DIRECTORIES("$ENV{TOOLCHAIN_DIR}/usr/include" "$ENV{TARGET_LDFLAGS}" "$ENV{TARGET_CPPFLAGS}" "$ENV{TARGET_CFLAGS}") diff --git a/configs/azure_iot_sdksConfig.cmake b/configs/azure_iot_sdksConfig.cmake index b9c62e8..edf5847 100644 --- a/configs/azure_iot_sdksConfig.cmake +++ b/configs/azure_iot_sdksConfig.cmake -@@ -1,5 +1,10 @@ +@@ -1,5 +1,11 @@ #Copyright (c) Microsoft. All rights reserved. #Licensed under the MIT license. See LICENSE file in the project root for full license information. +include(CMakeFindDependencyMacro) +find_dependency(unofficial-parson) +find_dependency(uamqp) ++find_dependency(uhttp) +find_dependency(umqtt) +find_dependency(azure_c_shared_utility) include("${CMAKE_CURRENT_LIST_DIR}/azure_iot_sdksTargets.cmake") -diff --git a/dependencies.cmake b/dependencies.cmake -index fd06df6..c0e06fa 100644 ---- a/dependencies.cmake -+++ b/dependencies.cmake -@@ -18,6 +18,9 @@ if(${use_installed_dependencies}) - endif () - endif () - -+ find_package(unofficial-parson REQUIRED) -+ link_libraries(unofficial::parson::parson) -+ - else () - add_subdirectory(c-utility) - diff --git a/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt b/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt -index 161872a..d53e111 100644 +index 33b5b8709..45ef7b87a 100644 --- a/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt +++ b/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt -@@ -31,12 +31,10 @@ set(${theseTestsName}_nuget_c_files - - set(${theseTestsName}_c_files - ../../../certs/certs.c -- ../../../deps/parson/parson.c - ) - - set(${theseTestsName}_h_files - ../../../certs/certs.h -- ../../../deps/parson/parson.h - ../common_dt_e2e/iothubclient_common_dt_e2e.h - ) - -diff --git a/iothub_client/tests/iothubclient_mqtt_dt_e2e/CMakeLists.txt b/iothub_client/tests/iothubclient_mqtt_dt_e2e/CMakeLists.txt -index d472161..b0291e8 100644 ---- a/iothub_client/tests/iothubclient_mqtt_dt_e2e/CMakeLists.txt -+++ b/iothub_client/tests/iothubclient_mqtt_dt_e2e/CMakeLists.txt -@@ -31,12 +31,10 @@ set(${theseTestsName}_nuget_c_files +@@ -22,11 +22,9 @@ set(${theseTestsName}_c_files set(${theseTestsName}_c_files ../../../certs/certs.c - ../../../deps/parson/parson.c ) - set(${theseTestsName}_h_files ../../../certs/certs.h - ../../../deps/parson/parson.h @@ -87,7 +34,7 @@ diff --git a/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt b/i index d05d654..5872c8d 100644 --- a/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt +++ b/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt -@@ -31,12 +31,10 @@ set(${theseTestsName}_nuget_c_files +@@ -22,12 +22,10 @@ set(${theseTestsName}_nuget_c_files set(${theseTestsName}_c_files ../../../certs/certs.c @@ -100,18 +47,33 @@ index d05d654..5872c8d 100644 ../common_dt_e2e/iothubclient_common_dt_e2e.h ) -diff --git a/iothub_service_client/CMakeLists.txt b/iothub_service_client/CMakeLists.txt -index e47473e..b073513 100644 ---- a/iothub_service_client/CMakeLists.txt -+++ b/iothub_service_client/CMakeLists.txt -@@ -81,9 +81,7 @@ endif() - setSdkTargetBuildProperties(iothub_service_client) - - if(NOT ${nuget_e2e_tests}) -- target_link_libraries(iothub_service_client uamqp parson) --else() -- target_link_libraries(iothub_service_client parson) -+ target_link_libraries(iothub_service_client uamqp) +diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt +index 22e24f851..7dc30beba 100644 +--- a/deps/CMakeLists.txt ++++ b/deps/CMakeLists.txt +@@ -37,5 +37,8 @@ endif() + if(NOT ${use_installed_dependencies}) + add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/parson) + else() +- find_package(parson REQUIRED CONFIG) ++ find_package(unofficial-parson REQUIRED CONFIG) ++ if(NOT TARGET parson) ++ add_library(parson ALIAS unofficial::parson::parson) ++ endif() + endif() +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b72bd41ed..b2812f1fd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -242,7 +242,10 @@ endif() + + add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/deps) + if(${use_installed_dependencies}) +- find_package(parson REQUIRED CONFIG) ++ find_package(unofficial-parson REQUIRED CONFIG) ++ if(NOT TARGET parson) ++ add_library(parson ALIAS unofficial::parson::parson) ++ endif() endif() - if (NOT ${ARCHITECTURE} STREQUAL "ARM") + include_directories(${MACRO_UTILS_INC_FOLDER}) 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 8e6043d92..8edad3688 100644 --- a/external_imported/vcpkg/ports/azure-iot-sdk-c/portfile.cmake +++ b/external_imported/vcpkg/ports/azure-iot-sdk-c/portfile.cmake @@ -8,21 +8,19 @@ if("public-preview" IN_LIST FEATURES) SHA512 6798b17d6768b3ccbd0eb66719b50f364cd951736eb71110e2dc9deca054a1566ff88b9e8c5e9b52536e4308cad6cd3cbebff3282c123083e3afaee5535e724b HEAD_REF public-preview PATCHES - improve-external-deps.patch - fix-cmake.patch - remove-werror.patch + improve-external-deps-preview.patch ) else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-iot-sdk-c - REF 808a5595f98853a5f2eae2c67dd9b3608a2338ea - SHA512 29cb04679b75a48a8a69713045465c7c416755764ec80781405c8528abd8225654c3262ed3816fb03a13f7505f6c811afbdc5dabc79b676b4f727feaf11e0583 + REF 5805fb669ffe2adff021d68c62725d0bd783ac49 + SHA512 8f1aa1020f3bb8b3e801f3977d11be50fd07d961c89ac921f795ef8a99312f12e1ddb2268ce3d2fb84b6a42bb5806cde410e6b51c7c4539a9a11a9ae512dbcd1 HEAD_REF master PATCHES + fix-install-location.patch improve-external-deps.patch - fix-cmake.patch - remove-werror.patch + fix-iothubclient-includes.patch ) endif() @@ -32,12 +30,11 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS use-prov-client use_prov_client ) -file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/azure-c-shared-utility/configs/) -file(COPY ${SOURCE_PATH}/configs/azure_iot_sdksFunctions.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/cmake/azure_iot_sdks/) +file(COPY "${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake" DESTINATION "${SOURCE_PATH}/deps/azure-c-shared-utility/configs/") +file(COPY "${SOURCE_PATH}/configs/azure_iot_sdksFunctions.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/cmake/azure_iot_sdks/") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -Dskip_samples=ON -Duse_installed_dependencies=ON @@ -45,14 +42,17 @@ vcpkg_configure_cmake( -Dbuild_as_dynamic=OFF -Duse_edge_modules=ON -Dwarnings_as_errors=OFF + MAYBE_UNUSED_VARIABLES + build_as_dynamic + warnings_as_errors ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/azure_iot_sdks) +vcpkg_cmake_config_fixup(PACKAGE_NAME azure_iot_sdks CONFIG_PATH "lib/cmake/azure_iot_sdks") -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-iot-sdk-c/remove-werror.patch b/external_imported/vcpkg/ports/azure-iot-sdk-c/remove-werror.patch deleted file mode 100644 index 694ae7929..000000000 --- a/external_imported/vcpkg/ports/azure-iot-sdk-c/remove-werror.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -34,14 +34,11 @@ - if (MSVC) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /wd4232") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4 /wd4232") - # Make warning as error -- add_definitions(/WX) - else() - # Make warning as error -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") - endif() - - IF(WIN32) - # windows needs this define - add_definitions(-D_CRT_SECURE_NO_WARNINGS) - 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 a04e188d8..eb8d7405f 100644 --- a/external_imported/vcpkg/ports/azure-iot-sdk-c/vcpkg.json +++ b/external_imported/vcpkg/ports/azure-iot-sdk-c/vcpkg.json @@ -1,8 +1,10 @@ { "name": "azure-iot-sdk-c", - "version-date": "2021-09-09", + "version-date": "2022-01-21", + "port-version": 2, "description": "A C99 SDK for connecting devices to Microsoft Azure IoT services", "homepage": "https://github.com/Azure/azure-iot-sdk-c", + "license": "MIT", "dependencies": [ "azure-c-shared-utility", "azure-macro-utils-c", @@ -10,7 +12,15 @@ "azure-uhttp-c", "azure-umqtt-c", "parson", - "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-kinect-sensor-sdk/fix-build-imgui.patch b/external_imported/vcpkg/ports/azure-kinect-sensor-sdk/fix-build-imgui.patch new file mode 100644 index 000000000..eb94390e6 --- /dev/null +++ b/external_imported/vcpkg/ports/azure-kinect-sensor-sdk/fix-build-imgui.patch @@ -0,0 +1,13 @@ +diff --git a/tools/k4aviewer/k4alogdockcontrol.cpp b/tools/k4aviewer/k4alogdockcontrol.cpp +index 4289f71..407e912 100644 +--- a/tools/k4aviewer/k4alogdockcontrol.cpp ++++ b/tools/k4aviewer/k4alogdockcontrol.cpp +@@ -161,7 +161,7 @@ K4ADockControlStatus K4ALogDockControl::Show() + + if (updated) + { +- ImGui::SetScrollHere(1.0f); ++ ImGui::SetScrollHereY(1.0f); + } + + ImGui::EndChild(); diff --git a/external_imported/vcpkg/ports/azure-kinect-sensor-sdk/portfile.cmake b/external_imported/vcpkg/ports/azure-kinect-sensor-sdk/portfile.cmake index bffcf83e8..414b6775f 100644 --- a/external_imported/vcpkg/ports/azure-kinect-sensor-sdk/portfile.cmake +++ b/external_imported/vcpkg/ports/azure-kinect-sensor-sdk/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( fix-dependency-imgui.patch fix-linux.patch fix-calibration-c.patch + fix-build-imgui.patch ) vcpkg_find_acquire_program(PYTHON3) @@ -23,43 +24,36 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS ) # .rc file needs windows.h, so do not use PREFER_NINJA here -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS ${FEATURE_OPTIONS} -DK4A_SOURCE_LINK=OFF -DK4A_MTE_VERSION=ON -DBUILD_EXAMPLES=OFF -DWITH_TEST=OFF - -DIMGUI_EXTERNAL_PATH=${CURRENT_INSTALLED_DIR}/include/bindings + -DIMGUI_EXTERNAL_PATH="${CURRENT_INSTALLED_DIR}/include/bindings" ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Avoid deleting debug/lib/cmake when fixing the first cmake -file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/cmake ${CURRENT_PACKAGES_DIR}/debug/share) -file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake ${CURRENT_PACKAGES_DIR}/share) -vcpkg_fixup_cmake_targets(CONFIG_PATH share/k4a TARGET_PATH share/k4a) -vcpkg_fixup_cmake_targets(CONFIG_PATH share/k4arecord TARGET_PATH share/k4arecord) +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" "${CURRENT_PACKAGES_DIR}/debug/share") +file(RENAME "${CURRENT_PACKAGES_DIR}/lib/cmake" "${CURRENT_PACKAGES_DIR}/share") + +vcpkg_cmake_config_fixup(PACKAGE_NAME k4a CONFIG_PATH share/k4a) +vcpkg_cmake_config_fixup(PACKAGE_NAME k4arecord CONFIG_PATH share/k4arecord) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if ("tool" IN_LIST FEATURES) - if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release) - file(GLOB AZURE_TOOLS ${CURRENT_PACKAGES_DIR}/bin/*${VCPKG_TARGET_EXECUTABLE_SUFFIX}) - file(COPY ${AZURE_TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools) - file(REMOVE ${AZURE_TOOLS}) - endif() - if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) - file(GLOB AZURE_TOOLS ${CURRENT_PACKAGES_DIR}/debug/bin/*${VCPKG_TARGET_EXECUTABLE_SUFFIX}) - file(REMOVE ${AZURE_TOOLS}) - endif() + vcpkg_copy_tools(TOOL_NAMES k4arecorder k4aviewer AzureKinectFirmwareTool AUTO_CLEAN) 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() # Install Depth Engine @@ -84,14 +78,14 @@ else () endif () if (VCPKG_TARGET_IS_LINUX) - file(COPY ${PACKAGE_PATH}/linux/lib/native/${VCPKG_TARGET_ARCHITECTURE}/release/libdepthengine.so.2.0 DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(COPY ${PACKAGE_PATH}/linux/lib/native/${VCPKG_TARGET_ARCHITECTURE}/release/libdepthengine.so.2.0 DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${PACKAGE_PATH}/linux/lib/native/${VCPKG_TARGET_ARCHITECTURE}/release/libdepthengine.so.2.0" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(COPY "${PACKAGE_PATH}/linux/lib/native/${VCPKG_TARGET_ARCHITECTURE}/release/libdepthengine.so.2.0" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") else() - file(COPY ${PACKAGE_PATH}/lib/native/${ARCHITECTURE}/release/depthengine_2_0.dll DESTINATION ${CURRENT_PACKAGES_DIR}/tools/azure-kinect-sensor-sdk) - file(COPY ${PACKAGE_PATH}/lib/native/${ARCHITECTURE}/release/depthengine_2_0.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/azure-kinect-sensor-sdk) - file(COPY ${CMAKE_CURRENT_LIST_DIR}/k4adeploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/tools/azure-kinect-sensor-sdk) - file(COPY ${CMAKE_CURRENT_LIST_DIR}/k4adeploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/azure-kinect-sensor-sdk) + file(COPY "${PACKAGE_PATH}/lib/native/${ARCHITECTURE}/release/depthengine_2_0.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/azure-kinect-sensor-sdk") + file(COPY "${PACKAGE_PATH}/lib/native/${ARCHITECTURE}/release/depthengine_2_0.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools/azure-kinect-sensor-sdk") + file(COPY "${CMAKE_CURRENT_LIST_DIR}/k4adeploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/azure-kinect-sensor-sdk") + file(COPY "${CMAKE_CURRENT_LIST_DIR}/k4adeploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools/azure-kinect-sensor-sdk") endif() # 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/azure-kinect-sensor-sdk/vcpkg.json b/external_imported/vcpkg/ports/azure-kinect-sensor-sdk/vcpkg.json index f20bbe2af..3addef920 100644 --- a/external_imported/vcpkg/ports/azure-kinect-sensor-sdk/vcpkg.json +++ b/external_imported/vcpkg/ports/azure-kinect-sensor-sdk/vcpkg.json @@ -1,10 +1,10 @@ { "name": "azure-kinect-sensor-sdk", "version": "1.4.1", - "port-version": 3, + "port-version": 4, "description": "Azure Kinect SDK is a cross platform (Linux and Windows) user mode SDK to read data from your Azure Kinect device.", "homepage": "https://github.com/microsoft/Azure-Kinect-Sensor-SDK", - "supports": "linux & windows", + "supports": "linux | windows", "dependencies": [ "azure-c-shared-utility", "cjson", @@ -21,7 +21,15 @@ }, "libyuv", "matroska", - "spdlog" + "spdlog", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "docs": { @@ -36,7 +44,7 @@ "name": "imgui", "features": [ "glfw-binding", - "opengl3-glew-binding" + "opengl3-binding" ] } ] diff --git a/external_imported/vcpkg/ports/azure-macro-utils-c/vcpkg.json b/external_imported/vcpkg/ports/azure-macro-utils-c/vcpkg.json index 367a73a17..0d4df0005 100644 --- a/external_imported/vcpkg/ports/azure-macro-utils-c/vcpkg.json +++ b/external_imported/vcpkg/ports/azure-macro-utils-c/vcpkg.json @@ -1,7 +1,6 @@ { "name": "azure-macro-utils-c", - "version-string": "2020-06-17", - "port-version": 3, + "version-date": "2022-01-21", "description": "A library of macros for the Azure IoT SDK Suite", "features": { "public-preview": { diff --git a/external_imported/vcpkg/ports/azure-security-keyvault-common-cpp/portfile.cmake b/external_imported/vcpkg/ports/azure-security-attestation-cpp/portfile.cmake similarity index 52% rename from external_imported/vcpkg/ports/azure-security-keyvault-common-cpp/portfile.cmake rename to external_imported/vcpkg/ports/azure-security-attestation-cpp/portfile.cmake index e0f4762f6..c6406d6e9 100644 --- a/external_imported/vcpkg/ports/azure-security-keyvault-common-cpp/portfile.cmake +++ b/external_imported/vcpkg/ports/azure-security-attestation-cpp/portfile.cmake @@ -1,14 +1,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-security-keyvault-common_4.0.0-beta.3 - SHA512 bdd5b59b8e1e53cde8df9b38881e067328e9b434cbf80cf63b2a0ef17e9e30c7b42c7439bb4ea47c412a566478c44364618b918af8139765d789101549f6062e + REF azure-security-attestation_1.0.0-beta.1 + SHA512 bb408ffa209c6d6416836296472f391d3418d6768f74d3fcf7962f93a991319f4f53b8588b2e82b2b366c060ad71cd1a2ad4a5515f19db97e5e5ef4bd222b926 ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-common/ - PREFER_NINJA + 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 new file mode 100644 index 000000000..34c912c60 --- /dev/null +++ b/external_imported/vcpkg/ports/azure-security-attestation-cpp/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "azure-security-attestation-cpp", + "version-semver": "1.0.0-beta.1", + "description": [ + "Microsoft Azure Attestation Service SDK for C++", + "This library provides API access to the Microsoft Azure Attestation service." + ], + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/attestation/azure-security-attestation", + "license": "MIT", + "dependencies": [ + { + "name": "azure-core-cpp", + "default-features": false, + "version>=": "1.5.0" + }, + { + "name": "openssl", + "version>=": "1.1.1n" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "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 5b0035e64..ff74c8cd4 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.1 - SHA512 8cb7fccade755cb984a311430a808e777a041e663b607a40308a79b353431abea2eaef1c49c48c783ec9020b5d0e6e53fa101f2e2432bd71bba3b578bfe810ca + REF azure-security-keyvault-certificates_4.0.0-beta.2 + SHA512 b8e3c2fc942854610a9ae3a0f57f1f1e5a5fe73905ca5085bb418b68e9888f7acb1d0866ba7692b055d4438bdf4f3f796e5860a95e0d9663e68353dabd07bed7 ) 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 06b6ce023..a7ea53574 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.1", + "version-semver": "4.0.0-beta.2", "description": [ "Microsoft Azure Key Vault Certificates SDK for C++", "This library provides Azure Key Vault Certificates SDK." @@ -11,7 +11,7 @@ { "name": "azure-core-cpp", "default-features": false, - "version>=": "1.2.0" + "version>=": "1.3.1" }, { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/azure-security-keyvault-common-cpp/vcpkg.json b/external_imported/vcpkg/ports/azure-security-keyvault-common-cpp/vcpkg.json deleted file mode 100644 index be5ed4777..000000000 --- a/external_imported/vcpkg/ports/azure-security-keyvault-common-cpp/vcpkg.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "azure-security-keyvault-common-cpp", - "version-semver": "4.0.0-beta.3", - "description": [ - "Microsoft Azure Common Key Vault SDK for C++", - "This library provides common Azure Key Vault related abstractions for Azure SDK." - ], - "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/keyvault/azure-security-keyvault-common", - "license": "MIT", - "dependencies": [ - { - "name": "azure-core-cpp", - "default-features": false - }, - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} 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 3e6b1c84f..3589f4061 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.1 - SHA512 dc40606fdd5f0c6934f9720fc9722346a5bff02093cd9a1805ca6a2356854a8648fcdf689e3456162b0b93dc85bea916ca1532547a4937113067deb5abdb3ff7 + REF azure-security-keyvault-secrets_4.0.0-beta.2 + SHA512 471158c13cd356289f1876f68c69ce761adead141aa832d13abed8a3dd5a221666a09a9c33d8f840ec1372d4edf602d867dba5978262785bf9b9040a50e08904 ) 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 f95d09800..198577edf 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.1", + "version-semver": "4.0.0-beta.2", "description": [ "Microsoft Azure Key Vault Secrets SDK for C++", "This library provides Azure Key Vault Secrets SDK." @@ -11,7 +11,7 @@ { "name": "azure-core-cpp", "default-features": false, - "version>=": "1.2.0" + "version>=": "1.3.1" }, { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/azure-storage-blobs-cpp/portfile.cmake b/external_imported/vcpkg/ports/azure-storage-blobs-cpp/portfile.cmake index bffc0c5ed..3b69597be 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.2.1 - SHA512 7150b1d5c9ceb7ca2f500b3ff1fe45ca2f2769ec895191fa8b0fd0b63e5acc6f8fd58b3aec1b00ba5125d99a5f28c29335f8d13253af7d1d70b1575b98183810 + REF azure-storage-blobs_12.4.0 + SHA512 8d60970d0eff794cfcb6fb8471e7b0086cd8620072845195f67ae2fe2a7e1ecdaf21f10a80a708c981afa3589115f0fd2477a8c398d06b66b4babcd49f0c4c9a ) 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 8f0295819..2847c101f 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.2.1", + "version-semver": "12.4.0", "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.0" + "version>=": "12.2.3" }, { "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 9843c83a3..a5ce63659 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.0 - SHA512 59d7c755c9aca09e49487765c5571da242bd6cbf426f6fd07a2d7235f4e5c894f6a36e209f08908d1e6fc97d64d60fd5e7f4dd87d88416e21b6591fc88674663 + REF azure-storage-common_12.2.3 + SHA512 456854fa39e98fab10e65e0bab148aeb9fee61439bcb1b689c17110343be0162174a8075eb09b0b4eba6c5f59c8d454d78cbd3c4aafb1af3db16d9f984189393 ) 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 d1729985a..cc7651dd6 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.0", + "version-semver": "12.2.3", "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.0.0" + "version>=": "1.5.0" }, { "name": "libxml2", diff --git a/external_imported/vcpkg/ports/azure-storage-cpp/portfile.cmake b/external_imported/vcpkg/ports/azure-storage-cpp/portfile.cmake index c091b31c0..b4bad8eee 100644 --- a/external_imported/vcpkg/ports/azure-storage-cpp/portfile.cmake +++ b/external_imported/vcpkg/ports/azure-storage-cpp/portfile.cmake @@ -1,5 +1,4 @@ message(WARNING "azure-storage-cpp is no longer actively developed. Instead, users should migrate to the new sdk:azure-core-cpp") -vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -31,4 +30,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) vcpkg_copy_pdbs() - diff --git a/external_imported/vcpkg/ports/azure-storage-cpp/vcpkg.json b/external_imported/vcpkg/ports/azure-storage-cpp/vcpkg.json index 21180d49f..53dc1752c 100644 --- a/external_imported/vcpkg/ports/azure-storage-cpp/vcpkg.json +++ b/external_imported/vcpkg/ports/azure-storage-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "azure-storage-cpp", "version-string": "7.5.0", - "port-version": 2, + "port-version": 3, "description": [ "[legacy] Microsoft Azure Storage Client SDK for C++", "A client library for working with Microsoft Azure storage services including blobs, files, tables, and queues. This client library enables working with the Microsoft Azure storage services which include the blob service for storing binary and text data, the file service for storing binary and text data, the table service for storing structured non-relational data, and the queue service for storing messages that may be accessed by a client." diff --git a/external_imported/vcpkg/ports/azure-storage-files-datalake-cpp/portfile.cmake b/external_imported/vcpkg/ports/azure-storage-files-datalake-cpp/portfile.cmake index fad24c171..e29137531 100644 --- a/external_imported/vcpkg/ports/azure-storage-files-datalake-cpp/portfile.cmake +++ b/external_imported/vcpkg/ports/azure-storage-files-datalake-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-files-datalake_12.2.0 - SHA512 42e5fd30f76236cbe055ed51fdba3672421e9ad329addc665df1b2d29d5ea1df016932b5d4c28c7a0dd820bbab09d4b245711a7020d4b9a1e96d05657c05b94b + REF azure-storage-files-datalake_12.3.1 + SHA512 4d0879808e0d2c2ca0e2c6a89496af3f51a8bcebd071ea51359bb42f1ead193292bb3e21c8c3f023634a48585ab68bdd4d95af0b7357a3e92030c6d1a12ceba9 ) vcpkg_cmake_configure( diff --git a/external_imported/vcpkg/ports/azure-storage-files-datalake-cpp/vcpkg.json b/external_imported/vcpkg/ports/azure-storage-files-datalake-cpp/vcpkg.json index b59f47fd3..fff483c12 100644 --- a/external_imported/vcpkg/ports/azure-storage-files-datalake-cpp/vcpkg.json +++ b/external_imported/vcpkg/ports/azure-storage-files-datalake-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-files-datalake-cpp", - "version-semver": "12.2.0", + "version-semver": "12.3.1", "description": [ "Microsoft Azure Storage Files Data Lake SDK for C++", "This library provides Azure Storage Files Data Lake SDK." @@ -11,7 +11,7 @@ { "name": "azure-storage-blobs-cpp", "default-features": false, - "version>=": "12.2.0" + "version>=": "12.3.0" }, { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/azure-storage-files-shares-cpp/portfile.cmake b/external_imported/vcpkg/ports/azure-storage-files-shares-cpp/portfile.cmake index 420ee8925..21dacef3a 100644 --- a/external_imported/vcpkg/ports/azure-storage-files-shares-cpp/portfile.cmake +++ b/external_imported/vcpkg/ports/azure-storage-files-shares-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-files-shares_12.2.0 - SHA512 b3e0c0a6b4ab11ff9d4c3318a56621d4d6c453b393f692f5d61118a18c571fbb5a1b259c44bb2ba7ac14e056d3a30bde66e36601139d704baeb9cbc865c43ecd + REF azure-storage-files-shares_12.2.1 + SHA512 c3fd61496833fd90984c20c3ec6f3be663dda922458a7984ce6010c82df28a546f2e24f7d3690f327b22dbdf2abc669f12ebc182f43ba171111ece0450dbe35c ) vcpkg_cmake_configure( diff --git a/external_imported/vcpkg/ports/azure-storage-files-shares-cpp/vcpkg.json b/external_imported/vcpkg/ports/azure-storage-files-shares-cpp/vcpkg.json index 54807b9b4..0d0d853eb 100644 --- a/external_imported/vcpkg/ports/azure-storage-files-shares-cpp/vcpkg.json +++ b/external_imported/vcpkg/ports/azure-storage-files-shares-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-files-shares-cpp", - "version-semver": "12.2.0", + "version-semver": "12.2.1", "description": [ "Microsoft Azure Storage Files Shares SDK for C++", "This library provides Azure Storage Files Shares SDK." @@ -11,7 +11,7 @@ { "name": "azure-storage-common-cpp", "default-features": false, - "version>=": "12.2.0" + "version>=": "12.2.2" }, { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/azure-storage-queues-cpp/portfile.cmake b/external_imported/vcpkg/ports/azure-storage-queues-cpp/portfile.cmake index 6adb06992..cabef6187 100644 --- a/external_imported/vcpkg/ports/azure-storage-queues-cpp/portfile.cmake +++ b/external_imported/vcpkg/ports/azure-storage-queues-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-queues_12.0.0-beta.2 - SHA512 43815483aa8def6eb475683d765a5315a65218bceb9dbf95b9f4e154c23ed8af1af4a52943b4b89fed35b50318407c98674e8af4c4076e42be60f460a610a118 + REF azure-storage-queues_12.0.0 + SHA512 f393d481a9bb098d1a361605d9d55e1385ec5417a20ea05c53d479dbe4dcb0e8be34c2b9fc31b64e7d78b81fd642461f27beb02b6ed047f87c968c0bb718b85b ) vcpkg_cmake_configure( diff --git a/external_imported/vcpkg/ports/azure-storage-queues-cpp/vcpkg.json b/external_imported/vcpkg/ports/azure-storage-queues-cpp/vcpkg.json index 8a8fafe21..e81924b0d 100644 --- a/external_imported/vcpkg/ports/azure-storage-queues-cpp/vcpkg.json +++ b/external_imported/vcpkg/ports/azure-storage-queues-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-queues-cpp", - "version-semver": "12.0.0-beta.2", + "version-semver": "12.0.0", "description": [ "Microsoft Azure Storage Queues SDK for C++", "This library provides Azure Storage Queues SDK." @@ -11,7 +11,7 @@ { "name": "azure-storage-common-cpp", "default-features": false, - "version>=": "12.2.0" + "version>=": "12.2.3" }, { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/azure-uamqp-c/portfile.cmake b/external_imported/vcpkg/ports/azure-uamqp-c/portfile.cmake index 3b95f6447..8e296ff0a 100644 --- a/external_imported/vcpkg/ports/azure-uamqp-c/portfile.cmake +++ b/external_imported/vcpkg/ports/azure-uamqp-c/portfile.cmake @@ -12,8 +12,8 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uamqp-c - REF b75cdb7e1736a388fe3e9fc2a99493aa1db6f43f - SHA512 a13da2bc8a471329cbcd63aaa6fb94265388f709bf8977d55017a6cdd5af21e3b08935498ff8bfebfa63791dfa04552806684fae82b664045a12d14a91df3183 + REF 85aae56beb717dddaf5512845de537d2926afb02 + SHA512 3d9e7788c784169e6d1d9abd233e00a4c1e6525d67cbc25f8ba42292b6d66d0179a742833a0c00a3a0df6498bf88dc8b12a40c183e7141f7290cbb4eceb67dbe HEAD_REF master ) endif() @@ -27,6 +27,8 @@ vcpkg_configure_cmake( -Dskip_samples=ON -Duse_installed_dependencies=ON -Dbuild_as_dynamic=OFF + MAYBE_UNUSED_VARIABLES + build_as_dynamic ) vcpkg_install_cmake() diff --git a/external_imported/vcpkg/ports/azure-uamqp-c/vcpkg.json b/external_imported/vcpkg/ports/azure-uamqp-c/vcpkg.json index 52dfd75fa..40c1177fd 100644 --- a/external_imported/vcpkg/ports/azure-uamqp-c/vcpkg.json +++ b/external_imported/vcpkg/ports/azure-uamqp-c/vcpkg.json @@ -1,8 +1,10 @@ { "name": "azure-uamqp-c", - "version-date": "2021-09-09", + "version-date": "2022-01-21", + "port-version": 1, "description": "AMQP library for C", "homepage": "https://github.com/Azure/azure-uamqp-c", + "license": "MIT", "dependencies": [ "azure-c-shared-utility", "azure-macro-utils-c", diff --git a/external_imported/vcpkg/ports/azure-uhttp-c/package-location-fix-preview.patch b/external_imported/vcpkg/ports/azure-uhttp-c/package-location-fix-preview.patch new file mode 100644 index 000000000..8544ae63b --- /dev/null +++ b/external_imported/vcpkg/ports/azure-uhttp-c/package-location-fix-preview.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 27eae0b..ef87ec0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -138,7 +138,7 @@ if (NOT ${skip_samples}) + endif() + + # Install uhttp +-set(package_location "cmake") ++set(package_location "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") + + if(NOT DEFINED CMAKE_INSTALL_LIBDIR) + set(CMAKE_INSTALL_LIBDIR "lib") diff --git a/external_imported/vcpkg/ports/azure-uhttp-c/portfile.cmake b/external_imported/vcpkg/ports/azure-uhttp-c/portfile.cmake index 4a3105c02..0478c7174 100644 --- a/external_imported/vcpkg/ports/azure-uhttp-c/portfile.cmake +++ b/external_imported/vcpkg/ports/azure-uhttp-c/portfile.cmake @@ -7,35 +7,38 @@ if("public-preview" IN_LIST FEATURES) REF d84a20609a2b5a555920389451fb3c9a2ed3656c SHA512 4eadd7e120082cc3bcf696d6cd16bc7ee8e1082380dd7583fba7fad1bb95109f3456890495e25ae7675e656ef721fa12eff22eeb96d8a4cf359be5c96889cbd6 HEAD_REF master + PATCHES + package-location-fix-preview.patch ) else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uhttp-c - REF db8ac9c1353fe05cf6917e8ec8bcb866bf4a6f11 - SHA512 4c9b053bcdc1086dbba6883a887e5af1f6aa4572bfb1e36c3b07c9bb93c35b188cb31f510fca5c4b2a0557df446dd965eafda993eab7c04b4502ed07b269c148 + REF 1cc70f4d21ad69768cafb9551b1b512118fba995 + SHA512 6604e82b347a1a4eb5072ab762fde7bd5ae9b32848a78da9103e0eb528b9ccd420a12dbc237dc0b5fe6db271d5cdcd24eedf1cde8ac058102fdd24c5a5a33f26 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/) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dskip_samples=ON -Duse_installed_dependencies=ON -Dbuild_as_dynamic=OFF -DCMAKE_INSTALL_INCLUDEDIR=include + MAYBE_UNUSED_VARIABLES + build_as_dynamic ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/uhttp) +vcpkg_cmake_config_fixup(PACKAGE_NAME uhttp CONFIG_PATH "lib/cmake/uhttp") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/azure-uhttp-c/vcpkg.json b/external_imported/vcpkg/ports/azure-uhttp-c/vcpkg.json index 11f6fea12..ff97c54e3 100644 --- a/external_imported/vcpkg/ports/azure-uhttp-c/vcpkg.json +++ b/external_imported/vcpkg/ports/azure-uhttp-c/vcpkg.json @@ -1,12 +1,22 @@ { "name": "azure-uhttp-c", - "version-date": "2021-09-09", + "version-date": "2022-01-21", + "port-version": 1, "description": "Azure HTTP Library written in C", "homepage": "https://github.com/Azure/azure-uhttp-c", + "license": "MIT", "dependencies": [ "azure-c-shared-utility", "azure-macro-utils-c", - "umock-c" + "umock-c", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "public-preview": { diff --git a/external_imported/vcpkg/ports/azure-umqtt-c/package-location-fix-preview.patch b/external_imported/vcpkg/ports/azure-umqtt-c/package-location-fix-preview.patch new file mode 100644 index 000000000..ec837b7c0 --- /dev/null +++ b/external_imported/vcpkg/ports/azure-umqtt-c/package-location-fix-preview.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8fd08f0..c228519 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -155,7 +155,7 @@ endif () + include(GNUInstallDirs) + + # Install umqtt +-set(package_location "cmake") ++set(package_location "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") + + if(NOT DEFINED CMAKE_INSTALL_LIBDIR) + set(CMAKE_INSTALL_LIBDIR "lib") diff --git a/external_imported/vcpkg/ports/azure-umqtt-c/portfile.cmake b/external_imported/vcpkg/ports/azure-umqtt-c/portfile.cmake index a3e9246bb..e9e65434f 100644 --- a/external_imported/vcpkg/ports/azure-umqtt-c/portfile.cmake +++ b/external_imported/vcpkg/ports/azure-umqtt-c/portfile.cmake @@ -7,34 +7,37 @@ if("public-preview" IN_LIST FEATURES) REF 7557db6de094b67818d3c410dc95a3cf07cd86a6 SHA512 f2577379f711e2576fdd6dfecbc4d8a0b26c7670a77bc468238e8dd5fa43f208db85eddd06dd570fde4219ba19304338c712f671c059c6cc10abb4892d58ae40 HEAD_REF master + PATCHES + package-location-fix-preview.patch ) else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-umqtt-c - REF 12cb55ee5a926a124f22ad737c7cec35f6af7165 - SHA512 ed7d5c5132cfaa46574e70a99ce0181208b772fa2dca9122c8d16918af29240a2060705a25b121785c210eb5a4b917588a1623aedfd0bf9a4cf39df601b05dea + REF 09558f380a314ea89b28f406cc810f47718cea49 + SHA512 7fc1b3d4ed6bd7401b764e27755270dd97caeb09f3bdede90e2e8c554acd13b5c24f9c7343e642bcb62d2937b8169d900fa46a1b97a8c439733c8cdcac19d548 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/) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -Dskip_samples=ON -Duse_installed_dependencies=ON -Dbuild_as_dynamic=OFF + MAYBE_UNUSED_VARIABLES + build_as_dynamic ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/umqtt) +vcpkg_cmake_config_fixup(PACKAGE_NAME umqtt CONFIG_PATH "lib/cmake/umqtt") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/azure-umqtt-c/vcpkg.json b/external_imported/vcpkg/ports/azure-umqtt-c/vcpkg.json index 1ccfb1699..ec223bd03 100644 --- a/external_imported/vcpkg/ports/azure-umqtt-c/vcpkg.json +++ b/external_imported/vcpkg/ports/azure-umqtt-c/vcpkg.json @@ -1,12 +1,22 @@ { "name": "azure-umqtt-c", - "version-date": "2021-09-09", + "version-date": "2022-01-21", + "port-version": 1, "description": "General purpose library for communication over the mqtt protocol", "homepage": "https://github.com/Azure/azure-umqtt-c", + "license": "MIT", "dependencies": [ "azure-c-shared-utility", "azure-macro-utils-c", - "umock-c" + "umock-c", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "public-preview": { diff --git a/external_imported/vcpkg/ports/bddisasm/portfile.cmake b/external_imported/vcpkg/ports/bddisasm/portfile.cmake index 7d44789c4..3a23531d0 100644 --- a/external_imported/vcpkg/ports/bddisasm/portfile.cmake +++ b/external_imported/vcpkg/ports/bddisasm/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/external_imported/vcpkg/ports/bddisasm/vcpkg.json b/external_imported/vcpkg/ports/bddisasm/vcpkg.json index 23aec9946..4cbc024b4 100644 --- a/external_imported/vcpkg/ports/bddisasm/vcpkg.json +++ b/external_imported/vcpkg/ports/bddisasm/vcpkg.json @@ -1,6 +1,7 @@ { "name": "bddisasm", "version": "1.34.7", + "port-version": 1, "maintainers": "Cristi Anichitei ", "description": "bddisasm is a fast, lightweight, x86/x64 instruction decoder and emulator.", "homepage": "https://github.com/bitdefender/bddisasm", diff --git a/external_imported/vcpkg/ports/bde/vcpkg.json b/external_imported/vcpkg/ports/bde/vcpkg.json index 7fffab888..b4e77488f 100644 --- a/external_imported/vcpkg/ports/bde/vcpkg.json +++ b/external_imported/vcpkg/ports/bde/vcpkg.json @@ -1,7 +1,7 @@ { "name": "bde", - "version-string": "3.2.0.0", - "port-version": 4, + "version": "3.2.0.0", + "port-version": 5, "description": "Basic Development Environment - a set of foundational C++ libraries used at Bloomberg.", - "supports": "!windows" + "supports": "!windows & !arm" } diff --git a/external_imported/vcpkg/ports/bdwgc/portfile.cmake b/external_imported/vcpkg/ports/bdwgc/portfile.cmake index 5e6f34dca..9fe8ed0f8 100644 --- a/external_imported/vcpkg/ports/bdwgc/portfile.cmake +++ b/external_imported/vcpkg/ports/bdwgc/portfile.cmake @@ -6,23 +6,22 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS -Denable_cplusplus=ON + -Denable_docs=OFF -DCFLAGS_EXTRA=-I${CURRENT_INSTALLED_DIR}/include # for libatomic_ops OPTIONS_DEBUG -Dinstall_headers=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/bdwgc) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/bdwgc) vcpkg_copy_pdbs() -# Handle copyright -file(INSTALL "${SOURCE_PATH}/README.QUICK" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/README.QUICK" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/bdwgc/vcpkg.json b/external_imported/vcpkg/ports/bdwgc/vcpkg.json index 35e3cd85b..f99581153 100644 --- a/external_imported/vcpkg/ports/bdwgc/vcpkg.json +++ b/external_imported/vcpkg/ports/bdwgc/vcpkg.json @@ -1,9 +1,18 @@ { "name": "bdwgc", "version": "8.2.0", - "port-version": 2, + "port-version": 3, "description": "The Boehm-Demers-Weiser conservative C/C++ Garbage Collector (libgc, bdwgc, boehm-gc)", + "homepage": "http://www.hboehm.info/gc/", "dependencies": [ - "libatomic-ops" + "libatomic-ops", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/behaviortree-cpp/portfile.cmake b/external_imported/vcpkg/ports/behaviortree-cpp/portfile.cmake index 0782dbdfb..79feac53a 100644 --- a/external_imported/vcpkg/ports/behaviortree-cpp/portfile.cmake +++ b/external_imported/vcpkg/ports/behaviortree-cpp/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_download_distfile(ARCHIVE diff --git a/external_imported/vcpkg/ports/behaviortree-cpp/vcpkg.json b/external_imported/vcpkg/ports/behaviortree-cpp/vcpkg.json index 4632b9786..835160cc3 100644 --- a/external_imported/vcpkg/ports/behaviortree-cpp/vcpkg.json +++ b/external_imported/vcpkg/ports/behaviortree-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "behaviortree-cpp", "version": "3.5.6", - "port-version": 1, + "port-version": 2, "description": "Behavior Trees Library in C++.", "homepage": "https://www.behaviortree.dev", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/benchmark/portfile.cmake b/external_imported/vcpkg/ports/benchmark/portfile.cmake index f1b79a6ca..c89c45bb1 100644 --- a/external_imported/vcpkg/ports/benchmark/portfile.cmake +++ b/external_imported/vcpkg/ports/benchmark/portfile.cmake @@ -1,13 +1,10 @@ -#https://github.com/google/benchmark/issues/661 -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/benchmark - REF f91b6b42b1b9854772a90ae9501464a161707d1e # v1.6.0 - SHA512 5e3db75fcaa86b766d33e368f58cec5c5b2b9ba7fde658d13868d577679c13069756e68e86323b972daccc4f7d5e392d24d2d42e5308c1ae7e9955e651d45866 + REF v1.6.1 + SHA512 7d3e3baf5a2d92e9552ab5007c37253b3510ac269edf8922a2794ff3dfbd0bf5b4c519240d4577b1ec30ef9e8a64caa17a809054c3dc7f2b1bcd410596177d67 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/benchmark/vcpkg.json b/external_imported/vcpkg/ports/benchmark/vcpkg.json index 713f0fa31..d0764894c 100644 --- a/external_imported/vcpkg/ports/benchmark/vcpkg.json +++ b/external_imported/vcpkg/ports/benchmark/vcpkg.json @@ -1,6 +1,7 @@ { + "$comment": "https://github.com/google/benchmark/issues/661 describes the missing UWP support upstream", "name": "benchmark", - "version-semver": "1.6.0", + "version-semver": "1.6.1", "description": "A library to support the benchmarking of functions, similar to unit-tests.", "homepage": "https://github.com/google/benchmark", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/berkeleydb/portfile.cmake b/external_imported/vcpkg/ports/berkeleydb/portfile.cmake index 93d89fb3e..5d3495496 100644 --- a/external_imported/vcpkg/ports/berkeleydb/portfile.cmake +++ b/external_imported/vcpkg/ports/berkeleydb/portfile.cmake @@ -1,7 +1,5 @@ -vcpkg_fail_port_install( ON_TARGET "uwp" "linux" "osx") - vcpkg_download_distfile(ARCHIVE - URLS "http://download.oracle.com/berkeley-db/db-4.8.30.NC.zip" + URLS "https://download.oracle.com/berkeley-db/db-4.8.30.NC.zip" FILENAME "db-4.8.30.NC.zip" SHA512 59c1d2d5a3551f988ab1dc063900572b67ad087537e0d71760de34601f9ebd4d5c070a49b809bec4a599a62417e9a162683ce0f6442deb1a0dadb80764bf6eab ) diff --git a/external_imported/vcpkg/ports/berkeleydb/vcpkg.json b/external_imported/vcpkg/ports/berkeleydb/vcpkg.json index 318643530..d9436faa6 100644 --- a/external_imported/vcpkg/ports/berkeleydb/vcpkg.json +++ b/external_imported/vcpkg/ports/berkeleydb/vcpkg.json @@ -1,7 +1,7 @@ { "name": "berkeleydb", - "version-string": "4.8.30", - "port-version": 6, + "version": "4.8.30", + "port-version": 8, "description": "BDB - A high-performance embedded database for key/value data.", "homepage": "https://download.oracle.com/", "supports": "!(uwp | linux | osx)" diff --git a/external_imported/vcpkg/ports/bext-di/portfile.cmake b/external_imported/vcpkg/ports/bext-di/portfile.cmake index 8b123db7d..36ce8c0a9 100644 --- a/external_imported/vcpkg/ports/bext-di/portfile.cmake +++ b/external_imported/vcpkg/ports/bext-di/portfile.cmake @@ -10,7 +10,7 @@ file(INSTALL ${SOURCE_PATH}/include/boost DESTINATION ${CURRENT_PACKAGES_DIR}/include) vcpkg_download_distfile(LICENSE - URLS http://www.boost.org/LICENSE_1_0.txt + URLS https://www.boost.org/LICENSE_1_0.txt FILENAME "di-copyright" SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8 ) diff --git a/external_imported/vcpkg/ports/bext-di/vcpkg.json b/external_imported/vcpkg/ports/bext-di/vcpkg.json index 3278462b4..2b47e5578 100644 --- a/external_imported/vcpkg/ports/bext-di/vcpkg.json +++ b/external_imported/vcpkg/ports/bext-di/vcpkg.json @@ -1,6 +1,7 @@ { "name": "bext-di", - "version-string": "1.2.0", + "version": "1.2.0", + "port-version": 1, "description": "C++14 Dependency Injection Library.", "homepage": "https://github.com/boost-ext/di" } diff --git a/external_imported/vcpkg/ports/blend2d/portfile.cmake b/external_imported/vcpkg/ports/blend2d/portfile.cmake index 4b50bf92c..09c8cf8d7 100644 --- a/external_imported/vcpkg/ports/blend2d/portfile.cmake +++ b/external_imported/vcpkg/ports/blend2d/portfile.cmake @@ -1,10 +1,8 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_ARCH "wasm32" ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO blend2d/blend2d - REF 92ba4eaa2f22331bc9823ddb47f53dd8ce683c8b - SHA512 bb5585d0b73c2acc815a96d613c53c334b5f0d398e99cbaa7b7cf0c63b7a17d36a9f505779d9f5b549b6c6de69414183aadf1b2b8117552bdb273ad7167d761e + REF 63db360c7eb2c1c3ca9cd92a867dbb23dc95ca7d + SHA512 cf83dd36e51fc92587633dec315b3ad8570137ab0b58836c43b8c73ba934dfc0ad03a58e633bd76b79753b12831007c2a5b3fde237d671594c62a3919507c39a HEAD_REF master ) @@ -12,6 +10,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BLEND2D_STATIC) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS INVERTED_FEATURES + futex BLEND2D_NO_FUTEX jit BLEND2D_NO_JIT logging BLEND2D_NO_JIT_LOGGING tls BLEND2D_NO_TLS @@ -21,8 +20,8 @@ if(NOT BLEND2D_NO_JIT) vcpkg_from_github( OUT_SOURCE_PATH ASMJIT_SOURCE_PATH REPO asmjit/asmjit - REF e7a728018e5d88ffa477430fa63bdebbf480fb02 - SHA512 99e0f40d6d90ff194cb9e3238c5090a7fb09f871eeaad24283c461214ef584002d4b00c066b303698f71c55b2ccdb926704ec485956d35fc70ea829eff4888a7 + REF a4e1e88374142f4a842892f9c4bd0b0776fdcd0a + SHA512 c8588e2185502c9d045a63ebf722d1cf14eb7373423ef36f0e410525837430f117ad6c841aac16af17246c4d348c3e9094a848b917985de3f677098c1e32606f HEAD_REF master ) @@ -33,18 +32,17 @@ if(NOT BLEND2D_NO_JIT) file(RENAME ${SOURCE_PATH}/3rdparty/${ASMJIT_SOURCE_DIR_NAME} ${SOURCE_PATH}/3rdparty/asmjit) endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DBLEND2D_STATIC=${BLEND2D_STATIC} ${FEATURE_OPTIONS} ) -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/blend2d/vcpkg.json b/external_imported/vcpkg/ports/blend2d/vcpkg.json index 8c4eb58c2..5db3d5ce2 100644 --- a/external_imported/vcpkg/ports/blend2d/vcpkg.json +++ b/external_imported/vcpkg/ports/blend2d/vcpkg.json @@ -1,16 +1,31 @@ { "name": "blend2d", - "version-date": "2021-03-17", + "version-date": "2022-02-19", "description": "Beta 2D Vector Graphics Powered by a JIT Compiler", "homepage": "https://github.com/blend2d/blend2d", "documentation": "https://blend2d.com/doc/index.html", - "supports": "!(arm | uwp)", + "license": "Zlib", + "supports": "!arm & !uwp & !wasm32", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "default-features": [ + "futex", "jit", "logging", "tls" ], "features": { + "futex": { + "description": "Default feature. Enables use of futex." + }, "jit": { "description": "Default feature. Enables jit pipeline compilation. Not supported for ARM and UWP." }, diff --git a/external_imported/vcpkg/ports/blitz/portfile.cmake b/external_imported/vcpkg/ports/blitz/portfile.cmake index f53a286e7..cba693f54 100644 --- a/external_imported/vcpkg/ports/blitz/portfile.cmake +++ b/external_imported/vcpkg/ports/blitz/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO blitzpp/blitz @@ -16,7 +14,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_DOC=OFF - -DBUILD_TESTING=OFF + -DBUILD_TESTING=OFF ) vcpkg_cmake_install() diff --git a/external_imported/vcpkg/ports/blitz/vcpkg.json b/external_imported/vcpkg/ports/blitz/vcpkg.json index 906e4d833..93da72b81 100644 --- a/external_imported/vcpkg/ports/blitz/vcpkg.json +++ b/external_imported/vcpkg/ports/blitz/vcpkg.json @@ -1,7 +1,7 @@ { "name": "blitz", - "version-string": "2020-03-25", - "port-version": 3, + "version-date": "2020-03-25", + "port-version": 5, "description": "Blitz++ is a C++ template class library that provides high-performance multidimensional array containers for scientific computing.", "homepage": "https://github.com/blitzpp/blitz", "supports": "!(arm | arm64 | uwp)", @@ -13,6 +13,10 @@ { "name": "vcpkg-cmake-config", "host": true + }, + { + "name": "vcpkg-tool-python2", + "host": true } ] } diff --git a/external_imported/vcpkg/ports/blosc/0001-find-deps.patch b/external_imported/vcpkg/ports/blosc/0001-find-deps.patch index af0f92150..33407b9b3 100644 --- a/external_imported/vcpkg/ports/blosc/0001-find-deps.patch +++ b/external_imported/vcpkg/ports/blosc/0001-find-deps.patch @@ -1,16 +1,3 @@ -diff --git a/blosc/CMakeLists.txt b/blosc/CMakeLists.txt -index 1d1bebe..3a7a51c 100644 ---- a/blosc/CMakeLists.txt -+++ b/blosc/CMakeLists.txt -@@ -109,7 +109,7 @@ endif(NOT DEACTIVATE_ZLIB) - - if (NOT DEACTIVATE_ZSTD) - if (ZSTD_FOUND) -- set(LIBS ${LIBS} ${ZSTD_LIBRARY}) -+ set(LIBS ${LIBS} ${ZSTD_LIBRARIES}) - else (ZSTD_FOUND) - file(GLOB ZSTD_FILES - ${ZSTD_LOCAL_DIR}/common/*.c diff --git a/cmake/FindLZ4.cmake b/cmake/FindLZ4.cmake index e581a80..8ce17c5 100644 --- a/cmake/FindLZ4.cmake @@ -63,45 +50,3 @@ index 688d4d5..c8b9a05 100644 + SNAPPY DEFAULT_MSG + SNAPPY_LIBRARY SNAPPY_INCLUDE_DIR +) -diff --git a/cmake/FindZstd.cmake b/cmake/FindZstd.cmake -index 7db4bb9..ba20ba6 100644 ---- a/cmake/FindZstd.cmake -+++ b/cmake/FindZstd.cmake -@@ -1,10 +1,30 @@ -+include(FindPackageHandleStandardArgs) -+ - find_path(ZSTD_INCLUDE_DIR zstd.h) - --find_library(ZSTD_LIBRARY NAMES zstd) -+get_filename_component(_prefix_path ${ZSTD_INCLUDE_DIR} PATH) -+ -+find_library( -+ ZSTD_LIBRARY_DEBUG -+ NAMES zstdd -+ PATHS ${_prefix_path}/debug/lib -+ NO_DEFAULT_PATH -+) -+ -+find_library( -+ ZSTD_LIBRARY_RELEASE -+ NAMES zstd -+ PATHS ${_prefix_path}/lib -+ NO_DEFAULT_PATH -+) -+ -+unset(_prefix_path) -+ -+include(SelectLibraryConfigurations) -+select_library_configurations(ZSTD) - --if (ZSTD_INCLUDE_DIR AND ZSTD_LIBRARY) -- set(ZSTD_FOUND TRUE) -- message(STATUS "Found Zstd library: ${ZSTD_LIBRARY}") --else () -- message(STATUS "No Zstd library found. Using internal sources.") --endif () -+include(FindPackageHandleStandardArgs) -+find_package_handle_standard_args( -+ ZSTD -+ REQUIRED_VARS ZSTD_LIBRARIES ZSTD_INCLUDE_DIR -+) diff --git a/external_imported/vcpkg/ports/blosc/vcpkg.json b/external_imported/vcpkg/ports/blosc/vcpkg.json index 47ea38da4..ba1b06bc1 100644 --- a/external_imported/vcpkg/ports/blosc/vcpkg.json +++ b/external_imported/vcpkg/ports/blosc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "blosc", "version-string": "1.18.1", - "port-version": 3, + "port-version": 4, "description": "A blocking, shuffling and loss-less compression library that can be faster than `memcpy()`", "homepage": "https://github.com/Blosc/c-blosc", "dependencies": [ diff --git a/external_imported/vcpkg/ports/boinc/001-add-openssl3-support.patch b/external_imported/vcpkg/ports/boinc/001-add-openssl3-support.patch new file mode 100644 index 000000000..d0fd5ea89 --- /dev/null +++ b/external_imported/vcpkg/ports/boinc/001-add-openssl3-support.patch @@ -0,0 +1,13 @@ +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 6fd0ccd92..0009b0e74 100644 --- a/external_imported/vcpkg/ports/boinc/portfile.cmake +++ b/external_imported/vcpkg/ports/boinc/portfile.cmake @@ -1,7 +1,4 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "arm") -endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -9,6 +6,8 @@ vcpkg_from_github( REF client_release/7.18/7.18.1 SHA512 200587a0896aec6a7e7247132811141909aa333cb2bb9350c5ba016ffdf056413b1c5346361b311c087634b2d29cdbb204486385d8561a299b68739244c5a532 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 44c783323..f962c47a5 100644 --- a/external_imported/vcpkg/ports/boinc/vcpkg.json +++ b/external_imported/vcpkg/ports/boinc/vcpkg.json @@ -1,9 +1,10 @@ { "name": "boinc", "version": "7.18.1", - "port-version": 3, + "port-version": 5, "description": "Open-source software for volunteer computing and grid computing.", "homepage": "https://boinc.berkeley.edu/", + "license": "LGPL-3.0-or-later", "supports": "!(windows & arm) & !uwp", "dependencies": [ "openssl", diff --git a/external_imported/vcpkg/ports/boost-build/0002-fix-get-version.patch b/external_imported/vcpkg/ports/boost-build/0002-fix-get-version.patch new file mode 100644 index 000000000..cf35e7831 --- /dev/null +++ b/external_imported/vcpkg/ports/boost-build/0002-fix-get-version.patch @@ -0,0 +1,13 @@ +diff --git a/src/tools/clang-linux.jam b/src/tools/clang-linux.jam +index 949e277..8934787 100644 +--- a/src/tools/clang-linux.jam ++++ b/src/tools/clang-linux.jam +@@ -97,7 +97,7 @@ rule init ( version ? : command * : options * ) { + + rule get-full-version ( command-string ) + { +- return [ common.match-command-output version : "version ([0-9.]+)" ++ return [ common.match-command-output version : "([0-9]+.[0-9]+.[0-9]+)" + : "$(command-string) --version" ] ; + } + diff --git a/external_imported/vcpkg/ports/boost-build/portfile.cmake b/external_imported/vcpkg/ports/boost-build/portfile.cmake index 2f3bc7a08..ec913ceaf 100644 --- a/external_imported/vcpkg/ports/boost-build/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-build/portfile.cmake @@ -12,7 +12,9 @@ vcpkg_from_github( REF boost-${BOOST_VERSION} SHA512 867966e3d254c0e996786587fb64ad1bda6f96546e5302c15231b17d66537798770bbd9e89f800d445a1f0a4d3be06dff8aed42dfd3a77b563d0f5d715e79324 HEAD_REF master - PATCHES 0001-don-t-skip-install-targets.patch + PATCHES + 0001-don-t-skip-install-targets.patch + 0002-fix-get-version.patch ) vcpkg_download_distfile(ARCHIVE diff --git a/external_imported/vcpkg/ports/boost-build/vcpkg.json b/external_imported/vcpkg/ports/boost-build/vcpkg.json index 6cb3ff14a..a425121de 100644 --- a/external_imported/vcpkg/ports/boost-build/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-build/vcpkg.json @@ -1,6 +1,7 @@ { "name": "boost-build", "version": "1.78.0", + "port-version": 1, "description": "Boost.Build", "homepage": "https://github.com/boostorg/build", "dependencies": [ diff --git a/external_imported/vcpkg/ports/boost-iostreams/b2-options.cmake b/external_imported/vcpkg/ports/boost-iostreams/b2-options.cmake index 1271c8130..b95c08db0 100644 --- a/external_imported/vcpkg/ports/boost-iostreams/b2-options.cmake +++ b/external_imported/vcpkg/ports/boost-iostreams/b2-options.cmake @@ -27,12 +27,6 @@ if("lzma" IN_LIST FEATURES) list(APPEND B2_OPTIONS -sLZMA_INCLUDE="${CURRENT_INSTALLED_DIR}/include" ) - # Overwride debug library name - if(CMAKE_BUILD_TYPE STREQUAL "Debug") - list(APPEND B2_OPTIONS - -sLZMA_NAME=lzmad - ) - endif() list(APPEND B2_OPTIONS -sLZMA_LIBRARY_PATH="${CURRENT_INSTALLED_DIR}/${lib_path_suffix}" ) @@ -70,12 +64,6 @@ if("zstd" IN_LIST FEATURES) list(APPEND B2_OPTIONS -sZSTD_INCLUDE="${CURRENT_INSTALLED_DIR}/include" ) - # Overwride debug library name - if(CMAKE_BUILD_TYPE STREQUAL "Debug") - list(APPEND B2_OPTIONS - -sZSTD_NAME=zstdd - ) - endif() list(APPEND B2_OPTIONS -sZSTD_LIBRARY_PATH="${CURRENT_INSTALLED_DIR}/${lib_path_suffix}" ) diff --git a/external_imported/vcpkg/ports/boost-iostreams/vcpkg.json b/external_imported/vcpkg/ports/boost-iostreams/vcpkg.json index a644df9c5..080cec0a1 100644 --- a/external_imported/vcpkg/ports/boost-iostreams/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-iostreams/vcpkg.json @@ -1,8 +1,10 @@ { "name": "boost-iostreams", "version": "1.78.0", + "port-version": 2, "description": "Boost iostreams module", "homepage": "https://github.com/boostorg/iostreams", + "license": "BSL-1.0", "supports": "!uwp", "dependencies": [ "boost-assert", 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 db475d993..368c60174 100644 --- a/external_imported/vcpkg/ports/boost-modular-build-helper/CMakeLists.txt +++ b/external_imported/vcpkg/ports/boost-modular-build-helper/CMakeLists.txt @@ -1,15 +1,18 @@ cmake_minimum_required(VERSION 3.9) -project(boost CXX) +project(boost NONE) # The following variables are used in user-config.jam file -set(USER_CONFIG_TOOLSET) -set(USER_CONFIG_TOOLSET_VERSION) -set(USER_CONFIG_TOOLSET_INVOCATION_COMMAND) -set(USER_CONFIG_TOOLSET_OPTIONS) -set(USER_CONFIG_EXTRA_LINES) +set(USER_CONFIG_TOOLSET "") +set(USER_CONFIG_TOOLSET_VERSION "") +set(USER_CONFIG_TOOLSET_INVOCATION_COMMAND "") +set(USER_CONFIG_TOOLSET_OPTIONS "") +set(USER_CONFIG_EXTRA_LINES "") +set(USER_CONFIG_REQUIREMENTS "") set(B2_OPTIONS) +include("${VCPKG_CMAKE_VARS_FILE}") + # Add build type specific options if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") list(APPEND B2_OPTIONS runtime-link=shared) @@ -23,13 +26,13 @@ else() list(APPEND B2_OPTIONS link=static) endif() -if(CMAKE_SIZEOF_VOID_P EQUAL 8) +if(VCPKG_DETECTED_CMAKE_SIZEOF_VOID_P EQUAL "8") list(APPEND B2_OPTIONS address-model=64) else() list(APPEND B2_OPTIONS address-model=32) endif() -if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "s390x") +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "s390x") list(APPEND B2_OPTIONS architecture=s390x) elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") list(APPEND B2_OPTIONS architecture=arm) @@ -43,170 +46,103 @@ if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND WIN32) list(APPEND B2_OPTIONS "asmflags=/safeseh") endif() -if(WIN32) - if(MSVC) - if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - set(USER_CONFIG_TOOLSET clang-win) - else() - set(USER_CONFIG_TOOLSET msvc) - endif() - if(MSVC_VERSION LESS 1900) - math(EXPR USER_CONFIG_TOOLSET_VERSION "${MSVC_VERSION} / 10 - 60") - else() - math(EXPR USER_CONFIG_TOOLSET_VERSION "${MSVC_VERSION} / 10 - 50") - endif() +if(VCPKG_DETECTED_MSVC) + if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + set(USER_CONFIG_TOOLSET clang-win) + else() + set(USER_CONFIG_TOOLSET msvc) + endif() + if(VCPKG_DETECTED_MSVC_VERSION LESS "1900") + math(EXPR USER_CONFIG_TOOLSET_VERSION "${VCPKG_DETECTED_MSVC_VERSION} / 10 - 60") else() - if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - set(USER_CONFIG_TOOLSET clang) - else() - set(USER_CONFIG_TOOLSET gcc) - endif() + math(EXPR USER_CONFIG_TOOLSET_VERSION "${VCPKG_DETECTED_MSVC_VERSION} / 10 - 50") endif() +elseif(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID MATCHES "Clang") + set(USER_CONFIG_TOOLSET clang) +else() + set(USER_CONFIG_TOOLSET gcc) +endif() + +if(WIN32) list(APPEND B2_OPTIONS target-os=windows) elseif(APPLE) - set(USER_CONFIG_TOOLSET clang) list(APPEND B2_OPTIONS target-os=darwin) elseif(ANDROID) - set(USER_CONFIG_TOOLSET gcc) list(APPEND B2_OPTIONS target-os=android) else() - if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - set(USER_CONFIG_TOOLSET clang) - else() - set(USER_CONFIG_TOOLSET gcc) - endif() list(APPEND B2_OPTIONS target-os=linux) endif() # Properly handle compiler and linker flags passed by VCPKG -if(CMAKE_BUILD_TYPE STREQUAL "Release") - set(CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}") - set(CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_RELEASE}") - if(BUILD_SHARED_LIBS) - set(LDFLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS_RELEASE}") - else() - set(LDFLAGS "${CMAKE_STATIC_LINKER_FLAGS} ${CMAKE_STATIC_LINKER_FLAGS_RELEASE}") - endif() -elseif(CMAKE_BUILD_TYPE STREQUAL "Debug") - set(CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}") - set(CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_DEBUG}") - if(BUILD_SHARED_LIBS) - set(LDFLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS_DEBUG}") - else() - set(LDFLAGS "${CMAKE_STATIC_LINKER_FLAGS} ${CMAKE_STATIC_LINKER_FLAGS_DEBUG}") - endif() -endif() - -if(APPLE) - if(CMAKE_OSX_DEPLOYMENT_TARGET) - set(CXXFLAGS "-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} ${CXXFLAGS}") - set(CFLAGS "-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} ${CFLAGS}") - set(LDFLAGS "-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} ${LDFLAGS}") - endif() - - if(CMAKE_OSX_SYSROOT) - set(CXXFLAGS "-isysroot ${CMAKE_OSX_SYSROOT} ${CXXFLAGS}") - set(CFLAGS "-isysroot ${CMAKE_OSX_SYSROOT} ${CFLAGS}") - set(LDFLAGS "-isysroot ${CMAKE_OSX_SYSROOT} ${LDFLAGS}") - endif() +string(TOUPPER "${CMAKE_BUILD_TYPE}" UPPER_BUILD_TYPE) - # if specific architectures are set, configure them, - # if not set, this will still default to current arch - foreach(ARCH IN LISTS CMAKE_OSX_ARCHITECTURES) - set(CXXFLAGS "-arch ${ARCH} ${CXXFLAGS}") - set(CFLAGS "-arch ${ARCH} ${CFLAGS}") - set(LDFLAGS "-arch ${ARCH} ${LDFLAGS}") - endforeach() -endif() - -string(REGEX REPLACE "[ \t\r\n]+" " " CXXFLAGS "${CXXFLAGS}") -string(STRIP "${CXXFLAGS}" CXXFLAGS) -string(REGEX REPLACE "[ \t\r\n]+" " " CFLAGS "${CFLAGS}") -string(STRIP "${CFLAGS}" CFLAGS) -string(REGEX REPLACE "[ \t\r\n]+" " " LDFLAGS "${LDFLAGS}") -string(STRIP "${LDFLAGS}" LDFLAGS) - -if(NOT CXXFLAGS STREQUAL "") - string(REPLACE " " " " CXXFLAGS "${CXXFLAGS}") -endif() -if(NOT CFLAGS STREQUAL "") - string(REPLACE " " " " CFLAGS "${CFLAGS}") -endif() -if(NOT LDFLAGS STREQUAL "") - string(REPLACE " " " " LDFLAGS "${LDFLAGS}") -endif() - -if(CMAKE_CXX_COMPILER_TARGET AND CMAKE_CXX_COMPILE_OPTIONS_TARGET) - if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - string(APPEND CXXFLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_TARGET}${CMAKE_CXX_COMPILER_TARGET}") - string(APPEND LDFLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_TARGET}${CMAKE_CXX_COMPILER_TARGET}") - else() - string(APPEND CXXFLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_TARGET} ${CMAKE_CXX_COMPILER_TARGET}") - string(APPEND LDFLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_TARGET} ${CMAKE_CXX_COMPILER_TARGET}") - endif() -endif() - -if(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN) - if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - string(APPEND CXXFLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}") - string(APPEND LDFLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}") - else() - string(APPEND CXXFLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN} ${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}") - string(APPEND LDFLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN} ${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}") - endif() -endif() - -if(CMAKE_SYSROOT AND CMAKE_CXX_COMPILE_OPTIONS_SYSROOT) - string(APPEND CXXFLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}") - string(APPEND LDFLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}") -endif() -foreach(INCDIR IN LISTS CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES) - string(APPEND CXXFLAGS " ${CMAKE_INCLUDE_FLAG_C}${CMAKE_INCLUDE_FLAG_C_SEP}${INCDIR}") -endforeach() +set(CXXFLAGS "${VCPKG_COMBINED_CXX_FLAGS_${UPPER_BUILD_TYPE}}") +set(CFLAGS "${VCPKG_COMBINED_C_FLAGS_${UPPER_BUILD_TYPE}}") +set(LDFLAGS "${VCPKG_COMBINED_SHARED_LINKER_FLAGS_${UPPER_BUILD_TYPE}}") +set(ARFLAGS "${VCPKG_COMBINED_STATIC_LINKER_FLAGS_${UPPER_BUILD_TYPE}}") if(APPLE) - string(APPEND CXXFLAGS " -D_DARWIN_C_SOURCE -std=c++11 -stdlib=libc++") - string(APPEND LDFLAGS " -stdlib=libc++") + string(APPEND COMPILEFLAGS " -D_DARWIN_C_SOURCE") + if(NOT CXXFLAGS MATCHES " -std=") + # If the user hasn't provided their own standard flag, use at least c++11 + string(APPEND CXXFLAGS " -std=c++11") + endif() endif() -if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") +if(VCPKG_DETECTED_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") # cl in b2 appears to not receive `LIBPATH` for finding winmd files, so we transform them to `/AI` options. set(libpath_args "$ENV{LIBPATH}") # Apply: {x -> /AI"x"} list(TRANSFORM libpath_args PREPEND "/AI\"") list(TRANSFORM libpath_args APPEND "\"") - # Apply: {\ -> \\} - list(TRANSFORM libpath_args REPLACE "\\\\" "\\\\\\\\") - # Apply: {" -> \"} - list(TRANSFORM libpath_args REPLACE "\\\"" "\\\\\"") list(JOIN libpath_args " " libpath_arg) - string(APPEND CXXFLAGS " \"${libpath_arg}\" /ZW \"/D_WIN32_WINNT=0x0A00\"") - string(APPEND CFLAGS " -Zl") + 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) endif() -set(USER_CONFIG_TOOLSET_INVOCATION_COMMAND "\"${CMAKE_CXX_COMPILER}\"") +set(USER_CONFIG_TOOLSET_INVOCATION_COMMAND "\"${VCPKG_DETECTED_CMAKE_CXX_COMPILER}\"") + +string(APPEND CXXFLAGS "${COMPILEFLAGS}") +string(APPEND CFLAGS "${COMPILEFLAGS}") + +foreach(var CXXFLAGS CFLAGS LDFLAGS ARFLAGS) + string(REPLACE [[\]] [[\\]] ${var} "${${var}}") + string(REPLACE [["]] [[\"]] ${var} "${${var}}") + string(REGEX REPLACE "[ \t\r\n]+" " " ${var} "${${var}}") + string(STRIP "${${var}}" ${var}) +endforeach() if(USER_CONFIG_TOOLSET STREQUAL "msvc") file(TO_CMAKE_PATH "${CMAKE_CURRENT_LIST_DIR}/nothing.bat" NOTHING_BAT) string(APPEND USER_CONFIG_TOOLSET_OPTIONS " \"${NOTHING_BAT}\"\n" - " ${CXXFLAGS}\n" - " ${CFLAGS}\n" - " ${LDFLAGS}\n" ) + if(NOT ARFLAGS STREQUAL "") + # Only apply these flags for MSVC + string(APPEND USER_CONFIG_REQUIREMENTS "\"${ARFLAGS}\"\n ") + endif() else() string(APPEND USER_CONFIG_TOOLSET_OPTIONS - " \"${CMAKE_RANLIB}\"\n" - " \"${CMAKE_AR}\"\n" - " ${CXXFLAGS}\n" - " ${CFLAGS}\n" - " ${LDFLAGS}\n" + " \"${VCPKG_DETECTED_CMAKE_RANLIB}\"\n" + " \"${VCPKG_DETECTED_CMAKE_AR}\"\n" ) endif() +if(NOT CXXFLAGS STREQUAL "") + string(APPEND USER_CONFIG_TOOLSET_OPTIONS " \"${CXXFLAGS}\"\n") +endif() +if(NOT CFLAGS STREQUAL "") + string(APPEND USER_CONFIG_TOOLSET_OPTIONS " \"${CFLAGS}\"\n \"${CFLAGS}\"\n") +endif() +if(NOT LDFLAGS STREQUAL "") + string(APPEND USER_CONFIG_REQUIREMENTS "\"${LDFLAGS}\"\n ") + string(APPEND USER_CONFIG_TOOLSET_OPTIONS " \"${LDFLAGS}\"\n") +endif() + if(WIN32 AND NOT USER_CONFIG_TOOLSET STREQUAL "msvc") # MINGW here causes b2 to not run cygpath string(APPEND USER_CONFIG_TOOLSET_OPTIONS @@ -247,7 +183,7 @@ endif() # Handle Python set(python_versions "") -if("python2" IN_LIST FEATURES) +if(WITH_PYTHON2) # Find Python2 in the current installed directory file(GLOB python2_include_dir "${CURRENT_INSTALLED_DIR}/include/python2.*") string(REGEX REPLACE ".*python([0-9\.]+).*" "\\1" python2_version "${python2_include_dir}") @@ -258,7 +194,7 @@ if("python2" IN_LIST FEATURES) list(APPEND python_versions "${python2_version}") endif() -if("python3" IN_LIST FEATURES) +if(WITH_PYTHON3) # Find Python3 in the current installed directory file(GLOB python3_include_dir "${CURRENT_INSTALLED_DIR}/include/python3.*") string(REGEX REPLACE ".*python([0-9\.]+).*" "\\1" python3_version "${python3_include_dir}") 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 2cc344595..344deb615 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 @@ -46,6 +46,9 @@ function(boost_modular_build) elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v120") set(BOOST_LIB_RELEASE_SUFFIX -vc120-mt.lib) set(BOOST_LIB_DEBUG_SUFFIX -vc120-mt-gd.lib) + else() + set(BOOST_LIB_RELEASE_SUFFIX .lib) + set(BOOST_LIB_DEBUG_SUFFIX d.lib) endif() else() set(BOOST_LIB_PREFIX lib) @@ -102,17 +105,28 @@ function(boost_modular_build) list(APPEND configure_options "-DBOOST_CMAKE_FRAGMENT=${_bm_BOOST_CMAKE_FRAGMENT}") endif() + vcpkg_cmake_get_vars(cmake_vars_file) + + vcpkg_check_features( + OUT_FEATURE_OPTIONS feature_options + FEATURES + python2 WITH_PYTHON2 + python3 WITH_PYTHON3 + ) + vcpkg_cmake_configure( SOURCE_PATH ${BOOST_BUILD_INSTALLED_DIR}/share/boost-build GENERATOR Ninja OPTIONS "-DPORT=${PORT}" "-DFEATURES=${FEATURES}" + ${feature_options} "-DCURRENT_INSTALLED_DIR=${CURRENT_INSTALLED_DIR}" "-DB2_EXE=${B2_EXE}" "-DSOURCE_PATH=${_bm_SOURCE_PATH}" "-DBOOST_BUILD_PATH=${BOOST_BUILD_PATH}" "-DVCPKG_CRT_LINKAGE=${VCPKG_CRT_LINKAGE}" + "-DVCPKG_CMAKE_VARS_FILE=${cmake_vars_file}" ${configure_options} MAYBE_UNUSED_VARIABLES FEATURES diff --git a/external_imported/vcpkg/ports/boost-modular-build-helper/user-config.jam.in b/external_imported/vcpkg/ports/boost-modular-build-helper/user-config.jam.in index fd9b9f0a9..fccfa1a43 100644 --- a/external_imported/vcpkg/ports/boost-modular-build-helper/user-config.jam.in +++ b/external_imported/vcpkg/ports/boost-modular-build-helper/user-config.jam.in @@ -7,7 +7,7 @@ using @USER_CONFIG_TOOLSET@ : @USER_CONFIG_TOOLSET_VERSION@ : @USER_CONFIG_TOOLS @USER_CONFIG_EXTRA_LINES@ -project user-config : ; +project user-config : requirements @USER_CONFIG_REQUIREMENTS@ ; if "@USER_CONFIG_TOOLSET@" = "msvc" || "@USER_CONFIG_TOOLSET@" = "clang-win" { 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 b43d1e7ac..a70e22280 100644 --- a/external_imported/vcpkg/ports/boost-modular-build-helper/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-modular-build-helper/vcpkg.json @@ -1,7 +1,9 @@ { "name": "boost-modular-build-helper", "version": "1.78.0", + "port-version": 3, "description": "Internal vcpkg port used to build Boost libraries", + "license": "MIT", "dependencies": [ "boost-uninstall", "vcpkg-cmake" diff --git a/external_imported/vcpkg/ports/boost-vcpkg-helpers/boost-modular-headers.cmake b/external_imported/vcpkg/ports/boost-vcpkg-helpers/boost-modular-headers.cmake index f072bbf1b..6cb052392 100644 --- a/external_imported/vcpkg/ports/boost-vcpkg-helpers/boost-modular-headers.cmake +++ b/external_imported/vcpkg/ports/boost-vcpkg-helpers/boost-modular-headers.cmake @@ -1,26 +1,20 @@ function(boost_modular_headers) cmake_parse_arguments(_bm "" "SOURCE_PATH" "" ${ARGN}) - set(BOOST_VERSION 1.78.0) - if(NOT DEFINED _bm_SOURCE_PATH) message(FATAL_ERROR "SOURCE_PATH is a required argument to boost_modular_headers.") endif() - message(STATUS "Packaging headers") - + message(STATUS "Copying headers") file( COPY ${_bm_SOURCE_PATH}/include/boost DESTINATION ${CURRENT_PACKAGES_DIR}/include ) + message(STATUS "Copying headers done") - message(STATUS "Packaging headers done") - - vcpkg_download_distfile(ARCHIVE - URLS "https://raw.githubusercontent.com/boostorg/boost/boost-${BOOST_VERSION}/LICENSE_1_0.txt" - FILENAME "boost_LICENSE_1_0.txt" - SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8 + file(INSTALL + ${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/usage + ${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/copyright + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} ) - file(INSTALL ${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) - file(INSTALL ${ARCHIVE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) endfunction() diff --git a/external_imported/vcpkg/ports/boost-vcpkg-helpers/portfile.cmake b/external_imported/vcpkg/ports/boost-vcpkg-helpers/portfile.cmake index 0233bda5a..3737f9273 100644 --- a/external_imported/vcpkg/ports/boost-vcpkg-helpers/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-vcpkg-helpers/portfile.cmake @@ -1,8 +1,17 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +set(BOOST_VERSION 1.78.0) -file(COPY +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/boost-modular-headers.cmake ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} ) -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +vcpkg_download_distfile(LICENSE + URLS "https://raw.githubusercontent.com/boostorg/boost/boost-${BOOST_VERSION}/LICENSE_1_0.txt" + FILENAME "boost_LICENSE_1_0.txt" + SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8 +) + +file(INSTALL ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/external_imported/vcpkg/ports/boost-vcpkg-helpers/vcpkg.json b/external_imported/vcpkg/ports/boost-vcpkg-helpers/vcpkg.json index 70d08eb90..8987cc0ba 100644 --- a/external_imported/vcpkg/ports/boost-vcpkg-helpers/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-vcpkg-helpers/vcpkg.json @@ -1,6 +1,7 @@ { "name": "boost-vcpkg-helpers", "version": "1.78.0", + "port-version": 1, "description": "Internal vcpkg port used to modularize Boost", "dependencies": [ "boost-uninstall" diff --git a/external_imported/vcpkg/ports/boringssl/portfile.cmake b/external_imported/vcpkg/ports/boringssl/portfile.cmake index 71cef4ed3..e604c6a34 100644 --- a/external_imported/vcpkg/ports/boringssl/portfile.cmake +++ b/external_imported/vcpkg/ports/boringssl/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openssl/ssl.h") message(FATAL_ERROR "Can't build BoringSSL if OpenSSL is installed. Please remove OpenSSL, and try to install BoringSSL again if you need it. Build will continue since BoringSSL is a drop-in replacement for OpenSSL") endif() @@ -24,7 +22,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/boringssl - REF 479adf98d54a21c1d154aac59b2ce120e1d1a6d6 + REF 479adf98d54a21c1d154aac59b2ce120e1d1a6d6 SHA512 74b5d001c0f5c1846b8818e9e668fa35de5171fc21a8f713d241f57b3e8abe42426fdc66b085cca1853b904def6f4bea573dfed40b8b1422894cca85b0b1a44a HEAD_REF master PATCHES diff --git a/external_imported/vcpkg/ports/boringssl/vcpkg.json b/external_imported/vcpkg/ports/boringssl/vcpkg.json index e3aaec032..d8d9f7ac2 100644 --- a/external_imported/vcpkg/ports/boringssl/vcpkg.json +++ b/external_imported/vcpkg/ports/boringssl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "boringssl", "version-date": "2021-06-23", + "port-version": 1, "description": "BoringSSl is a fork of OpenSSL developed by Google", "homepage": "https://boringssl.googlesource.com/boringssl", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/botan/embed-debug-info.patch b/external_imported/vcpkg/ports/botan/embed-debug-info.patch new file mode 100644 index 000000000..09a17202e --- /dev/null +++ b/external_imported/vcpkg/ports/botan/embed-debug-info.patch @@ -0,0 +1,17 @@ +diff --git a/src/build-data/cc/msvc.txt b/src/build-data/cc/msvc.txt +index 2306a4485..977e2e958 100644 +--- a/src/build-data/cc/msvc.txt ++++ b/src/build-data/cc/msvc.txt +@@ -17,10 +17,10 @@ optimization_flags "/O2 /Oi" + size_optimization_flags "/O1 /Os" + + # for debug info in the object file: +-#debug_info_flags "/Z7" ++debug_info_flags "/Z7" + + # for using a PDB file: +-debug_info_flags "/Zi /FS" ++#debug_info_flags "/Zi /FS" + + preproc_flags "/nologo /EP" + diff --git a/external_imported/vcpkg/ports/botan/portfile.cmake b/external_imported/vcpkg/ports/botan/portfile.cmake index d741b4f3e..1852eb55e 100644 --- a/external_imported/vcpkg/ports/botan/portfile.cmake +++ b/external_imported/vcpkg/ports/botan/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-generate-build-path.patch + embed-debug-info.patch ) if(CMAKE_HOST_WIN32) @@ -51,6 +52,7 @@ endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES amalgamation BOTAN_AMALGAMATION + zlib BOTAN_WITH_ZLIB ) function(BOTAN_BUILD BOTAN_BUILD_TYPE) @@ -80,14 +82,24 @@ function(BOTAN_BUILD BOTAN_BUILD_TYPE) "--distribution-info=vcpkg ${TARGET_TRIPLET}" --prefix=${BOTAN_FLAG_PREFIX} --with-pkg-config - --link-method=copy) + --link-method=copy + --with-debug-info) if(CMAKE_HOST_WIN32) list(APPEND configure_arguments ${BOTAN_MSVC_RUNTIME}${BOTAN_MSVC_RUNTIME_SUFFIX}) endif() + if(VCPKG_CXX_FLAGS) + list(APPEND configure_arguments --extra-cxxflags ${VCPKG_CXX_FLAGS}) + endif() + if("-DBOTAN_AMALGAMATION=ON" IN_LIST FEATURE_OPTIONS) list(APPEND configure_arguments --amalgamation) endif() + if("-DBOTAN_WITH_ZLIB=ON" IN_LIST FEATURE_OPTIONS) + list(APPEND configure_arguments --with-zlib) + list(APPEND configure_arguments --with-external-includedir="${CURRENT_INSTALLED_DIR}/include") + list(APPEND configure_arguments --with-external-libdir="${CURRENT_INSTALLED_DIR}/lib") + endif() vcpkg_execute_required_process( COMMAND "${PYTHON3}" "${SOURCE_PATH}/configure.py" ${configure_arguments} @@ -140,6 +152,7 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") [[${prefix}/include]] ) endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/botan-2.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/botan-2.pc") @@ -176,6 +189,7 @@ endif() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "#define BOTAN_INSTALL_PREFIX R\"(${CURRENT_PACKAGES_DIR})\"" "") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "#define BOTAN_INSTALL_LIB_DIR R\"(${CURRENT_PACKAGES_DIR}\\lib)\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "#define BOTAN_INSTALL_LIB_DIR R\"(${CURRENT_PACKAGES_DIR}/lib)\"" "") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "--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/botan/vcpkg.json b/external_imported/vcpkg/ports/botan/vcpkg.json index 5f1cec7c0..1bb8d4cb4 100644 --- a/external_imported/vcpkg/ports/botan/vcpkg.json +++ b/external_imported/vcpkg/ports/botan/vcpkg.json @@ -1,13 +1,20 @@ { "name": "botan", "version": "2.18.1", - "port-version": 6, + "port-version": 10, "description": "A cryptography library written in C++11", "homepage": "https://botan.randombit.net", + "license": "BSD-2-Clause", "supports": "!(windows & arm)", "features": { "amalgamation": { "description": "Do an amalgamation build of the library" + }, + "zlib": { + "description": "Build with zlib. Enable compression pipes.", + "dependencies": [ + "zlib" + ] } } } diff --git a/external_imported/vcpkg/ports/box2d/portfile.cmake b/external_imported/vcpkg/ports/box2d/portfile.cmake index e6004f079..e209c85a3 100644 --- a/external_imported/vcpkg/ports/box2d/portfile.cmake +++ b/external_imported/vcpkg/ports/box2d/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/external_imported/vcpkg/ports/box2d/vcpkg.json b/external_imported/vcpkg/ports/box2d/vcpkg.json index 38535d8fa..b1b4b1401 100644 --- a/external_imported/vcpkg/ports/box2d/vcpkg.json +++ b/external_imported/vcpkg/ports/box2d/vcpkg.json @@ -1,7 +1,7 @@ { "name": "box2d", "version-semver": "2.4.1", - "port-version": 1, + "port-version": 2, "description": "An open source C++ engine for simulating rigid bodies in 2D", "homepage": "https://box2d.org", "supports": "!uwp" diff --git a/external_imported/vcpkg/ports/braft/export-target.patch b/external_imported/vcpkg/ports/braft/export-target.patch new file mode 100644 index 000000000..097a0570c --- /dev/null +++ b/external_imported/vcpkg/ports/braft/export-target.patch @@ -0,0 +1,48 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 78adc56..ff435a2 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -19,8 +19,10 @@ add_library(braft-static STATIC $) + endif() + + if (BUILD_SHARED_LIBS) ++target_include_directories(braft-shared PUBLIC $) + target_link_libraries(braft-shared PUBLIC ${DYNAMIC_LIB}) + else() ++target_include_directories(braft-static PUBLIC $) + target_link_libraries(braft-static PUBLIC ${DYNAMIC_LIB}) + endif() + +@@ -31,15 +33,30 @@ SET_TARGET_PROPERTIES(braft-shared PROPERTIES OUTPUT_NAME braft CLEAN_DIRECT_OUT + endif() + + if (NOT BUILD_SHARED_LIBS) +-install(TARGETS braft-static ++install(TARGETS braft-static EXPORT unofficial-braftTargets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIBSUFFIX} + ARCHIVE DESTINATION lib${LIBSUFFIX} + ) + else() +-install(TARGETS braft-shared ++install(TARGETS braft-shared EXPORT unofficial-braftTargets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIBSUFFIX} + ARCHIVE DESTINATION lib${LIBSUFFIX} + ) + endif() ++ ++file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-braft-config.cmake" ++[[include(CMakeFindDependencyMacro) ++find_dependency(gflags CONFIG) ++file(GLOB TARGET_FILES "${CMAKE_CURRENT_LIST_DIR}/unofficial-braftTargets.cmake") ++foreach (TARGET_FILE ${TARGET_FILES}) ++ include("${TARGET_FILE}") ++endforeach() ++]]) ++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/unofficial-braft-config.cmake" DESTINATION share/unofficial-braft) ++ ++install(EXPORT unofficial-braftTargets ++ NAMESPACE unofficial::braft:: ++ DESTINATION share/unofficial-braft ++) diff --git a/external_imported/vcpkg/ports/braft/fix-build.patch b/external_imported/vcpkg/ports/braft/fix-build.patch new file mode 100644 index 000000000..1be7d3c97 --- /dev/null +++ b/external_imported/vcpkg/ports/braft/fix-build.patch @@ -0,0 +1,56 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a735c53..53ddaed 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -229,7 +229,9 @@ add_subdirectory(src) + if(BUILD_UNIT_TESTS) + add_subdirectory(test) + endif() ++if(BUILD_TOOLS) + add_subdirectory(tools) ++endif() + + file(COPY ${CMAKE_CURRENT_BINARY_DIR}/braft/ + DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/output/include/braft/ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index f587464..78adc56 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -12,22 +12,34 @@ include_directories(${CMAKE_SOURCE_DIR}/src) + add_library(OBJ_LIB OBJECT ${SOURCES}) + + set_property(TARGET ${OBJ_LIB} PROPERTY POSITION_INDEPENDENT_CODE 1) ++if (BUILD_SHARED_LIBS) + add_library(braft-shared SHARED $) ++else() + add_library(braft-static STATIC $) +-target_link_libraries(braft-shared ${DYNAMIC_LIB}) +-target_link_libraries(braft-static ${DYNAMIC_LIB}) ++endif() ++ ++if (BUILD_SHARED_LIBS) ++target_link_libraries(braft-shared PUBLIC ${DYNAMIC_LIB}) ++else() ++target_link_libraries(braft-static PUBLIC ${DYNAMIC_LIB}) ++endif() + ++if (NOT BUILD_SHARED_LIBS) + SET_TARGET_PROPERTIES(braft-static PROPERTIES OUTPUT_NAME braft CLEAN_DIRECT_OUTPUT 1) ++else() + SET_TARGET_PROPERTIES(braft-shared PROPERTIES OUTPUT_NAME braft CLEAN_DIRECT_OUTPUT 1) ++endif() + ++if (NOT BUILD_SHARED_LIBS) + install(TARGETS braft-static + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIBSUFFIX} + ARCHIVE DESTINATION lib${LIBSUFFIX} + ) +- ++else() + install(TARGETS braft-shared + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIBSUFFIX} + ARCHIVE DESTINATION lib${LIBSUFFIX} + ) ++endif() diff --git a/external_imported/vcpkg/ports/braft/fix-dependency.patch b/external_imported/vcpkg/ports/braft/fix-dependency.patch new file mode 100644 index 000000000..b39ba03fa --- /dev/null +++ b/external_imported/vcpkg/ports/braft/fix-dependency.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 53ddaed..a851c00 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -47,8 +47,9 @@ if ((NOT LEVELDB_INCLUDE_PATH) OR (NOT LEVELDB_LIB)) + message(FATAL_ERROR "Fail to find leveldb") + endif() + +-find_path(GFLAGS_INCLUDE_PATH NAMES gflags/gflags.h) +-find_library(GFLAGS_LIB NAMES gflags) ++find_package(gflags CONFIG REQUIRED) ++get_target_property(GFLAGS_INCLUDE_PATH gflags::gflags INTERFACE_INCLUDE_DIRECTORIES) ++set(GFLAGS_LIB gflags::gflags) + if ((NOT GFLAGS_INCLUDE_PATH) OR (NOT GFLAGS_LIB)) + message(FATAL_ERROR "Fail to find gflags") + endif() diff --git a/external_imported/vcpkg/ports/braft/portfile.cmake b/external_imported/vcpkg/ports/braft/portfile.cmake new file mode 100644 index 000000000..c35fae993 --- /dev/null +++ b/external_imported/vcpkg/ports/braft/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO baidu/braft + REF 8d0128e02a2959f9cc427d5f97ed730ee6a6b410 + SHA512 f28afbf5fe8a354872c252580e2d679f7a66944a554f0c8e9331b8a68b6a87659d59fbbc41c3ada55e09a265032290bcef567c99a7428604d08f7885f97cf6d7 + HEAD_REF master + PATCHES + fix-build.patch + fix-dependency.patch + export-target.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBRPC_WITH_GLOG=ON + -DBUILD_TOOLS=OFF +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-braft CONFIG_PATH share/unofficial-braft) + +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/braft/vcpkg.json b/external_imported/vcpkg/ports/braft/vcpkg.json new file mode 100644 index 000000000..fc1294cab --- /dev/null +++ b/external_imported/vcpkg/ports/braft/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "braft", + "version-date": "2021-26-04", + "description": "Consesus algorithm library", + "homepage": "https://github.com/baidu/braft", + "license": "Apache-2.0", + "supports": "!windows", + "dependencies": [ + "brpc", + "gflags", + "glog", + "leveldb", + "protobuf", + "thrift", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/brpc/fix-protobuf-deprecated.patch b/external_imported/vcpkg/ports/brpc/fix-protobuf-deprecated.patch deleted file mode 100644 index 564724c63..000000000 --- a/external_imported/vcpkg/ports/brpc/fix-protobuf-deprecated.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/brpc/protocol.cpp b/src/brpc/protocol.cpp -index 11297ea..c998edb 100644 ---- a/src/brpc/protocol.cpp -+++ b/src/brpc/protocol.cpp -@@ -203,7 +203,7 @@ BUTIL_FORCE_INLINE bool ParsePbFromZeroCopyStreamInlined( - // According to source code of pb, SetTotalBytesLimit is not a simple set, - // avoid calling the function when the limit is definitely unreached. - if (PB_TOTAL_BYETS_LIMITS < FLAGS_max_body_size) { -- decoder.SetTotalBytesLimit(INT_MAX, -1); -+ decoder.SetTotalBytesLimit(INT_MAX); - } - return msg->ParseFromCodedStream(&decoder) && decoder.ConsumedEntireMessage(); - } diff --git a/external_imported/vcpkg/ports/brpc/portfile.cmake b/external_imported/vcpkg/ports/brpc/portfile.cmake index b78f6e4cc..ed0ff3acf 100644 --- a/external_imported/vcpkg/ports/brpc/portfile.cmake +++ b/external_imported/vcpkg/ports/brpc/portfile.cmake @@ -1,4 +1,8 @@ -vcpkg_fail_port_install(ON_TARGET "windows") +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 @@ -9,26 +13,25 @@ vcpkg_from_github( PATCHES fix_boost_ptr.patch fix_thrift.patch - fix-protobuf-deprecated.patch + ${patch1679} ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DWITH_THRIFT=ON -DWITH_MESALINK=OFF -DWITH_GLOG=ON ) -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(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/butil/third_party/superfasthash") 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) vcpkg_fixup_pkgconfig() diff --git a/external_imported/vcpkg/ports/brpc/vcpkg.json b/external_imported/vcpkg/ports/brpc/vcpkg.json index 8d7e722c7..67c0e3119 100644 --- a/external_imported/vcpkg/ports/brpc/vcpkg.json +++ b/external_imported/vcpkg/ports/brpc/vcpkg.json @@ -1,14 +1,18 @@ { "name": "brpc", - "version-string": "0.9.7", - "port-version": 3, + "version": "0.9.7", + "port-version": 7, "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", - "supports": "!windows", + "license": "Apache-2.0", + "supports": "!windows & !arm", "dependencies": [ "gflags", "glog", - "leveldb", + { + "name": "leveldb", + "default-features": false + }, "openssl", { "name": "protobuf", @@ -16,6 +20,10 @@ "zlib" ] }, - "thrift" + "thrift", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/brynet/portfile.cmake b/external_imported/vcpkg/ports/brynet/portfile.cmake index 43e28bdb7..fc3865a37 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 1a48a74ba5c6074cf6f478d6a52e3c37ce3b9cc8 # v1.11.1 - SHA512 5f04ee74a1ba8955ddb355286aa2bcd29d50b2a8bb7c2c3296fd000ab5e2060ceb3a5254e54e48f6c090f16883aea07178001532da39f28dcafbcf8df7a7304c + REF 4d162460372b2385cea121da0403f55582b4e39b # v1.11.2 + SHA512 656e8e0bdf44e2fb9f17c622d517cafc5ff965402ccab4b96e6f4663e715396a962df0ebb2baaec871336e27c0129ceb47b80352bfcd28cdff731d46aad08d8a HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/brynet/vcpkg.json b/external_imported/vcpkg/ports/brynet/vcpkg.json index 173ca0bd9..026f2d895 100644 --- a/external_imported/vcpkg/ports/brynet/vcpkg.json +++ b/external_imported/vcpkg/ports/brynet/vcpkg.json @@ -1,7 +1,6 @@ { "name": "brynet", - "version-string": "1.11.1", - "port-version": 1, + "version": "1.11.2", "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/buck-yeh-bux-mariadb-client/portfile.cmake b/external_imported/vcpkg/ports/buck-yeh-bux-mariadb-client/portfile.cmake index 4f675457d..2b7f7c7fd 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,4 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "linux" "uwp" "osx") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO buck-yeh/bux-mariadb-client 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 2ec1976a4..1f70c38e1 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,6 +1,7 @@ { "name": "buck-yeh-bux-mariadb-client", "version": "1.0.1", + "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)", diff --git a/external_imported/vcpkg/ports/buck-yeh-bux/fix-errorC7595.patch b/external_imported/vcpkg/ports/buck-yeh-bux/fix-errorC7595.patch new file mode 100644 index 000000000..1f9ff4768 --- /dev/null +++ b/external_imported/vcpkg/ports/buck-yeh-bux/fix-errorC7595.patch @@ -0,0 +1,15 @@ +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 890792d81..78dc069d3 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_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp" "osx") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO buck-yeh/bux REF 8788509f0281e9a2af34c0399a45a5c9e66a4664 # v1.6.3 SHA512 a7045a93d91e497ca2b60965bb2f098eae714d00feef0d252747178739cdd981f44cb8983278c679761f61e037da05889f22fa161d26fca05af511fc56c1ac8f HEAD_REF main + PATCHES fix-errorC7595.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 36fc610cc..2275629c2 100644 --- a/external_imported/vcpkg/ports/buck-yeh-bux/vcpkg.json +++ b/external_imported/vcpkg/ports/buck-yeh-bux/vcpkg.json @@ -1,6 +1,7 @@ { "name": "buck-yeh-bux", "version": "1.6.3", + "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)", diff --git a/external_imported/vcpkg/ports/bullet3/portfile.cmake b/external_imported/vcpkg/ports/bullet3/portfile.cmake index 79bcf0cda..4c70019d3 100644 --- a/external_imported/vcpkg/ports/bullet3/portfile.cmake +++ b/external_imported/vcpkg/ports/bullet3/portfile.cmake @@ -1,16 +1,13 @@ -if (NOT VCPKG_TARGET_IS_OSX) - vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") -endif() - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO bulletphysics/bullet3 - REF 3.17 - SHA512 a5105bf5f1dd365a64a350755c7d2c97942f74897a18dcdb3651e6732fd55cc1030a096f5808cf50575281f05e3ac09aa50a48d271a47b94cd61f5167a72b7cc + REF 3.22 + SHA512 edacf643ca9621523812effe69a7499716bc65282c58c1f5b4eb4f17b2b1ab55a4f71b06a73483f57e57a5b032c234d09ba5fab9881321f2cbc3c27b43fdc95d HEAD_REF master - PATCHES cmake-fix.patch + PATCHES + cmake-fix.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/external_imported/vcpkg/ports/bullet3/vcpkg.json b/external_imported/vcpkg/ports/bullet3/vcpkg.json index 6de08ff9f..50853901d 100644 --- a/external_imported/vcpkg/ports/bullet3/vcpkg.json +++ b/external_imported/vcpkg/ports/bullet3/vcpkg.json @@ -1,10 +1,9 @@ { "name": "bullet3", - "version": "3.17", - "port-version": 3, + "version": "3.22", "description": "Bullet Physics is a professional collision detection, rigid body, and soft body dynamics library", "homepage": "https://github.com/bulletphysics/bullet3", - "supports": "!((windows | linux) & (arm | uwp))", + "license": "Zlib", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/c-ares/avoid-docs.patch b/external_imported/vcpkg/ports/c-ares/avoid-docs.patch new file mode 100644 index 000000000..cd505ecce --- /dev/null +++ b/external_imported/vcpkg/ports/c-ares/avoid-docs.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 194485a..e903e50 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -618,7 +618,7 @@ ADD_SUBDIRECTORY (include) + ADD_SUBDIRECTORY (src) + + # Docs +-ADD_SUBDIRECTORY (docs) ++#ADD_SUBDIRECTORY (docs) + + # Tests + IF (CARES_BUILD_TESTS OR CARES_BUILD_CONTAINER_TESTS) diff --git a/external_imported/vcpkg/ports/c-ares/portfile.cmake b/external_imported/vcpkg/ports/c-ares/portfile.cmake index 4e9ee8266..f21cd6c58 100644 --- a/external_imported/vcpkg/ports/c-ares/portfile.cmake +++ b/external_imported/vcpkg/ports/c-ares/portfile.cmake @@ -1,18 +1,18 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO c-ares/c-ares - REF cares-1_17_2 - SHA512 1111f1e7eeb0e5d9e70d1a7c8566145d0a5e6e71b020f3fcaa02ecdf1931553ddeff83fdc152a1f9c5a780078e8afe3670164b631df56eecd2b638210cc59bb3 - HEAD_REF master + REF cares-1_18_1 + SHA512 9f5f9d5a22a4643aef8701c4abfd4b28e0bded2479bab462d2dfc63a8f84348f02d3cfbd7c85cc1e06a154a3e4206721cb6669c7c61538ecdcd44268e4ce073e + HEAD_REF main + PATCHES + avoid-docs.patch ) 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} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCARES_STATIC=${BUILD_STATIC} -DCARES_SHARED=${BUILD_SHARED} diff --git a/external_imported/vcpkg/ports/c-ares/vcpkg.json b/external_imported/vcpkg/ports/c-ares/vcpkg.json index da731a90c..b8f9a8746 100644 --- a/external_imported/vcpkg/ports/c-ares/vcpkg.json +++ b/external_imported/vcpkg/ports/c-ares/vcpkg.json @@ -1,9 +1,9 @@ { "name": "c-ares", - "version-semver": "1.17.2", - "port-version": 1, + "version-semver": "1.18.1", "description": "A C library for asynchronous DNS requests", "homepage": "https://github.com/c-ares/c-ares", + "license": "MIT", "supports": "!uwp", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/c-dbg-macro/portfile.cmake b/external_imported/vcpkg/ports/c-dbg-macro/portfile.cmake new file mode 100644 index 000000000..95dd96ceb --- /dev/null +++ b/external_imported/vcpkg/ports/c-dbg-macro/portfile.cmake @@ -0,0 +1,14 @@ +# single header file library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO eerimoq/dbg-macro + REF 78b7655bd0cfc2389fe96a3b6584d2930eb7ebd7 + SHA512 f755c8cf17b422f43f09dcd4f8232b6130a5933d0ce537ce4874ecb886ad2fd5dee26fe12c10cb1554a3720a1263d0ce07252c0893de395b8c9042c9330e60be + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/include/dbg.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/external_imported/vcpkg/ports/c-dbg-macro/vcpkg.json b/external_imported/vcpkg/ports/c-dbg-macro/vcpkg.json new file mode 100644 index 000000000..0891d40d9 --- /dev/null +++ b/external_imported/vcpkg/ports/c-dbg-macro/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "c-dbg-macro", + "version-date": "2020-02-29", + "description": "A dbg(...) macro for C", + "homepage": "https://github.com/eerimoq/dbg-macro" +} diff --git a/external_imported/vcpkg/ports/c89stringutils/portfile.cmake b/external_imported/vcpkg/ports/c89stringutils/portfile.cmake new file mode 100644 index 000000000..ae15441cb --- /dev/null +++ b/external_imported/vcpkg/ports/c89stringutils/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO offscale/c89stringutils + REF 375c87aaf50a945b17a76727f3314eb217897caf + SHA512 395d942a133209daf510094814830e35daf2047c35b0ff15b17051d7095e4598fd830e0e7f763cac6929b867ff3b0c03c5350c4c3cfc68ed98b69c9c68c04be0 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DBUILD_TESTS=OFF" +) +vcpkg_cmake_install() +file(INSTALL "${SOURCE_PATH}/cmake/LICENSE.txt" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/c89stringutils" + RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") diff --git a/external_imported/vcpkg/ports/c89stringutils/vcpkg.json b/external_imported/vcpkg/ports/c89stringutils/vcpkg.json new file mode 100644 index 000000000..7a14d2046 --- /dev/null +++ b/external_imported/vcpkg/ports/c89stringutils/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "c89stringutils", + "version": "0.0.1", + "description": "string functions from newer standards / common non-standards for C89", + "license": "Apache-2.0 OR MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/caffe2/no-inout-macros.patch b/external_imported/vcpkg/ports/caffe2/no-inout-macros.patch new file mode 100644 index 000000000..65f32e791 --- /dev/null +++ b/external_imported/vcpkg/ports/caffe2/no-inout-macros.patch @@ -0,0 +1,18 @@ +diff --git a/caffe2/core/logging_is_google_glog.h b/caffe2/core/logging_is_google_glog.h +index 2df4435..408bb4a 100644 +--- a/caffe2/core/logging_is_google_glog.h ++++ b/caffe2/core/logging_is_google_glog.h +@@ -30,5 +30,13 @@ INSTANTIATE_FOR_CONTAINER(std::set) + + #include + ++#ifdef IN ++#undef IN ++#endif ++ ++#ifdef OUT ++#undef OUT ++#endif ++ + + #endif // CAFFE2_CORE_LOGGING_IS_GOOGLE_GLOG_H_ diff --git a/external_imported/vcpkg/ports/caffe2/portfile.cmake b/external_imported/vcpkg/ports/caffe2/portfile.cmake index d7ec68e6a..b430b09c4 100644 --- a/external_imported/vcpkg/ports/caffe2/portfile.cmake +++ b/external_imported/vcpkg/ports/caffe2/portfile.cmake @@ -1,9 +1,5 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86) - message(FATAL_ERROR "Caffe2 cannot be built for the x86 architecture") -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO caffe2/caffe2 @@ -14,6 +10,7 @@ vcpkg_from_github( msvc-fixes.patch fix-space.patch fix-protobuf-deprecated.patch + no-inout-macros.patch ) if(VCPKG_CRT_LINKAGE STREQUAL static) @@ -28,9 +25,8 @@ else() set(EXECUTABLE_SUFFIX "") endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS # Set to ON to use python -DBUILD_PYTHON=OFF @@ -63,44 +59,43 @@ vcpkg_configure_cmake( -DPROTOBUF_PROTOC_EXECUTABLE:FILEPATH=${CURRENT_INSTALLED_DIR}/tools/protobuf/protoc${EXECUTABLE_SUFFIX} ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Remove folders from install -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/caffe) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/caffe2) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/caffe) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/caffe2) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/caffe") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/caffe2") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/caffe") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/caffe2") # Remove empty directories from include (should probably fix or # patch caffe2 install script) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/caffe2/test) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/caffe2/python) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/caffe2/experiments/python) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/caffe2/contrib/opengl) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/caffe2/contrib/nnpack) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/caffe2/contrib/libopencl-stub) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/caffe2/contrib/docker-ubuntu-14.04) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/caffe2/binaries) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/test") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/python") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/experiments/python") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/contrib/opengl") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/contrib/nnpack") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/contrib/libopencl-stub") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/contrib/docker-ubuntu-14.04") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/binaries") # Move bin to tools -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools) -file(GLOB BINARIES ${CURRENT_PACKAGES_DIR}/bin/*${EXECUTABLE_SUFFIX}) -foreach(binary ${BINARIES}) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools") +file(GLOB BINARIES "${CURRENT_PACKAGES_DIR}/bin/*${EXECUTABLE_SUFFIX}") +foreach(binary IN LISTS BINARIES) get_filename_component(binary_name ${binary} NAME) - file(RENAME ${binary} ${CURRENT_PACKAGES_DIR}/tools/${binary_name}) + file(RENAME ${binary} "${CURRENT_PACKAGES_DIR}/tools/${binary_name}") endforeach() # Remove bin directory if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") endif() # Remove headers and tools from debug build -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # install license -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/caffe2) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/caffe2 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/caffe2/vcpkg.json b/external_imported/vcpkg/ports/caffe2/vcpkg.json index eeecad531..8f4f65632 100644 --- a/external_imported/vcpkg/ports/caffe2/vcpkg.json +++ b/external_imported/vcpkg/ports/caffe2/vcpkg.json @@ -1,15 +1,20 @@ { "name": "caffe2", - "version-string": "0.8.1", - "port-version": 5, + "version": "0.8.1", + "port-version": 6, "description": "Caffe2 is a lightweight, modular, and scalable deep learning framework.", "homepage": "https://github.com/caffe2/caffe2", + "license": "Apache-2.0", "supports": "!x86", "dependencies": [ "eigen3", "gflags", "glog", "lmdb", - "protobuf" + "protobuf", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/cairo/0001-meson-fix-macOS-build-and-add-macOS-ci.patch b/external_imported/vcpkg/ports/cairo/0001-meson-fix-macOS-build-and-add-macOS-ci.patch deleted file mode 100644 index 5bc6ca885..000000000 --- a/external_imported/vcpkg/ports/cairo/0001-meson-fix-macOS-build-and-add-macOS-ci.patch +++ /dev/null @@ -1,112 +0,0 @@ -From d8d16562ec094593eba4446432e918704590ab20 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= -Date: Sat, 26 Sep 2020 19:25:21 +0100 -Subject: [PATCH] meson: fix macOS build and add macOS ci - -Fixes #441 ---- - .gitlab-ci.yml | 26 ++++++++++++++++++++ - meson.build | 61 ++++++++++++++++++++++------------------------- - meson_options.txt | 1 + - 3 files changed, 56 insertions(+), 32 deletions(-) - -diff --git a/meson.build b/meson.build -index 53a9af343..fe7757b1f 100644 ---- a/meson.build -+++ b/meson.build -@@ -371,37 +371,34 @@ if qtgui_dep.found() and false - deps += [qtgui_dep] - endif - --# Untested --if cc.has_header('ApplicationServices/ApplicationServices.h') -- if cc.has_header('CoreGraphics/CoreGraphics.h') -- quartz_extra_libs = ['-Xlinker', '-framework', '-Xlinker', 'CoreGraphics'] -- else -- quartz_extra_libs = ['-Xlinker', '-framework', '-Xlinker', 'ApplicationServices'] -+if host_machine.system() == 'darwin' and not get_option('quartz').disabled() -+ quartz_deps = dependency('appleframeworks', modules : ['CoreFoundation', 'ApplicationServices'], required: get_option('quartz')) -+ -+ if quartz_deps.found() -+ deps += [quartz_deps] -+ -+ feature_conf.set('CAIRO_HAS_QUARTZ_SURFACE', 1) -+ feature_conf.set('CAIRO_HAS_QUARTZ_FONT', 1) -+ feature_conf.set('CAIRO_HAS_QUARTZ_IMAGE_SURFACE', 1) -+ -+ built_features += [ -+ { -+ 'name': 'cairo-quartz', -+ 'description': 'Quartz surface backend', -+ 'deps': quartz_deps, -+ }, -+ { -+ 'name': 'cairo-quartz-image', -+ 'description': 'Quartz Image surface backend', -+ 'deps': quartz_deps, -+ }, -+ { -+ 'name': 'cairo-quartz-font', -+ 'description': 'Quartz font backend', -+ 'deps': quartz_deps, -+ }, -+ ] - endif -- -- extra_link_args += quartz_extra_libs -- -- feature_conf.set('CAIRO_HAS_QUARTZ_SURFACE', 1) -- feature_conf.set('CAIRO_HAS_QUARTZ_FONT', 1) -- feature_conf.set('CAIRO_HAS_QUARTZ_IMAGE_SURFACE', 1) -- -- built_features += [ -- { -- 'name': 'cairo-quartz', -- 'description': 'Quartz surface backend', -- 'libs': quartz_extra_libs, -- }, -- { -- 'name': 'cairo-quartz-image', -- 'description': 'Quartz Image surface backend', -- 'libs': quartz_extra_libs, -- }, -- { -- 'name': 'cairo-quartz-font', -- 'description': 'Quartz font backend', -- 'libs': quartz_extra_libs, -- }, -- ] - endif - - if host_machine.system() == 'windows' -@@ -887,13 +884,13 @@ foreach feature: built_features - feature_deps = feature.get('deps', []) - feature_libs = feature.get('libs', []) - feature_compile_deps = feature.get('compile-deps', []) -- pkgmod.generate(libraries: [libcairo] + feature_deps + feature_libs, -+ pkgmod.generate(libraries: [libcairo, feature_deps, feature_libs], - name: feature['name'], - description: feature['description'] + ' for cairo graphics library', - ) - meson.override_dependency(feature['name'], - declare_dependency(link_with: libcairo, -- dependencies: feature_deps + feature_compile_deps, -+ dependencies: [feature_deps, feature_compile_deps], - link_args: feature_libs, - ) - ) -diff --git a/meson_options.txt b/meson_options.txt -index ff11fe7ed..5cafe8bda 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -13,6 +13,7 @@ option('glesv3', type : 'feature', value : 'disabled') - option('drm', type : 'feature', value : 'disabled') - option('openvg', type : 'feature', value : 'disabled') - option('png', type : 'feature', value : 'auto') # png and svg surfaces -+option('quartz', type : 'feature', value : 'auto') - option('qt', type : 'feature', value : 'disabled') - option('tee', type : 'feature', value : 'disabled') - option('xcb', type : 'feature', value : 'auto') --- -2.29.2 - diff --git a/external_imported/vcpkg/ports/cairo/cairo_static_fix.patch b/external_imported/vcpkg/ports/cairo/cairo_static_fix.patch index 8030679b1..20c1c2877 100644 --- a/external_imported/vcpkg/ports/cairo/cairo_static_fix.patch +++ b/external_imported/vcpkg/ports/cairo/cairo_static_fix.patch @@ -1,92 +1,16 @@ -diff --git a/util/cairo-fdr/meson.build b/util/cairo-fdr/meson.build -index 3cb66c678..b12b90036 100644 ---- a/util/cairo-fdr/meson.build -+++ b/util/cairo-fdr/meson.build -@@ -4,7 +4,7 @@ cairo_fdr_sources = [ +--- meson.build.orig 2022-03-19 03:40:07.000000000 +0900 ++++ meson.build 2022-03-29 21:32:41.000000000 +0900 +@@ -100,6 +100,13 @@ + # Autotools compatibility + add_project_arguments('-DHAVE_CONFIG_H', language: 'c') - libcairofdr = library('cairo-fdr', cairo_fdr_sources, - include_directories: [incbase, incsrc], -- c_args: ['-DHAVE_CONFIG_H'], -+ c_args: ['-DHAVE_CONFIG_H'] + static_definition, - dependencies: deps, - install: true, - install_dir: join_paths(get_option('prefix'), get_option('libdir'), 'cairo'), -diff --git a/util/cairo-script/meson.build b/util/cairo-script/meson.build -index a782ec63f..7e21f6c04 100644 ---- a/util/cairo-script/meson.build -+++ b/util/cairo-script/meson.build -@@ -26,7 +26,7 @@ csi_trace_sources = [ - - libcairoscript = library('cairo-script-interpreter', - cairoscript_interpreter_sources, -- c_args: ['-DHAVE_CONFIG_H'], -+ c_args: ['-DHAVE_CONFIG_H'] + static_definition, - include_directories: [incbase, incsrc], - dependencies: deps, - link_with: [libcairo], -@@ -41,14 +41,14 @@ libcairoscript_dep = declare_dependency(link_with: libcairoscript, - include_directories: [incbase, inccairoscript]) - - csi_replay_exe = executable('csi-replay', csi_replay_sources, -- c_args: ['-DHAVE_CONFIG_H'], -+ c_args: ['-DHAVE_CONFIG_H'] + static_definition, - include_directories: [incbase, incsrc], - link_with: [libcairo, libcairoscript], - dependencies: deps, - ) - - csi_exec_exe = executable('csi-exec', csi_exec_sources, -- c_args: ['-DHAVE_CONFIG_H'], -+ c_args: ['-DHAVE_CONFIG_H'] + static_definition, - include_directories: [incbase, incsrc], - link_with: [libcairo, libcairoscript], - dependencies: deps, -@@ -56,7 +56,7 @@ csi_exec_exe = executable('csi-exec', csi_exec_sources, - - if feature_conf.get('CAIRO_HAS_SCRIPT_SURFACE', 0) == 1 and conf.get('HAVE_LIBGEN_H', 0) == 1 - csi_trace_exe = executable('csi-trace', csi_trace_sources, -- c_args: ['-DHAVE_CONFIG_H'], -+ c_args: ['-DHAVE_CONFIG_H'] + static_definition, - include_directories: [incbase, incsrc], - link_with: [libcairo, libcairoscript], - dependencies: deps, -diff --git a/util/cairo-trace/meson.build b/util/cairo-trace/meson.build -index e836f98cf..76ee372a2 100644 ---- a/util/cairo-trace/meson.build -+++ b/util/cairo-trace/meson.build -@@ -12,7 +12,7 @@ libcairotrace = library('cairo-trace', cairo_trace_sources, - include_directories: [incbase, incsrc], - dependencies: deps, - link_args: extra_link_args, -- c_args: ['-DSHARED_LIB_EXT="@0@"'.format(shared_lib_ext), '-DHAVE_CONFIG_H'] + pthread_c_args, -+ c_args: ['-DSHARED_LIB_EXT="@0@"'.format(shared_lib_ext), '-DHAVE_CONFIG_H'] + pthread_c_args + static_definition, - install: true, - install_dir: join_paths(get_option('prefix'), get_option('libdir'), 'cairo'), - ) -diff --git a/util/meson.build b/util/meson.build -index 016955cea..a90363115 100644 ---- a/util/meson.build -+++ b/util/meson.build -@@ -2,6 +2,14 @@ subdir('cairo-missing') - - cairo_utils = [] - -+static_definition=[] +if host_machine.system() == 'windows' + lib_default = get_option('default_library') + if lib_default == 'static' -+ static_definition=['-DCAIRO_WIN32_STATIC_BUILD'] ++ add_project_arguments('-DCAIRO_WIN32_STATIC_BUILD', language: 'c') + endif +endif + - if feature_conf.get('CAIRO_HAS_GOBJECT_FUNCTIONS', 0) == 1 - subdir('cairo-gobject') - endif -@@ -55,6 +63,7 @@ foreach util : cairo_utils - include_directories: [incbase, incsrc, inccairoscript], - dependencies: deps + util_deps, - link_with: [libcairo, libcairoscript], -+ c_args: static_definition - ) - endforeach - + # Make sure source directory hasn't been configured with autotools + fs = import('fs') + if fs.exists('config.h') or fs.exists('src/cairo-features.h') or fs.exists('src/cairo-supported-features.h') diff --git a/external_imported/vcpkg/ports/cairo/disable-atomic-ops-check.patch b/external_imported/vcpkg/ports/cairo/disable-atomic-ops-check.patch new file mode 100644 index 000000000..b7768013d --- /dev/null +++ b/external_imported/vcpkg/ports/cairo/disable-atomic-ops-check.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index e3ec5d9..7b20c0c 100644 +--- a/meson.build ++++ b/meson.build +@@ -870,7 +870,7 @@ if cc.links(files('meson-cc-tests/atomic-ops-cxx11.c'), name: 'Atomic ops: cxx11 + conf.set('HAVE_CXX11_ATOMIC_PRIMITIVES', 1) + elif cc.links(files('meson-cc-tests/atomic-ops-gcc-legacy.c'), name: 'Atomic ops: gcc legacy') + conf.set('HAVE_GCC_LEGACY_ATOMICS', 1) +-elif cc.has_header('atomic_ops.h') ++elif false + conf.set('HAVE_LIB_ATOMIC_OPS', 1) + elif cc.has_header('libkern/OSAtomic.h') + conf.set('HAVE_OS_ATOMIC_OPS', 1) diff --git a/external_imported/vcpkg/ports/cairo/portfile.cmake b/external_imported/vcpkg/ports/cairo/portfile.cmake index 64ec99418..6eff7ba43 100644 --- a/external_imported/vcpkg/ports/cairo/portfile.cmake +++ b/external_imported/vcpkg/ports/cairo/portfile.cmake @@ -4,11 +4,12 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org OUT_SOURCE_PATH SOURCE_PATH REPO cairo/cairo - REF 156cd3eaaebfd8635517c2baf61fcf3627ff7ec2 #v1.17.4 - SHA512 2c516ad3ffe56cf646b2435d6ef3cf25e8c05aeb13d95dd18a7d0510d134d9990cba1b376063352ff99483cfc4e5d2af849afd2f9538f9136f22d44d34be362c + REF b43e7c6f3cf7855e16170a06d3a9c7234c60ca94 #v1.17.6 + SHA512 2d8f0cbb11638610eda104a370bb8450e28d835852b0f861928738a60949e0aaba7a554a9f9efabbefda10a37616d4cd0d3021b3fbb4ced1d52db1edb49bc358 HEAD_REF master - PATCHES 0001-meson-fix-macOS-build-and-add-macOS-ci.patch - cairo_static_fix.patch + PATCHES + cairo_static_fix.patch + disable-atomic-ops-check.patch # See https://gitlab.freedesktop.org/cairo/cairo/-/issues/554 ) if("fontconfig" IN_LIST FEATURES) @@ -33,7 +34,7 @@ else() list(APPEND OPTIONS -Dxlib=disabled) endif() list(APPEND OPTIONS -Dxcb=disabled) -#list(APPEND OPTIONS -Dxlib-xcb=disabled) don't forget this option with the next update! +list(APPEND OPTIONS -Dxlib-xcb=disabled) if("gobject" IN_LIST FEATURES) if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -49,13 +50,14 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) endif() vcpkg_configure_meson( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${OPTIONS} -Dtests=disabled -Dzlib=enabled -Dpng=enabled -Dspectre=auto -Dgtk2-utils=disabled + -Dsymbol-lookup=disabled ) vcpkg_install_meson() @@ -70,9 +72,6 @@ else() endif() file(WRITE ${_file} "${CAIRO_H}") -# Handle copyright -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() @@ -86,3 +85,6 @@ vcpkg_fixup_pkgconfig() 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}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/cairo/vcpkg.json b/external_imported/vcpkg/ports/cairo/vcpkg.json index 4170587c5..1f65b37aa 100644 --- a/external_imported/vcpkg/ports/cairo/vcpkg.json +++ b/external_imported/vcpkg/ports/cairo/vcpkg.json @@ -1,9 +1,10 @@ { "name": "cairo", - "version": "1.17.4", - "port-version": 3, + "version": "1.17.6", + "port-version": 1, "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", "dependencies": [ "dirent", "expat", diff --git a/external_imported/vcpkg/ports/cairomm/build-support-msvc2022.diff b/external_imported/vcpkg/ports/cairomm/build-support-msvc2022.diff new file mode 100644 index 000000000..b83bdd85f --- /dev/null +++ b/external_imported/vcpkg/ports/cairomm/build-support-msvc2022.diff @@ -0,0 +1,41 @@ +commit ed1ce9a630b375b0f43435e34fbe690eb8276178 +Author: Chun-wei Fan +Date: Wed Nov 10 16:11:04 2021 +0800 + + build: Support Visual Studio 2022 + + Make these builds distinct from the Visual Studio 2019 builds. + +diff --git a/MSVC_NMake/detectenv-msvc.mak b/MSVC_NMake/detectenv-msvc.mak +index bf2e906..58b7092 100644 +--- a/MSVC_NMake/detectenv-msvc.mak ++++ b/MSVC_NMake/detectenv-msvc.mak +@@ -98,9 +98,12 @@ PDBVER = 14 + !if $(VCVERSION) > 1909 && $(VCVERSION) < 1920 + VSVER_SUFFIX = 1 + VSVER = 15 +-!elseif $(VCVERSION) > 1919 && $(VCVERSION) < 2000 ++!elseif $(VCVERSION) > 1919 && $(VCVERSION) < 1930 + VSVER_SUFFIX = 2 + VSVER = 16 ++!elseif $(VCVERSION) > 1929 && $(VCVERSION) < 2000 ++VSVER_SUFFIX = 3 ++VSVER = 17 + !else + VSVER = $(PDBVER) + !endif +diff --git a/meson.build b/meson.build +index 8b18fc2..1fa2da0 100644 +--- a/meson.build ++++ b/meson.build +@@ -238,7 +238,9 @@ if is_msvc + add_project_arguments(disabled_warning, language: 'cpp') + endforeach + if use_msvc14x_toolset_ver +- if cpp_compiler.version().version_compare('>=19.20') ++ if cpp_compiler.version().version_compare('>=19.30') ++ msvc14x_toolset_ver = '-vc143' ++ elif cpp_compiler.version().version_compare('>=19.20') + msvc14x_toolset_ver = '-vc142' + elif cpp_compiler.version().version_compare('>=19.10') + msvc14x_toolset_ver = '-vc141' diff --git a/external_imported/vcpkg/ports/cairomm/portfile.cmake b/external_imported/vcpkg/ports/cairomm/portfile.cmake index c20887b0d..212310565 100644 --- a/external_imported/vcpkg/ports/cairomm/portfile.cmake +++ b/external_imported/vcpkg/ports/cairomm/portfile.cmake @@ -1,5 +1,5 @@ -set(CAIROMM_VERSION 1.16.0) -set(CAIROMM_HASH 51929620feeac45377da5d486ea7a091bbd10ad8376fb16525328947b9e6ee740cdc8e8bd190a247b457cc9fec685a829c81de29b26cabaf95383ef04cce80d3) +set(CAIROMM_VERSION 1.16.1) +set(CAIROMM_HASH 2dbdd41f712d43573ad3118f37d443d2b9ae98737c240d5db8d830ef38f2b4a95182b2fc857577c7564eb94649e629f70380f16ee84f4978759f40e19d802757) vcpkg_download_distfile(ARCHIVE URLS "https://www.cairographics.org/releases/cairomm-${CAIROMM_VERSION}.tar.xz" @@ -11,7 +11,7 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} PATCHES - undef.win32.patch # because WIN32 is used as an ENUM identifier. + build-support-msvc2022.diff ) vcpkg_configure_meson( diff --git a/external_imported/vcpkg/ports/cairomm/undef.win32.patch b/external_imported/vcpkg/ports/cairomm/undef.win32.patch deleted file mode 100644 index e91db0bfe..000000000 --- a/external_imported/vcpkg/ports/cairomm/undef.win32.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cairomm/surface.h b/cairomm/surface.h -index c923e6086..8cfaa76a3 100644 ---- a/cairomm/surface.h -+++ b/cairomm/surface.h -@@ -49,6 +49,7 @@ - #include - #endif // CAIRO_HAS_GLITZ_SURFACE - -+#undef WIN32 - - namespace Cairo - { diff --git a/external_imported/vcpkg/ports/cairomm/vcpkg.json b/external_imported/vcpkg/ports/cairomm/vcpkg.json index b1f937ba6..467d320c6 100644 --- a/external_imported/vcpkg/ports/cairomm/vcpkg.json +++ b/external_imported/vcpkg/ports/cairomm/vcpkg.json @@ -1,9 +1,9 @@ { "name": "cairomm", - "version": "1.16.0", - "port-version": 1, + "version": "1.16.1", "description": "A C++ wrapper for the cairo graphics library", "homepage": "https://www.cairographics.org", + "license": "LGPL-2.0-only", "dependencies": [ "cairo", "libsigcpp", diff --git a/external_imported/vcpkg/ports/calceph/makefilevc.patch b/external_imported/vcpkg/ports/calceph/makefilevc.patch deleted file mode 100755 index 796eeb202..000000000 --- a/external_imported/vcpkg/ports/calceph/makefilevc.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/doc/Makefile.vc b/doc/Makefile.vc -index 60c7eee..1e783a0 100644 ---- a/doc/Makefile.vc -+++ b/doc/Makefile.vc -@@ -62,7 +62,7 @@ - # - - install: -- copy calceph_c.pdf $(DESTDIR)\doc -- copy calceph_fortran2003.pdf $(DESTDIR)\doc -- copy calceph_fortran77.pdf $(DESTDIR)\doc -- copy calceph_python.pdf $(DESTDIR)\doc -+ copy calceph_c.pdf "$(DESTDIR)"\doc -+ copy calceph_fortran2003.pdf "$(DESTDIR)"\doc -+ copy calceph_fortran77.pdf "$(DESTDIR)"\doc -+ copy calceph_python.pdf "$(DESTDIR)"\doc -diff --git a/mexapi/src/Makefile.vc b/mexapi/src/Makefile.vc -index 68e5d45..803c12f 100644 ---- a/mexapi/src/Makefile.vc -+++ b/mexapi/src/Makefile.vc -@@ -62,10 +62,10 @@ - # - - install: -- copy interfacemex.c $(DESTDIR)\libexec\calceph\mex -- copy CalcephBin.m $(DESTDIR)\libexec\calceph\mex -- copy calceph_compilemex.m $(DESTDIR)\libexec\calceph\mex -- copy Constants.m $(DESTDIR)\libexec\calceph\mex -- copy calceph_getversion_str.m $(DESTDIR)\libexec\calceph\mex -- copy NaifId.m $(DESTDIR)\libexec\calceph\mex -- copy calceph_seterrorhandler.m $(DESTDIR)\libexec\calceph\mex -+ copy interfacemex.c "$(DESTDIR)"\libexec\calceph\mex -+ copy CalcephBin.m "$(DESTDIR)"\libexec\calceph\mex -+ copy calceph_compilemex.m "$(DESTDIR)"\libexec\calceph\mex -+ copy Constants.m "$(DESTDIR)"\libexec\calceph\mex -+ copy calceph_getversion_str.m "$(DESTDIR)"\libexec\calceph\mex -+ copy NaifId.m "$(DESTDIR)"\libexec\calceph\mex -+ copy calceph_seterrorhandler.m "$(DESTDIR)"\libexec\calceph\mex -diff --git a/src/Makefile.vc b/src/Makefile.vc -index 730b4a7..9e790b1 100644 ---- a/src/Makefile.vc -+++ b/src/Makefile.vc -@@ -111,9 +111,9 @@ clean: - # install target: "nmake /f Makefile.vc install DESTDIR=xxx" to perform the installation. - # - install: all $(F2003INSTALL) -- copy f90calceph.h $(DESTDIR)\include -- copy calceph.h $(DESTDIR)\include -- copy $(LIBRARY) $(DESTDIR)\lib -+ copy f90calceph.h "$(DESTDIR)"\include -+ copy calceph.h "$(DESTDIR)"\include -+ copy $(LIBRARY) "$(DESTDIR)"\lib - - f2003install : -- copy f2003calceph.mod $(DESTDIR)\include -+ copy f2003calceph.mod "$(DESTDIR)"\include diff --git a/external_imported/vcpkg/ports/calceph/portfile.cmake b/external_imported/vcpkg/ports/calceph/portfile.cmake index e09f94c05..ecd7636e4 100755 --- a/external_imported/vcpkg/ports/calceph/portfile.cmake +++ b/external_imported/vcpkg/ports/calceph/portfile.cmake @@ -1,7 +1,5 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - -set(CALCEPH_VERSION "3.5.0") -set(CALCEPH_HASH 12bb269d846aab93799656919cd9ca5a995248fb806727ea95667374b9380ca8f52c57dc6a5930c6995c13749bff1459c430eb2908b1533a8804fcb6b95c3de9) +set(CALCEPH_VERSION "3.5.1") +set(CALCEPH_HASH 5e83bb46b92a0b53f2cae717363cb4497d5c9cb57b3903e70d9e2c50176ca7d234212d0209fd3fcb5feebfd0980313be17e2ad4e69482504bfe8686f93216b67) vcpkg_download_distfile(ARCHIVE URLS "https://www.imcce.fr/content/medias/recherche/equipes/asd/calceph/calceph-${CALCEPH_VERSION}.tar.gz" @@ -12,7 +10,6 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} - PATCHES makefilevc.patch ) if (VCPKG_TARGET_IS_WINDOWS) diff --git a/external_imported/vcpkg/ports/calceph/vcpkg.json b/external_imported/vcpkg/ports/calceph/vcpkg.json index a12b93bb5..1c5b7b196 100755 --- a/external_imported/vcpkg/ports/calceph/vcpkg.json +++ b/external_imported/vcpkg/ports/calceph/vcpkg.json @@ -1,9 +1,9 @@ { "name": "calceph", - "version": "3.5.0", - "port-version": 1, + "version": "3.5.1", "description": "C library to access the binary planetary ephemeris files.", "homepage": "https://www.imcce.fr/inpop/calceph/", "documentation": "https://www.imcce.fr/content/medias/recherche/equipes/asd/calceph/html/c/index.html", + "license": "CECILL-2.1 OR CECILL-B OR CECILL-C", "supports": "!uwp" } diff --git a/external_imported/vcpkg/ports/camport3/portfile.cmake b/external_imported/vcpkg/ports/camport3/portfile.cmake index a46d4ded9..8a2333469 100644 --- a/external_imported/vcpkg/ports/camport3/portfile.cmake +++ b/external_imported/vcpkg/ports/camport3/portfile.cmake @@ -1,13 +1,3 @@ -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_fail_port_install(ON_LIBRARY_LINKAGE "static") - vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_fail_port_install(ON_ARCH "arm" "arm64" "wasm32") -elseif(VCPKG_TARGET_IS_LINUX) - vcpkg_fail_port_install(ON_ARCH "wasm32") -else() - vcpkg_fail_port_install(ALWAYS) -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO percipioxyz/camport3 @@ -17,7 +7,7 @@ vcpkg_from_github( ) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include) -file(COPY +file(COPY ${SOURCE_PATH}/include/TYApi.h ${SOURCE_PATH}/include/TYCoordinateMapper.h ${SOURCE_PATH}/include/TYImageProc.h @@ -58,7 +48,7 @@ elseif(VCPKG_TARGET_IS_LINUX) else() set (CAMPORT3_ARCH ${VCPKG_TARGET_ARCHITECTURE}) endif() - + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib) file(COPY diff --git a/external_imported/vcpkg/ports/camport3/vcpkg.json b/external_imported/vcpkg/ports/camport3/vcpkg.json index 0bf92791f..d301a8711 100644 --- a/external_imported/vcpkg/ports/camport3/vcpkg.json +++ b/external_imported/vcpkg/ports/camport3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "camport3", "version-string": "1.5.3", - "port-version": 1, + "port-version": 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 7e1209350..a425280b3 100644 --- a/external_imported/vcpkg/ports/capnproto/portfile.cmake +++ b/external_imported/vcpkg/ports/capnproto/portfile.cmake @@ -1,8 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET UWP) -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_fail_port_install(ON_ARCH arm arm64) -endif() - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/external_imported/vcpkg/ports/capnproto/vcpkg.json b/external_imported/vcpkg/ports/capnproto/vcpkg.json index 97a39f16c..2a2c4f482 100644 --- a/external_imported/vcpkg/ports/capnproto/vcpkg.json +++ b/external_imported/vcpkg/ports/capnproto/vcpkg.json @@ -1,10 +1,10 @@ { "name": "capnproto", "version": "0.9.1", - "port-version": 1, + "port-version": 2, "description": "Data interchange format and capability-based RPC system", "homepage": "https://capnproto.org/", - "supports": "!uwp & !((arm | arm64) & windows)", + "supports": "!windows | (!uwp & !arm)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/capstone/001-silence-windows-crt-secure-warnings.patch b/external_imported/vcpkg/ports/capstone/001-silence-windows-crt-secure-warnings.patch new file mode 100644 index 000000000..a2e99e919 --- /dev/null +++ b/external_imported/vcpkg/ports/capstone/001-silence-windows-crt-secure-warnings.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f5f4448..5e5cc7e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -87,6 +87,10 @@ if(CAPSTONE_BUILD_STATIC_RUNTIME) + set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") + endif() + ++if(WIN32) ++ add_compile_definitions(_CRT_SECURE_NO_WARNINGS) ++endif() ++ + ## sources + set(SOURCES_ENGINE + cs.c diff --git a/external_imported/vcpkg/ports/capstone/portfile.cmake b/external_imported/vcpkg/ports/capstone/portfile.cmake index bd28511cf..544e59c2d 100644 --- a/external_imported/vcpkg/ports/capstone/portfile.cmake +++ b/external_imported/vcpkg/ports/capstone/portfile.cmake @@ -1,13 +1,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REF 4.0.2 - REPO "aquynh/capstone" - SHA512 7f93534517307b737422a8825b66b2a1f3e1cca2049465d60ab12595940154aaf843ba40ed348fce58de58b990c19a0caef289060eb72898cb008a88c470970e - HEAD_REF v4 + REF d5141c04785678535c7792eddc21f146186e639f # 5.0.0-rc2 + REPO "capstone-engine/capstone" + SHA512 de9cf7da9fc3e502165b28b998b472791c8d5366e1a1a1fabd6bb8856a6fae80bf7d1fc4d268572d69c3526161bb0509a598ad4d94207e25a62aff6a5f9e9404 + HEAD_REF next + PATCHES + 001-silence-windows-crt-secure-warnings.patch ) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CS_BUILD_STATIC) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" CS_BUILD_SHARED) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -28,29 +29,24 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "diet" CAPSTONE_BUILD_DIET ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +if ("osxkernel" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_OSX) + message(FATAL_ERROR "Feature 'osxkernel' only supported in OSX") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DCAPSTONE_BUILD_STATIC=${CS_BUILD_STATIC} - -DCAPSTONE_BUILD_SHARED=${CS_BUILD_SHARED} -DCAPSTONE_BUILD_TESTS=OFF -DCAPSTONE_BUILD_CSTOOL=OFF - -DCAPSTONE_BUILD_STATIC_RUNTIME=OFF - -DCAPSTONE_X86_ONLY=OFF + -DCAPSTONE_BUILD_STATIC_RUNTIME=${STATIC_CRT} ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(GLOB EXES ${CURRENT_PACKAGES_DIR}/bin/*.exe ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) -if(EXES) - file(REMOVE ${EXES}) -endif() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) -endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(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/capstone/vcpkg.json b/external_imported/vcpkg/ports/capstone/vcpkg.json index 770f47943..3b0362641 100644 --- a/external_imported/vcpkg/ports/capstone/vcpkg.json +++ b/external_imported/vcpkg/ports/capstone/vcpkg.json @@ -1,9 +1,18 @@ { "name": "capstone", - "version": "4.0.2", - "port-version": 2, + "version": "5.0.0-rc2", "description": "Multi-architecture disassembly framework", - "homepage": "https://github.com/aquynh/capstone", + "homepage": "https://github.com/capstone-engine/capstone", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "arm": { "description": "Capstone disassembly support for ARM" @@ -27,7 +36,7 @@ "description": "Capstone disassembly support for MIPS" }, "osxkernel": { - "description": "Support for emedding Capstone into OSX Kernel extensions" + "description": "Support for embedding Capstone into OSX Kernel extensions" }, "ppc": { "description": "Capstone disassembly support for PowerPC" diff --git a/external_imported/vcpkg/ports/cargs/portfile.cmake b/external_imported/vcpkg/ports/cargs/portfile.cmake new file mode 100644 index 000000000..6f42c0871 --- /dev/null +++ b/external_imported/vcpkg/ports/cargs/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO likle/cargs + REF v1.0.3 + SHA512 4f82f6857af6ae7bd1263f4c812a770fa3c3f94c84d5a0ba6256289a3d3084cd35b3aca6769241451d2acd57577ccc6638327b5bb70328800e9c3c4f5054f7de + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DENABLE_TESTS=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cargs) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/cargs/vcpkg.json b/external_imported/vcpkg/ports/cargs/vcpkg.json new file mode 100644 index 000000000..6a2d24f67 --- /dev/null +++ b/external_imported/vcpkg/ports/cargs/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "cargs", + "version": "1.0.3", + "description": "A lightweight cross-platform getopt alternative that works on Linux, Windows and macOS. Command line argument parser library for C/C++. Can be used to parse argv and argc parameters.", + "homepage": "https://likle.github.io/cargs/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/catch2/portfile.cmake b/external_imported/vcpkg/ports/catch2/portfile.cmake index 11bc847a4..231b18160 100644 --- a/external_imported/vcpkg/ports/catch2/portfile.cmake +++ b/external_imported/vcpkg/ports/catch2/portfile.cmake @@ -15,6 +15,7 @@ vcpkg_cmake_configure( OPTIONS -DBUILD_TESTING=OFF -DCATCH_BUILD_EXAMPLES=OFF + -DCATCH_INSTALL_DOCS=OFF -DCATCH_BUILD_STATIC_LIBRARY=${BUILD_STATIC} ) diff --git a/external_imported/vcpkg/ports/catch2/vcpkg.json b/external_imported/vcpkg/ports/catch2/vcpkg.json index ad094b7e9..a2ea784f6 100644 --- a/external_imported/vcpkg/ports/catch2/vcpkg.json +++ b/external_imported/vcpkg/ports/catch2/vcpkg.json @@ -1,8 +1,10 @@ { "name": "catch2", "version-semver": "2.13.8", + "port-version": 1, "description": "A modern, header-only test framework for unit testing.", "homepage": "https://github.com/catchorg/Catch2", + "license": "BSL-1.0", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/cello/vcpkg.json b/external_imported/vcpkg/ports/cello/vcpkg.json index ebb509e68..67e817b41 100644 --- a/external_imported/vcpkg/ports/cello/vcpkg.json +++ b/external_imported/vcpkg/ports/cello/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cello", - "version-string": "2019-07-23", - "port-version": 1, + "version-date": "2019-07-23", + "port-version": 2, "description": "Higher level programming in C", - "homepage": "http://libcello.org/" + "homepage": "https://libcello.org/" } diff --git a/external_imported/vcpkg/ports/cereal/portfile.cmake b/external_imported/vcpkg/ports/cereal/portfile.cmake index 833655e6d..9c44ab271 100644 --- a/external_imported/vcpkg/ports/cereal/portfile.cmake +++ b/external_imported/vcpkg/ports/cereal/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO USCiLab/cereal - REF v1.3.0 - SHA512 2bb640a222d4efe7c624c6ec3e755fecae00ef59e91c4db462e233546c5afe73c065ba1d16d9600f7cd3cc185593109148008b0b2b870208e2f1d6984fd40c72 + REF v1.3.1 + SHA512 5beafdd95b16344d5db43a0e26fd670a770e2c2a661ae117c9593db86697ca1034e2bf004fe6dc3c2a690e8a682f60d8b6121211d898009e59361ebef33f6fc9 HEAD_REF master ) @@ -16,10 +16,11 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/cereal) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cereal) # Clean 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) diff --git a/external_imported/vcpkg/ports/cereal/vcpkg.json b/external_imported/vcpkg/ports/cereal/vcpkg.json index 432b330e2..9582616ed 100644 --- a/external_imported/vcpkg/ports/cereal/vcpkg.json +++ b/external_imported/vcpkg/ports/cereal/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cereal", - "version-string": "1.3.0", - "port-version": 1, + "version": "1.3.1", "description": "a header-only C++11 serialization library (built in support for binary, XML and JSon)", - "homepage": "https://github.com/USCiLab/cereal" + "homepage": "https://github.com/USCiLab/cereal", + "license": "BSD-3-Clause" } diff --git a/external_imported/vcpkg/ports/ceres/portfile.cmake b/external_imported/vcpkg/ports/ceres/portfile.cmake index d0500faef..498774cd5 100644 --- a/external_imported/vcpkg/ports/ceres/portfile.cmake +++ b/external_imported/vcpkg/ports/ceres/portfile.cmake @@ -1,7 +1,7 @@ set(MSVC_USE_STATIC_CRT_VALUE OFF) if(VCPKG_CRT_LINKAGE STREQUAL "static") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - message(FATAL_ERROR "Ceres does not currently support mixing static CRT and dynamic library linkage") + message(FATAL_ERROR "Ceres does not support mixing static CRT and dynamic library linkage") endif() set(MSVC_USE_STATIC_CRT_VALUE ON) endif() @@ -20,11 +20,11 @@ vcpkg_from_github( find-package-required.patch ) -file(REMOVE ${SOURCE_PATH}/cmake/FindCXSparse.cmake) -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/FindCXSparse.cmake") +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") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -35,9 +35,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "tools" GFLAGS ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DEXPORT_BUILD_DIR=ON @@ -50,37 +49,17 @@ vcpkg_configure_cmake( -DLIB_SUFFIX=${LIB_SUFFIX} ) -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${LIB_SUFFIX}/cmake/Ceres) + vcpkg_cmake_config_fixup(CONFIG_PATH "lib${LIB_SUFFIX}/cmake/Ceres") endif() -file(READ ${CURRENT_PACKAGES_DIR}/share/ceres/CeresConfig.cmake CERES_CONFIG) -string(REPLACE "set_target_properties(ceres PROPERTIES INTERFACE_LINK_LIBRARIES Ceres::ceres)" - "set_target_properties(ceres PROPERTIES INTERFACE_LINK_LIBRARIES Ceres::ceres) - set(CMAKE_CXX_STANDARD 14) - set(CMAKE_CXX_STANDARD_REQUIRED ON)" CERES_CONFIG "${CERES_CONFIG}") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/ceres/CeresConfig.cmake "${CERES_CONFIG}") vcpkg_copy_pdbs() -# Changes target search path -if(VCPKG_TARGET_IS_WINDOWS) - file(READ ${CURRENT_PACKAGES_DIR}/share/ceres/CeresConfig.cmake CERES_TARGETS) - string(REPLACE "get_filename_component(CURRENT_ROOT_INSTALL_DIR\n \${CERES_CURRENT_CONFIG_DIR}/../" - "get_filename_component(CURRENT_ROOT_INSTALL_DIR\n \${CERES_CURRENT_CONFIG_DIR}/../../" CERES_TARGETS "${CERES_TARGETS}") - file(WRITE ${CURRENT_PACKAGES_DIR}/share/ceres/CeresConfig.cmake "${CERES_TARGETS}") -else() - file(READ ${CURRENT_PACKAGES_DIR}/share/ceres/CeresConfig.cmake CERES_TARGETS) - string(REPLACE "get_filename_component(CURRENT_ROOT_INSTALL_DIR\n \${CERES_CURRENT_CONFIG_DIR}/../../../" - "get_filename_component(CURRENT_ROOT_INSTALL_DIR\n \${CERES_CURRENT_CONFIG_DIR}/../../" CERES_TARGETS "${CERES_TARGETS}") - file(WRITE ${CURRENT_PACKAGES_DIR}/share/ceres/CeresConfig.cmake "${CERES_TARGETS}") -endif() - -# 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(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/external_imported/vcpkg/ports/ceres/vcpkg.json b/external_imported/vcpkg/ports/ceres/vcpkg.json index b1be6bde6..4194d3ecd 100644 --- a/external_imported/vcpkg/ports/ceres/vcpkg.json +++ b/external_imported/vcpkg/ports/ceres/vcpkg.json @@ -1,12 +1,20 @@ { "name": "ceres", "version-semver": "2.0.0", - "port-version": 5, + "port-version": 6, "description": "non-linear optimization package", "homepage": "https://github.com/ceres-solver/ceres-solver", "dependencies": [ "eigen3", - "glog" + "glog", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "cxsparse": { diff --git a/external_imported/vcpkg/ports/cfitsio/portfile.cmake b/external_imported/vcpkg/ports/cfitsio/portfile.cmake index 05821771a..e75a10945 100644 --- a/external_imported/vcpkg/ports/cfitsio/portfile.cmake +++ b/external_imported/vcpkg/ports/cfitsio/portfile.cmake @@ -1,5 +1,5 @@ vcpkg_download_distfile(ARCHIVE - URLS "http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-3.49.tar.gz" + URLS "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-3.49.tar.gz" FILENAME "cfitsio-3.49.tar.gz" SHA512 9836a4af3bbbfed1ea1b4c70b9d500ac485d7c3d8131eb8a25ee6ef6662f46ba52b5161c45c709ed9a601ff0e9ec36daa5650eaaf4f2cc7d6f4bb5640f10da15 ) diff --git a/external_imported/vcpkg/ports/cfitsio/vcpkg.json b/external_imported/vcpkg/ports/cfitsio/vcpkg.json index fe2794b54..9ecf0be86 100644 --- a/external_imported/vcpkg/ports/cfitsio/vcpkg.json +++ b/external_imported/vcpkg/ports/cfitsio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cfitsio", "version": "3.49", - "port-version": 1, + "port-version": 2, "description": "Library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data format", "homepage": "https://heasarc.gsfc.nasa.gov/fitsio/", "dependencies": [ diff --git a/external_imported/vcpkg/ports/cgal/portfile.cmake b/external_imported/vcpkg/ports/cgal/portfile.cmake index 6313dfd46..c58abc40d 100644 --- a/external_imported/vcpkg/ports/cgal/portfile.cmake +++ b/external_imported/vcpkg/ports/cgal/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CGAL/cgal - REF v5.3.1 - SHA512 d258797be1980ac0757e4152ed4b4ea2710dceba11e67ba70b1ebc897224b868852f484d9979cbf3967b010a1f2c02ab7c3215d6026762e27c6815ec020e1275 + REF v5.4 + SHA512 c9cdacc74844a6eca94980d0350ae6defb99462ef70ddc3e15e825f06b171a21571efd9246a4abac16a6efc350aa9fa79330d2e89dcec24fc6ecff51905efdeb HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/cgal/vcpkg.json b/external_imported/vcpkg/ports/cgal/vcpkg.json index 4bb40805c..83dae13a9 100644 --- a/external_imported/vcpkg/ports/cgal/vcpkg.json +++ b/external_imported/vcpkg/ports/cgal/vcpkg.json @@ -1,8 +1,9 @@ { "name": "cgal", - "version": "5.3.1", + "version": "5.4", "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", "dependencies": [ "boost-accumulators", "boost-algorithm", diff --git a/external_imported/vcpkg/ports/chakracore/portfile.cmake b/external_imported/vcpkg/ports/chakracore/portfile.cmake index 62277eceb..5cbe8e570 100644 --- a/external_imported/vcpkg/ports/chakracore/portfile.cmake +++ b/external_imported/vcpkg/ports/chakracore/portfile.cmake @@ -1,7 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET osx uwp) -if(WIN32) - vcpkg_fail_port_install(ON_CRT_LINKAGE static ON_LIBRARY_LINKAGE static) -endif() vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( @@ -49,7 +45,7 @@ else() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") list(APPEND configs "debug") execute_process( - COMMAND bash "build.sh" "--arch=${CHAKRACORE_TARGET_ARCH}" "--debug" + COMMAND bash "build.sh" "--arch=${CHAKRACORE_TARGET_ARCH}" "--debug" "-j=${VCPKG_CONCURRENCY}" WORKING_DIRECTORY "${BUILDTREE_PATH}" OUTPUT_VARIABLE CHAKRA_BUILD_SH_OUT @@ -62,7 +58,7 @@ else() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") list(APPEND configs "release") execute_process( - COMMAND bash "build.sh" "--arch=${CHAKRACORE_TARGET_ARCH}" + COMMAND bash "build.sh" "--arch=${CHAKRACORE_TARGET_ARCH}" "-j=${VCPKG_CONCURRENCY}" WORKING_DIRECTORY "${BUILDTREE_PATH}" OUTPUT_VARIABLE CHAKRA_BUILD_SH_OUT ERROR_VARIABLE CHAKRA_BUILD_SH_ERR diff --git a/external_imported/vcpkg/ports/chakracore/vcpkg.json b/external_imported/vcpkg/ports/chakracore/vcpkg.json index 316fefa0a..df0c0ffee 100644 --- a/external_imported/vcpkg/ports/chakracore/vcpkg.json +++ b/external_imported/vcpkg/ports/chakracore/vcpkg.json @@ -1,7 +1,8 @@ { "name": "chakracore", - "version-string": "2021-04-22", + "version-date": "2021-04-22", + "port-version": 2, "description": "Core part of the Chakra Javascript engine", "homepage": "https://github.com/Microsoft/ChakraCore", - "supports": "!osx & !uwp & (linux | !static)" + "supports": "!osx & !uwp & (linux | (!static & !staticcrt))" } diff --git a/external_imported/vcpkg/ports/charls/portfile.cmake b/external_imported/vcpkg/ports/charls/portfile.cmake index bbb9038c2..6b32b5683 100644 --- a/external_imported/vcpkg/ports/charls/portfile.cmake +++ b/external_imported/vcpkg/ports/charls/portfile.cmake @@ -1,25 +1,24 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO team-charls/charls - REF 0bafe4ecdc591f633303ad0d32f3f6c38d099802 #v2.2.0 - SHA512 56acb0085a4f653660166c11982934d7f8c8836db63339aaca700aabade2bf7cff8cba77f9f04a68bbc119b5b15800bf01ffb10628703fb2188f6e654d0e5f22 + REF 662d4f2a0238357ccc4d89cd14b1fa67d2597ff1 #v2.3.4 + SHA512 f022d025ae1d5ff624982ceb61ee88c5a42ee958afcff39fbc3e698030092b6667c3a685b66b7fd16ab7c3d3af1d44b773f761e2eefd7f026432b80176b6894b HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCHARLS_BUILD_TESTS=OFF -DCHARLS_BUILD_SAMPLES=OFF -DCHARLS_BUILD_FUZZ_TEST=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/charls) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/charls) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/charls/vcpkg.json b/external_imported/vcpkg/ports/charls/vcpkg.json index 3f07ca3c2..805b20f15 100644 --- a/external_imported/vcpkg/ports/charls/vcpkg.json +++ b/external_imported/vcpkg/ports/charls/vcpkg.json @@ -1,7 +1,17 @@ { "name": "charls", - "version-string": "2.2.0", - "port-version": 2, + "version": "2.3.4", "description": "CharLS, a C++ JPEG-LS library implementation.", - "homepage": "https://github.com/team-charls/charls" + "homepage": "https://github.com/team-charls/charls", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/chartdir/portfile.cmake b/external_imported/vcpkg/ports/chartdir/portfile.cmake index 6a9f78610..7e79c17d6 100644 --- a/external_imported/vcpkg/ports/chartdir/portfile.cmake +++ b/external_imported/vcpkg/ports/chartdir/portfile.cmake @@ -9,7 +9,7 @@ elseif(VCPKG_TARGET_IS_WINDOWS) vcpkg_download_distfile(ARCHIVE_FILE URLS "https://www.advsofteng.net/chartdir_cpp_win.zip" FILENAME "chartdir_cpp_win-7.0.0.zip" - SHA512 38d9dae641c0341ccee4709138afd37ad4718c34def70a0dc569956bf9c3488d0d66072f604dca4663dc80bd09446a2ba27ef3806fc3b87dda6aaa5453a7316f + SHA512 e5b5d387cff693a7f5ee98c2d2df75f421129b006e4324ae30ace0cbaac58867f048868ddfacdb3224c7165c8f27219c4273f3c778be3330d39ef95260d4186b ) vcpkg_extract_source_archive_ex( diff --git a/external_imported/vcpkg/ports/chartdir/vcpkg.json b/external_imported/vcpkg/ports/chartdir/vcpkg.json index f10b4d171..f99954188 100644 --- a/external_imported/vcpkg/ports/chartdir/vcpkg.json +++ b/external_imported/vcpkg/ports/chartdir/vcpkg.json @@ -1,7 +1,7 @@ { "name": "chartdir", "version": "7.0.0", - "port-version": 1, + "port-version": 3, "description": "ChartDirector is a powerful chart component for creating professional looking charts for web and windows applications.", "homepage": "https://www.advsofteng.com/" } diff --git a/external_imported/vcpkg/ports/chromium-base/portfile.cmake b/external_imported/vcpkg/ports/chromium-base/portfile.cmake index 6f6d9728c..f7fd3a013 100644 --- a/external_imported/vcpkg/ports/chromium-base/portfile.cmake +++ b/external_imported/vcpkg/ports/chromium-base/portfile.cmake @@ -1,7 +1,3 @@ -vcpkg_fail_port_install( - ON_ARCH "x86" "arm" "arm64" - ON_TARGET "UWP") - # Patches may be provided at the end function(checkout_in_path PATH URL REF) if(EXISTS "${PATH}") @@ -12,7 +8,7 @@ function(checkout_in_path PATH URL REF) endif() file(REMOVE_RECURSE "${PATH}") endif() - + vcpkg_from_git( OUT_SOURCE_PATH DEP_SOURCE_PATH URL "${URL}" @@ -29,26 +25,26 @@ file(MAKE_DIRECTORY "${SOURCE_PATH}/third_party") set(CHROMIUM_GIT "https://chromium.googlesource.com/chromium/src") checkout_in_path( - "${SOURCE_PATH}/base" - "${CHROMIUM_GIT}/base" + "${SOURCE_PATH}/base" + "${CHROMIUM_GIT}/base" "25ce73258703a5ac018da0e203fb3d4a98c2136e" res/0001-base.patch) checkout_in_path( - "${SOURCE_PATH}/build" - "${CHROMIUM_GIT}/build" + "${SOURCE_PATH}/build" + "${CHROMIUM_GIT}/build" "312532ee66abdacbe58afb5df7ddf05e3a6399f9" res/0002-build.patch) checkout_in_path( - "${SOURCE_PATH}/third_party/apple_apsl" - "${CHROMIUM_GIT}/third_party/apple_apsl" + "${SOURCE_PATH}/third_party/apple_apsl" + "${CHROMIUM_GIT}/third_party/apple_apsl" "4cc25bbf65194f6726f7f10da0a885818e35d53e") checkout_in_path( - "${SOURCE_PATH}/third_party/ced" - "${CHROMIUM_GIT}/third_party/ced" + "${SOURCE_PATH}/third_party/ced" + "${CHROMIUM_GIT}/third_party/ced" "4cd87a44674edd9fe1f01c4cb5f1b73907ce4236") checkout_in_path( - "${SOURCE_PATH}/third_party/modp_b64" - "${CHROMIUM_GIT}/third_party/modp_b64" + "${SOURCE_PATH}/third_party/modp_b64" + "${CHROMIUM_GIT}/third_party/modp_b64" "509f005fa65e652dc4a6f636da6fa1002b6dce16") set(RES "${CMAKE_CURRENT_LIST_DIR}/res") @@ -92,7 +88,7 @@ if(CLANG MATCHES "-NOTFOUND") endif() get_filename_component(CLANG "${CLANG}" DIRECTORY) get_filename_component(CLANG "${CLANG}" DIRECTORY) -if((WIN32 AND NOT EXISTS "${CLANG}/bin/clang-cl.exe") OR +if((WIN32 AND NOT EXISTS "${CLANG}/bin/clang-cl.exe") OR (APPLE AND NOT EXISTS "${CLANG}/bin/clang")) message(FATAL_ERROR "Clang needs to be inside a bin directory.") endif() @@ -125,9 +121,9 @@ set(NINJA_REBUILD "build build.ninja: gn\n generator = 1\n depfile = build.nin vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/build.ninja" "${NINJA_REBUILD}" "") vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/build.ninja" "${NINJA_REBUILD}" "") -set(TARGETS +set(TARGETS base base:base_static - base/third_party/dynamic_annotations + base/third_party/dynamic_annotations base/third_party/double_conversion) if(WIN32) diff --git a/external_imported/vcpkg/ports/chromium-base/vcpkg.json b/external_imported/vcpkg/ports/chromium-base/vcpkg.json index 6ca5e8a9e..a96735ba3 100644 --- a/external_imported/vcpkg/ports/chromium-base/vcpkg.json +++ b/external_imported/vcpkg/ports/chromium-base/vcpkg.json @@ -1,7 +1,7 @@ { "name": "chromium-base", "version-string": "86.0.4199.1", - "port-version": 2, + "port-version": 3, "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" diff --git a/external_imported/vcpkg/ports/civetweb/portfile.cmake b/external_imported/vcpkg/ports/civetweb/portfile.cmake index 7a0837a8b..1797bf083 100644 --- a/external_imported/vcpkg/ports/civetweb/portfile.cmake +++ b/external_imported/vcpkg/ports/civetweb/portfile.cmake @@ -1,7 +1,5 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_fail_port_install(MESSAGE "${PORT} does not currently support UWP" ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO civetweb/civetweb diff --git a/external_imported/vcpkg/ports/civetweb/vcpkg.json b/external_imported/vcpkg/ports/civetweb/vcpkg.json index f39eea59c..e804454c3 100644 --- a/external_imported/vcpkg/ports/civetweb/vcpkg.json +++ b/external_imported/vcpkg/ports/civetweb/vcpkg.json @@ -1,6 +1,7 @@ { "name": "civetweb", "version": "1.15", + "port-version": 1, "description": "Easy to use, powerful, C/C++ embeddable web server.", "homepage": "https://github.com/civetweb/civetweb", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/clamav/portfile.cmake b/external_imported/vcpkg/ports/clamav/portfile.cmake index ceb1ce7f5..3697306a1 100644 --- a/external_imported/vcpkg/ports/clamav/portfile.cmake +++ b/external_imported/vcpkg/ports/clamav/portfile.cmake @@ -1,10 +1,9 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Cisco-Talos/clamav-devel - REF clamav-0.103.0 + REF clamav-0.103.0 SHA512 e7ff4d98e0615a9fec0752bbfa2b882ae95034a8e01d0f7cc635ee520ff917c3be2a2d3273caa2fc1598e7d5ec4fd60d59b517cb439c5454d32447f8c8d7ba5a FILE_DISAMBIGUATOR 1 HEAD_REF master diff --git a/external_imported/vcpkg/ports/clamav/vcpkg.json b/external_imported/vcpkg/ports/clamav/vcpkg.json index dd6cbc928..ca212c576 100644 --- a/external_imported/vcpkg/ports/clamav/vcpkg.json +++ b/external_imported/vcpkg/ports/clamav/vcpkg.json @@ -1,7 +1,7 @@ { "name": "clamav", "version-semver": "0.103.0", - "port-version": 2, + "port-version": 3, "description": "ClamAV is an open-source anti-virus toolkit.", "homepage": "https://www.clamav.net", "supports": "!uwp & !static", diff --git a/external_imported/vcpkg/ports/clapack/portfile.cmake b/external_imported/vcpkg/ports/clapack/portfile.cmake index 986335e6d..d84c864e2 100644 --- a/external_imported/vcpkg/ports/clapack/portfile.cmake +++ b/external_imported/vcpkg/ports/clapack/portfile.cmake @@ -5,7 +5,7 @@ endif() vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_download_distfile(ARCHIVE - URLS "http://www.netlib.org/clapack/clapack-3.2.1-CMAKE.tgz" + URLS "https://www.netlib.org/clapack/clapack-3.2.1-CMAKE.tgz" FILENAME "clapack-3.2.1.tgz" SHA512 cf19c710291ddff3f6ead7d86bdfdeaebca21291d9df094bf0a8ef599546b007757fb2dbb19b56511bb53ef7456eac0c73973b9627bf4d02982c856124428b49 ) diff --git a/external_imported/vcpkg/ports/clapack/vcpkg.json b/external_imported/vcpkg/ports/clapack/vcpkg.json index f0fd61e8f..78b840f56 100644 --- a/external_imported/vcpkg/ports/clapack/vcpkg.json +++ b/external_imported/vcpkg/ports/clapack/vcpkg.json @@ -1,7 +1,7 @@ { "name": "clapack", - "version-string": "3.2.1", - "port-version": 19, + "version": "3.2.1", + "port-version": 20, "description": "CLAPACK (f2c'ed version of LAPACK)", "homepage": "https://www.netlib.org/clapack", "dependencies": [ diff --git a/external_imported/vcpkg/ports/clblast/portfile.cmake b/external_imported/vcpkg/ports/clblast/portfile.cmake index ce749ae73..74e7e3d4b 100644 --- a/external_imported/vcpkg/ports/clblast/portfile.cmake +++ b/external_imported/vcpkg/ports/clblast/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_LIBRARY_LINKAGE static) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CNugteren/CLBlast @@ -10,33 +8,26 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DTUNERS=OFF ) vcpkg_cmake_install() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") - -if(VCPKG_TARGET_IS_WINDOWS) - if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/clblast.dll") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/clblast.dll" "${CURRENT_PACKAGES_DIR}/bin/clblast.dll") - endif() - if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/clblast.dll") +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/clblast.dll" "${CURRENT_PACKAGES_DIR}/bin/clblast.dll") + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/clblast.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/clblast.dll") endif() - file(GLOB EXE "${CURRENT_PACKAGES_DIR}/bin/*.exe") - file(GLOB DEBUG_EXE "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe") - if(EXE OR DEBUG_EXE) - file(REMOVE ${EXE} ${DEBUG_EXE}) - endif() endif() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/clblast) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/CLBLast) vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -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/clblast/vcpkg.json b/external_imported/vcpkg/ports/clblast/vcpkg.json index a5915a0da..bc77f3498 100644 --- a/external_imported/vcpkg/ports/clblast/vcpkg.json +++ b/external_imported/vcpkg/ports/clblast/vcpkg.json @@ -1,9 +1,10 @@ { "name": "clblast", "version": "1.5.2", + "port-version": 2, "description": "A modern, lightweight, performant and tunable OpenCL BLAS library written in C++11.", "homepage": "https://github.com/CNugteren/CLBlast", - "supports": "!static", + "license": "Apache-2.0", "dependencies": [ "opencl", { diff --git a/external_imported/vcpkg/ports/clockutils/portfile.cmake b/external_imported/vcpkg/ports/clockutils/portfile.cmake index 3c49b79be..d3c42fef1 100644 --- a/external_imported/vcpkg/ports/clockutils/portfile.cmake +++ b/external_imported/vcpkg/ports/clockutils/portfile.cmake @@ -5,17 +5,19 @@ vcpkg_from_github( SHA512 ddb70cae9ced25de77a2df1854dac15e58a77347042ba3ee9c691f85f49edbc6539c84929a7477d429fb9161ba24c57d24d767793b8b1180216d5ddfc5d3ed6a HEAD_REF dev-1.2 PATCHES - "${CURRENT_PORT_DIR}/fix-warningC4643.patch" + fix-warningC4643.patch ) -if (VCPKG_CRT_LINKAGE STREQUAL dynamic) - SET(SHARED_FLAG ON) -else() - SET(SHARED_FLAG OFF) +set(SHARED_FLAG OFF) +set(USE_MSBUILD "") +if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "dynamic") + set(SHARED_FLAG ON) + set(USE_MSBUILD WINDOWS_USE_MSBUILD) # MS Build only required for dynamic builds endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + ${USE_MSBUILD} OPTIONS -DWITH_LIBRARY_ARGPARSER=ON -DWITH_LIBRARY_COMPRESSION=ON @@ -26,13 +28,11 @@ vcpkg_configure_cmake( -DCLOCKUTILS_BUILD_SHARED=${SHARED_FLAG} ) -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(REMOVE "${CURRENT_PACKAGES_DIR}/LICENSE") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/LICENSE") -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/clockUtils) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/clockUtils/LICENSE ${CURRENT_PACKAGES_DIR}/share/clockUtils/copyright) -file(REMOVE ${CURRENT_PACKAGES_DIR}/LICENSE) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/LICENSE) - -vcpkg_copy_pdbs() \ 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/clockutils/vcpkg.json b/external_imported/vcpkg/ports/clockutils/vcpkg.json index 066a9ccac..1939b6aa8 100644 --- a/external_imported/vcpkg/ports/clockutils/vcpkg.json +++ b/external_imported/vcpkg/ports/clockutils/vcpkg.json @@ -1,7 +1,14 @@ { "name": "clockutils", - "version-string": "1.1.1-3651f232c27074c4ceead169e223edf5f00247c5", - "port-version": 4, + "version": "1.1.1", + "port-version": 1, "description": "A lightweight c++ library for commonly needed tasks. Optimized for simplicity and speed.", - "homepage": "https://github.com/ClockworkOrigins/clockUtils" + "homepage": "https://github.com/ClockworkOrigins/clockUtils", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/clrng/portfile.cmake b/external_imported/vcpkg/ports/clrng/portfile.cmake index 49bab0b9e..1c9fe2bb3 100644 --- a/external_imported/vcpkg/ports/clrng/portfile.cmake +++ b/external_imported/vcpkg/ports/clrng/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm64") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO clMathLibraries/clRNG diff --git a/external_imported/vcpkg/ports/clrng/vcpkg.json b/external_imported/vcpkg/ports/clrng/vcpkg.json index a2d3de4dd..9e90dccd0 100644 --- a/external_imported/vcpkg/ports/clrng/vcpkg.json +++ b/external_imported/vcpkg/ports/clrng/vcpkg.json @@ -1,7 +1,7 @@ { "name": "clrng", "version-date": "2020-12-01", - "port-version": 2, + "port-version": 3, "description": "clRNG is a library for uniform random number generation in OpenCL.", "homepage": "https://github.com/clMathLibraries/clRNG", "supports": "!arm64", diff --git a/external_imported/vcpkg/ports/cnats/portfile.cmake b/external_imported/vcpkg/ports/cnats/portfile.cmake new file mode 100644 index 000000000..22bc7cd6c --- /dev/null +++ b/external_imported/vcpkg/ports/cnats/portfile.cmake @@ -0,0 +1,76 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nats-io/nats.c + REF v3.2.0 + SHA512 570bbd5b6ed25db17755f4cbd2df9449bf1f838450e29aaa1483c11e6131293490d302031e3039d710bbbc3563ce72fb72cd3ad2c98618977a4858a5a3f2abe3 + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "streaming" NATS_BUILD_STREAMING +) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + list(APPEND OPTIONS -DNATS_BUILD_LIB_SHARED=ON) + list(APPEND OPTIONS -DNATS_BUILD_LIB_STATIC=OFF) + list(APPEND OPTIONS -DBUILD_TESTING=OFF) + list(APPEND OPTIONS -DNATS_BUILD_USE_SODIUM=ON) +else() + list(APPEND OPTIONS -DNATS_BUILD_LIB_SHARED=OFF) + list(APPEND OPTIONS -DNATS_BUILD_LIB_STATIC=ON) + list(APPEND OPTIONS -DBUILD_TESTING=ON) + if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND OPTIONS -DNATS_BUILD_USE_SODIUM=OFF) + else() + list(APPEND OPTIONS -DNATS_BUILD_USE_SODIUM=ON) + endif() +endif() + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + ${FEATURE_OPTIONS} + ${OPTIONS} + -DNATS_BUILD_TLS_USE_OPENSSL_1_1_API=ON + -DNATS_BUILD_EXAMPLES=OFF +) + +vcpkg_cmake_install(ADD_BIN_TO_PATH) + +if(VCPKG_TARGET_IS_WINDOWS) + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/nats.dll") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/nats.dll" "${CURRENT_PACKAGES_DIR}/bin/nats.dll") + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/natsd.dll") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/natsd.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/natsd.dll") + endif() + endif() +endif() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +if(VCPKG_TARGET_IS_WINDOWS) + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + if(EXISTS "${CURRENT_PACKAGES_DIR}/share/cnats/cnats-config-debug.cmake") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/cnats/cnats-config-debug.cmake" + "\${_IMPORT_PREFIX}/debug/lib/natsd.dll" "\${_IMPORT_PREFIX}/debug/bin/natsd.dll") + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/share/cnats/cnats-config-release.cmake") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/cnats/cnats-config-release.cmake" + "\${_IMPORT_PREFIX}/lib/nats.dll" "\${_IMPORT_PREFIX}/bin/nats.dll") + endif() + endif() +endif() + +vcpkg_fixup_pkgconfig() + +vcpkg_copy_pdbs() + +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/cnats/vcpkg.json b/external_imported/vcpkg/ports/cnats/vcpkg.json new file mode 100644 index 000000000..8ea3c8113 --- /dev/null +++ b/external_imported/vcpkg/ports/cnats/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "cnats", + "version": "3.2.0", + "description": "A C client for the NATS messaging system", + "homepage": "https://github.com/nats-io/nats.c", + "license": "Apache-2.0", + "dependencies": [ + "libsodium", + "openssl", + "protobuf-c", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "streaming": { + "description": "Include NATS Streaming APIs in the NATS library", + "supports": "!windows" + } + } +} diff --git a/external_imported/vcpkg/ports/co/portfile.cmake b/external_imported/vcpkg/ports/co/portfile.cmake index 2e4524c19..0015715fb 100644 --- a/external_imported/vcpkg/ports/co/portfile.cmake +++ b/external_imported/vcpkg/ports/co/portfile.cmake @@ -1,36 +1 @@ -if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) - vcpkg_fail_port_install(ON_ARCH "arm" ON_TAREGT "uwp") -endif() - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO idealvin/co - REF 3fd22601de4d7a06548ca4d24ac36b4f82cde8c5 #v2.0.3 - SHA512 fc3188355d3d4a8d56ebcca1cb4285be5bb4769328536f140d4ff6fc58f1e5ffe426f8a95506dfbc617acdd88c13d9b0420a03900bf63f83aeec090d4099c199 - HEAD_REF master -) - -string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - libcurl WITH_LIBCURL - openssl WITH_OPENSSL -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - ${FEATURE_OPTIONS} - -DSTATIC_VS_CRT=${STATIC_CRT} - DISABLE_PARALLEL_CONFIGURE -) - -vcpkg_cmake_install() - -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/share" -) - -file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/external_imported/vcpkg/ports/co/vcpkg.json b/external_imported/vcpkg/ports/co/vcpkg.json index 6b1e6c97c..6bbd68588 100644 --- a/external_imported/vcpkg/ports/co/vcpkg.json +++ b/external_imported/vcpkg/ports/co/vcpkg.json @@ -1,33 +1,11 @@ { "name": "co", "version-semver": "2.0.3", + "port-version": 1, "description": "A go-style coroutine library in C++11 and more", - "homepage": "https://github.com/idealvin/co", + "homepage": "https://github.com/idealvin/cocoyaxi", "supports": "!uwp & !(arm & windows)", "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - } - ], - "features": { - "libcurl": { - "description": "libcurl with OpenSSL support", - "dependencies": [ - { - "name": "curl", - "default-features": false, - "features": [ - "openssl" - ] - } - ] - }, - "openssl": { - "description": "SSL support (OpenSSL)", - "dependencies": [ - "openssl" - ] - } - } + "cocoyaxi" + ] } diff --git a/external_imported/vcpkg/ports/co/fix-event-destruct.patch b/external_imported/vcpkg/ports/cocoyaxi/fix-event-destruct.patch similarity index 100% rename from external_imported/vcpkg/ports/co/fix-event-destruct.patch rename to external_imported/vcpkg/ports/cocoyaxi/fix-event-destruct.patch diff --git a/external_imported/vcpkg/ports/co/install-dll.patch b/external_imported/vcpkg/ports/cocoyaxi/install-dll.patch similarity index 100% rename from external_imported/vcpkg/ports/co/install-dll.patch rename to external_imported/vcpkg/ports/cocoyaxi/install-dll.patch diff --git a/external_imported/vcpkg/ports/cocoyaxi/portfile.cmake b/external_imported/vcpkg/ports/cocoyaxi/portfile.cmake new file mode 100644 index 000000000..309011b71 --- /dev/null +++ b/external_imported/vcpkg/ports/cocoyaxi/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO idealvin/cocoyaxi + REF 3fd22601de4d7a06548ca4d24ac36b4f82cde8c5 #v2.0.3 + SHA512 15a7fbd934b44ffd981067c18a66bf07423d8ded102d0c15b79c2f451192f17541b9c1a3d4eb913d9f8c7a55e051e4e1968e16a1113fa81038b3ad9534c57874 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + libcurl WITH_LIBCURL + openssl WITH_OPENSSL +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DSTATIC_VS_CRT=${STATIC_CRT} + DISABLE_PARALLEL_CONFIGURE +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/cocoyaxi/vcpkg.json b/external_imported/vcpkg/ports/cocoyaxi/vcpkg.json new file mode 100644 index 000000000..37ecc51c7 --- /dev/null +++ b/external_imported/vcpkg/ports/cocoyaxi/vcpkg.json @@ -0,0 +1,34 @@ +{ + "name": "cocoyaxi", + "version-semver": "2.0.3", + "port-version": 2, + "description": "A go-style coroutine library in C++11 and more", + "homepage": "https://github.com/idealvin/cocoyaxi", + "supports": "!uwp & !(arm & windows)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "libcurl": { + "description": "libcurl with OpenSSL support", + "dependencies": [ + { + "name": "curl", + "default-features": false, + "features": [ + "openssl" + ] + } + ] + }, + "openssl": { + "description": "SSL support (OpenSSL)", + "dependencies": [ + "openssl" + ] + } + } +} diff --git a/external_imported/vcpkg/ports/coin/portfile.cmake b/external_imported/vcpkg/ports/coin/portfile.cmake index 19ac9f120..22f97663d 100644 --- a/external_imported/vcpkg/ports/coin/portfile.cmake +++ b/external_imported/vcpkg/ports/coin/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "arm" "arm64") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Coin3D/coin @@ -45,5 +43,5 @@ endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/Coin/profiler) - -vcpkg_fixup_pkgconfig() + +vcpkg_fixup_pkgconfig() diff --git a/external_imported/vcpkg/ports/coin/vcpkg.json b/external_imported/vcpkg/ports/coin/vcpkg.json index fbe97369e..02430c765 100644 --- a/external_imported/vcpkg/ports/coin/vcpkg.json +++ b/external_imported/vcpkg/ports/coin/vcpkg.json @@ -1,7 +1,7 @@ { "name": "coin", "version-string": "4.0.0", - "port-version": 4, + "port-version": 5, "description": "A high-level 3D visualization library with Open Inventor 2.1 API", "homepage": "https://github.com/coin3d/coin", "supports": "!(arm | arm64 | uwp)", diff --git a/external_imported/vcpkg/ports/colmap/fix-dependency-freeimage.patch b/external_imported/vcpkg/ports/colmap/fix-dependencies.patch similarity index 59% rename from external_imported/vcpkg/ports/colmap/fix-dependency-freeimage.patch rename to external_imported/vcpkg/ports/colmap/fix-dependencies.patch index 29b591e34..62650bd8b 100644 --- a/external_imported/vcpkg/ports/colmap/fix-dependency-freeimage.patch +++ b/external_imported/vcpkg/ports/colmap/fix-dependencies.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b05097c..cdd8ca4 100644 +index 4759a94..3d25164 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -96,7 +96,8 @@ find_package(Boost REQUIRED COMPONENTS +@@ -98,9 +98,11 @@ find_package(Boost REQUIRED COMPONENTS find_package(Eigen3 REQUIRED) @@ -10,5 +10,9 @@ index b05097c..cdd8ca4 100644 +find_package(freeimage CONFIG REQUIRED) +set(FREEIMAGE_LIBRARIES freeimage::FreeImage) +-find_package(Metis REQUIRED) ++find_package(metis CONFIG REQUIRED) ++set(METIS_LIBRARIES metis) + find_package(Glog REQUIRED) diff --git a/external_imported/vcpkg/ports/colmap/portfile.cmake b/external_imported/vcpkg/ports/colmap/portfile.cmake index 1a5069730..a9971e6cc 100644 --- a/external_imported/vcpkg/ports/colmap/portfile.cmake +++ b/external_imported/vcpkg/ports/colmap/portfile.cmake @@ -1,13 +1,13 @@ -set(COLMAP_REF "3.6") +set(COLMAP_REF "29a1e3642a3b00734a52b21e597ea4d576485fe6") # 3.7 fix vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO colmap/colmap REF ${COLMAP_REF} - SHA512 9a4b4f2a49891ce8ac32ab1f2e9b859336326bada889e6de49c017a069884bb6c8ab8a2ae430d955e58fc22377c63e8fba9ce80ff959713e2878e29814d44632 + SHA512 c22511592dadd1fce51baeaa5ab3ca48b0df5f1c02f9e2a97593ea1b01c5aea0e1054063a5665e2653f2c7b1b7525ce4c62ae35fb4197df614112861045b76fd HEAD_REF dev PATCHES - fix-dependency-freeimage.patch + fix-dependencies.patch ) if (NOT TRIPLET_SYSTEM_ARCH STREQUAL "x64" AND ("cuda" IN_LIST FEATURES OR "cuda-redist" IN_LIST FEATURES)) diff --git a/external_imported/vcpkg/ports/colmap/vcpkg.json b/external_imported/vcpkg/ports/colmap/vcpkg.json index b9b5a09a2..f1f0a09b6 100644 --- a/external_imported/vcpkg/ports/colmap/vcpkg.json +++ b/external_imported/vcpkg/ports/colmap/vcpkg.json @@ -1,7 +1,6 @@ { "name": "colmap", - "version-string": "3.6", - "port-version": 2, + "version-date": "2022-03-14", "description": "COLMAP is a general-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline with a graphical and command-line interface. It offers a wide range of features for reconstruction of ordered and unordered image collections. The software is licensed under the new BSD license.", "homepage": "https://colmap.github.io/", "license": "BSD-3-Clause", @@ -9,7 +8,6 @@ "boost-filesystem", "boost-graph", "boost-program-options", - "boost-regex", "boost-system", "boost-test", { @@ -55,7 +53,7 @@ ] }, "tests": { - "description": "Enable TESTS." + "description": "Build all tests." } } } diff --git a/external_imported/vcpkg/ports/color-console/portfile.cmake b/external_imported/vcpkg/ports/color-console/portfile.cmake new file mode 100644 index 000000000..392a600a7 --- /dev/null +++ b/external_imported/vcpkg/ports/color-console/portfile.cmake @@ -0,0 +1,16 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO imfl/color-console + REF 745f57141e6322e20cdda59a74ab1e00d107ade1 + SHA512 d4d919eb211f2981daf6b9af93262fc8ac89bac0db755ba30b31d6aa1b981e5383fb23ef95d1ff004606d138fee630fd790c72e92440b684306c6780750bd9fd + HEAD_REF master +) + +# Install source file +file(INSTALL ${SOURCE_PATH}/include/color.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include RENAME colorconsole.hpp) + +# Install license +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +# Install usage +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) \ No newline at end of file diff --git a/external_imported/vcpkg/ports/color-console/usage b/external_imported/vcpkg/ports/color-console/usage new file mode 100644 index 000000000..ec734688d --- /dev/null +++ b/external_imported/vcpkg/ports/color-console/usage @@ -0,0 +1,4 @@ +The package zstr is header only and can be used from CMake via: + + find_path(COLORCONSOLE_INCLUDE_DIRS "colorconsole.hpp") + target_include_directories(main PRIVATE ${COLORCONSOLE_INCLUDE_DIRS}) \ No newline at end of file diff --git a/external_imported/vcpkg/ports/color-console/vcpkg.json b/external_imported/vcpkg/ports/color-console/vcpkg.json new file mode 100644 index 000000000..2475ce2cc --- /dev/null +++ b/external_imported/vcpkg/ports/color-console/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "color-console", + "version-date": "2022-03-20", + "description": "A lightweight header-only C++ library to bring colors to your Windows console with a very-easy-to-use API.", + "homepage": "https://github.com/imfl/color-console", + "license": "MIT" +} diff --git a/external_imported/vcpkg/ports/comms/portfile.cmake b/external_imported/vcpkg/ports/comms/portfile.cmake index 3ec544e2f..0ea8ef045 100644 --- a/external_imported/vcpkg/ports/comms/portfile.cmake +++ b/external_imported/vcpkg/ports/comms/portfile.cmake @@ -1,5 +1,4 @@ #header-only library - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO commschamp/comms_champion @@ -17,11 +16,6 @@ vcpkg_check_features( tools CC_INSTALL_TOOLS ) -# check before configure -if("tools" IN_LIST FEATURES) - vcpkg_fail_port_install(ON_LIBRARY_LINKAGE "static" MESSAGE "Feature 'Tools' can't be built statically") -endif() - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -42,7 +36,8 @@ if("tools" IN_LIST FEATURES) TOOL_NAMES cc_dump cc_view AUTO_CLEAN ) - file(INSTALL "${CURRENT_PACKAGES_DIR}/lib/CommsChampion/plugin" + + 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") diff --git a/external_imported/vcpkg/ports/comms/vcpkg.json b/external_imported/vcpkg/ports/comms/vcpkg.json index 677032b11..fe4c58918 100644 --- a/external_imported/vcpkg/ports/comms/vcpkg.json +++ b/external_imported/vcpkg/ports/comms/vcpkg.json @@ -1,6 +1,7 @@ { "name": "comms", "version-semver": "3.4.0", + "port-version": 1, "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", @@ -17,6 +18,7 @@ "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 60cb2bbbc..e7131d93a 100644 --- a/external_imported/vcpkg/ports/commsdsl/portfile.cmake +++ b/external_imported/vcpkg/ports/commsdsl/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO commschamp/commsdsl diff --git a/external_imported/vcpkg/ports/commsdsl/vcpkg.json b/external_imported/vcpkg/ports/commsdsl/vcpkg.json index ebfbd0c72..84ceafc77 100644 --- a/external_imported/vcpkg/ports/commsdsl/vcpkg.json +++ b/external_imported/vcpkg/ports/commsdsl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "commsdsl", "version-semver": "3.6.4", + "port-version": 1, "description": "DSL schemas parser and code generator for CommsChampion Ecosystem", "homepage": "https://commschamp.github.io/", "documentation": "https://github.com/commschamp/commsdsl", diff --git a/external_imported/vcpkg/ports/concurrencpp/portfile.cmake b/external_imported/vcpkg/ports/concurrencpp/portfile.cmake index 43578ea88..64231d30b 100644 --- a/external_imported/vcpkg/ports/concurrencpp/portfile.cmake +++ b/external_imported/vcpkg/ports/concurrencpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO David-Haim/concurrencpp - REF v.0.1.3 - SHA512 2f4530ba93d768a7a1ae14c532c8ef443745e48cceeca8a0e9da9f91633876ae4971caad70eeff9e18c7a45e8cf7c0b7bb79720a62026850244fb2377ad10df7 + REF v.0.1.4 + SHA512 494680b8a642d9c2ad1e31a6b52ecac672af7b8ba2213fc6b0d525968bd27122c9b3c7105286af22fd6ebfa3cee4bb3b2c8948062418ad8419a305f7c3df0d4b HEAD_REF master PATCHES fix-include-path.patch @@ -16,6 +16,6 @@ vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/concurrencpp-0.1.3) +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) diff --git a/external_imported/vcpkg/ports/concurrencpp/vcpkg.json b/external_imported/vcpkg/ports/concurrencpp/vcpkg.json index c4c8482f1..85ab61dc3 100644 --- a/external_imported/vcpkg/ports/concurrencpp/vcpkg.json +++ b/external_imported/vcpkg/ports/concurrencpp/vcpkg.json @@ -1,8 +1,9 @@ { "name": "concurrencpp", - "version-string": "0.1.3", + "version": "0.1.4", "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": [ { diff --git a/external_imported/vcpkg/ports/coroutine/gsl-4_0_0.patch b/external_imported/vcpkg/ports/coroutine/gsl-4_0_0.patch new file mode 100644 index 000000000..466d3ff13 --- /dev/null +++ b/external_imported/vcpkg/ports/coroutine/gsl-4_0_0.patch @@ -0,0 +1,80 @@ +diff --git a/interface/coroutine/net.h b/interface/coroutine/net.h +index 17b70a8..3c44827 100644 +--- a/interface/coroutine/net.h ++++ b/interface/coroutine/net.h +@@ -344,7 +344,7 @@ void poll_net_tasks(uint64_t nano) noexcept(false); + * @ingroup Network + */ + uint32_t get_address(const addrinfo& hint, // +- gsl::czstring<> host, gsl::czstring<> serv, ++ gsl::czstring host, gsl::czstring serv, + gsl::span output) noexcept; + + /** +@@ -361,7 +361,7 @@ uint32_t get_address(const addrinfo& hint, // + * @ingroup Network + */ + uint32_t get_address(const addrinfo& hint, // +- gsl::czstring<> host, gsl::czstring<> serv, ++ gsl::czstring host, gsl::czstring serv, + gsl::span output) noexcept; + + /** +@@ -377,7 +377,7 @@ uint32_t get_address(const addrinfo& hint, // + * @ingroup Network + */ + uint32_t get_name(const sockaddr_in& addr, // +- gsl::zstring name, gsl::zstring serv, ++ gsl::basic_zstring name, gsl::basic_zstring serv, + int32_t flags = NI_NUMERICHOST | NI_NUMERICSERV) noexcept; + + /** +@@ -392,7 +392,7 @@ uint32_t get_name(const sockaddr_in& addr, // + * @ingroup Network + */ + uint32_t get_name(const sockaddr_in6& addr, // +- gsl::zstring name, gsl::zstring serv, ++ gsl::basic_zstring name, gsl::basic_zstring serv, + int32_t flags = NI_NUMERICHOST | NI_NUMERICSERV) noexcept; + + } // namespace coro +diff --git a/modules/net/resolver.cpp b/modules/net/resolver.cpp +index 21a9800..5328939 100644 +--- a/modules/net/resolver.cpp ++++ b/modules/net/resolver.cpp +@@ -9,7 +9,7 @@ namespace coro { + + GSL_SUPPRESS(type .1) + uint32_t get_name(const sockaddr_in& addr, // +- gsl::zstring name, gsl::zstring serv, ++ gsl::basic_zstring name, gsl::basic_zstring serv, + int32_t flags) noexcept { + const auto* ptr = reinterpret_cast(addressof(addr)); + return ::getnameinfo(ptr, sizeof(sockaddr_in), // +@@ -20,7 +20,7 @@ uint32_t get_name(const sockaddr_in& addr, // + + GSL_SUPPRESS(type .1) + uint32_t get_name(const sockaddr_in6& addr, // +- gsl::zstring name, gsl::zstring serv, ++ gsl::basic_zstring name, gsl::basic_zstring serv, + int32_t flags) noexcept { + const auto* ptr = reinterpret_cast(addressof(addr)); + return ::getnameinfo(ptr, sizeof(sockaddr_in6), // +@@ -58,7 +58,7 @@ auto get_address(addrinfo* list, sockaddr_in6 addr) noexcept + } + + uint32_t get_address(const addrinfo& hint, // +- gsl::czstring<> host, gsl::czstring<> serv, ++ gsl::czstring host, gsl::czstring serv, + gsl::span output) noexcept { + addrinfo* list = nullptr; + if (const auto ec = ::getaddrinfo(host, serv, // +@@ -74,7 +74,7 @@ uint32_t get_address(const addrinfo& hint, // + } + + uint32_t get_address(const addrinfo& hint, // +- gsl::czstring<> host, gsl::czstring<> serv, ++ gsl::czstring host, gsl::czstring serv, + gsl::span output) noexcept { + addrinfo* list = nullptr; + if (const auto ec = ::getaddrinfo(host, serv, // diff --git a/external_imported/vcpkg/ports/coroutine/portfile.cmake b/external_imported/vcpkg/ports/coroutine/portfile.cmake index 1326b5a7d..f01475086 100644 --- a/external_imported/vcpkg/ports/coroutine/portfile.cmake +++ b/external_imported/vcpkg/ports/coroutine/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - if(VCPKG_TARGET_IS_LINUX) message("Warning: `coroutine` requires libc++ and Clang or GCC 10+ on Linux") endif() @@ -13,6 +11,7 @@ vcpkg_from_github( PATCHES fix-errorC7651.patch add-noexcept-to-frame.patch + gsl-4_0_0.patch ) vcpkg_configure_cmake( diff --git a/external_imported/vcpkg/ports/coroutine/vcpkg.json b/external_imported/vcpkg/ports/coroutine/vcpkg.json index 8c557f6fa..e1b0a5d77 100644 --- a/external_imported/vcpkg/ports/coroutine/vcpkg.json +++ b/external_imported/vcpkg/ports/coroutine/vcpkg.json @@ -1,7 +1,7 @@ { "name": "coroutine", - "version-string": "1.5.0", - "port-version": 2, + "version": "1.5.0", + "port-version": 4, "description": "C++ 20 Coroutines helper/example library", "homepage": "https://github.com/luncliff/coroutine", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/cpp-httplib/portfile.cmake b/external_imported/vcpkg/ports/cpp-httplib/portfile.cmake index 07c0cfda9..349a0d685 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 v0.9.7 - SHA512 7c12ff7b5cfba1a814cb14bdc28c949a97817668e1e6cee030fe1ea5e8748460677908ddb83fd1d06d96dd79a910004071076d1486d39103b6280f628ba38e2d + REF d73395e1dc652465fa9524266cd26ad57365491f #v0.10.3 + SHA512 cace318611a1e306b774b4bb08e0312ad06fc10acb829b1df6d5cef9c1d6b018c0c5ebb8e3859fa2bee974dbd51fc5df90a43aa81107c97377d55bb36595b67d HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/cpp-httplib/vcpkg.json b/external_imported/vcpkg/ports/cpp-httplib/vcpkg.json index 20b175539..ebbccb3f1 100644 --- a/external_imported/vcpkg/ports/cpp-httplib/vcpkg.json +++ b/external_imported/vcpkg/ports/cpp-httplib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cpp-httplib", - "version": "0.9.7", + "version": "0.10.3", "description": "A single file C++11 header-only HTTP/HTTPS server and client library", - "homepage": "https://github.com/yhirose/cpp-httplib" + "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 4842897fb..d48a25f7d 100644 --- a/external_imported/vcpkg/ports/cpp-ipc/portfile.cmake +++ b/external_imported/vcpkg/ports/cpp-ipc/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "OSX") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mutouyun/cpp-ipc @@ -36,4 +34,4 @@ vcpkg_copy_pdbs() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") \ No newline at end of file +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/external_imported/vcpkg/ports/cpp-ipc/vcpkg.json b/external_imported/vcpkg/ports/cpp-ipc/vcpkg.json index b0d59447b..0be585637 100644 --- a/external_imported/vcpkg/ports/cpp-ipc/vcpkg.json +++ b/external_imported/vcpkg/ports/cpp-ipc/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cpp-ipc", "version": "1.0.1", + "port-version": 1, "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-netlib/portfile.cmake b/external_imported/vcpkg/ports/cpp-netlib/portfile.cmake index adfe9ad29..4674917b6 100644 --- a/external_imported/vcpkg/ports/cpp-netlib/portfile.cmake +++ b/external_imported/vcpkg/ports/cpp-netlib/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/external_imported/vcpkg/ports/cpp-netlib/vcpkg.json b/external_imported/vcpkg/ports/cpp-netlib/vcpkg.json index 22a7c7b9e..40f200d78 100644 --- a/external_imported/vcpkg/ports/cpp-netlib/vcpkg.json +++ b/external_imported/vcpkg/ports/cpp-netlib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cpp-netlib", "version-string": "0.13.0", - "port-version": 5, + "port-version": 6, "description": "A collection of network-related routines/implementations geared towards providing a robust cross-platform networking library", "homepage": "https://cpp-netlib.org/", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/cpp-redis/fix-sleep_for.patch b/external_imported/vcpkg/ports/cpp-redis/fix-sleep_for.patch new file mode 100644 index 000000000..54bc953f3 --- /dev/null +++ b/external_imported/vcpkg/ports/cpp-redis/fix-sleep_for.patch @@ -0,0 +1,12 @@ +diff --git a/sources/core/client.cpp b/sources/core/client.cpp +index 7ea20e2..c5d2c40 100644 +--- a/sources/core/client.cpp ++++ b/sources/core/client.cpp +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + namespace cpp_redis { + diff --git a/external_imported/vcpkg/ports/cpp-redis/portfile.cmake b/external_imported/vcpkg/ports/cpp-redis/portfile.cmake index 033878abf..f12a5709b 100644 --- a/external_imported/vcpkg/ports/cpp-redis/portfile.cmake +++ b/external_imported/vcpkg/ports/cpp-redis/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF 4.3.1 SHA512 abf372542c53f37f504b3211b840b100d07a8f4b2e7f5584cc7550ab16ed617838e2df79064374c7a409458d8567f4834686318ea3a40249c767e36c744c7a47 HEAD_REF master + PATCHES + "fix-sleep_for.patch" ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/tacopie/CMakeLists.txt DESTINATION ${SOURCE_PATH}/tacopie) @@ -22,14 +24,13 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAM set(VCPKG_C_FLAGS_DEBUG "${VCPKG_C_FLAGS_DEBUG} -RTC1") endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DMSVC_RUNTIME_LIBRARY_CONFIG=${MSVC_RUNTIME_LIBRARY_CONFIG} ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/external_imported/vcpkg/ports/cpp-redis/vcpkg.json b/external_imported/vcpkg/ports/cpp-redis/vcpkg.json index e04ec8d84..604bfd19d 100644 --- a/external_imported/vcpkg/ports/cpp-redis/vcpkg.json +++ b/external_imported/vcpkg/ports/cpp-redis/vcpkg.json @@ -1,10 +1,19 @@ { "name": "cpp-redis", - "version-string": "4.3.1", - "port-version": 4, + "version": "4.3.1", + "port-version": 5, "description": "cpp-redis is a C++11 Asynchronous Multi-Platform Lightweight Redis Client, with support for synchronous operations and pipelining.", "homepage": "https://github.com/cpp-redis/cpp_redis", + "license": "MIT", "dependencies": [ - "tacopie" + "tacopie", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/cppad/portfile.cmake b/external_imported/vcpkg/ports/cppad/portfile.cmake index 3de257037..23ddddb60 100644 --- a/external_imported/vcpkg/ports/cppad/portfile.cmake +++ b/external_imported/vcpkg/ports/cppad/portfile.cmake @@ -1,7 +1,3 @@ -# the compilation fails on arm and uwp. Please check the related issue: -# https://github.com/microsoft/vcpkg/pull/12560#issuecomment-668412073 -vcpkg_fail_port_install(ON_TARGET "uwp" and "arm") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO coin-or/CppAD diff --git a/external_imported/vcpkg/ports/cppad/vcpkg.json b/external_imported/vcpkg/ports/cppad/vcpkg.json index 48ae8fa4e..494ccdfa5 100644 --- a/external_imported/vcpkg/ports/cppad/vcpkg.json +++ b/external_imported/vcpkg/ports/cppad/vcpkg.json @@ -1,7 +1,8 @@ { + "$comment": "See related issue for compilation failure on UWP and ARM: https://github.com/microsoft/vcpkg/pull/12560#issuecomment-668412073", "name": "cppad", "version-string": "20210000.7", - "port-version": 2, + "port-version": 3, "description": "CppAD: A Package for Differentiation of C++ Algorithms", "homepage": "https://github.com/coin-or/CppAD", "supports": "!(arm | uwp)", diff --git a/external_imported/vcpkg/ports/cppcms/portfile.cmake b/external_imported/vcpkg/ports/cppcms/portfile.cmake index d25c1b18e..54bc57039 100644 --- a/external_imported/vcpkg/ports/cppcms/portfile.cmake +++ b/external_imported/vcpkg/ports/cppcms/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install( ON_TARGET "linux" "osx") - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) vcpkg_from_github( diff --git a/external_imported/vcpkg/ports/cppcms/vcpkg.json b/external_imported/vcpkg/ports/cppcms/vcpkg.json index 0991668ef..601d57550 100644 --- a/external_imported/vcpkg/ports/cppcms/vcpkg.json +++ b/external_imported/vcpkg/ports/cppcms/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cppcms", "version-string": "1.2.1", - "port-version": 3, + "port-version": 4, "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)", diff --git a/external_imported/vcpkg/ports/cppcoro/portfile.cmake b/external_imported/vcpkg/ports/cppcoro/portfile.cmake index 7938a65ba..39c110e2a 100644 --- a/external_imported/vcpkg/ports/cppcoro/portfile.cmake +++ b/external_imported/vcpkg/ports/cppcoro/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) if(VCPKG_TARGET_IS_LINUX) diff --git a/external_imported/vcpkg/ports/cppcoro/vcpkg.json b/external_imported/vcpkg/ports/cppcoro/vcpkg.json index e5e116dc8..794309e34 100644 --- a/external_imported/vcpkg/ports/cppcoro/vcpkg.json +++ b/external_imported/vcpkg/ports/cppcoro/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cppcoro", - "version-string": "2020-2-28", - "port-version": 2, + "version-date": "2020-02-28", + "port-version": 3, "description": "A library of C++ coroutine abstractions for the Coroutines TS", "homepage": "https://github.com/lewissbaker/cppcoro", "supports": "!uwp" diff --git a/external_imported/vcpkg/ports/cppgraphqlgen/portfile.cmake b/external_imported/vcpkg/ports/cppgraphqlgen/portfile.cmake index 9e83952c6..e9fbd0033 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.0.0 - SHA512 5e356234e9e47977077f36fdd4a811fe140559a6961b2c8f1a4cd56559df444e890da1863d6b020b1afcec81cd82f7bf91d907a635089459b98da9b74613aae0 + REF v4.1.1 + SHA512 20987f03719558cec2fac8aee5a94e59c5e833a318361aef802f39bc369af141fef0c7f2d3bb35324d44d289843564c2f7e890419f871bfd8e5d7d5de53b363e HEAD_REF main ) diff --git a/external_imported/vcpkg/ports/cppgraphqlgen/vcpkg.json b/external_imported/vcpkg/ports/cppgraphqlgen/vcpkg.json index fccb336b5..6bed1ba31 100644 --- a/external_imported/vcpkg/ports/cppgraphqlgen/vcpkg.json +++ b/external_imported/vcpkg/ports/cppgraphqlgen/vcpkg.json @@ -1,8 +1,9 @@ { "name": "cppgraphqlgen", - "version-semver": "4.0.0", + "version-semver": "4.1.1", "description": "C++ GraphQL schema service generator", "homepage": "https://github.com/microsoft/cppgraphqlgen", + "license": "MIT", "dependencies": [ "boost-program-options", "pegtl", diff --git a/external_imported/vcpkg/ports/cppunit/portfile.cmake b/external_imported/vcpkg/ports/cppunit/portfile.cmake index 01522579f..5daefd732 100644 --- a/external_imported/vcpkg/ports/cppunit/portfile.cmake +++ b/external_imported/vcpkg/ports/cppunit/portfile.cmake @@ -1,8 +1,5 @@ -# UWP is not supported -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_download_distfile(ARCHIVE - URLS "http://dev-www.libreoffice.org/src/cppunit-1.15.1.tar.gz" + URLS "https://dev-www.libreoffice.org/src/cppunit-1.15.1.tar.gz" FILENAME "cppunit-1.15.1.tar.gz" SHA512 0feb47faec451357bb4c4e287efa17bb60fd3ad966d5350e9f25b414aaab79e94921024b0c0497672f8d3eeb22a599213d2d71d9e1d28b243b3e37f3a9a43691 ) @@ -62,4 +59,4 @@ file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/CppUnitConfig.cmake" DESTINATION "${CURR file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" -) \ No newline at end of file +) diff --git a/external_imported/vcpkg/ports/cppunit/vcpkg.json b/external_imported/vcpkg/ports/cppunit/vcpkg.json index 221f330a0..15fef69b6 100644 --- a/external_imported/vcpkg/ports/cppunit/vcpkg.json +++ b/external_imported/vcpkg/ports/cppunit/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cppunit", "version": "1.15.1", - "port-version": 1, + "port-version": 3, "description": "Unit testing framework module for the C++ programming language", "homepage": "https://www.freedesktop.org/wiki/Software/cppunit", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/cppxaml/portfile.cmake b/external_imported/vcpkg/ports/cppxaml/portfile.cmake new file mode 100644 index 000000000..0a76e0e7a --- /dev/null +++ b/external_imported/vcpkg/ports/cppxaml/portfile.cmake @@ -0,0 +1,11 @@ +#header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO asklar/xaml-islands + REF 0.0.16 + SHA512 30fba1ef9264bf2eeaf0e48898c6b138adef9ee98d758ac91bcc7f2c90e50f00ec35925705347c3fc5c84b97652caeece7b3854be5b468a02e51fed23eda8007 + HEAD_REF main +) + +file(INSTALL "${SOURCE_PATH}/inc/cppxaml" 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/cppxaml/vcpkg.json b/external_imported/vcpkg/ports/cppxaml/vcpkg.json new file mode 100644 index 000000000..d99f00387 --- /dev/null +++ b/external_imported/vcpkg/ports/cppxaml/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "cppxaml", + "version": "0.0.16", + "description": "CppXaml is a library to facilitate usage of the XAML UI framework in C++ Windows apps.", + "homepage": "https://asklar.github.io/xaml-islands", + "supports": "windows" +} diff --git a/external_imported/vcpkg/ports/cpr/001-cpr-config.patch b/external_imported/vcpkg/ports/cpr/001-cpr-config.patch index 7d8dc5933..9d666553d 100644 --- a/external_imported/vcpkg/ports/cpr/001-cpr-config.patch +++ b/external_imported/vcpkg/ports/cpr/001-cpr-config.patch @@ -1,23 +1,15 @@ diff --git a/cpr/CMakeLists.txt b/cpr/CMakeLists.txt -index d43fc1d..d6a3992 100644 +index 66fc9eb..cc00c72 100644 --- a/cpr/CMakeLists.txt +++ b/cpr/CMakeLists.txt -@@ -29,6 +29,10 @@ set_target_properties(cpr - PROPERTIES +@@ -30,6 +30,10 @@ set_target_properties(cpr VERSION ${${PROJECT_NAME}_VERSION} SOVERSION ${${PROJECT_NAME}_VERSION_MAJOR}) -+ + +if (NOT DISABLE_INSTALL_HEADERS) -+ install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../include/cpr DESTINATION include) ++ install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../include/cpr DESTINATION include) +endif() - ++ # Import GNU common install directory variables include(GNUInstallDirs) -@@ -37,6 +41,7 @@ if(CPR_FORCE_USE_SYSTEM_CURL) - install(TARGETS cpr - EXPORT cprTargets - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - # Include CMake helpers for package config files diff --git a/external_imported/vcpkg/ports/cpr/portfile.cmake b/external_imported/vcpkg/ports/cpr/portfile.cmake index ad7ecc0bd..24790b9b6 100644 --- a/external_imported/vcpkg/ports/cpr/portfile.cmake +++ b/external_imported/vcpkg/ports/cpr/portfile.cmake @@ -3,30 +3,31 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libcpr/cpr - REF 1.7.2 - SHA512 b2af6ab13a5dab435cc298c74ba79c365569c1e5ccfaffeea9dab0ad28cd918a198f83446761ac2e2101abb4be3a2f669f991e854e541851c1d250f34e16c414 + REF 1.8.1 + SHA512 f586b63ddbd9bd03e5c5aa385aad0d4f16f79847e1a14f6dc8a5e0cad4ed89e097ab83484c9ed19e034abf0d2eece13a7609652bc6a1a9caba43189cf0a782db HEAD_REF master PATCHES 001-cpr-config.patch ) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + ssl CPR_ENABLE_SSL +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCPR_BUILD_TESTS=OFF -DCPR_FORCE_USE_SYSTEM_CURL=ON + ${FEATURE_OPTIONS} OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) vcpkg_cmake_install() - - vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cpr) -vcpkg_copy_pdbs() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -# Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/cpr/vcpkg.json b/external_imported/vcpkg/ports/cpr/vcpkg.json index 9ff4893cb..be243b70c 100644 --- a/external_imported/vcpkg/ports/cpr/vcpkg.json +++ b/external_imported/vcpkg/ports/cpr/vcpkg.json @@ -1,8 +1,9 @@ { "name": "cpr", - "version-semver": "1.7.2", + "version-semver": "1.8.1", "description": "C++ Requests is a simple wrapper around libcurl inspired by the excellent Python Requests project.", "homepage": "https://github.com/libcpr/cpr", + "license": "MIT", "dependencies": [ { "name": "curl", @@ -16,5 +17,26 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "default-features": [ + "ssl" + ], + "features": { + "ssl": { + "description": "Enable SSL support", + "dependencies": [ + { + "name": "curl", + "default-features": false, + "features": [ + "ssl" + ] + }, + { + "name": "openssl", + "platform": "linux" + } + ] + } + } } diff --git a/external_imported/vcpkg/ports/cpu-features/portfile.cmake b/external_imported/vcpkg/ports/cpu-features/portfile.cmake index 0e7602fdc..4b4ca71d2 100644 --- a/external_imported/vcpkg/ports/cpu-features/portfile.cmake +++ b/external_imported/vcpkg/ports/cpu-features/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/external_imported/vcpkg/ports/cpu-features/vcpkg.json b/external_imported/vcpkg/ports/cpu-features/vcpkg.json index 8980a30b5..e44c32017 100644 --- a/external_imported/vcpkg/ports/cpu-features/vcpkg.json +++ b/external_imported/vcpkg/ports/cpu-features/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cpu-features", "version": "0.6.0", + "port-version": 1, "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/cpuid/portfile.cmake b/external_imported/vcpkg/ports/cpuid/portfile.cmake index 306ccd5ac..6f38ec89b 100644 --- a/external_imported/vcpkg/ports/cpuid/portfile.cmake +++ b/external_imported/vcpkg/ports/cpuid/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "arm" "arm64") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/external_imported/vcpkg/ports/cpuid/vcpkg.json b/external_imported/vcpkg/ports/cpuid/vcpkg.json index a2ae5e99b..1e77b381c 100644 --- a/external_imported/vcpkg/ports/cpuid/vcpkg.json +++ b/external_imported/vcpkg/ports/cpuid/vcpkg.json @@ -1,10 +1,10 @@ { "name": "cpuid", "version": "0.5.1", - "port-version": 2, + "port-version": 3, "description": "Provides CPU identification for the x86 (and x86_64)", "homepage": "https://github.com/anrieff/libcpuid", - "supports": "x86 | x64", + "supports": "(x86 | x64) & !uwp", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/cpuinfo/fix-install.patch b/external_imported/vcpkg/ports/cpuinfo/fix-install.patch deleted file mode 100644 index 86080f522..000000000 --- a/external_imported/vcpkg/ports/cpuinfo/fix-install.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e2d7d53..6d380e9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -15,6 +15,28 @@ OPTION(CPUINFO_BUILD_UNIT_TESTS "Build cpuinfo unit tests" ON) - OPTION(CPUINFO_BUILD_MOCK_TESTS "Build cpuinfo mock tests" ON) - OPTION(CPUINFO_BUILD_BENCHMARKS "Build cpuinfo micro-benchmarks" ON) - -+# Configuration -+set(config_install_dir "lib/cmake/unofficial-${PROJECT_NAME}") -+set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated") -+set(project_config "${generated_dir}/unofficial-${PROJECT_NAME}Config.cmake") -+set(targets_export_name "unofficial-${PROJECT_NAME}Targets") -+set(namespace "unofficial::${PROJECT_NAME}::") -+ -+# Include module with fuction 'write_basic_package_version_file' -+include(CMakePackageConfigHelpers) -+configure_package_config_file( -+ "cmake/Config.cmake.in" -+ "${project_config}" -+ INSTALL_DESTINATION "${config_install_dir}" -+) -+install(FILES "${project_config}" -+ DESTINATION "${config_install_dir}" -+) -+install(EXPORT "${targets_export_name}" -+ NAMESPACE "${namespace}" -+ DESTINATION "${config_install_dir}" -+) -+ - # ---[ CMake options - INCLUDE(GNUInstallDirs) - -@@ -210,7 +232,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "^(Windows|CYGWIN|MSYS)$") - TARGET_COMPILE_DEFINITIONS(cpuinfo_internals PRIVATE _WIN32_WINNT=0x0601) - ENDIF() - SET_TARGET_PROPERTIES(cpuinfo PROPERTIES PUBLIC_HEADER include/cpuinfo.h) --TARGET_INCLUDE_DIRECTORIES(cpuinfo BEFORE PUBLIC include) -+TARGET_INCLUDE_DIRECTORIES(cpuinfo BEFORE PUBLIC $ $) - TARGET_INCLUDE_DIRECTORIES(cpuinfo BEFORE PRIVATE src) - TARGET_INCLUDE_DIRECTORIES(cpuinfo_internals BEFORE PUBLIC include src) - IF(CPUINFO_LOG_LEVEL STREQUAL "default") -@@ -261,6 +283,7 @@ TARGET_LINK_LIBRARIES(cpuinfo PRIVATE clog) - TARGET_LINK_LIBRARIES(cpuinfo_internals PRIVATE clog) - - INSTALL(TARGETS cpuinfo -+ EXPORT "${targets_export_name}" - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in -new file mode 100644 -index 0000000..9b4c9ee ---- /dev/null -+++ b/cmake/Config.cmake.in -@@ -0,0 +1,4 @@ -+@PACKAGE_INIT@ -+ -+include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake") -+check_required_components("@PROJECT_NAME@") -diff --git a/deps/clog/CMakeLists.txt b/deps/clog/CMakeLists.txt -index 083f519..43b5c78 100644 ---- a/deps/clog/CMakeLists.txt -+++ b/deps/clog/CMakeLists.txt -@@ -57,7 +57,7 @@ SET_TARGET_PROPERTIES(clog PROPERTIES - C_EXTENSIONS NO) - CLOG_TARGET_RUNTIME_LIBRARY(clog) - SET_TARGET_PROPERTIES(clog PROPERTIES PUBLIC_HEADER include/clog.h) --TARGET_INCLUDE_DIRECTORIES(clog BEFORE PUBLIC include) -+TARGET_INCLUDE_DIRECTORIES(clog PUBLIC $ $) - IF(CLOG_LOG_TO_STDIO) - TARGET_COMPILE_DEFINITIONS(clog PRIVATE CLOG_LOG_TO_STDIO=1) - ELSE() -@@ -68,6 +68,7 @@ IF(ANDROID AND NOT CLOG_LOG_TO_STDIO) - ENDIF() - - INSTALL(TARGETS clog -+ EXPORT ${targets_export_name} - LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" - ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" - PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") diff --git a/external_imported/vcpkg/ports/cpuinfo/portfile.cmake b/external_imported/vcpkg/ports/cpuinfo/portfile.cmake index c670c0459..aa964e6e1 100644 --- a/external_imported/vcpkg/ports/cpuinfo/portfile.cmake +++ b/external_imported/vcpkg/ports/cpuinfo/portfile.cmake @@ -1,14 +1,14 @@ # On Windows, we can get a cpuinfo.dll, but it exports no symbols. -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 REPO pytorch/cpuinfo - REF 5916273f79a21551890fd3d56fc5375a78d1598d - SHA512 50e537b61d991e8579577fb1ecf8d9ceb2171dbad96dfe159a062eadfdc0b2372b94988fc6f223c20e327453c7f55042ee06779f5b5fe0922f4470f746c9686b + REF b40bae27785787b6dd70788986fd96434cf90ae2 + SHA512 dbbe4f3e1d5ae74ffc8ba2cba0ab745a23f4993788f4947825ef5125dd1cbed3e13e0c98e020e6fcfa9879f54f06d7cba4de73ec29f77649b6a27b4ab82c8f1c HEAD_REF master - PATCHES - fix-install.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -16,23 +16,53 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS tools CPUINFO_BUILD_TOOLS ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS_DEBUG - -DCPUINFO_BUILD_TOOLS=OFF - -DCPUINFO_LOG_LEVEL=debug - OPTIONS_RELEASE - ${FEATURE_OPTIONS} - -DCPUINFO_LOG_LEVEL=default +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + list(APPEND LINK_OPTIONS -DCPUINFO_LIBRARY_TYPE=shared) +else() + list(APPEND LINK_OPTIONS -DCPUINFO_LIBRARY_TYPE=static) +endif() + +if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") + list(APPEND LINK_OPTIONS -DCPUINFO_RUNTIME_TYPE=shared) +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 + OPTIONS_DEBUG + -DCPUINFO_LOG_LEVEL=debug + OPTIONS_RELEASE + -DCPUINFO_LOG_LEVEL=default ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT}) +vcpkg_fixup_pkgconfig() # pkg_check_modules(libcpuinfo) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) @@ -43,5 +73,4 @@ if("tools" IN_LIST FEATURES) ) endif() -# 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/cpuinfo/vcpkg.json b/external_imported/vcpkg/ports/cpuinfo/vcpkg.json index a67a77bae..d718f9393 100644 --- a/external_imported/vcpkg/ports/cpuinfo/vcpkg.json +++ b/external_imported/vcpkg/ports/cpuinfo/vcpkg.json @@ -1,8 +1,20 @@ { "name": "cpuinfo", - "version-date": "2021-04-04", + "version-date": "2022-04-02", "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)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "tools": { "description": "Build cpuinfo command-line tools" diff --git a/external_imported/vcpkg/ports/crashpad/portfile.cmake b/external_imported/vcpkg/ports/crashpad/portfile.cmake index 30026d5c1..1764fc99a 100644 --- a/external_imported/vcpkg/ports/crashpad/portfile.cmake +++ b/external_imported/vcpkg/ports/crashpad/portfile.cmake @@ -1,7 +1,3 @@ -vcpkg_fail_port_install( - ON_ARCH "x86" "arm" "arm64" - ON_TARGET "UWP" "LINUX") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_git( @@ -14,7 +10,7 @@ function(checkout_in_path PATH URL REF) if(EXISTS "${PATH}") return() endif() - + vcpkg_from_git( OUT_SOURCE_PATH DEP_SOURCE_PATH URL "${URL}" @@ -116,8 +112,8 @@ install_headers("${SOURCE_PATH}/third_party/mini_chromium/mini_chromium/base") install_headers("${SOURCE_PATH}/third_party/mini_chromium/mini_chromium/build") # remove empty directories -file(REMOVE_RECURSE - "${PACKAGES_INCLUDE_DIR}/util/net/testdata" +file(REMOVE_RECURSE + "${PACKAGES_INCLUDE_DIR}/util/net/testdata" "${PACKAGES_INCLUDE_DIR}/build/ios") configure_file("${CMAKE_CURRENT_LIST_DIR}/crashpadConfig.cmake.in" diff --git a/external_imported/vcpkg/ports/crashpad/vcpkg.json b/external_imported/vcpkg/ports/crashpad/vcpkg.json index a47031499..d244f5987 100644 --- a/external_imported/vcpkg/ports/crashpad/vcpkg.json +++ b/external_imported/vcpkg/ports/crashpad/vcpkg.json @@ -1,7 +1,7 @@ { "name": "crashpad", - "version-string": "2020-03-18", - "port-version": 1, + "version-date": "2020-03-18", + "port-version": 2, "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." diff --git a/external_imported/vcpkg/ports/crashrpt/portfile.cmake b/external_imported/vcpkg/ports/crashrpt/portfile.cmake index ffc83aa98..a4265e0f8 100644 --- a/external_imported/vcpkg/ports/crashrpt/portfile.cmake +++ b/external_imported/vcpkg/ports/crashrpt/portfile.cmake @@ -1,11 +1,9 @@ -vcpkg_fail_port_install(ON_TARGET "OSX" "Linux" "UWP") - if(VCPKG_TARGET_ARCHITECTURE STREQUAL x86) set(ARCH_DIR "") elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) set(ARCH_DIR "x64/") else() - vcpkg_fail_port_install(MESSAGE "${PORT} only supports x86 and x64 architectures" ALWAYS) + message(FATAL_ERROR "${PORT} only supports x86 and x64 architectures") endif() vcpkg_from_git( diff --git a/external_imported/vcpkg/ports/crashrpt/vcpkg.json b/external_imported/vcpkg/ports/crashrpt/vcpkg.json index 3ed55e731..4b36fcda6 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": 1, + "port-version": 2, "description": "A crash reporting system for Windows applications", "homepage": "http://crashrpt.sourceforge.net/", + "supports": "!osx & !linux & !uwp & (x86 | x64)", "dependencies": [ "dbghelp", "libjpeg-turbo", diff --git a/external_imported/vcpkg/ports/crfsuite/portfile.cmake b/external_imported/vcpkg/ports/crfsuite/portfile.cmake index 19b2399be..14e339216 100644 --- a/external_imported/vcpkg/ports/crfsuite/portfile.cmake +++ b/external_imported/vcpkg/ports/crfsuite/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET uwp) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( @@ -10,7 +8,6 @@ vcpkg_from_github( HEAD_REF master ) - list(REMOVE_ITEM SOURCE_FILE "${SOURCE_PATH}/win32/liblbfgs/lbfgs.lib") list(REMOVE_ITEM SOURCE_FILE "${SOURCE_PATH}/win32/liblbfgs/lbfgs_debug.lib") diff --git a/external_imported/vcpkg/ports/crfsuite/vcpkg.json b/external_imported/vcpkg/ports/crfsuite/vcpkg.json index aa62f95bf..5899466d5 100644 --- a/external_imported/vcpkg/ports/crfsuite/vcpkg.json +++ b/external_imported/vcpkg/ports/crfsuite/vcpkg.json @@ -1,9 +1,9 @@ { "name": "crfsuite", "version-date": "2019-07-21", - "port-version": 1, + "port-version": 3, "description": "CRFSuite is an implementation of Conditional Random Fields (CRFs) for labeling sequential data.", - "homepage": "http://www.chokkan.org/software/crfsuite/", + "homepage": "https://www.chokkan.org/software/crfsuite/", "supports": "!uwp", "dependencies": [ "liblbfgs" diff --git a/external_imported/vcpkg/ports/croncpp/no-test.patch b/external_imported/vcpkg/ports/croncpp/no-test.patch new file mode 100644 index 000000000..0860e3f10 --- /dev/null +++ b/external_imported/vcpkg/ports/croncpp/no-test.patch @@ -0,0 +1,17 @@ +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index a82e605..405f306 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -1,3 +1,4 @@ ++if(BUILD_TESTS) + cmake_minimum_required(VERSION 3.7.0) + project(test_croncpp) + +@@ -9,7 +10,6 @@ file(GLOB SOURCES "*.cpp" "include/*.cpp") + + add_executable(test_croncpp ${SOURCES} ${headers}) + +-if(BUILD_TESTS) + enable_testing() + + add_test(NAME "test_croncpp" COMMAND "test_croncpp" "-r compact") diff --git a/external_imported/vcpkg/ports/croncpp/portfile.cmake b/external_imported/vcpkg/ports/croncpp/portfile.cmake index ebf35895b..bfdd2f84f 100644 --- a/external_imported/vcpkg/ports/croncpp/portfile.cmake +++ b/external_imported/vcpkg/ports/croncpp/portfile.cmake @@ -5,19 +5,22 @@ vcpkg_from_github( REF 11cce4666a06c40346c7ba380ddd90c53806809d #master on 9/4/2020 SHA512 8f4d892ce90d8eca3711b21728bb599bf64857b20c0b143c5277687d0b6e5d5b8bf3e6dc7f9e8d028ba4e5ee711a5a9e750bcc2f771177d2f659c0c19e12207a HEAD_REF master - PATCHES 0001-fix-cmake.patch + PATCHES + 0001-fix-cmake.patch + no-test.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -# # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/croncpp RENAME copyright) +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/croncpp/vcpkg.json b/external_imported/vcpkg/ports/croncpp/vcpkg.json index d1b9e05de..e41db7b77 100644 --- a/external_imported/vcpkg/ports/croncpp/vcpkg.json +++ b/external_imported/vcpkg/ports/croncpp/vcpkg.json @@ -1,7 +1,18 @@ { "name": "croncpp", - "version-string": "2020-09-04", - "port-version": 2, + "version-date": "2020-09-04", + "port-version": 3, "description": "croncpp is a C++17 header-only cross-platform library for handling CRON expressions.", - "homepage": "https://github.com/mariusbancila/croncpp" + "homepage": "https://github.com/mariusbancila/croncpp", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/crossguid/portfile.cmake b/external_imported/vcpkg/ports/crossguid/portfile.cmake index aaea83345..5be5064d1 100644 --- a/external_imported/vcpkg/ports/crossguid/portfile.cmake +++ b/external_imported/vcpkg/ports/crossguid/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF ca1bf4b810e2d188d04cb6286f957008ee1b7681 #2021-10-22 SHA512 f0a80d8e99b10473bcfdfde3d1c5fd7b766959819f0d1c0595ac84ce46db9007a5fbfde9a55aca60530c46cb7f8ef4c7e472c6191559ded92f868589c141ccaf HEAD_REF master + PATCHES + warnings.patch ) vcpkg_cmake_configure( diff --git a/external_imported/vcpkg/ports/crossguid/vcpkg.json b/external_imported/vcpkg/ports/crossguid/vcpkg.json index e086c4585..aa9aecd85 100644 --- a/external_imported/vcpkg/ports/crossguid/vcpkg.json +++ b/external_imported/vcpkg/ports/crossguid/vcpkg.json @@ -1,12 +1,12 @@ { "name": "crossguid", "version-date": "2021-10-22", - "port-version": 1, + "port-version": 2, "description": "CrossGuid is a minimal, cross platform, C++ GUID library.", "dependencies": [ { "name": "libuuid", - "platform": "!windows & !uwp & !osx & !android" + "platform": "!windows & !osx & !android" }, { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/crossguid/warnings.patch b/external_imported/vcpkg/ports/crossguid/warnings.patch new file mode 100644 index 000000000..d0ffc790a --- /dev/null +++ b/external_imported/vcpkg/ports/crossguid/warnings.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 76b5a62..174d981 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -40,15 +40,6 @@ else() + target_compile_definitions(crossguid PRIVATE GUID_LIBUUID) + endif() + +-if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +- set(WARNINGS "-Werror" "-Wall") +-elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") +- set(WARNINGS "-Werror" "-Wall") +-elseif(MSVC) +- set(WARNINGS "/WX" "/W4") +-endif() +-target_compile_options(crossguid PRIVATE ${WARNINGS}) +- + set_target_properties(crossguid + PROPERTIES + VERSION ${PROJECT_VERSION} diff --git a/external_imported/vcpkg/ports/crow/portfile.cmake b/external_imported/vcpkg/ports/crow/portfile.cmake index c1b710fff..5f792e668 100644 --- a/external_imported/vcpkg/ports/crow/portfile.cmake +++ b/external_imported/vcpkg/ports/crow/portfile.cmake @@ -1,11 +1,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CrowCpp/crow - REF a166a6d3cb08b10e9b00b57fd2216b9c4329d4e6 #0.3+3 - SHA512 5a32f66c96376c9c17f82492a7bc6f77417aa9dd808c082a2aeae983d05e895c27c2a01c46f8b5fdf9d30267ad14e8ba64a629ba354dce6ce0f7a2ff5d0a7fb2 - FILE_DISAMBIGUATOR 1 + REF 4d2f26ee8ff2c96c6c93e7e2b7f5162027f2482d # v1.0+1 + SHA512 69a27ae87eaa5523905e80fd1028208f2862cdd76c467e8d12dc1cca388965edb7615ae102bc1af13d824ad681eea17f69a42e790755f88ad57cae11b4268683 HEAD_REF master ) -file(INSTALL "${SOURCE_PATH}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCROW_BUILD_EXAMPLES=OFF + -DCROW_BUILD_TESTS=OFF +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Crow) + +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/crow/vcpkg.json b/external_imported/vcpkg/ports/crow/vcpkg.json index dc57251d7..70e70f380 100644 --- a/external_imported/vcpkg/ports/crow/vcpkg.json +++ b/external_imported/vcpkg/ports/crow/vcpkg.json @@ -1,6 +1,24 @@ { "name": "crow", - "version": "0.3.3", + "version": "1.0-1", "description": "Very fast and easy to use C++ micro web framework", - "homepage": "https://github.com/CrowCpp/crow" + "homepage": "https://github.com/CrowCpp/crow", + "license": "BSD-3-Clause", + "dependencies": [ + "boost-algorithm", + "boost-array", + "boost-asio", + "boost-date-time", + "boost-functional", + "boost-lexical-cast", + "boost-optional", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/cryptopp/cmake.patch b/external_imported/vcpkg/ports/cryptopp/cmake.patch index 8502ff17c..b0839bca7 100644 --- a/external_imported/vcpkg/ports/cryptopp/cmake.patch +++ b/external_imported/vcpkg/ports/cryptopp/cmake.patch @@ -1,9 +1,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1683961..f63c71e 100644 +index fb43b95..c39e470 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -395,6 +395,10 @@ if (MSVC) - list(APPEND CRYPTOPP_COMPILE_OPTIONS /FI winapifamily.h) +@@ -451,6 +451,10 @@ if (MSVC) + endif() endif () +if(WINDOWS_STORE) @@ -13,3 +13,17 @@ index 1683961..f63c71e 100644 # Enable PIC for all target machines except 32-bit i386 due to register pressures. if (NOT CRYPTOPP_I386) SET(CMAKE_POSITION_INDEPENDENT_CODE 1) +@@ -1022,10 +1026,10 @@ endif () + # add_compile_definitions added in CMake 3.12 + if (${CMAKE_VERSION} VERSION_LESS "3.12") + # https://stackoverflow.com/q/61250087 +- add_definitions("${CMAKE_CPP_FLAGS}" "${CMAKE_CXX_FLAGS}" "${CRYPTOPP_COMPILE_DEFINITIONS}" "${CRYPTOPP_COMPILE_OPTIONS}") ++ add_definitions(${CMAKE_CPP_FLAGS} ${CRYPTOPP_COMPILE_DEFINITIONS} ${CRYPTOPP_COMPILE_OPTIONS}) + else() +- add_compile_definitions("${CMAKE_CPP_FLAGS}" "${CRYPTOPP_COMPILE_DEFINITIONS}") +- add_compile_options("${CMAKE_CXX_FLAGS}" "${CRYPTOPP_COMPILE_OPTIONS}") ++ add_compile_definitions(${CRYPTOPP_COMPILE_DEFINITIONS}) ++ add_compile_options(${CMAKE_CPP_FLAGS} ${CRYPTOPP_COMPILE_OPTIONS}) + endif() + + #============================================================================ diff --git a/external_imported/vcpkg/ports/cryptopp/portfile.cmake b/external_imported/vcpkg/ports/cryptopp/portfile.cmake index 03612d305..584eb7144 100644 --- a/external_imported/vcpkg/ports/cryptopp/portfile.cmake +++ b/external_imported/vcpkg/ports/cryptopp/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH CMAKE_SOURCE_PATH REPO noloader/cryptopp-cmake - REF CRYPTOPP_8_5_0 - SHA512 758633786c81f5a34ade0ab99983b3262bb3a028b086e734b1f8ddb618c801453d517f67176178936f87ec36a91fca93fba9bcaec4301705138954e6eb49d136 + REF CRYPTOPP_8_6_0 + SHA512 655107b8a41e1e6603a6b3ed2ddc95fad22b646c071c7251c3c7e2151afe439de848679235a3790fe540263424324f06c922687719da6dfea341bc2a75337bdc HEAD_REF master PATCHES cmake.patch @@ -13,8 +13,8 @@ vcpkg_from_github( vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO weidai11/cryptopp - REF CRYPTOPP_8_5_0 - SHA512 e8dd210c9e9d4925edc456e4d68780deaa224d85e11394ad5da835dcb1a1e6b3e899aa473acf20449f9721116960884b6d88b29335479b305bb7e29faa87e6c0 + REF CRYPTOPP_8_6_0 + SHA512 ccb4baa6674cd830cddb779216ce702b3cdba6de8a3d627c218861507c36bddd2861b0d0e8cad35001a1e9f0c3d5020404684c87dd05d85264ac166fa7f70589 HEAD_REF master PATCHES patch.patch ) @@ -51,9 +51,8 @@ endif() # https://www.cryptopp.com/wiki/Visual_Studio#Dynamic_Runtime_Linking # https://www.cryptopp.com/wiki/Visual_Studio#The_DLL -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DBUILD_SHARED=OFF -DBUILD_STATIC=ON @@ -62,8 +61,8 @@ vcpkg_configure_cmake( -DDISABLE_ASM=${CRYPTOPP_DISABLE_ASM} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cryptopp) +vcpkg_cmake_install () +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cryptopp) # There is no way to suppress installation of the headers and resource files in debug build. file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/external_imported/vcpkg/ports/cryptopp/vcpkg.json b/external_imported/vcpkg/ports/cryptopp/vcpkg.json index e75fa2162..02ffa51b1 100644 --- a/external_imported/vcpkg/ports/cryptopp/vcpkg.json +++ b/external_imported/vcpkg/ports/cryptopp/vcpkg.json @@ -1,9 +1,18 @@ { "name": "cryptopp", - "version-string": "8.5.0", - "port-version": 1, + "version": "8.6.0", "description": "Crypto++ is a free C++ class library of cryptographic schemes.", "homepage": "https://github.com/weidai11/cryptopp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "pem-pack": { "description": "Crypto++ with PEM pack" diff --git a/external_imported/vcpkg/ports/cspice/CMakeLists.txt b/external_imported/vcpkg/ports/cspice/CMakeLists.txt index 899a94033..042a7af81 100644 --- a/external_imported/vcpkg/ports/cspice/CMakeLists.txt +++ b/external_imported/vcpkg/ports/cspice/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.1) project(cspice LANGUAGES C) -set(SOVERSION 66) +set(SOVERSION 67) # Include all *.c files from the library file(GLOB CSPICE_SOURCE ${PROJECT_SOURCE_DIR}/cspice/src/cspice/*.c) @@ -29,7 +29,7 @@ endif () if (NOT _SKIP_HEADERS) file(GLOB SPICE_HEADERS ${INCLUDE_PATH}/*.h) - install(FILES ${SPICE_HEADERS} DESTINATION include) + install(FILES ${SPICE_HEADERS} DESTINATION include/cspice) endif() set_target_properties( diff --git a/external_imported/vcpkg/ports/cspice/portfile.cmake b/external_imported/vcpkg/ports/cspice/portfile.cmake index 667785cac..33d481d7b 100644 --- a/external_imported/vcpkg/ports/cspice/portfile.cmake +++ b/external_imported/vcpkg/ports/cspice/portfile.cmake @@ -1,45 +1,35 @@ -if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_download_distfile(ARCHIVE - URLS "https://naif.jpl.nasa.gov/pub/naif/toolkit/C/PC_Windows_VisualC_32bit/packages/cspice.zip" - FILENAME "cspice_32bit.zip" - SHA512 4f6129b26543729f4eb4f8240b43ca87530db9c6d9a5c0e3f43faf30561eaad95dcf507e3fecfd1c3d4388ccaa4e22a76df7bf7945b6ce9a68eb3b4893885992 - ) - elseif (VCPKG_TARGET_IS_OSX) - vcpkg_download_distfile(ARCHIVE - URLS "https://naif.jpl.nasa.gov/pub/naif/toolkit//C/MacIntel_OSX_AppleC_32bit/packages/cspice.tar.Z" - FILENAME "cspice_32bit.tar.Z" - SHA512 bd5cc20206e48b3712c5077a2beb05c98cd58a25ce374ed363699a04998eb8ba93e42b5f7c2104c5296db95b3bccdc7cc9b6a2ba45875454d0c3914834aa4c42 - ) - else () - vcpkg_download_distfile(ARCHIVE - URLS "https://naif.jpl.nasa.gov/pub/naif/toolkit/C/PC_Linux_GCC_32bit/packages/cspice.tar.Z" - FILENAME "cspice_32bit.tar.Z" - SHA512 b387bc2cfca4deccc451d198af49564ea0b19cf665ba143d39196ed532639cbc11aad7e1d63f71f1bb88d72c0e6ac30757b6e1babca9e0ee3b92f9c205c1b908 - ) +if (VCPKG_TARGET_IS_WINDOWS) + if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(SUBPATH "PC_Windows_VisualC_32bit/packages/cspice.zip") + set(SHA512 1949fd12b30ca0e42f53311a97d8571e68737f6a667a56946d3415ee715dda0a1adca9bfc985b9b9447084189c50d261f2c00960cbe2ddf6a1d1d92cf8fa17ab) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(SUBPATH "PC_Windows_VisualC_64bit/packages/cspice.zip") + set(SHA512 5457f24279fb485b0ac92713dab026d1c1ed766a358fcf7d9ce3f70693e75da85a656e72b1ada4dc334e9e68d6c0eb42b2a31f3ad0c83b491dd3afc79e5cda98) + endif() +elseif(VCPKG_TARGET_IS_OSX) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(SUBPATH "MacIntel_OSX_AppleC_64bit/packages/cspice.tar.Z") + set(SHA512 ea9a32c763cd54303de180b4895a195cd5ef6774051f18a1812f2fff39adc0ca9d5dd7878853af40e766882e79a0f542a45139656fb79fb4b436c4bc5bdecddc) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(SUBPATH "MacM1_OSX_clang_64bit/packages/cspice.tar.Z") + set(SHA512 a64f028ec1935dbc7f8d03c903fbfa40cfff097ec4aa0ca4aa1d2ee08561833000e7caf99d6550b06d2a0874cbaf1767382e7a9aea6a39228f3eaa89c6c31a6d) endif() else() - if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_download_distfile(ARCHIVE - URLS "https://naif.jpl.nasa.gov/pub/naif/toolkit/C/PC_Windows_VisualC_64bit/packages/cspice.zip" - FILENAME "cspice_64bit.zip" - SHA512 7b5353c638fdba67ed2e9fd21c4f78ac56c0afba408caa70f910f23bb025f6dc822fbaa7d6d7fa277d1038f835e6a962563f4b11a6adf63150d48354959e3c62 - ) - elseif (VCPKG_TARGET_IS_OSX) - vcpkg_download_distfile(ARCHIVE - URLS "https://naif.jpl.nasa.gov/pub/naif/toolkit//C/MacIntel_OSX_AppleC_64bit/packages/cspice.tar.Z" - FILENAME "cspice_64bit.tar.Z" - SHA512 0d4ef95dfa65d127c1d6f9cf1f637d41ca6680660ee3003f357652f12ed9d04a21888ef796f347ba90354a445b5aea9ffca7dedc6c1617f253b0002683d54a0f - ) - else () - vcpkg_download_distfile(ARCHIVE - URLS "https://naif.jpl.nasa.gov/pub/naif/toolkit/C/PC_Linux_GCC_64bit/packages/cspice.tar.Z" - FILENAME "cspice_64bit.tar.Z" - SHA512 7d090e9196596436740b53180a7c6ca885c12e301771a83fc62d625a63691129c69012cb0385a6c8f246cc5edf1c1af57ffac8a9d766061e1bde8584c57c6ca4 - ) + if ((VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") OR (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")) + set(SUBPATH "PC_Linux_GCC_32bit/packages/cspice.tar.Z") + set(SHA512 22a6250376e9f98d75ecc8682c5432a07a89addc9812010ad97059491e2c19cab418d7aa3f591bded9df132fcfb6865686f0ecfe70821ad31061ae2f7b165f2b) + elseif((VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") OR (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")) + set(SUBPATH "PC_Linux_GCC_64bit/packages/cspice.tar.Z") + set(SHA512 59946f628284cd31c75a23c152d725ae7e01b179f97c52b98518eceeda54bc38875b1dd93dc17574c0bf00e706e0ee35d06ecb5d7871d49633baa8f16eb6c7c8) endif() endif() +set(VERSION 67) +set(URL "https://naif.jpl.nasa.gov/pub/naif/misc/toolkit_N00${VERSION}/C/${SUBPATH}") +get_filename_component(ext "${SUBPATH}" EXT) +string(SUBSTRING "${SHA512}" 0 6 subsha) +vcpkg_download_distfile(ARCHIVE URLS "${URL}" FILENAME "cspice-${subsha}${ext}" SHA512 "${SHA512}") + set(PATCHES isatty.patch) if (NOT VCPKG_TARGET_IS_WINDOWS) set(PATCHES ${PATCHES} mktemp.patch) @@ -63,14 +53,13 @@ if (VCPKG_TARGET_IS_UWP) set(VCPKG_CXX_FLAGS "/sdl- ${VCPKG_CXX_FLAGS}") endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -D_STATIC_BUILD=${_STATIC_BUILD} OPTIONS_DEBUG -D_SKIP_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/cspice/vcpkg.json b/external_imported/vcpkg/ports/cspice/vcpkg.json index abbf6dfaf..d84c24ae0 100644 --- a/external_imported/vcpkg/ports/cspice/vcpkg.json +++ b/external_imported/vcpkg/ports/cspice/vcpkg.json @@ -1,7 +1,19 @@ { "name": "cspice", - "version-string": "66", - "port-version": 5, + "version": "67", + "port-version": 2, "description": "NASA C SPICE toolkit", - "homepage": "https://naif.jpl.nasa.gov/naif/toolkit_C.html" + "homepage": "https://naif.jpl.nasa.gov/naif/toolkit_C.html", + "license": null, + "supports": "!((arm | arm64) & windows)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/ctemplate/vcpkg.json b/external_imported/vcpkg/ports/ctemplate/vcpkg.json index 2f3d6bd41..7a8c84bbf 100644 --- a/external_imported/vcpkg/ports/ctemplate/vcpkg.json +++ b/external_imported/vcpkg/ports/ctemplate/vcpkg.json @@ -1,7 +1,8 @@ { "name": "ctemplate", "version-date": "2020-09-14", - "port-version": 2, + "port-version": 3, "description": "C++ CTemplate system", - "homepage": "https://github.com/OlafvdSpek/ctemplate" + "homepage": "https://github.com/OlafvdSpek/ctemplate", + "supports": "!arm" } diff --git a/external_imported/vcpkg/ports/cub/fix-usage.patch b/external_imported/vcpkg/ports/cub/fix-usage.patch new file mode 100644 index 000000000..56801fdb9 --- /dev/null +++ b/external_imported/vcpkg/ports/cub/fix-usage.patch @@ -0,0 +1,24 @@ +diff --git a/cub/cmake/cub-config.cmake b/cub/cmake/cub-config.cmake +index 3d7f64b..213a95e 100644 +--- a/cub/cmake/cub-config.cmake ++++ b/cub/cmake/cub-config.cmake +@@ -8,6 +8,7 @@ if (TARGET CUB::CUB) + return() + endif() + ++include("${CMAKE_CURRENT_LIST_DIR}/cub-header-search.cmake") + function(_cub_declare_interface_alias alias_name ugly_name) + # 1) Only IMPORTED and ALIAS targets can be placed in a namespace. + # 2) When an IMPORTED library is linked to another target, its include +diff --git a/cub/cmake/cub-header-search.cmake.in b/cub/cmake/cub-header-search.cmake.in +index 2a46606..d2c38ef 100644 +--- a/cub/cmake/cub-header-search.cmake.in ++++ b/cub/cmake/cub-header-search.cmake.in +@@ -3,6 +3,6 @@ unset(_CUB_VERSION_INCLUDE_DIR CACHE) # Clear old result to force search + find_path(_CUB_VERSION_INCLUDE_DIR cub/version.cuh + NO_DEFAULT_PATH # Only search explicit paths below: + PATHS +- "${CMAKE_CURRENT_LIST_DIR}/../../../@CMAKE_INSTALL_INCLUDEDIR@" # Install tree ++ "${CMAKE_CURRENT_LIST_DIR}/../../@CMAKE_INSTALL_INCLUDEDIR@" # Install tree + ) + set_property(CACHE _CUB_VERSION_INCLUDE_DIR PROPERTY TYPE INTERNAL) diff --git a/external_imported/vcpkg/ports/cub/portfile.cmake b/external_imported/vcpkg/ports/cub/portfile.cmake index d15c623f8..69f73ad63 100644 --- a/external_imported/vcpkg/ports/cub/portfile.cmake +++ b/external_imported/vcpkg/ports/cub/portfile.cmake @@ -1,11 +1,31 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO NVlabs/cub - REF 7cdf6dfc7ed60e4f44d025b84ea8260755f298e6 #v1.12.0 - SHA512 aff3ba375a33844efdc57f8ba190e8880db6247bc1245340b2fe87f8933d3abfcbc7dcdffffd45cf00db4981cd2e37029061fca7161554a4c7c779a7d414aada + REF ed040d585c3237d706973d7ad290bfee40958270 #v1.16.0 + SHA512 81e0bacb0aa4ee7a1c86f3c12e3135a133579678d3530e0e0b8310f716d0355e5096925ac6de5865140a7aac08d974ea5169d47e34951b932a23965f74fe4ee6 HEAD_REF master + PATCHES fix-usage.patch ) -file(COPY ${SOURCE_PATH}/cub/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/cub) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCUB_ENABLE_INSTALL_RULES=ON + -DCUB_ENABLE_HEADER_TESTING=OFF + -DCUB_ENABLE_TESTING=OFF + -DCUB_ENABLE_EXAMPLES=OFF + -DCUB_ENABLE_CPP_DIALECT_IN_NAMES=ON +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cub) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/cub/cmake" + "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/lib" +) + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -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/cub/usage b/external_imported/vcpkg/ports/cub/usage new file mode 100644 index 000000000..bea0cf585 --- /dev/null +++ b/external_imported/vcpkg/ports/cub/usage @@ -0,0 +1,4 @@ +The package cub is header only and can be used from CMake via: + + find_package(cub CONFIG REQUIRED) + target_include_directories(main PRIVATE CUB::CUB) diff --git a/external_imported/vcpkg/ports/cub/vcpkg.json b/external_imported/vcpkg/ports/cub/vcpkg.json index 85f29e6fb..f6988759f 100644 --- a/external_imported/vcpkg/ports/cub/vcpkg.json +++ b/external_imported/vcpkg/ports/cub/vcpkg.json @@ -1,9 +1,18 @@ { "name": "cub", - "version": "1.12.0", + "version": "1.16.0", "description": "CUB is a flexible library of cooperative threadblock primitives and other utilities for CUDA kernel programming", "homepage": "https://github.com/NVIDIA/cub", + "license": "BSD-3-Clause", "dependencies": [ - "cuda" + "cuda", + { + "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 a448794d3..61a3ce96c 100644 --- a/external_imported/vcpkg/ports/cuda/vcpkg.json +++ b/external_imported/vcpkg/ports/cuda/vcpkg.json @@ -1,7 +1,9 @@ { "name": "cuda", - "version-string": "10.1", - "port-version": 8, + "version": "10.1", + "port-version": 10, "description": "A parallel computing platform and programming model", - "homepage": "https://developer.nvidia.com/cuda-toolkit" + "homepage": "https://developer.nvidia.com/cuda-toolkit", + "license": null, + "supports": "(windows & x64 & !uwp) | (linux & x64) | (linux & arm64)" } diff --git a/external_imported/vcpkg/ports/cudnn/vcpkg.json b/external_imported/vcpkg/ports/cudnn/vcpkg.json index 7c52ccc7a..50b47fe7a 100644 --- a/external_imported/vcpkg/ports/cudnn/vcpkg.json +++ b/external_imported/vcpkg/ports/cudnn/vcpkg.json @@ -1,10 +1,11 @@ { "name": "cudnn", "version": "7.6.5", - "port-version": 4, + "port-version": 5, "description": "NVIDIA's cuDNN deep neural network acceleration library.", "homepage": "https://developer.nvidia.com/cudnn", - "supports": "(windows | linux) & x64", + "license": null, + "supports": "(windows & x64 & !uwp) | (linux & x64) | (linux & arm64)", "dependencies": [ "cuda" ] diff --git a/external_imported/vcpkg/ports/curl/0002_fix_uwp.patch b/external_imported/vcpkg/ports/curl/0002_fix_uwp.patch index c1572624a..e31cb9fbf 100644 --- a/external_imported/vcpkg/ports/curl/0002_fix_uwp.patch +++ b/external_imported/vcpkg/ports/curl/0002_fix_uwp.patch @@ -2,15 +2,14 @@ diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 62b7b33..8a4bd71 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt -@@ -107,6 +107,10 @@ endif() - - target_link_libraries(${LIB_NAME} ${CURL_LIBS}) - -+if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") -+ add_definitions(-D_WINSOCK_DEPRECATED_NO_WARNINGS) -+endif() -+ - if(WIN32) - add_definitions(-D_USRDLL) - endif() - +@@ -115,6 +115,10 @@ if(CURL_HAS_LTO) + INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO TRUE) + endif() + ++if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") ++ set_property(TARGET ${LIB_NAME} APPEND PROPERTY COMPILE_DEFINITIONS "_WINSOCK_DEPRECATED_NO_WARNINGS") ++endif() ++ + if(WIN32) + if(BUILD_SHARED_LIBS) + set_property(TARGET ${LIB_NAME} APPEND PROPERTY COMPILE_DEFINITIONS "_USRDLL") diff --git a/external_imported/vcpkg/ports/curl/0005_remove_imp_suffix.patch b/external_imported/vcpkg/ports/curl/0005_remove_imp_suffix.patch index 83ec10513..e52da2585 100644 --- a/external_imported/vcpkg/ports/curl/0005_remove_imp_suffix.patch +++ b/external_imported/vcpkg/ports/curl/0005_remove_imp_suffix.patch @@ -2,13 +2,11 @@ diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 1d71e14..62b7b33 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt -@@ -128,7 +128,7 @@ if(CURL_HAS_LTO) - INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO TRUE) - endif() - --if(WIN32) -+if(WIN32 AND 0) - if(BUILD_SHARED_LIBS) - if(MSVC) - # Add "_imp" as a suffix before the extension to avoid conflicting with - # the statically linked "libcurl.lib" +@@ -125,7 +125,6 @@ if(WIN32) + if(MSVC) + # Add "_imp" as a suffix before the extension to avoid conflicting with + # the statically linked "libcurl.lib" +- set_target_properties(${LIB_NAME} PROPERTIES IMPORT_SUFFIX "_imp.lib") + endif() + endif() + endif() diff --git a/external_imported/vcpkg/ports/curl/0006_fix_tool_depends.patch b/external_imported/vcpkg/ports/curl/0006_fix_tool_depends.patch deleted file mode 100644 index a918b08e2..000000000 --- a/external_imported/vcpkg/ports/curl/0006_fix_tool_depends.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 26e3cfe..74d00dd 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -61,6 +61,8 @@ if(MSVC) - list(APPEND CURL_FILES curl.rc) - endif() - -+find_package(ZLIB REQUIRED) -+ - # CURL_FILES comes from Makefile.inc - add_executable( - ${EXE_NAME} -@@ -91,7 +93,7 @@ include_directories( - ) - - #Build curl executable --target_link_libraries(${EXE_NAME} libcurl ${CURL_LIBS}) -+target_link_libraries(${EXE_NAME} libcurl ${CURL_LIBS} ZLIB::ZLIB) - - ################################################################################ - diff --git a/external_imported/vcpkg/ports/curl/0007_disable_tool_export_curl_target.patch b/external_imported/vcpkg/ports/curl/0007_disable_tool_export_curl_target.patch deleted file mode 100644 index 689104a93..000000000 --- a/external_imported/vcpkg/ports/curl/0007_disable_tool_export_curl_target.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 74d00dd..5838805 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -103,8 +103,8 @@ target_link_libraries(${EXE_NAME} libcurl ${CURL_LIBS} ZLIB::ZLIB) - - #INCLUDE(ModuleInstall OPTIONAL) - --install(TARGETS ${EXE_NAME} EXPORT ${TARGETS_EXPORT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) --export(TARGETS ${EXE_NAME} -- APPEND FILE ${PROJECT_BINARY_DIR}/curl-target.cmake -- NAMESPACE ${PROJECT_NAME}:: --) -+install(TARGETS ${EXE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) -+#export(TARGETS ${EXE_NAME} -+# APPEND FILE ${PROJECT_BINARY_DIR}/curl-target.cmake -+# NAMESPACE ${PROJECT_NAME}:: -+#) diff --git a/external_imported/vcpkg/ports/curl/0011_fix_static_build.patch b/external_imported/vcpkg/ports/curl/0011_fix_static_build.patch deleted file mode 100644 index a50fa287f..000000000 --- a/external_imported/vcpkg/ports/curl/0011_fix_static_build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index 8a4bd71..1927fb0 100644 ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -111,7 +111,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - add_definitions(-D_WINSOCK_DEPRECATED_NO_WARNINGS) - endif() - --if(WIN32) -+if(WIN32 AND BUILD_SHARED_LIBS) - add_definitions(-D_USRDLL) - endif() - 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 9388f91a0..e1d59bf5d 100644 --- a/external_imported/vcpkg/ports/curl/0012-fix-dependency-idn2.patch +++ b/external_imported/vcpkg/ports/curl/0012-fix-dependency-idn2.patch @@ -7,7 +7,7 @@ index 9f6de81..6702845 100644 set(HAVE_LIBIDN2 OFF) if(USE_LIBIDN2) + set(HAVE_LIBIDN2 TRUE) -+ list(APPEND CURL_LIBS ${LIBIDN2_LIBRARIES}) ++ list(INSERT CURL_LIBS 0 ${LIBIDN2_LINK_LIBRARIES}) +elseif(0) check_library_exists_concat("idn2" idn2_lookup_ul HAVE_LIBIDN2) endif() diff --git a/external_imported/vcpkg/ports/curl/0020-fix-pc-file.patch b/external_imported/vcpkg/ports/curl/0020-fix-pc-file.patch index 73e042ca2..21eab0933 100644 --- a/external_imported/vcpkg/ports/curl/0020-fix-pc-file.patch +++ b/external_imported/vcpkg/ports/curl/0020-fix-pc-file.patch @@ -2,58 +2,14 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b2e428..ea430f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1462,7 +1462,26 @@ set(includedir "\${prefix}/include") +@@ -1505,7 +1505,9 @@ set(includedir "\${prefix}/include") set(LDFLAGS "${CMAKE_SHARED_LINKER_FLAGS}") set(LIBCURL_LIBS "") set(libdir "${CMAKE_INSTALL_PREFIX}/lib") -foreach(_lib ${CMAKE_C_IMPLICIT_LINK_LIBRARIES} ${CURL_LIBS}) -+function(flatten input output) -+ set(output_libs "${${output}}") -+ set(input_libs "${${input}}") -+ while(input_libs) -+ list(POP_BACK input_libs lib) -+ if(NOT "${lib}" IN_LIST output_libs) -+ if(TARGET "${lib}") -+ get_target_property(link_libs "${lib}" INTERFACE_LINK_LIBRARIES) -+ if(link_libs) -+ flatten(link_libs output_libs) -+ endif() -+ endif() -+ list(PREPEND output_libs "${lib}") -+ endif() -+ endwhile() -+ set("${output}" "${output_libs}" PARENT_SCOPE) -+endfunction() +set(CURL_LIBS_FLAT "") -+flatten(CURL_LIBS CURL_LIBS_FLAT) ++vcpkg_curl_flatten(CURL_LIBS CURL_LIBS_FLAT) +foreach(_lib ${CURL_LIBS_FLAT}) if(TARGET "${_lib}") set(_libname "${_lib}") get_target_property(_imported "${_libname}" IMPORTED) -@@ -1503,12 +1523,26 @@ foreach(_lib ${CMAKE_C_IMPLICIT_LINK_LIBRARIES} ${CURL_LIBS}) - # Assume the user won't need this information in the .pc file. - continue() - endif() -+ set(_lib NOTFOUND) -+ if(DEFINED CMAKE_BUILD_TYPE) -+ string(TOUPPER "${CMAKE_BUILD_TYPE}" config) -+ get_target_property(_lib "${_libname}" IMPORTED_LOCATION_${config}) -+ endif() -+ if(NOT _lib) - get_target_property(_lib "${_libname}" LOCATION) -+ endif() - if(NOT _lib) - message(WARNING "Bad lib in library list: ${_libname}") - continue() - endif() - endif() -+ if(_lib MATCHES "^(.*)/([^/]*)[.]framework$") -+ if(CMAKE_MATCH_1 IN_LIST CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES) -+ set(_lib "-framework ${CMAKE_MATCH_2}") -+ else() -+ set(_lib "-framework ${_lib}") -+ endif() -+ endif() - if(_lib MATCHES ".*/.*" OR _lib MATCHES "^-") - set(LIBCURL_LIBS "${LIBCURL_LIBS} ${_lib}") - else() diff --git a/external_imported/vcpkg/ports/curl/0022-deduplicate-libs.patch b/external_imported/vcpkg/ports/curl/0022-deduplicate-libs.patch index bd027d4cb..16cc0498a 100644 --- a/external_imported/vcpkg/ports/curl/0022-deduplicate-libs.patch +++ b/external_imported/vcpkg/ports/curl/0022-deduplicate-libs.patch @@ -10,16 +10,3 @@ index 09d82f1..f0d99e6 100644 endif() # "a" (Linux) or "lib" (Windows) string(REPLACE "." "" libext "${CMAKE_STATIC_LIBRARY_SUFFIX}") -diff --git a/curl-config.in b/curl-config.in -index 8b4a29a..e756ae8 100644 ---- a/curl-config.in -+++ b/curl-config.in -@@ -172,7 +172,7 @@ while test $# -gt 0; do - - --static-libs) - if test "X@ENABLE_STATIC@" != "Xno" ; then -- echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_LIBS@ -+ echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_NO_SHARED@ - else - echo "curl was built with static libraries disabled" >&2 - exit 1 diff --git a/external_imported/vcpkg/ports/curl/0023-fix-static-libs-export.patch b/external_imported/vcpkg/ports/curl/0023-fix-static-libs-export.patch deleted file mode 100644 index de12b38b5..000000000 --- a/external_imported/vcpkg/ports/curl/0023-fix-static-libs-export.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 158d7a5..ae7b388 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1534,6 +1534,9 @@ foreach(_lib ${CURL_LIBS_FLAT}) - set(_lib "-framework ${_lib}") - endif() - endif() -+ if(_lib MATCHES ".*/${CMAKE_STATIC_LIBRARY_PREFIX}([^/]*)${CMAKE_STATIC_LIBRARY_SUFFIX}") -+ set(_lib -l${CMAKE_MATCH_1}) -+ endif() - if(_lib MATCHES ".*/.*" OR _lib MATCHES "^-") - set(LIBCURL_LIBS "${LIBCURL_LIBS} ${_lib}") - else() diff --git a/external_imported/vcpkg/ports/curl/cmake-project-include.cmake b/external_imported/vcpkg/ports/curl/cmake-project-include.cmake new file mode 100644 index 000000000..27254864c --- /dev/null +++ b/external_imported/vcpkg/ports/curl/cmake-project-include.cmake @@ -0,0 +1,82 @@ +# Process the libs and targets in the variable named by `input` +# into a flat list of libs in the variable named by `output`. +# Simplify -framework elements. +# Use -l where possible. +# Avoid duplicates. +function(vcpkg_curl_flatten input output) + set(output_libs "${${output}}") + if(CMAKE_BUILD_TYPE STREQUAL "Debug") + string(REGEX REPLACE ";optimized;[^;]*|;debug" "" input_libs "VCPKG;${${input}}") + else() + string(REGEX REPLACE ";debug;[^;]*|;optimized" "" input_libs "VCPKG;${${input}}") + endif() + list(REMOVE_AT input_libs 0) + while(input_libs) + list(POP_BACK input_libs lib) + if(TARGET "${lib}") + set(import_lib "") + set(import_location "") + get_target_property(type "${lib}" TYPE) + if(NOT type STREQUAL "INTERFACE_LIBRARY") + if(CMAKE_BUILD_TYPE STREQUAL "Debug") + get_target_property(link_libs "${lib}" IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG) + get_target_property(import_lib "${lib}" IMPORTED_IMPLIB_DEBUG) + get_target_property(import_location "${lib}" IMPORTED_LOCATION_DEBUG) + else() + get_target_property(link_libs "${lib}" IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE) + get_target_property(import_lib "${lib}" IMPORTED_IMPLIB_RELEASE) + get_target_property(import_location "${lib}" IMPORTED_LOCATION_RELEASE) + endif() + if(link_libs) + vcpkg_curl_flatten(link_libs output_libs) + endif() + get_target_property(link_libs "${lib}" IMPORTED_LINK_INTERFACE_LIBRARIES) + if(link_libs) + vcpkg_curl_flatten(link_libs output_libs) + endif() + if(NOT import_lib) + get_target_property(import_lib "${lib}" IMPORTED_IMPLIB) + endif() + if(NOT import_location) + get_target_property(import_location "${lib}" IMPORTED_LOCATION) + endif() + endif() + get_target_property(link_libs "${lib}" INTERFACE_LINK_LIBRARIES) + if(link_libs) + vcpkg_curl_flatten(link_libs output_libs) + endif() + if(import_lib) + set(lib "${import_lib}") + elseif(import_location) + set(lib "${import_location}") + endif() + endif() + if(lib MATCHES "^(.*)/([^/]*)[.]framework$") + if(CMAKE_MATCH_1 IN_LIST CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES) + set(lib "-framework ${CMAKE_MATCH_2}") + else() + set(lib "-framework ${lib}") + endif() + elseif(WIN32 AND lib MATCHES ".*/${CMAKE_IMPORT_LIBRARY_PREFIX}([^/]*)${CMAKE_IMPORT_LIBRARY_SUFFIX}") + set(lib -l${CMAKE_MATCH_1}) + elseif(lib MATCHES ".*/${CMAKE_STATIC_LIBRARY_PREFIX}([^/]*)${CMAKE_STATIC_LIBRARY_SUFFIX}") + set(lib -l${CMAKE_MATCH_1}) + endif() + if(NOT "${lib}" IN_LIST output_libs) + list(PREPEND output_libs "${lib}") + endif() + endwhile() + set("${output}" "${output_libs}" PARENT_SCOPE) +endfunction() + +if(CURL_USE_LIBSSH2) + find_package(Libssh2 CONFIG REQUIRED) + set(LIBSSH2_FOUND TRUE) + get_target_property(LIBSSH2_INCLUDE_DIR Libssh2::libssh2 INTERFACE_INCLUDE_DIRECTORIES) + set(LIBSSH2_LIBRARY Libssh2::libssh2) +endif() + +if(USE_LIBIDN2) + find_package(PkgConfig REQUIRED) + pkg_check_modules(LIBIDN2 REQUIRED libidn2) +endif() diff --git a/external_imported/vcpkg/ports/curl/export-components.patch b/external_imported/vcpkg/ports/curl/export-components.patch new file mode 100644 index 000000000..1a727e5de --- /dev/null +++ b/external_imported/vcpkg/ports/curl/export-components.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 874a237..3974956 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1617,8 +1617,17 @@ if(CURL_ENABLE_EXPORT_TARGET) + ) + endif() + ++set(components_file "${CMAKE_CURRENT_BINARY_DIR}/CURLConfigComponents.cmake") ++file(CONFIGURE OUTPUT "${components_file}" CONTENT [[ ++foreach(z_vcpkg_curl_component IN ITEMS @SUPPORT_FEATURES@ @SUPPORT_PROTOCOLS@) ++ if(z_vcpkg_curl_component MATCHES "^[-_a-zA-Z0-9]*$") ++ set(CURL_${z_vcpkg_curl_component}_FOUND TRUE) ++ endif() ++endforeach() ++]] @ONLY) ++ + install( +- FILES ${version_config} ${project_config} ++ FILES ${version_config} ${project_config} ${components_file} + DESTINATION ${CURL_INSTALL_CMAKE_DIR} + ) + diff --git a/external_imported/vcpkg/ports/curl/mbedtls-ws2_32.patch b/external_imported/vcpkg/ports/curl/mbedtls-ws2_32.patch new file mode 100644 index 000000000..37e4f18c9 --- /dev/null +++ b/external_imported/vcpkg/ports/curl/mbedtls-ws2_32.patch @@ -0,0 +1,14 @@ +diff --git a/CMake/FindMbedTLS.cmake b/CMake/FindMbedTLS.cmake +index 7bdb197..c8c5a73 100644 +--- a/CMake/FindMbedTLS.cmake ++++ b/CMake/FindMbedTLS.cmake +@@ -26,6 +26,9 @@ find_library(MBEDX509_LIBRARY mbedx509) + find_library(MBEDCRYPTO_LIBRARY mbedcrypto) + + set(MBEDTLS_LIBRARIES "${MBEDTLS_LIBRARY}" "${MBEDX509_LIBRARY}" "${MBEDCRYPTO_LIBRARY}") ++if(WIN32) ++ list(APPEND MBEDTLS_LIBRARIES ws2_32) ++endif() + + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(MbedTLS DEFAULT_MSG diff --git a/external_imported/vcpkg/ports/curl/portfile.cmake b/external_imported/vcpkg/ports/curl/portfile.cmake index ce8b75705..f81d0c491 100644 --- a/external_imported/vcpkg/ports/curl/portfile.cmake +++ b/external_imported/vcpkg/ports/curl/portfile.cmake @@ -1,20 +1,18 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO curl/curl - REF 9e560d11aad028de74addc0d1edfefa5667884f4 #curl-7_80_0 - SHA512 f920f151e31f26de8d9a0f8f22aebe98435b0165c52bc169a1204f84f38671dea1eaa2833feceb8495e619b8b9becac0c8ad335ec6fe0c2c59e458bf9014c6c2 + REF curl-7_82_0 + SHA512 5b42e3c520e540059113fb4a5da2bbb82a4eea88e05ba17d661ab04e16e4b1f5f0ac2d16e51e17c9c2c4f5aca07e23015564a11bd0d034e1544c6f603b800c21 HEAD_REF master PATCHES 0002_fix_uwp.patch 0005_remove_imp_suffix.patch - 0006_fix_tool_depends.patch - 0007_disable_tool_export_curl_target.patch - 0011_fix_static_build.patch 0012-fix-dependency-idn2.patch 0020-fix-pc-file.patch 0021-normaliz.patch # for mingw on case-sensitive file system 0022-deduplicate-libs.patch - 0023-fix-static-libs-export.patch + mbedtls-ws2_32.patch + export-components.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CURL_STATICLIB) @@ -40,15 +38,15 @@ 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 - openssl CMAKE_USE_OPENSSL - mbedtls CMAKE_USE_MBEDTLS - ssh CMAKE_USE_LIBSSH2 + openssl CURL_USE_OPENSSL + mbedtls CURL_USE_MBEDTLS + ssh CURL_USE_LIBSSH2 tool BUILD_CURL_EXE c-ares ENABLE_ARES sspi CURL_WINDOWS_SSPI brotli CURL_BROTLI - schannel CMAKE_USE_SCHANNEL - sectransp CMAKE_USE_SECTRANSP + schannel CURL_USE_SCHANNEL + sectransp CURL_USE_SECTRANSP idn2 USE_LIBIDN2 winidn USE_WIN32_IDN winldap USE_WIN32_LDAP @@ -57,23 +55,21 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS winldap CURL_DISABLE_LDAP # Only WinLDAP support ATM ) +set(OPTIONS "") set(OPTIONS_RELEASE "") set(OPTIONS_DEBUG "") if("idn2" IN_LIST FEATURES) - x_vcpkg_pkgconfig_get_modules(PREFIX libidn2 MODULES libidn2 LIBS) - list(APPEND OPTIONS_RELEASE "-DLIBIDN2_LIBRARIES=${libidn2_LIBS_RELEASE}") - list(APPEND OPTIONS_DEBUG "-DLIBIDN2_LIBRARIES=${libidn2_LIBS_DEBUG}") + vcpkg_find_acquire_program(PKGCONFIG) + list(APPEND OPTIONS "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}") endif() -set(SECTRANSP_OPTIONS "") if("sectransp" IN_LIST FEATURES) - set(SECTRANSP_OPTIONS -DCURL_CA_PATH=none) + list(APPEND OPTIONS -DCURL_CA_PATH=none) endif() # UWP targets -set(UWP_OPTIONS "") if(VCPKG_TARGET_IS_UWP) - set(UWP_OPTIONS + list(APPEND OPTIONS -DCURL_DISABLE_TELNET=ON -DENABLE_IPV6=OFF -DENABLE_UNIX_SOCKETS=OFF @@ -83,9 +79,9 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake" ${FEATURE_OPTIONS} - ${UWP_OPTIONS} - ${SECTRANSP_OPTIONS} + ${OPTIONS} -DBUILD_TESTING=OFF -DENABLE_MANUAL=OFF -DCURL_STATICLIB=${CURL_STATICLIB} @@ -133,6 +129,7 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/curl-config") endif() 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") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") diff --git a/external_imported/vcpkg/ports/curl/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/curl/vcpkg-cmake-wrapper.cmake index 955d9353a..526cb515c 100644 --- a/external_imported/vcpkg/ports/curl/vcpkg-cmake-wrapper.cmake +++ b/external_imported/vcpkg/ports/curl/vcpkg-cmake-wrapper.cmake @@ -1,14 +1,16 @@ -list(REMOVE_ITEM ARGS "NO_MODULE") -list(REMOVE_ITEM ARGS "CONFIG") -list(REMOVE_ITEM ARGS "MODULE") - +cmake_policy(PUSH) cmake_policy(SET CMP0012 NEW) +cmake_policy(SET CMP0054 NEW) +cmake_policy(SET CMP0057 NEW) -_find_package(${ARGS} CONFIG) +if(NOT CMAKE_VERSION VERSION_LESS 3.14 AND COMPONENTS IN_LIST ARGS) + include("${CMAKE_CURRENT_LIST_DIR}/CURLConfigComponents.cmake") +endif() -if(TARGET CURL::libcurl) - set(CURL_FOUND TRUE) +list(REMOVE_ITEM ARGS "NO_MODULE" "CONFIG" "MODULE") +_find_package(${ARGS} CONFIG) +if(CURL_FOUND) get_target_property(_curl_include_dirs CURL::libcurl INTERFACE_INCLUDE_DIRECTORIES) get_target_property(_curl_link_libraries CURL::libcurl INTERFACE_LINK_LIBRARIES) @@ -23,7 +25,11 @@ if(TARGET CURL::libcurl) endif() if(NOT _curl_link_libraries) - set(_curl_link_libraries) + set(_curl_link_libraries "") + endif() + + if("Libssh2::libssh2" IN_LIST _curl_link_libraries) + find_package(Libssh2 CONFIG QUIET) endif() set(CURL_INCLUDE_DIRS "${_curl_include_dirs}") @@ -37,8 +43,9 @@ if(TARGET CURL::libcurl) set(CURL_LIBRARIES ${CURL_LIBRARY} ${_curl_link_libraries}) set(CURL_VERSION_STRING "${CURL_VERSION}") - set(_curl_include_dirs) - set(_curl_link_libraries) - set(_curl_location_debug) - set(_curl_location_release) + unset(_curl_include_dirs) + unset(_curl_link_libraries) + unset(_curl_location_debug) + unset(_curl_location_release) endif() +cmake_policy(POP) diff --git a/external_imported/vcpkg/ports/curl/vcpkg.json b/external_imported/vcpkg/ports/curl/vcpkg.json index 63879df0f..fd52ac394 100644 --- a/external_imported/vcpkg/ports/curl/vcpkg.json +++ b/external_imported/vcpkg/ports/curl/vcpkg.json @@ -1,8 +1,9 @@ { "name": "curl", - "version": "7.80.0", + "version": "7.82.0", "description": "A library for transferring data with URLs", - "homepage": "https://github.com/curl/curl", + "homepage": "https://curl.se/", + "license": null, "dependencies": [ { "name": "vcpkg-cmake", @@ -68,11 +69,7 @@ "idn2": { "description": "idn2 support (libidn2)", "dependencies": [ - "libidn2", - { - "name": "vcpkg-pkgconfig-get-modules", - "host": true - } + "libidn2" ] }, "mbedtls": { diff --git a/external_imported/vcpkg/ports/curlpp/portfile.cmake b/external_imported/vcpkg/ports/curlpp/portfile.cmake index f52c2b575..8a2652fc4 100644 --- a/external_imported/vcpkg/ports/curlpp/portfile.cmake +++ b/external_imported/vcpkg/ports/curlpp/portfile.cmake @@ -24,13 +24,17 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin" ) -elseif(VCPKG_TARGET_IS_WINDOWS) +endif() + +if(VCPKG_TARGET_IS_WINDOWS AND NOT (VCPKG_LIBRARY_LINKAGE STREQUAL static)) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/curlpp-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/..") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/curlpp-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..") + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/curlpp-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..") + endif() endif() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -file(INSTALL "${SOURCE_PATH}/doc/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}") +file(INSTALL "${SOURCE_PATH}/doc/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/curlpp/vcpkg.json b/external_imported/vcpkg/ports/curlpp/vcpkg.json index 0fbbe9fe6..00b45a3f3 100644 --- a/external_imported/vcpkg/ports/curlpp/vcpkg.json +++ b/external_imported/vcpkg/ports/curlpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "curlpp", "version-date": "2018-06-15", - "port-version": 6, + "port-version": 7, "description": "C++ wrapper around libcURL", "dependencies": [ "curl", diff --git a/external_imported/vcpkg/ports/darknet/portfile.cmake b/external_imported/vcpkg/ports/darknet/portfile.cmake index cd1f9716f..5274e101b 100644 --- a/external_imported/vcpkg/ports/darknet/portfile.cmake +++ b/external_imported/vcpkg/ports/darknet/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AlexeyAB/darknet - REF 5853e51d604712918bd2fb23bab0ec82d19a88f9 - SHA512 d61e94209d66db3b71ad14d83c83a4d562879119b67881e9eacc60efb16e44496b291000c8c545055db5ae0e542cfb149fdbed2058584962fa52b604353ddccd + REF 8a0bf84c19e38214219dbd3345f04ce778426c57 + SHA512 6253d5b498f4f6eba7fc539d5a4b4e163139f4841623f11d84760bcf1ffabe6519f85e98e3d4aeac6846313fea3b98451407134b6b6f5b91137c62d1647109d9 HEAD_REF master ) @@ -26,39 +26,38 @@ if ("cuda" IN_LIST FEATURES) 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}/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") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE - PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} -DINSTALL_BIN_DIR:STRING=bin -DINSTALL_LIB_DIR:STRING=lib -DENABLE_OPENCV:BOOL=${ENABLE_OPENCV} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_tools(AUTO_CLEAN TOOL_NAMES darknet uselib) if ("opencv-cuda" IN_LIST FEATURES OR "opencv3-cuda" IN_LIST FEATURES) vcpkg_copy_tools(AUTO_CLEAN TOOL_NAMES uselib_track) endif() -file(COPY ${SOURCE_PATH}/cfg DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) -file(COPY ${SOURCE_PATH}/data DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) +file(COPY "${SOURCE_PATH}/cfg" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +file(COPY "${SOURCE_PATH}/data" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -vcpkg_fixup_cmake_targets() +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(INSTALL ${SOURCE_PATH}/scripts/download_weights.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}/scripts) +file(INSTALL "${SOURCE_PATH}/scripts/download_weights.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/scripts") message(STATUS "To download weight files, please go to ${CURRENT_INSTALLED_DIR}/tools/${PORT}/scripts and run ./download_weights.ps1") -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/darknet/vcpkg.json b/external_imported/vcpkg/ports/darknet/vcpkg.json index d599397c6..0f4c99a52 100644 --- a/external_imported/vcpkg/ports/darknet/vcpkg.json +++ b/external_imported/vcpkg/ports/darknet/vcpkg.json @@ -1,12 +1,20 @@ { "name": "darknet", - "version-date": "2021-04-16", - "port-version": 1, + "version-date": "2022-03-06", "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, "dependencies": [ "pthreads", - "stb" + "stb", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "cuda": { diff --git a/external_imported/vcpkg/ports/date/fix-uninitialized-values.patch b/external_imported/vcpkg/ports/date/fix-uninitialized-values.patch new file mode 100644 index 000000000..422696e70 --- /dev/null +++ b/external_imported/vcpkg/ports/date/fix-uninitialized-values.patch @@ -0,0 +1,40 @@ +diff --git a/include/date/date.h b/include/date/date.h +index 9c6f335..3967d6b 100644 +--- a/include/date/date.h ++++ b/include/date/date.h +@@ -6767,7 +6767,7 @@ from_stream(std::basic_istream& is, const CharT* fmt, + CONSTDATA auto w = Duration::period::den == 1 ? 2 : 3 + dfs::width; + int tH; + int tM; +- long double S; ++ long double S{}; + read(is, ru{tH, 1, 2}, CharT{':'}, ru{tM, 1, 2}, + CharT{':'}, rld{S, 1, w}); + checked_set(H, tH, not_a_hour, is); +@@ -7202,7 +7202,7 @@ from_stream(std::basic_istream& is, const CharT* fmt, + // "%I:%M:%S %p" + using dfs = detail::decimal_format_seconds; + CONSTDATA auto w = Duration::period::den == 1 ? 2 : 3 + dfs::width; +- long double S; ++ long double S{}; + int tI = not_a_hour_12_value; + int tM = not_a_minute; + read(is, ru{tI, 1, 2}, CharT{':'}, ru{tM, 1, 2}, +@@ -7258,7 +7258,7 @@ from_stream(std::basic_istream& is, const CharT* fmt, + { + using dfs = detail::decimal_format_seconds; + CONSTDATA auto w = Duration::period::den == 1 ? 2 : 3 + dfs::width; +- long double S; ++ long double S{}; + read(is, rld{S, 1, width == -1 ? w : static_cast(width)}); + checked_set(s, round_i(duration{S}), + not_a_second, is); +@@ -7292,7 +7292,7 @@ from_stream(std::basic_istream& is, const CharT* fmt, + CONSTDATA auto w = Duration::period::den == 1 ? 2 : 3 + dfs::width; + int tH = not_a_hour; + int tM = not_a_minute; +- long double S; ++ long double S{}; + read(is, ru{tH, 1, 2}, CharT{':'}, ru{tM, 1, 2}, + CharT{':'}, rld{S, 1, w}); + checked_set(H, tH, not_a_hour, is); diff --git a/external_imported/vcpkg/ports/date/portfile.cmake b/external_imported/vcpkg/ports/date/portfile.cmake index 0882961fc..876e0529f 100644 --- a/external_imported/vcpkg/ports/date/portfile.cmake +++ b/external_imported/vcpkg/ports/date/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_from_github( PATCHES 0001-fix-uwp.patch 0002-fix-cmake-3.14.patch + fix-uninitialized-values.patch #Update the new version please remove this patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/external_imported/vcpkg/ports/date/vcpkg.json b/external_imported/vcpkg/ports/date/vcpkg.json index 5b2aa172d..35e75e421 100644 --- a/external_imported/vcpkg/ports/date/vcpkg.json +++ b/external_imported/vcpkg/ports/date/vcpkg.json @@ -1,7 +1,7 @@ { "name": "date", "version": "3.0.1", - "port-version": 1, + "port-version": 2, "description": "A date and time library based on the C++17 header", "homepage": "https://github.com/HowardHinnant/date", "dependencies": [ diff --git a/external_imported/vcpkg/ports/dav1d/portfile.cmake b/external_imported/vcpkg/ports/dav1d/portfile.cmake index cc109ff43..cd7276225 100644 --- a/external_imported/vcpkg/ports/dav1d/portfile.cmake +++ b/external_imported/vcpkg/ports/dav1d/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "x86" ON_TARGET "uwp") - vcpkg_from_gitlab( GITLAB_URL https://code.videolan.org OUT_SOURCE_PATH SOURCE_PATH diff --git a/external_imported/vcpkg/ports/dav1d/vcpkg.json b/external_imported/vcpkg/ports/dav1d/vcpkg.json index 7863c3c4d..0a10cfc65 100644 --- a/external_imported/vcpkg/ports/dav1d/vcpkg.json +++ b/external_imported/vcpkg/ports/dav1d/vcpkg.json @@ -1,7 +1,7 @@ { "name": "dav1d", "version-semver": "0.8.2", - "port-version": 2, + "port-version": 3, "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", "supports": "!(uwp | arm | x86)", diff --git a/external_imported/vcpkg/ports/dbghelp/portfile.cmake b/external_imported/vcpkg/ports/dbghelp/portfile.cmake index 832bec6d7..1b902cff3 100644 --- a/external_imported/vcpkg/ports/dbghelp/portfile.cmake +++ b/external_imported/vcpkg/ports/dbghelp/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "OSX" "Linux") vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_get_windows_sdk(WINDOWS_SDK) diff --git a/external_imported/vcpkg/ports/dbghelp/vcpkg.json b/external_imported/vcpkg/ports/dbghelp/vcpkg.json index cb7786a83..85c4d7c8f 100644 --- a/external_imported/vcpkg/ports/dbghelp/vcpkg.json +++ b/external_imported/vcpkg/ports/dbghelp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "dbghelp", - "version-string": "0.0", - "port-version": 1, + "version": "0", + "port-version": 2, "description": "Windows Debug Help Library", "supports": "windows" } diff --git a/external_imported/vcpkg/ports/dcmtk/vcpkg.json b/external_imported/vcpkg/ports/dcmtk/vcpkg.json index 10616156b..8f0d893d0 100644 --- a/external_imported/vcpkg/ports/dcmtk/vcpkg.json +++ b/external_imported/vcpkg/ports/dcmtk/vcpkg.json @@ -1,8 +1,9 @@ { "name": "dcmtk", - "version-string": "3.6.6", - "port-version": 2, + "version": "3.6.6", + "port-version": 3, "description": "This DICOM ToolKit (DCMTK) package consists of source code, documentation and installation instructions for a set of software libraries and applications implementing part of the DICOM/MEDICOM Standard.", + "supports": "!arm", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/detours/portfile.cmake b/external_imported/vcpkg/ports/detours/portfile.cmake index c09d61b7f..f583d287c 100644 --- a/external_imported/vcpkg/ports/detours/portfile.cmake +++ b/external_imported/vcpkg/ports/detours/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_from_github( ) vcpkg_build_nmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH "src" PROJECT_NAME "Makefile" OPTIONS "PROCESSOR_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE}" diff --git a/external_imported/vcpkg/ports/detours/vcpkg.json b/external_imported/vcpkg/ports/detours/vcpkg.json index 269215381..ba134218d 100644 --- a/external_imported/vcpkg/ports/detours/vcpkg.json +++ b/external_imported/vcpkg/ports/detours/vcpkg.json @@ -1,7 +1,8 @@ { "name": "detours", - "version-string": "4.0.1", - "port-version": 4, + "version": "4.0.1", + "port-version": 5, "description": "Detours is a software package for monitoring and instrumenting API calls on Windows.", - "homepage": "https://github.com/microsoft/Detours" + "homepage": "https://github.com/microsoft/Detours", + "supports": "windows" } diff --git a/external_imported/vcpkg/ports/devicenameresolver/portfile.cmake b/external_imported/vcpkg/ports/devicenameresolver/portfile.cmake index c62478202..b08e2f681 100644 --- a/external_imported/vcpkg/ports/devicenameresolver/portfile.cmake +++ b/external_imported/vcpkg/ports/devicenameresolver/portfile.cmake @@ -9,20 +9,17 @@ vcpkg_from_bitbucket( PATCHES add-string-headfile.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(READ ${CURRENT_PACKAGES_DIR}/include/DeviceNameResolver.h _contents) -string(REPLACE "__declspec(dllexport)" "" _contents "${_contents}") -file(WRITE ${CURRENT_PACKAGES_DIR}/include/DeviceNameResolver.h "${_contents}") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/DeviceNameResolver.h" "__declspec(dllexport)" "") -file(INSTALL ${SOURCE_PATH}/readme.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/devicenameresolver RENAME copyright) +file(INSTALL "${SOURCE_PATH}/readme.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/devicenameresolver" RENAME copyright) diff --git a/external_imported/vcpkg/ports/devicenameresolver/vcpkg.json b/external_imported/vcpkg/ports/devicenameresolver/vcpkg.json index b52d9c4fd..0647d0831 100644 --- a/external_imported/vcpkg/ports/devicenameresolver/vcpkg.json +++ b/external_imported/vcpkg/ports/devicenameresolver/vcpkg.json @@ -1,6 +1,13 @@ { "name": "devicenameresolver", "version-string": "2016-06-26-0850d88fa6", - "port-version": 2, - "description": "a little library that resolves a path from a (virtual) device name." + "port-version": 3, + "description": "a little library that resolves a path from a (virtual) device name.", + "supports": "windows & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/dimcli/fix-build.patch b/external_imported/vcpkg/ports/dimcli/fix-build.patch new file mode 100644 index 000000000..0ec5659c8 --- /dev/null +++ b/external_imported/vcpkg/ports/dimcli/fix-build.patch @@ -0,0 +1,39 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 509e634..8b5a30b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -392,7 +392,7 @@ if(MSVC) + set(CMAKE_CXX_FLAGS "\ + /EHsc /GF /nologo /std:c++latest /utf-8 /W4 /WX \ + /Zc:inline /Zc:rvalueCast /Zc:strictStrings \ +- /Fa$(IntDir)") ++ /Fa${CMAKE_SOURCE_DIR}/libs/dimcli") + if(NOT MSVC_VERSION LESS 1910) + # /permissive- // reject non-conforming backward compatibility-isms + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /permissive-") +@@ -431,8 +431,8 @@ elseif(CMAKE_COMPILER_IS_GNUCXX) + if(BUILD_COVERAGE) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage") + endif() +-elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang) ++elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") + if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1z") + else() +@@ -533,7 +533,6 @@ endforeach() + # test targets + if(BUILD_TESTING) + enable_testing() +-endif() + file(GLOB allnames tests/*) + foreach(var ${allnames}) + if(IS_DIRECTORY "${var}") +@@ -548,6 +547,7 @@ foreach(var ${allnames}) + endif() + endif() + endforeach() ++endif() + + # update deps file + update_deps_file(${deps}) diff --git a/external_imported/vcpkg/ports/dimcli/portfile.cmake b/external_imported/vcpkg/ports/dimcli/portfile.cmake index ceb07c044..af02f7705 100644 --- a/external_imported/vcpkg/ports/dimcli/portfile.cmake +++ b/external_imported/vcpkg/ports/dimcli/portfile.cmake @@ -4,22 +4,25 @@ vcpkg_from_github( REF a4dbb4b1c8a3825fc304bbbad3438dbe1840feae # v5.0.2 SHA512 25cc9002fd46856854545934f385d8578f207b1ce01802a172e49e008cdf1db0db11db7cefeef18258b99c13570af9193e83f5826613d8b0a118d7bae3f0d03f HEAD_REF master + PATCHES fix-build.patch ) -set(staticCrt OFF) -if(VCPKG_CRT_LINKAGE STREQUAL "static") - set(staticCrt ON) -endif() +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" staticCrt) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE OPTIONS -DLINK_STATIC_RUNTIME:BOOL=${staticCrt} -DINSTALL_LIBS:BOOL=ON -DBUILD_PROJECT_NAME=dimcli + -DBUILD_TESTING=OFF + -DINSTALL_TOOLS=OFF + -DINSTALL_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_copy_pdbs() # Remove includes from ${CMAKE_INSTALL_PREFIX}/debug file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/external_imported/vcpkg/ports/dimcli/vcpkg.json b/external_imported/vcpkg/ports/dimcli/vcpkg.json index 6845445db..3de3fc1b4 100644 --- a/external_imported/vcpkg/ports/dimcli/vcpkg.json +++ b/external_imported/vcpkg/ports/dimcli/vcpkg.json @@ -1,7 +1,14 @@ { "name": "dimcli", "version-semver": "5.0.2", - "port-version": 2, + "port-version": 3, "description": "C++ command line parser toolkit", - "homepage": "https://github.com/gknowles/dimcli" + "homepage": "https://github.com/gknowles/dimcli", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/directx-headers/portfile.cmake b/external_imported/vcpkg/ports/directx-headers/portfile.cmake index 8d1bb0beb..93ec93f09 100644 --- a/external_imported/vcpkg/ports/directx-headers/portfile.cmake +++ b/external_imported/vcpkg/ports/directx-headers/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "OSX") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectX-Headers diff --git a/external_imported/vcpkg/ports/directx-headers/vcpkg.json b/external_imported/vcpkg/ports/directx-headers/vcpkg.json index 66658e2f4..b0723567c 100644 --- a/external_imported/vcpkg/ports/directx-headers/vcpkg.json +++ b/external_imported/vcpkg/ports/directx-headers/vcpkg.json @@ -1,6 +1,7 @@ { "name": "directx-headers", "version": "1.4.9", + "port-version": 1, "description": "Official DirectX 12 Headers", "homepage": "https://devblogs.microsoft.com/directx/", "supports": "windows | linux" diff --git a/external_imported/vcpkg/ports/directxmath/portfile.cmake b/external_imported/vcpkg/ports/directxmath/portfile.cmake index b9a509eda..f3f336669 100644 --- a/external_imported/vcpkg/ports/directxmath/portfile.cmake +++ b/external_imported/vcpkg/ports/directxmath/portfile.cmake @@ -1,19 +1,17 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXMath - REF jan2021 - SHA512 8288f9e4d30b4947e98122f298ca25b8e2f82091c1257d3a0fd4d8de44c4c9a97d4549c105b388afbefad11ad6f30429e875e3e70eb4aa7865be6d4c08d6d1f3 - HEAD_REF master - FILE_DISAMBIGUATOR 2 + REF jan2022 + SHA512 8defaa693c8b8aed05791c83b99fa73aac2fc18475b0d51337a81f7d9807b53e426fdf530ed6f1d2d0ebd259e87cc42ac881bdb168387d883998f58a5c0a4886 + HEAD_REF main ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH cmake) if(NOT VCPKG_TARGET_IS_WINDOWS) vcpkg_download_distfile( diff --git a/external_imported/vcpkg/ports/directxmath/vcpkg.json b/external_imported/vcpkg/ports/directxmath/vcpkg.json index e0ffe0e44..e41e6c6c2 100644 --- a/external_imported/vcpkg/ports/directxmath/vcpkg.json +++ b/external_imported/vcpkg/ports/directxmath/vcpkg.json @@ -1,9 +1,18 @@ { "name": "directxmath", - "version-string": "jan2021", - "port-version": 1, + "version-date": "2022-01-18", "description": "DirectXMath SIMD C++ math library", "homepage": "https://github.com/Microsoft/DirectXMath", - "documentation": "https://docs.microsoft.com/en-us/windows/win32/dxmath/directxmath-portal", - "license": "MIT" + "documentation": "https://docs.microsoft.com/windows/win32/dxmath/directxmath-portal", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/directxmesh/portfile.cmake b/external_imported/vcpkg/ports/directxmesh/portfile.cmake index 6cd9c3180..293a475e1 100644 --- a/external_imported/vcpkg/ports/directxmesh/portfile.cmake +++ b/external_imported/vcpkg/ports/directxmesh/portfile.cmake @@ -1,13 +1,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_fail_port_install(ON_TARGET "OSX") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXMesh - REF nov2021b - SHA512 be2137c02c7a5973eaf91eaacfc9174148ec6dc68b163507d8146beb87c1ffff512e2593f7fd000ea7be440529ed2deda415e0dacd53e4c7d9679e97c6440d3d - HEAD_REF master + REF mar2022 + SHA512 ec5cfcbba0f361a2a7d572284c77a88464fcf38a10b113f12b1e51a1c0c42a651abd6f8bbf257a3470b35c62c8d25af9a79925f2e0c79eb33a8b1c9ca6a9191b + HEAD_REF main ) vcpkg_check_features( @@ -37,9 +35,9 @@ vcpkg_cmake_config_fixup(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile( MESHCONVERT_EXE - URLS "https://github.com/Microsoft/DirectXMesh/releases/download/nov2021/meshconvert.exe" - FILENAME "meshconvert-nov2021.exe" - SHA512 0f97ac49ce292b1cb90372884f1d6a4fc10eb3e92125a854ee9b7030fd9d0564536cdd88199aa4838832ae2a1e9c2df2c9e32c106705b6b06f156994b9476360 + URLS "https://github.com/Microsoft/DirectXMesh/releases/download/mar2022/meshconvert.exe" + FILENAME "meshconvert-mar2022.exe" + SHA512 43b4305b73994eccc086bf1812147a5156359f5d927475b915bbf8edde70189cc419b96703aeb736f76d9d52037657f10ba0c104f9713c1f0defb28ce7a46ac1 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxmesh/") @@ -48,7 +46,7 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) ${MESHCONVERT_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxmesh/) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert-nov2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert-mar2022.exe ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert.exe) elseif((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP)) diff --git a/external_imported/vcpkg/ports/directxmesh/vcpkg.json b/external_imported/vcpkg/ports/directxmesh/vcpkg.json index 545ca0f9e..1180f4b5e 100644 --- a/external_imported/vcpkg/ports/directxmesh/vcpkg.json +++ b/external_imported/vcpkg/ports/directxmesh/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxmesh", - "version-date": "2021-11-08", + "version-date": "2022-03-24", "description": "DirectXMesh geometry processing library", "homepage": "https://github.com/Microsoft/DirectXMesh", "documentation": "https://github.com/microsoft/DirectXMesh/wiki", diff --git a/external_imported/vcpkg/ports/directxsdk/portfile.cmake b/external_imported/vcpkg/ports/directxsdk/portfile.cmake index 67551cffa..3e38e42e1 100644 --- a/external_imported/vcpkg/ports/directxsdk/portfile.cmake +++ b/external_imported/vcpkg/ports/directxsdk/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "LINUX" "OSX" "UWP" "ANDROID" ON_ARCH "arm") - if(EXISTS "${CURRENT_INSTALLED_DIR}/share/dxsdk-d3dx/copyright") message(FATAL_ERROR "Can't build ${PORT} if dxsdk-d3dx is installed. Please remove dxsdk-d3dx, and try to install ${PORT} again if you need it.") endif() diff --git a/external_imported/vcpkg/ports/directxsdk/vcpkg.json b/external_imported/vcpkg/ports/directxsdk/vcpkg.json index 0d093e5bb..178026f01 100644 --- a/external_imported/vcpkg/ports/directxsdk/vcpkg.json +++ b/external_imported/vcpkg/ports/directxsdk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "directxsdk", "version-string": "jun10", - "port-version": 4, + "port-version": 5, "description": "Legacy DirectX SDK", "homepage": "https://docs.microsoft.com/en-us/windows/win32/directx-sdk--august-2009-", "supports": "windows & !uwp & !arm", diff --git a/external_imported/vcpkg/ports/directxtex/enable_openexr_support.patch b/external_imported/vcpkg/ports/directxtex/enable_openexr_support.patch index 2fef1f9d7..2a7141371 100644 --- a/external_imported/vcpkg/ports/directxtex/enable_openexr_support.patch +++ b/external_imported/vcpkg/ports/directxtex/enable_openexr_support.patch @@ -1,5 +1,5 @@ diff --git a/DirectXTexEXR.cpp b/DirectXTexEXR.cpp -index 9ac601f..204bde2 100644 +index 17bd171..825cfe4 100644 --- a/DirectXTex/DirectXTexEXR.cpp +++ b/DirectXTex/DirectXTexEXR.cpp @@ -8,7 +8,7 @@ @@ -11,7 +11,7 @@ index 9ac601f..204bde2 100644 #include "DirectXTexEXR.h" -@@ -56,7 +56,7 @@ using namespace DirectX; +@@ -57,7 +57,7 @@ using namespace DirectX; using PackedVector::XMHALF4; // Comment out this first anonymous namespace if you add the include of DirectXTexP.h above @@ -19,4 +19,4 @@ index 9ac601f..204bde2 100644 +#if 0 namespace { - struct handle_closer { void operator()(HANDLE h) { assert(h != INVALID_HANDLE_VALUE); if (h) CloseHandle(h); } }; + struct handle_closer { void operator()(HANDLE h) noexcept { assert(h != INVALID_HANDLE_VALUE); if (h) CloseHandle(h); } }; diff --git a/external_imported/vcpkg/ports/directxtex/portfile.cmake b/external_imported/vcpkg/ports/directxtex/portfile.cmake index aa9f572f0..62e43378a 100644 --- a/external_imported/vcpkg/ports/directxtex/portfile.cmake +++ b/external_imported/vcpkg/ports/directxtex/portfile.cmake @@ -1,34 +1,32 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_fail_port_install(ON_TARGET "OSX") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTex - REF nov2021b - SHA512 7f9b17e265836933c02b98c613e7c0503a74a6c3c1d97552bfbaf2f060b500019c74def80694f5e2ad6250f8bcceeac17677f264f677ff46851a9020ab604353 - HEAD_REF master + REF mar2022 + SHA512 04f898b2cf2c76edd400147db9144e196fc8441739de3293f8851952ce8153bab033deba52a0d35e51c4fbc9705ffe183f1606a0fae29970dc2babe65ed78e19 + HEAD_REF main ) if("openexr" IN_LIST FEATURES) vcpkg_download_distfile( DIRECTXTEX_EXR_HEADER URLS "https://raw.githubusercontent.com/wiki/Microsoft/DirectXTex/DirectXTexEXR.h" - FILENAME "DirectXTexEXR-2.h" - SHA512 54163820996f7f3c47d0e34da7d717ba51a4363458d77e8f3750d2b6b38bcf803f199b913b4fd7b8dcdd3f520cd0c2bb42a9f79d30f5805fccdece6af368dd12 + FILENAME "DirectXTexEXR-3.h" + SHA512 b4c75fa0e3365d63beba0ba471f0ded124b2f0e20f2c11cef76a88e6af1582889abcf5aa2ec74270d7b9bde7f7b4bc36fd17f030357b4139d8c83c35060344be ) vcpkg_download_distfile( DIRECTXTEX_EXR_SOURCE URLS "https://raw.githubusercontent.com/wiki/Microsoft/DirectXTex/DirectXTexEXR.cpp" - FILENAME "DirectXTexEXR-2.cpp" - SHA512 fbf5a330961f3ac80e4425e8451e9a696240cd89fabca744a19f1f110ae188bae7d8eb5b058aaf66015066d919d4f581b14494d78d280147b23355d8a32745b9 + FILENAME "DirectXTexEXR-3.cpp" + SHA512 9192cfea01654b1537b444cc6e3369de2f721959ad749551ad06ba92a12fa61e12f2169cf412788b0156220bb8bacf531160f924a4744e43e875163463586620 ) file(COPY ${DIRECTXTEX_EXR_HEADER} DESTINATION "${SOURCE_PATH}/DirectXTex") file(COPY ${DIRECTXTEX_EXR_SOURCE} DESTINATION "${SOURCE_PATH}/DirectXTex") - file(RENAME "${SOURCE_PATH}/DirectXTex/DirectXTexEXR-2.h" "${SOURCE_PATH}/DirectXTex/DirectXTexEXR.h") - file(RENAME "${SOURCE_PATH}/DirectXTex/DirectXTexEXR-2.cpp" "${SOURCE_PATH}/DirectXTex/DirectXTexEXR.cpp") + file(RENAME "${SOURCE_PATH}/DirectXTex/DirectXTexEXR-3.h" "${SOURCE_PATH}/DirectXTex/DirectXTexEXR.h") + file(RENAME "${SOURCE_PATH}/DirectXTex/DirectXTexEXR-3.cpp" "${SOURCE_PATH}/DirectXTex/DirectXTexEXR.cpp") vcpkg_apply_patches(SOURCE_PATH "${SOURCE_PATH}" PATCHES enable_openexr_support.patch) endif() @@ -64,23 +62,23 @@ vcpkg_cmake_config_fixup(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ("openexr" IN_LIST FEATURES))) vcpkg_download_distfile( TEXASSEMBLE_EXE - URLS "https://github.com/Microsoft/DirectXTex/releases/download/nov2021/texassemble.exe" - FILENAME "texassemble-nov2021.exe" - SHA512 a31151d368d41f50b58b417e8d27987fe0e3caa2c4e0d0abe7bef472db51429526277b0c554df2825c6892bb2021111f59d3d8f321ad68c71c0a153852d2c81f + URLS "https://github.com/Microsoft/DirectXTex/releases/download/mar2022/texassemble.exe" + FILENAME "texassemble-mar2022.exe" + SHA512 2a2bec1f012ba6778d99f53a3b4f015f84e4ab76dd68a1980d77cdac588c60a21b30abbfc0de9f0b0ef790ef5ed8444f1648b80990053f8a1f967a04d20d3c33 ) vcpkg_download_distfile( TEXCONV_EXE - URLS "https://github.com/Microsoft/DirectXTex/releases/download/nov2021/texconv.exe" - FILENAME "texconv-nov2021.exe" - SHA512 7cb70b3cbf46c78b99aa18c28b043fc5930b6b254729efd447868fcf8cb8b77987d41b570082bdfb3bab01452e67d17e81b966bf2534036a3415fa918ddc2956 + URLS "https://github.com/Microsoft/DirectXTex/releases/download/mar2022/texconv.exe" + FILENAME "texconv-mar2022.exe" + SHA512 fa0b12dcc7e4688f356bb591dedd07dcb27b6029c6490438b39368f72b77f90112360544e035f89e1098dc09b26fb921840ecae851ad5eba6a339cd46316c4e3 ) vcpkg_download_distfile( TEXDIAG_EXE - URLS "https://github.com/Microsoft/DirectXTex/releases/download/nov2021/texdiag.exe" - FILENAME "texdiag-nov2021.exe" - SHA512 7826c594fa42978da8a15bd771fafe4d4f5b97d611ce62a806ddff77204cabf63eea6ac24e3409c2720631681260b7e3fa6ad5f33b2162d2266457462e6b13c9 + URLS "https://github.com/Microsoft/DirectXTex/releases/download/mar2022/texdiag.exe" + FILENAME "texdiag-mar2022.exe" + SHA512 7fe074a08599edca9ad8ad5ff930c9c4dbc74faad6502c288e9a555a4a79f51affbce51758c99518d54c4698457e0edb379ffaebfd3dcae0bd16a343195f8292 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtex/") @@ -91,9 +89,9 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ${TEXDIAG_EXE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtex/") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble-nov2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble.exe") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv-nov2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv.exe") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texdiag-nov2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texadiag.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble-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") 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 cca22a250..297f6f220 100644 --- a/external_imported/vcpkg/ports/directxtex/vcpkg.json +++ b/external_imported/vcpkg/ports/directxtex/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxtex", - "version-date": "2021-11-08", + "version-date": "2022-03-24", "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 32d30522c..ab5b1db56 100644 --- a/external_imported/vcpkg/ports/directxtk/portfile.cmake +++ b/external_imported/vcpkg/ports/directxtk/portfile.cmake @@ -1,13 +1,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_fail_port_install(ON_TARGET "OSX" "Linux") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK - REF nov2021b - SHA512 d1c99cc7d1a95939b4dc28ee5c757e3b4eae2b7f923031b44f988b1ca93838e765d702f125a9a9fb38e6f5304721f88843e961b6ba9591066b511b530aad5280 - HEAD_REF master + REF mar2022 + SHA512 09264e19ff786b1f8cf56f0a789ce9df60b3682adba6dbb3e9c8c8c7d869b464c0ad869299fc5cda2d535db19c7a96b43cba2fd40d8cb6aa9dc14914b181d410 + HEAD_REF main ) vcpkg_check_features( @@ -35,16 +33,16 @@ vcpkg_cmake_config_fixup(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile( MAKESPRITEFONT_EXE - URLS "https://github.com/Microsoft/DirectXTK/releases/download/nov2021/MakeSpriteFont.exe" - FILENAME "makespritefont-nov2021.exe" - SHA512 0aab40aced022588d9c1089c5b2f297b0521497d0ae559ead98f99e1e73f2daf9f38ebecadb413095abd2a6c207183fbca582d47528c6f21258df3ac391134e5 + URLS "https://github.com/Microsoft/DirectXTK/releases/download/mar2022/MakeSpriteFont.exe" + FILENAME "makespritefont-mar2022.exe" + SHA512 a24f76781ddb2c9baa2550d3ef26bf4cf6cb03bfd97caa3b202232a04730fd81e299a9f3549c3ff58c03fda827e44deac5e0b311e8e3fc795e393651ecb51752 ) vcpkg_download_distfile( XWBTOOL_EXE - URLS "https://github.com/Microsoft/DirectXTK/releases/download/nov2021/XWBTool.exe" - FILENAME "xwbtool-nov2021.exe" - SHA512 f2f291c496500e593c0a4795fee9fafc685666682f23a38a25546bb67ec083533a26f2ce0562b819abea44bd8b403a2f246fbf978e366c457eb8a0f836fd5a2e + URLS "https://github.com/Microsoft/DirectXTK/releases/download/mar2022/XWBTool.exe" + FILENAME "xwbtool-mar2022.exe" + SHA512 32dd88e742211deaf0ca83e51ec510490456473c07fabbd6627960dc9abfa32289d99f2c8f53d7590a6a6733b3068ba25bff9a512fcf7d1072791dce931d463f ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk/") @@ -54,8 +52,8 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) ${XWBTOOL_EXE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk/") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont-nov2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont.exe") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool-nov2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont-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") 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 a5b784ead..e0379377d 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": "2021-11-08", + "version-date": "2022-03-24", "description": "A collection of helper classes for writing DirectX 11.x code in C++.", "homepage": "https://github.com/Microsoft/DirectXTK", "documentation": "https://github.com/microsoft/DirectXTK/wiki", diff --git a/external_imported/vcpkg/ports/directxtk12/portfile.cmake b/external_imported/vcpkg/ports/directxtk12/portfile.cmake index 5f053692a..c980b3de6 100644 --- a/external_imported/vcpkg/ports/directxtk12/portfile.cmake +++ b/external_imported/vcpkg/ports/directxtk12/portfile.cmake @@ -1,13 +1,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_fail_port_install(ON_TARGET "OSX" "Linux") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK12 - REF nov2021b - SHA512 32afd3e3e6c122c80a4b1980482b6092e2723c2d691657385d699a01a6edb8339efd482f1c20ae32c5c6d3619f48ea749d5826b730952c619a6b053e6b780596 - HEAD_REF master + REF mar2022 + SHA512 fc41450aad51491f4ac89f87bfd76a62179052db1b98ee626561ef3edb8716578c8dfee01613731cdd9fd91f03ed54a8ec73595374ae16e217cfc87d6f11eca4 + HEAD_REF main ) vcpkg_cmake_configure( @@ -21,16 +19,16 @@ vcpkg_cmake_config_fixup(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile( MAKESPRITEFONT_EXE - URLS "https://github.com/Microsoft/DirectXTK12/releases/download/nov2021/MakeSpriteFont.exe" - FILENAME "makespritefont-nov2021.exe" - SHA512 0aab40aced022588d9c1089c5b2f297b0521497d0ae559ead98f99e1e73f2daf9f38ebecadb413095abd2a6c207183fbca582d47528c6f21258df3ac391134e5 + URLS "https://github.com/Microsoft/DirectXTK12/releases/download/mar2022/MakeSpriteFont.exe" + FILENAME "makespritefont-mar2022.exe" + SHA512 a24f76781ddb2c9baa2550d3ef26bf4cf6cb03bfd97caa3b202232a04730fd81e299a9f3549c3ff58c03fda827e44deac5e0b311e8e3fc795e393651ecb51752 ) vcpkg_download_distfile( XWBTOOL_EXE - URLS "https://github.com/Microsoft/DirectXTK12/releases/download/nov2021/XWBTool.exe" - FILENAME "xwbtool-nov2021.exe" - SHA512 f2f291c496500e593c0a4795fee9fafc685666682f23a38a25546bb67ec083533a26f2ce0562b819abea44bd8b403a2f246fbf978e366c457eb8a0f836fd5a2e + URLS "https://github.com/Microsoft/DirectXTK12/releases/download/mar2022/XWBTool.exe" + FILENAME "xwbtool-mar2022.exe" + SHA512 32dd88e742211deaf0ca83e51ec510490456473c07fabbd6627960dc9abfa32289d99f2c8f53d7590a6a6733b3068ba25bff9a512fcf7d1072791dce931d463f ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") @@ -40,8 +38,8 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) ${XWBTOOL_EXE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont-nov2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont.exe") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool-nov2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont-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") 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 9b4ef1df5..e6e83a029 100644 --- a/external_imported/vcpkg/ports/directxtk12/vcpkg.json +++ b/external_imported/vcpkg/ports/directxtk12/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxtk12", - "version-date": "2021-11-08", + "version-date": "2022-03-24", "description": "A collection of helper classes for writing DirectX 12 code in C++.", "homepage": "https://github.com/Microsoft/DirectXTK12", "documentation": "https://github.com/microsoft/DirectXTK12/wiki", diff --git a/external_imported/vcpkg/ports/discord-game-sdk/portfile.cmake b/external_imported/vcpkg/ports/discord-game-sdk/portfile.cmake index ab85a7d72..ab3bec66b 100644 --- a/external_imported/vcpkg/ports/discord-game-sdk/portfile.cmake +++ b/external_imported/vcpkg/ports/discord-game-sdk/portfile.cmake @@ -1,8 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "android" "uwp") -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND NOT VCPKG_TARGET_IS_WINDOWS) - vcpkg_fail_port_install(MESSAGE "The GameSDK only supports x86 on Windows." ALWAYS) -endif() - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_download_distfile(ARCHIVE @@ -15,8 +10,8 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} NO_REMOVE_ONE_LEVEL - PATCHES - include-cstdint.patch # allows compiling on newer versions of GCC + PATCHES + include-cstdint.patch # allows compiling on newer versions of GCC ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION ${SOURCE_PATH}) diff --git a/external_imported/vcpkg/ports/discord-game-sdk/vcpkg.json b/external_imported/vcpkg/ports/discord-game-sdk/vcpkg.json index 3a35dc459..5282f601e 100644 --- a/external_imported/vcpkg/ports/discord-game-sdk/vcpkg.json +++ b/external_imported/vcpkg/ports/discord-game-sdk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "discord-game-sdk", "version": "2.5.6", - "port-version": 3, + "port-version": 4, "description": "The Discord GameSDK is an easy drop-in SDK to help you manage all the hard things that come with making a game.", "homepage": "https://discord.com/developers/docs/game-sdk/sdk-starter-guide", "supports": "((x64 & (windows | osx | linux)) | (x86 & windows)) & !uwp & !static" diff --git a/external_imported/vcpkg/ports/discordcoreapi/portfile.cmake b/external_imported/vcpkg/ports/discordcoreapi/portfile.cmake new file mode 100644 index 000000000..d61b18143 --- /dev/null +++ b/external_imported/vcpkg/ports/discordcoreapi/portfile.cmake @@ -0,0 +1,35 @@ +if(VCPKG_TARGET_IS_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 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(NO_PREFIX_CORRECTION) + +vcpkg_fixup_pkgconfig() + +vcpkg_copy_pdbs() + +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/discordcoreapi/vcpkg.json b/external_imported/vcpkg/ports/discordcoreapi/vcpkg.json new file mode 100644 index 000000000..e9b175b3e --- /dev/null +++ b/external_imported/vcpkg/ports/discordcoreapi/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "discordcoreapi", + "version-date": "2022-03-30", + "description": "A Discord bot library written in C++ using custom asynchronous coroutines.", + "homepage": "https://discordcoreapi.com", + "license": "AGPL-3.0-or-later", + "supports": "(windows & x64 & !static) | (linux & x64)", + "dependencies": [ + "curl", + "ffmpeg", + "glib", + "libsodium", + "nlohmann-json", + "openssl", + "opus", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/dlfcn-win32/portfile.cmake b/external_imported/vcpkg/ports/dlfcn-win32/portfile.cmake index 1e1fdccb1..29726bcc3 100644 --- a/external_imported/vcpkg/ports/dlfcn-win32/portfile.cmake +++ b/external_imported/vcpkg/ports/dlfcn-win32/portfile.cmake @@ -8,23 +8,22 @@ 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() -file(READ ${CURRENT_PACKAGES_DIR}/debug/share/dlfcn-win32/dlfcn-win32-targets-debug.cmake dlfcn-win32_DEBUG_MODULE) +file(READ "${CURRENT_PACKAGES_DIR}/debug/share/dlfcn-win32/dlfcn-win32-targets-debug.cmake" dlfcn-win32_DEBUG_MODULE) string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" dlfcn-win32_DEBUG_MODULE "${dlfcn-win32_DEBUG_MODULE}") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/dlfcn-win32/dlfcn-win32-targets-debug.cmake "${dlfcn-win32_DEBUG_MODULE}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/dlfcn-win32/dlfcn-win32-targets-debug.cmake" "${dlfcn-win32_DEBUG_MODULE}") -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") vcpkg_copy_pdbs() -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled) diff --git a/external_imported/vcpkg/ports/dlfcn-win32/vcpkg.json b/external_imported/vcpkg/ports/dlfcn-win32/vcpkg.json index 505674d5b..e4d0b1651 100644 --- a/external_imported/vcpkg/ports/dlfcn-win32/vcpkg.json +++ b/external_imported/vcpkg/ports/dlfcn-win32/vcpkg.json @@ -1,7 +1,14 @@ { "name": "dlfcn-win32", - "version-string": "1.1.1", - "port-version": 5, + "version": "1.1.1", + "port-version": 6, "description": "dlfcn-win32 is an implementation of dlfcn for Windows.", - "homepage": "https://github.com/dlfcn-win32/dlfcn-win32" + "homepage": "https://github.com/dlfcn-win32/dlfcn-win32", + "supports": "windows & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/dlib/portfile.cmake b/external_imported/vcpkg/ports/dlib/portfile.cmake index 0961337cd..8df6a8c2b 100644 --- a/external_imported/vcpkg/ports/dlib/portfile.cmake +++ b/external_imported/vcpkg/ports/dlib/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO davisking/dlib - REF 70ea028f12e10f4d992a0c4f0169749eae5bb185 #v19.22 - SHA512 f7c5988d6a1b2384a54a3e1a330c50011d3325bb87b4edd9fa08a2f4daeffdcb276ea21bc1d4cfd766b4e4d0a9c13b235e4b6002aa97af5327b833f91b688fd0 + REF 074ab8bdbadbee1afb95653c3ce46867ed32dfa1 #v19.23 + SHA512 da7942cf006566bafdd7079cc31ac445cd66e300714e522c53dfcf6b1a811de4cf2188c9a75c978388b09554bccc4164d40afc907bf9e6f75a17f8ca10ee0355 HEAD_REF master PATCHES fix-sqlite3-fftw-linkage.patch diff --git a/external_imported/vcpkg/ports/dlib/vcpkg.json b/external_imported/vcpkg/ports/dlib/vcpkg.json index 77d90c7e7..fa7907dec 100644 --- a/external_imported/vcpkg/ports/dlib/vcpkg.json +++ b/external_imported/vcpkg/ports/dlib/vcpkg.json @@ -1,8 +1,9 @@ { "name": "dlib", - "version": "19.22", + "version": "19.23", "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", "dependencies": [ "blas", "lapack", diff --git a/external_imported/vcpkg/ports/dmlc/portfile.cmake b/external_imported/vcpkg/ports/dmlc/portfile.cmake index 3e4c7baeb..bae56fc77 100644 --- a/external_imported/vcpkg/ports/dmlc/portfile.cmake +++ b/external_imported/vcpkg/ports/dmlc/portfile.cmake @@ -1,7 +1,5 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dmlc/dmlc-core diff --git a/external_imported/vcpkg/ports/dmlc/vcpkg.json b/external_imported/vcpkg/ports/dmlc/vcpkg.json index 36a4e0395..d5f74b3d7 100644 --- a/external_imported/vcpkg/ports/dmlc/vcpkg.json +++ b/external_imported/vcpkg/ports/dmlc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "dmlc", "version-date": "2019-08-12", - "port-version": 6, + "port-version": 7, "description": "DMLC-Core is the backbone library to support all DMLC projects, offers the bricks to build efficient and scalable distributed machine learning libraries.", "homepage": "https://github.com/dmlc/dmlc-core", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/doctest/portfile.cmake b/external_imported/vcpkg/ports/doctest/portfile.cmake index 170c48578..2f78fb5b3 100644 --- a/external_imported/vcpkg/ports/doctest/portfile.cmake +++ b/external_imported/vcpkg/ports/doctest/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO onqtam/doctest - REF 2.4.6 - SHA512 A5CCCF085AF946003140AF688F071A6407D42FC685324A537E3B704EF9DE0F2228BD06EABFD1DF8DA70DEC001420DD0B2813E5E4320B5C1DA450CB0AADD63788 + REF v2.4.8 + SHA512 f9b40abfd756331f9b667f3c1e7dcf2652effacac70523834dd3946522f01459c095bdbad04651ad2ad155977e1395025f868ed4dcf5d5712aae9807afb5699c HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/doctest/vcpkg.json b/external_imported/vcpkg/ports/doctest/vcpkg.json index 060fecff6..8b838d450 100644 --- a/external_imported/vcpkg/ports/doctest/vcpkg.json +++ b/external_imported/vcpkg/ports/doctest/vcpkg.json @@ -1,6 +1,6 @@ { "name": "doctest", - "version": "2.4.6", - "description": "The fastest feature-rich C++ single-header testing framework for unit tests and TDD", + "version": "2.4.8", + "description": "The fastest feature-rich C++11/14/17/20 single-header testing framework", "homepage": "https://github.com/onqtam/doctest" } diff --git a/external_imported/vcpkg/ports/double-conversion/portfile.cmake b/external_imported/vcpkg/ports/double-conversion/portfile.cmake index 5ede45da1..39f311e13 100644 --- a/external_imported/vcpkg/ports/double-conversion/portfile.cmake +++ b/external_imported/vcpkg/ports/double-conversion/portfile.cmake @@ -3,26 +3,25 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/double-conversion - REF v3.1.5 - SHA512 0aeabdbfa06c3c4802905ac4bf8c2180840577677b47d45e1c91034fe07746428c9db79260ce6bdbdf8b584746066cea9247ba43a9c38155caf1ef44e214180a + REF 9e0c13564e17362aad8a32c1344a2214f71952c6 #v3.2.0 + SHA512 4579ae02196a2722cbce2888a404d026d62523256aa5f726c4b46aa25aa76d3caaf653848afb88939aac697049afc8968ddecda8a093520b392c9f963559a992 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() # Rename exported target files into something vcpkg_fixup_cmake_targets expects -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/double-conversion) - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/double-conversion) +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/${PORT}") + vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") endif() 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}/LICENSE ${CURRENT_PACKAGES_DIR}/share/double-conversion/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/external_imported/vcpkg/ports/double-conversion/vcpkg.json b/external_imported/vcpkg/ports/double-conversion/vcpkg.json index 541bf7701..604189ded 100644 --- a/external_imported/vcpkg/ports/double-conversion/vcpkg.json +++ b/external_imported/vcpkg/ports/double-conversion/vcpkg.json @@ -1,7 +1,16 @@ { "name": "double-conversion", - "version-string": "3.1.5", - "port-version": 1, + "version": "3.2.0", "description": "Efficient binary-decimal and decimal-binary conversion routines for IEEE doubles.", - "homepage": "https://github.com/google/double-conversion" + "homepage": "https://github.com/google/double-conversion", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/drlibs/portfile.cmake b/external_imported/vcpkg/ports/drlibs/portfile.cmake index 5e4fa4419..9919d67a6 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 f13cbcfd06afe7287f99b1bb5982cefdf3d6a974 - SHA512 c108db409389f912bdcb979bc0dfe31658b8bcd7ce327145a77bdb9a168512e2c1a94cb59677b5d6bfa213e412498360a8ec25d5424bb2ba292edaf88bf5f195 + REF c729134b41cf09542542b5da841ac2f933b36cba + SHA512 3760a5921d120db21c9351e7edf1877b7052783e20dd7f6ab673992db0f6e4014c07c559f993f7870f6e7fe021b5e47b10b27ea0ed3895d07077b0eea8e13078 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/drlibs/vcpkg.json b/external_imported/vcpkg/ports/drlibs/vcpkg.json index 73a1cb4e2..db59c2fe4 100644 --- a/external_imported/vcpkg/ports/drlibs/vcpkg.json +++ b/external_imported/vcpkg/ports/drlibs/vcpkg.json @@ -1,6 +1,7 @@ { "name": "drlibs", - "version-date": "2021-11-02", + "version-date": "2022-04-03", "description": "Single-file audio decoding libraries for C/C++", - "homepage": "https://github.com/mackron/dr_libs" + "homepage": "https://github.com/mackron/dr_libs", + "license": "Unlicense OR MIT-0" } diff --git a/external_imported/vcpkg/ports/drogon/fs.patch b/external_imported/vcpkg/ports/drogon/fs.patch deleted file mode 100644 index 7af708aad..000000000 --- a/external_imported/vcpkg/ports/drogon/fs.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 85e8ee7..c78dfc5 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -192,9 +192,11 @@ if(NEED_BOOST_FS) - else() - option(HAS_STD_FILESYSTEM_PATH "use std::filesystem" ON) - # HACK: Needed to be compiled on Yocto Linux -- get_property(CAN_LINK_FS TARGET std::filesystem PROPERTY INTERFACE_LINK_LIBRARIES SET) -- if ( CAN_LINK_FS ) -- target_link_libraries(${PROJECT_NAME} PUBLIC std::filesystem) -+ if(TARGET std::filesystem) -+ get_property(CAN_LINK_FS TARGET std::filesystem PROPERTY INTERFACE_LINK_LIBRARIES SET) -+ if ( CAN_LINK_FS ) -+ target_link_libraries(${PROJECT_NAME} PUBLIC std::filesystem) -+ endif() - endif() - endif() - diff --git a/external_imported/vcpkg/ports/drogon/portfile.cmake b/external_imported/vcpkg/ports/drogon/portfile.cmake index 1c07d1629..4f24228c3 100644 --- a/external_imported/vcpkg/ports/drogon/portfile.cmake +++ b/external_imported/vcpkg/ports/drogon/portfile.cmake @@ -1,14 +1,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO an-tao/drogon - REF v1.7.4 - SHA512 ee2458e584beb1dc0e437cbdbdea211762aeac60acc7104d1a7bf6aa7629f70d0cc71a45978b27917373599806f6f183ec2494be7ec00c74694888a31e5fd5d1 + REF v1.7.5 + SHA512 8be77961026d13b55dbfcc2e43972b4fb8f1cd9a6bfb8098d5bdfc8b60ff67c2d3ede4bdb5815614a8233dc184cbf3aa363a9d33eed96b9f748544e20b15f2c7 HEAD_REF master PATCHES vcpkg.patch drogon_config.patch static-brotli.patch - fs.patch + use-libmariadb.patch ) vcpkg_check_features( @@ -56,7 +56,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -# Handle copyright +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) # Copy pdb files diff --git a/external_imported/vcpkg/ports/drogon/usage b/external_imported/vcpkg/ports/drogon/usage new file mode 100644 index 000000000..7887e3474 --- /dev/null +++ b/external_imported/vcpkg/ports/drogon/usage @@ -0,0 +1,4 @@ +The package drogon provides CMake targets: + + find_package(Drogon CONFIG REQUIRED) + target_link_libraries(main PRIVATE Drogon::Drogon) diff --git a/external_imported/vcpkg/ports/drogon/use-libmariadb.patch b/external_imported/vcpkg/ports/drogon/use-libmariadb.patch new file mode 100644 index 000000000..71ca89892 --- /dev/null +++ b/external_imported/vcpkg/ports/drogon/use-libmariadb.patch @@ -0,0 +1,31 @@ +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 f643dc85e..f6e70f75d 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.4", + "version-semver": "1.7.5", "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/", @@ -10,7 +10,7 @@ "jsoncpp", { "name": "libuuid", - "platform": "!windows" + "platform": "!windows & !osx" }, "trantor", { diff --git a/external_imported/vcpkg/ports/dstorage/dstorage-config.cmake.in b/external_imported/vcpkg/ports/dstorage/dstorage-config.cmake.in new file mode 100644 index 000000000..c29561951 --- /dev/null +++ b/external_imported/vcpkg/ports/dstorage/dstorage-config.cmake.in @@ -0,0 +1,25 @@ + +get_filename_component(_dstorage_root "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_dstorage_root "${_dstorage_root}" PATH) +get_filename_component(_dstorage_root "${_dstorage_root}" PATH) + +set(_dstorage_root_lib "${_dstorage_root}/lib/dstorage.lib") +if (EXISTS "${_dstorage_root_lib}") + + add_library(Microsoft::DirectStorage SHARED IMPORTED) + set_target_properties(Microsoft::DirectStorage PROPERTIES + IMPORTED_LOCATION "${_dstorage_root}/bin/dstorage.dll" + IMPORTED_IMPLIB "${_dstorage_root_lib}" + INTERFACE_INCLUDE_DIRECTORIES "${_dstorage_root}/include" + IMPORTED_LINK_INTERFACE_LANGUAGES "C") + + set(dstorage_FOUND TRUE) + +else() + + set(dstorage_FOUND FALSE) + +endif() + +unset(_dstorage_root_lib) +unset(_dstorage_root) diff --git a/external_imported/vcpkg/ports/dstorage/portfile.cmake b/external_imported/vcpkg/ports/dstorage/portfile.cmake new file mode 100644 index 000000000..45c04b469 --- /dev/null +++ b/external_imported/vcpkg/ports/dstorage/portfile.cmake @@ -0,0 +1,28 @@ +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 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH PACKAGE_PATH + ARCHIVE ${ARCHIVE} + 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}/bin/${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(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug") +file(COPY "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL "${PACKAGE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +configure_file("${CMAKE_CURRENT_LIST_DIR}/dstorage-config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" COPYONLY) diff --git a/external_imported/vcpkg/ports/dstorage/vcpkg.json b/external_imported/vcpkg/ports/dstorage/vcpkg.json new file mode 100644 index 000000000..66ada05df --- /dev/null +++ b/external_imported/vcpkg/ports/dstorage/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "dstorage", + "version": "1.0.0", + "description": "DirectStorage for Windows", + "homepage": "https://aka.ms/directstorage/", + "license": null, + "supports": "windows & !uwp & !static" +} diff --git a/external_imported/vcpkg/ports/duilib/portfile.cmake b/external_imported/vcpkg/ports/duilib/portfile.cmake index 272691914..06d536cfa 100644 --- a/external_imported/vcpkg/ports/duilib/portfile.cmake +++ b/external_imported/vcpkg/ports/duilib/portfile.cmake @@ -12,26 +12,25 @@ vcpkg_from_github( "enable-unicode-for-vcpkg.patch" ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/DuiLib - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/DuiLib" NO_CHARSET_FLAG ) -vcpkg_build_cmake() +vcpkg_cmake_build() -file(INSTALL ${SOURCE_PATH}/DuiLib DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h) +file(INSTALL "${SOURCE_PATH}/DuiLib" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN *.h) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/duilib.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/duilib.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/duilib.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/duilib.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") else() - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/duilib.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/duilib.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/duilib.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/duilib.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/duilib.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/duilib.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/duilib.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/duilib.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/duilib.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/duilib.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/duilib.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/duilib.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") 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/duilib/vcpkg.json b/external_imported/vcpkg/ports/duilib/vcpkg.json index 6c08b75db..3c9946e1c 100644 --- a/external_imported/vcpkg/ports/duilib/vcpkg.json +++ b/external_imported/vcpkg/ports/duilib/vcpkg.json @@ -1,7 +1,14 @@ { "name": "duilib", - "version-string": "2019-4-28", - "port-version": 4, + "version-date": "2019-04-28", + "port-version": 5, "description": "Duilib is a free open source DirectUI interface library under Windows. It is widely accepted by major Internet companies due to its simple and easy to expand design and stable and efficient implementation. It is widely used in IM, video client, stock market software, navigation software, and mobile phone assistive software. Duilib is still evolving, and will continue to improve in many aspects such as documentation, examples, animations, and rendering engines.", - "homepage": "https://github.com/duilib/duilib" + "homepage": "https://github.com/duilib/duilib", + "supports": "windows & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/dxsdk-d3dx/dxsdk-d3dx-config.cmake.in b/external_imported/vcpkg/ports/dxsdk-d3dx/dxsdk-d3dx-config.cmake.in new file mode 100644 index 000000000..039d0a3b0 --- /dev/null +++ b/external_imported/vcpkg/ports/dxsdk-d3dx/dxsdk-d3dx-config.cmake.in @@ -0,0 +1,48 @@ + +get_filename_component(_d3dx_root "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_d3dx_root "${_d3dx_root}" PATH) +get_filename_component(_d3dx_root "${_d3dx_root}" PATH) + +set(_d3dx_root_lib "${_d3dx_root}/lib/d3dx9.lib") +if (EXISTS "${_d3dx_root_lib}") + + add_library(Microsoft::D3DX9 SHARED IMPORTED) + set_target_properties(Microsoft::D3DX9 PROPERTIES + IMPORTED_LOCATION_RELEASE "${_d3dx_root}/bin/D3DX9_43.dll" + IMPORTED_IMPLIB_RELEASE "${_d3dx_root_lib}" + IMPORTED_LOCATION_DEBUG "${_d3dx_root}/debug/bin/D3DX9d_43.dll" + IMPORTED_IMPLIB_DEBUG "${_d3dx_root}/debug/lib/d3dx9d.lib" + INTERFACE_INCLUDE_DIRECTORIES "${_d3dx_root}/include/dxsdk-d3dx" + IMPORTED_CONFIGURATIONS "Debug;Release" + IMPORTED_LINK_INTERFACE_LANGUAGES "C") + + add_library(Microsoft::D3DX10 SHARED IMPORTED) + set_target_properties(Microsoft::D3DX10 PROPERTIES + IMPORTED_LOCATION_RELEASE "${_d3dx_root}/bin/d3dx10_43.dll" + IMPORTED_IMPLIB_RELEASE "${_d3dx_root}/lib/d3dx10.lib" + IMPORTED_LOCATION_DEBUG "${_d3dx_root}/debug/bin/D3DX10d_43.dll" + IMPORTED_IMPLIB_DEBUG "${_d3dx_root}/debug/lib/d3dx10d.lib" + INTERFACE_INCLUDE_DIRECTORIES "${_d3dx_root}/include/dxsdk-d3dx" + IMPORTED_CONFIGURATIONS "Debug;Release" + IMPORTED_LINK_INTERFACE_LANGUAGES "C") + + add_library(Microsoft::D3DX11 SHARED IMPORTED) + set_target_properties(Microsoft::D3DX11 PROPERTIES + IMPORTED_LOCATION_RELEASE "${_d3dx_root}/bin/d3dx11_43.dll" + IMPORTED_IMPLIB_RELEASE "${_d3dx_root}/lib/d3dx11.lib" + IMPORTED_LOCATION_DEBUG "${_d3dx_root}/debug/bin/D3DX11d_43.dll" + IMPORTED_IMPLIB_DEBUG "${_d3dx_root}/debug/lib/d3dx11d.lib" + INTERFACE_INCLUDE_DIRECTORIES "${_d3dx_root}/include/dxsdk-d3dx" + IMPORTED_CONFIGURATIONS "Debug;Release" + IMPORTED_LINK_INTERFACE_LANGUAGES "C") + + set(dxsdk-d3dx_FOUND TRUE) + +else() + + set(dxsdk-d3dx_FOUND FALSE) + +endif() + +unset(_d3dx_root_lib) +unset(_d3dx_root) diff --git a/external_imported/vcpkg/ports/dxsdk-d3dx/portfile.cmake b/external_imported/vcpkg/ports/dxsdk-d3dx/portfile.cmake index 71ff4d332..30bd0351f 100644 --- a/external_imported/vcpkg/ports/dxsdk-d3dx/portfile.cmake +++ b/external_imported/vcpkg/ports/dxsdk-d3dx/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "LINUX" "OSX" "UWP" "ANDROID" ON_ARCH "arm") - if(EXISTS "${CURRENT_INSTALLED_DIR}/share/directxsdk/copyright") message(FATAL_ERROR "Can't build ${PORT} if directxsdk is installed. Please remove directxsdk, and try to install ${PORT} again if you need it.") endif() @@ -38,3 +36,5 @@ file(GLOB DEBUG_DLL_FILES "${PACKAGE_PATH}/build/native/debug/bin/${VCPKG_TARGET file(INSTALL ${DEBUG_DLL_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/") file(INSTALL "${PACKAGE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +configure_file("${CMAKE_CURRENT_LIST_DIR}/dxsdk-d3dx-config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" COPYONLY) diff --git a/external_imported/vcpkg/ports/dxsdk-d3dx/vcpkg.json b/external_imported/vcpkg/ports/dxsdk-d3dx/vcpkg.json index bc50df965..7b0cf6d69 100644 --- a/external_imported/vcpkg/ports/dxsdk-d3dx/vcpkg.json +++ b/external_imported/vcpkg/ports/dxsdk-d3dx/vcpkg.json @@ -1,8 +1,9 @@ { "name": "dxsdk-d3dx", "version": "9.29.952.8", - "port-version": 1, + "port-version": 3, "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" } diff --git a/external_imported/vcpkg/ports/dxut/portfile.cmake b/external_imported/vcpkg/ports/dxut/portfile.cmake index 118bedd7b..a8cd6ceb1 100644 --- a/external_imported/vcpkg/ports/dxut/portfile.cmake +++ b/external_imported/vcpkg/ports/dxut/portfile.cmake @@ -1,7 +1,5 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_fail_port_install(ON_TARGET "LINUX" "OSX" "UWP" "ANDROID") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/DXUT diff --git a/external_imported/vcpkg/ports/dxut/vcpkg.json b/external_imported/vcpkg/ports/dxut/vcpkg.json index ede994b81..777546f34 100644 --- a/external_imported/vcpkg/ports/dxut/vcpkg.json +++ b/external_imported/vcpkg/ports/dxut/vcpkg.json @@ -1,6 +1,7 @@ { "name": "dxut", "version": "11.26", + "port-version": 1, "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", diff --git a/external_imported/vcpkg/ports/earcut-hpp/portfile.cmake b/external_imported/vcpkg/ports/earcut-hpp/portfile.cmake new file mode 100644 index 000000000..7cdb44ea2 --- /dev/null +++ b/external_imported/vcpkg/ports/earcut-hpp/portfile.cmake @@ -0,0 +1,13 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mapbox/earcut.hpp + REF v2.2.3 + SHA512 f87f0084dbbcda85b409c326587a376d443f2484b6a69c216d2ad94ea8ea238912dfe1174b464b08faec10ea5c29ebae6478e7abfe5ff682a7b043784c1e3acf + HEAD_REF master +) + +# This is a header only library +file(INSTALL "${SOURCE_PATH}/include/mapbox/earcut.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include/mapbox") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") diff --git a/external_imported/vcpkg/ports/earcut-hpp/vcpkg.json b/external_imported/vcpkg/ports/earcut-hpp/vcpkg.json new file mode 100644 index 000000000..053a57abe --- /dev/null +++ b/external_imported/vcpkg/ports/earcut-hpp/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "earcut-hpp", + "version": "2.2.3", + "description": "earcut.hpp is a C++ port of earcut.js, a fast, header-only polygon triangulation library.", + "homepage": "https://github.com/mapbox/earcut.hpp", + "license": "ISC" +} diff --git a/external_imported/vcpkg/ports/eastl/Fix-error-C2338.patch b/external_imported/vcpkg/ports/eastl/Fix-error-C2338.patch new file mode 100644 index 000000000..61d75dddc --- /dev/null +++ b/external_imported/vcpkg/ports/eastl/Fix-error-C2338.patch @@ -0,0 +1,14 @@ +diff --git a/scripts/CMake/CommonCppFlags.cmake b/scripts/CMake/CommonCppFlags.cmake +index 08b6af5..281665e 100644 +--- a/scripts/CMake/CommonCppFlags.cmake ++++ b/scripts/CMake/CommonCppFlags.cmake +@@ -74,6 +74,9 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU") + endif() + elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++latest /W4 /permissive-") ++ if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "19.31.30911.95") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:static_assert-") ++ endif() + endif() + + diff --git a/external_imported/vcpkg/ports/eastl/portfile.cmake b/external_imported/vcpkg/ports/eastl/portfile.cmake index d362ac0f4..04ba63fc5 100644 --- a/external_imported/vcpkg/ports/eastl/portfile.cmake +++ b/external_imported/vcpkg/ports/eastl/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( HEAD_REF master PATCHES fix_cmake_install.patch + Fix-error-C2338.patch ) 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 e496d6807..b2c97ba50 100644 --- a/external_imported/vcpkg/ports/eastl/vcpkg.json +++ b/external_imported/vcpkg/ports/eastl/vcpkg.json @@ -1,9 +1,10 @@ { "name": "eastl", "version-string": "3.18.00", - "port-version": 1, + "port-version": 2, "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", "dependencies": [ "eabase", { diff --git a/external_imported/vcpkg/ports/easyhook/portfile.cmake b/external_imported/vcpkg/ports/easyhook/portfile.cmake index 9b34f51a9..d67dc1d8f 100644 --- a/external_imported/vcpkg/ports/easyhook/portfile.cmake +++ b/external_imported/vcpkg/ports/easyhook/portfile.cmake @@ -1,6 +1,4 @@ -vcpkg_fail_port_install(ON_TARGET "Linux" "OSX" "UWP" ON_ARCH "arm" ON_LIBRARY_LINKAGE "static") - -message(WARNING ".Net framework 4.0 is required, please install it before install easyhook.") +message(WARNING ".Net framework 4.7.2 is required, please install it before installing easyhook.") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -40,6 +38,40 @@ foreach(VCXPROJ IN ITEMS ) endforeach() +# Use modern .NET Framework +foreach(CSPROJ IN ITEMS + "${SOURCE_PATH}/EasyHook/EasyHook.csproj" + "${SOURCE_PATH}/EasyHookSvc/EasyHookSvc.csproj" + "${SOURCE_PATH}/EasyLoad/EasyLoad.csproj" + "${SOURCE_PATH}/Examples/FileMon/FileMon.csproj" + "${SOURCE_PATH}/Examples/FileMonInject/FileMonInject.csproj" + "${SOURCE_PATH}/Examples/FileMonitorController/FileMonitorController.csproj" + "${SOURCE_PATH}/Examples/FileMonitorInterceptor/FileMonitorInterceptor.csproj" + "${SOURCE_PATH}/Examples/FileMonitorInterface/FileMonitorInterface.csproj" + "${SOURCE_PATH}/Examples/ProcessMonitor/ProcessMonitor.csproj" + "${SOURCE_PATH}/Examples/ProcMonInject/ProcMonInject.csproj" + "${SOURCE_PATH}/Test/ComplexParameterInject/ComplexParameterInject.csproj" + "${SOURCE_PATH}/Test/ComplexParameterTest/ComplexParameterTest.csproj" + "${SOURCE_PATH}/Test/EasyHook.Tests/EasyHook.Tests.csproj" + "${SOURCE_PATH}/Test/ManagedTarget/ManagedTarget.csproj" + "${SOURCE_PATH}/Test/ManagedTest/ManagedTest.csproj" + "${SOURCE_PATH}/Test/MultipleHooks/MultipleHooks/MultipleHooks.csproj" + "${SOURCE_PATH}/Test/MultipleHooks/SimpleHook1/SimpleHook1.csproj" + "${SOURCE_PATH}/Test/MultipleHooks/SimpleHook2/SimpleHook2.csproj" + "${SOURCE_PATH}/Test/TestFuncHooks/TestFuncHooks.csproj") + + vcpkg_replace_string( + "${CSPROJ}" + "v4.0" + "4.7.2" + ) + vcpkg_replace_string( + "${CSPROJ}" + "Client" + "" + ) +endforeach() + vcpkg_install_msbuild( SOURCE_PATH ${SOURCE_PATH} PROJECT_SUBPATH EasyHook.sln diff --git a/external_imported/vcpkg/ports/easyhook/vcpkg.json b/external_imported/vcpkg/ports/easyhook/vcpkg.json index 610d874fc..0a894137a 100644 --- a/external_imported/vcpkg/ports/easyhook/vcpkg.json +++ b/external_imported/vcpkg/ports/easyhook/vcpkg.json @@ -1,8 +1,8 @@ { "name": "easyhook", "version": "2.7.7097.0", - "port-version": 3, + "port-version": 5, "description": "This project supports extending (hooking) unmanaged code (APIs) with pure managed ones, from within a fully managed environment on 32- or 64-bit Windows Vista x64, Windows Server 2008 x64, Windows 7, Windows 8.1, and Windows 10.", "homepage": "https://github.com/EasyHook/EasyHook", - "supports": "windows & !(static | arm | uwp)" + "supports": "windows & !static & !uwp & (x86 | x64)" } diff --git a/external_imported/vcpkg/ports/eathread/portfile.cmake b/external_imported/vcpkg/ports/eathread/portfile.cmake index 5d4d9669a..421f7c591 100644 --- a/external_imported/vcpkg/ports/eathread/portfile.cmake +++ b/external_imported/vcpkg/ports/eathread/portfile.cmake @@ -1,5 +1,4 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "arm" "arm64") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -7,7 +6,7 @@ vcpkg_from_github( REF e4367a36f2e55d10b2b994bfbae8edf21f15bafd SHA512 cd5a2aa6cdfe6fa538067919aa49e5ecd901898e12929dc852068ce66efe386032eb1fe667ea7d9b7a3d73a7bef1d90a683c0b90b6fb0d6d9a27950b05c4ab6a HEAD_REF master - PATCHES + PATCHES fix_cmake_install.patch ) diff --git a/external_imported/vcpkg/ports/eathread/vcpkg.json b/external_imported/vcpkg/ports/eathread/vcpkg.json index b5ad4d3cf..4f18b4c7a 100644 --- a/external_imported/vcpkg/ports/eathread/vcpkg.json +++ b/external_imported/vcpkg/ports/eathread/vcpkg.json @@ -1,9 +1,10 @@ { "name": "eathread", "version-string": "1.32.09", - "port-version": 2, + "port-version": 3, "description": "Electronic Arts Thread Library. EAThread implements a unified cross-platform interface for multithreaded programming on various platforms.", "homepage": "https://github.com/electronicarts/EAThread", + "supports": "!uwp & x64", "dependencies": [ "eabase", "eastl" diff --git a/external_imported/vcpkg/ports/ebml/include-limits.patch b/external_imported/vcpkg/ports/ebml/include-limits.patch new file mode 100644 index 000000000..3d548edd3 --- /dev/null +++ b/external_imported/vcpkg/ports/ebml/include-limits.patch @@ -0,0 +1,24 @@ +diff --git a/src/EbmlString.cpp b/src/EbmlString.cpp +index 27e55fd..4c05fcf 100644 +--- a/src/EbmlString.cpp ++++ b/src/EbmlString.cpp +@@ -34,6 +34,7 @@ + \author Steve Lhomme + */ + #include ++#include + + #include "ebml/EbmlString.h" + +diff --git a/src/EbmlUnicodeString.cpp b/src/EbmlUnicodeString.cpp +index 496a16a..99fc073 100644 +--- a/src/EbmlUnicodeString.cpp ++++ b/src/EbmlUnicodeString.cpp +@@ -36,6 +36,7 @@ + */ + + #include ++#include + + #include "ebml/EbmlUnicodeString.h" + diff --git a/external_imported/vcpkg/ports/ebml/portfile.cmake b/external_imported/vcpkg/ports/ebml/portfile.cmake index 2a4d232ae..e92897923 100644 --- a/external_imported/vcpkg/ports/ebml/portfile.cmake +++ b/external_imported/vcpkg/ports/ebml/portfile.cmake @@ -8,6 +8,8 @@ vcpkg_from_github( REF release-1.4.2 SHA512 2A03CA1D82A41EE05CFE4DD2726CC79295FA06A4D8ECEB93FE8F41BDFF09F04897B434B49DD1F496E1C014289B14C3F3416EAB4C8B1E745652FF1AB4A620BF83 HEAD_REF master + PATCHES + include-limits.patch ) vcpkg_cmake_configure( diff --git a/external_imported/vcpkg/ports/ebml/vcpkg.json b/external_imported/vcpkg/ports/ebml/vcpkg.json index f90e93d79..18e817f26 100644 --- a/external_imported/vcpkg/ports/ebml/vcpkg.json +++ b/external_imported/vcpkg/ports/ebml/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ebml", "version": "1.4.2", + "port-version": 1, "description": "A C++ library to parse EBML files", "homepage": "https://github.com/Matroska-Org/libebml", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/ecsutil/portfile.cmake b/external_imported/vcpkg/ports/ecsutil/portfile.cmake index 5cbf085bf..98f5c2e13 100644 --- a/external_imported/vcpkg/ports/ecsutil/portfile.cmake +++ b/external_imported/vcpkg/ports/ecsutil/portfile.cmake @@ -1,5 +1,3 @@ - -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "UWP" "Linux" "OSX") if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") set(PLATFORM x86) endif() diff --git a/external_imported/vcpkg/ports/ecsutil/vcpkg.json b/external_imported/vcpkg/ports/ecsutil/vcpkg.json index fc3722756..1e909e922 100644 --- a/external_imported/vcpkg/ports/ecsutil/vcpkg.json +++ b/external_imported/vcpkg/ports/ecsutil/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ecsutil", "version-string": "1.0.7.15", - "port-version": 1, + "port-version": 2, "description": "Native Windows SDK for accessing ECS via the S3 HTTP protocol.", "homepage": "https://github.com/EMCECS/ecs-object-client-windows-cpp", "supports": "windows & (x64 | x86)", diff --git a/external_imported/vcpkg/ports/effects11/portfile.cmake b/external_imported/vcpkg/ports/effects11/portfile.cmake index e5ebf84ab..798d3554d 100644 --- a/external_imported/vcpkg/ports/effects11/portfile.cmake +++ b/external_imported/vcpkg/ports/effects11/portfile.cmake @@ -1,7 +1,4 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -vcpkg_fail_port_install(ON_TARGET "LINUX" "OSX" "ANDROID") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/FX11 diff --git a/external_imported/vcpkg/ports/effects11/vcpkg.json b/external_imported/vcpkg/ports/effects11/vcpkg.json index 4edddcd8d..a5bd57af4 100644 --- a/external_imported/vcpkg/ports/effects11/vcpkg.json +++ b/external_imported/vcpkg/ports/effects11/vcpkg.json @@ -1,7 +1,7 @@ { "name": "effects11", "version": "11.26", - "port-version": 1, + "port-version": 2, "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", diff --git a/external_imported/vcpkg/ports/efsw/portfile.cmake b/external_imported/vcpkg/ports/efsw/portfile.cmake index 289d4354d..450443fa1 100644 --- a/external_imported/vcpkg/ports/efsw/portfile.cmake +++ b/external_imported/vcpkg/ports/efsw/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO SpartanJ/efsw diff --git a/external_imported/vcpkg/ports/efsw/vcpkg.json b/external_imported/vcpkg/ports/efsw/vcpkg.json index a001ada8f..f992dc8a5 100644 --- a/external_imported/vcpkg/ports/efsw/vcpkg.json +++ b/external_imported/vcpkg/ports/efsw/vcpkg.json @@ -1,7 +1,7 @@ { "name": "efsw", - "version-string": "2020-06-08", - "port-version": 2, + "version-date": "2020-06-08", + "port-version": 3, "description": "efsw is a C++ cross-platform file system watcher and notifier.", "homepage": "https://github.com/SpartanJ/efsw", "supports": "!uwp" diff --git a/external_imported/vcpkg/ports/eigen3/disable_pkgconfig_absolute_path_check.patch b/external_imported/vcpkg/ports/eigen3/disable_pkgconfig_absolute_path_check.patch deleted file mode 100644 index cfa964340..000000000 --- a/external_imported/vcpkg/ports/eigen3/disable_pkgconfig_absolute_path_check.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index dbb9bcf..84c413c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -407,11 +407,13 @@ set(PKGCONFIG_INSTALL_DIR - CACHE STRING "The directory relative to CMAKE_PREFIX_PATH where eigen3.pc is installed" - ) - -+if(0) - foreach(var INCLUDE_INSTALL_DIR CMAKEPACKAGE_INSTALL_DIR PKGCONFIG_INSTALL_DIR) - if(IS_ABSOLUTE "${${var}}") - message(FATAL_ERROR "${var} must be relative to CMAKE_PREFIX_PATH. Got: ${${var}}") - endif() - endforeach() -+endif() - - # similar to set_target_properties but append the property instead of overwriting it - macro(ei_add_target_property target prop value) diff --git a/external_imported/vcpkg/ports/eigen3/fix-cuda-error.patch b/external_imported/vcpkg/ports/eigen3/fix-cuda-error.patch deleted file mode 100644 index 9123806df..000000000 --- a/external_imported/vcpkg/ports/eigen3/fix-cuda-error.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/Eigen/src/Core/arch/CUDA/Half.h b/Eigen/src/Core/arch/CUDA/Half.h -index 755e620..85e445b 100644 ---- a/Eigen/src/Core/arch/CUDA/Half.h -+++ b/Eigen/src/Core/arch/CUDA/Half.h -@@ -209,7 +209,11 @@ namespace half_impl { - // conversion steps back and forth. - - EIGEN_STRONG_INLINE __device__ half operator + (const half& a, const half& b) { -+#if defined(EIGEN_CUDACC_VER) && EIGEN_CUDACC_VER >= 90000 -+ return __hadd(::__half(a), ::__half(b)); -+#else - return __hadd(a, b); -+#endif - } - EIGEN_STRONG_INLINE __device__ half operator * (const half& a, const half& b) { - return __hmul(a, b); -@@ -218,9 +222,13 @@ EIGEN_STRONG_INLINE __device__ half operator - (const half& a, const half& b) { - return __hsub(a, b); - } - EIGEN_STRONG_INLINE __device__ half operator / (const half& a, const half& b) { -+#if defined(EIGEN_CUDACC_VER) && EIGEN_CUDACC_VER >= 90000 -+ return __hdiv(a, b); -+#else - float num = __half2float(a); - float denom = __half2float(b); - return __float2half(num / denom); -+#endif - } - EIGEN_STRONG_INLINE __device__ half operator - (const half& a) { - return __hneg(a); diff --git a/external_imported/vcpkg/ports/eigen3/fix-vectorized-reductions-half.patch b/external_imported/vcpkg/ports/eigen3/fix-vectorized-reductions-half.patch new file mode 100644 index 000000000..1c5e592db --- /dev/null +++ b/external_imported/vcpkg/ports/eigen3/fix-vectorized-reductions-half.patch @@ -0,0 +1,26 @@ +diff --git a/Eigen/src/Core/PartialReduxEvaluator.h b/Eigen/src/Core/PartialReduxEvaluator.h +index 29abf35..4051fcf 100644 +--- a/Eigen/src/Core/PartialReduxEvaluator.h ++++ b/Eigen/src/Core/PartialReduxEvaluator.h +@@ -54,12 +54,19 @@ struct packetwise_redux_traits + /* Value to be returned when size==0 , by default let's return 0 */ + template + EIGEN_DEVICE_FUNC +-PacketType packetwise_redux_empty_value(const Func& ) { return pset1(0); } ++PacketType packetwise_redux_empty_value(const Func& ) { ++ const typename unpacket_traits::type zero(0); ++ return pset1(zero); ++} ++ + + /* For products the default is 1 */ + template + EIGEN_DEVICE_FUNC +-PacketType packetwise_redux_empty_value(const scalar_product_op& ) { return pset1(1); } ++PacketType packetwise_redux_empty_value(const scalar_product_op& ) { ++ return pset1(Scalar(1)); ++} ++ + + /* Perform the actual reduction */ + template @@ -76,7 +76,7 @@ index 6f19a16..3c758d2 100644 - PRIVATE "${ASMJIT_SRC_DIR}/src" - PRIVATE "${CPUINFO_SOURCE_DIR}/include") +) -+target_link_libraries(fbgemm_avx2 PUBLIC asmjit::asmjit unofficial::cpuinfo::cpuinfo) ++target_link_libraries(fbgemm_avx2 PUBLIC asmjit::asmjit cpuinfo::cpuinfo) target_include_directories(fbgemm_avx512 BEFORE PUBLIC $ @@ -95,7 +95,7 @@ index 6f19a16..3c758d2 100644 - $ - $) +) -+target_link_libraries(fbgemm_avx512 PUBLIC asmjit::asmjit unofficial::cpuinfo::cpuinfo) ++target_link_libraries(fbgemm_avx512 PUBLIC asmjit::asmjit cpuinfo::cpuinfo) + +add_library(fbgemm + $ @@ -131,7 +131,7 @@ index 6f19a16..3c758d2 100644 -target_link_libraries(fbgemm $ - $) -add_dependencies(fbgemm asmjit cpuinfo) -+target_link_libraries(fbgemm PUBLIC asmjit::asmjit unofficial::cpuinfo::cpuinfo) ++target_link_libraries(fbgemm PUBLIC asmjit::asmjit cpuinfo::cpuinfo) install(TARGETS fbgemm EXPORT fbgemmLibraryConfig ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} diff --git a/external_imported/vcpkg/ports/fbgemm/portfile.cmake b/external_imported/vcpkg/ports/fbgemm/portfile.cmake index ee0da8e80..d7c443c0a 100644 --- a/external_imported/vcpkg/ports/fbgemm/portfile.cmake +++ b/external_imported/vcpkg/ports/fbgemm/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "x86" ON_TARGET "uwp") - # The project's CMakeLists.txt uses Python to select source files. Check if it is available in advance. vcpkg_find_acquire_program(PYTHON3) diff --git a/external_imported/vcpkg/ports/fbgemm/vcpkg.json b/external_imported/vcpkg/ports/fbgemm/vcpkg.json index aeddbfe0d..40cef6526 100644 --- a/external_imported/vcpkg/ports/fbgemm/vcpkg.json +++ b/external_imported/vcpkg/ports/fbgemm/vcpkg.json @@ -1,9 +1,10 @@ { "name": "fbgemm", "version-date": "2021-03-18", - "port-version": 2, + "port-version": 4, "description": "FB (Facebook) + GEMM (General Matrix-Matrix Multiplication)", "homepage": "https://code.fb.com/ml-applications/fbgemm/", + "license": "BSD-3-Clause", "supports": "!(x86 | uwp)", "dependencies": [ "asmjit", diff --git a/external_imported/vcpkg/ports/fbthrift/fix-sodium-target.patch b/external_imported/vcpkg/ports/fbthrift/fix-sodium-target.patch deleted file mode 100644 index 89d32e53d..000000000 --- a/external_imported/vcpkg/ports/fbthrift/fix-sodium-target.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/build/fbcode_builder/CMake/FindSodium.cmake b/build/fbcode_builder/CMake/FindSodium.cmake -index c664ccbe3..3c3f1245c 100644 ---- a/build/fbcode_builder/CMake/FindSodium.cmake -+++ b/build/fbcode_builder/CMake/FindSodium.cmake -@@ -254,7 +254,10 @@ if(sodium_USE_STATIC_LIBS) - else() - set(_LIB_TYPE SHARED) - endif() --add_library(sodium ${_LIB_TYPE} IMPORTED) -+ -+if(NOT TARGET sodium) -+ add_library(sodium ${_LIB_TYPE} IMPORTED) -+endif() - - set_target_properties(sodium PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${sodium_INCLUDE_DIR}" diff --git a/external_imported/vcpkg/ports/fbthrift/fix-zlib.patch b/external_imported/vcpkg/ports/fbthrift/fix-zlib.patch deleted file mode 100644 index d9a185ad1..000000000 --- a/external_imported/vcpkg/ports/fbthrift/fix-zlib.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 150671504a9..7b248a0105e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -106,7 +106,7 @@ if(lib_only OR build_all) - find_package(fizz CONFIG REQUIRED) - find_package(fmt CONFIG REQUIRED) - find_package(wangle CONFIG REQUIRED) -- find_package(Zlib REQUIRED) -+ find_package(ZLIB REQUIRED) - find_package(Zstd REQUIRED) - # https://cmake.org/cmake/help/v3.9/module/FindThreads.html - set(THREADS_PREFER_PTHREAD_FLAG ON) -@@ -115,7 +115,6 @@ if(lib_only OR build_all) - ${LIBGFLAGS_INCLUDE_DIR} - ${GLOG_INCLUDE_DIRS} - ${OPENSSL_INCLUDE_DIR} -- ${ZLIB_INCLUDE_DIRS} - ${ZSTD_INCLUDE_DIRS} - ${Boost_INCLUDE_DIRS} - ) -diff --git a/thrift/cmake/FBThriftConfig.cmake.in b/thrift/cmake/FBThriftConfig.cmake.in -index 69b29b948c5..e1297ed18c3 100644 ---- a/thrift/cmake/FBThriftConfig.cmake.in -+++ b/thrift/cmake/FBThriftConfig.cmake.in -@@ -28,6 +28,8 @@ else() - set_and_check(FBTHRIFT_COMPILER "@PACKAGE_BIN_INSTALL_DIR@/thrift1") - endif() - -+find_dependency(ZLIB REQUIRED) -+ - if (NOT TARGET FBThrift::thriftcpp2) - include("${FBTHRIFT_CMAKE_DIR}/FBThriftTargets.cmake") - endif() -diff --git a/thrift/cmake/FindZlib.cmake b/thrift/cmake/FindZlib.cmake -deleted file mode 100644 -index c15525b411f..00000000000 ---- a/thrift/cmake/FindZlib.cmake -+++ /dev/null -@@ -1,46 +0,0 @@ --# Copyright (c) Facebook, Inc. and its affiliates. --# --# 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. -- --# --# - Try to find Facebook zstd library --# This will define --# ZLIB_FOUND --# ZLIB_INCLUDE_DIR --# ZLIB_LIBRARIES --# -- --find_path( -- ZLIB_INCLUDE_DIRS zlib.h -- HINTS -- $ENV{ZLIB_ROOT}/include -- ${ZLIB_ROOT}/include --) -- --find_library( -- ZLIB_LIBRARIES z zlib -- HINTS -- $ENV{ZLIB_ROOT}/lib -- ${ZLIB_ROOT}/lib --) -- --# For some reason ZLIB_FOUND is never marked as TRUE --set(ZLIB_FOUND TRUE) --mark_as_advanced(ZLIB_INCLUDE_DIRS ZLIB_LIBRARIES) -- --include(FindPackageHandleStandardArgs) --find_package_handle_standard_args(Zstd ZLIB_INCLUDE_DIRS ZLIB_LIBRARIES) -- --if(ZLIB_FOUND AND NOT ZLIB_FIND_QUIETLY) -- message(STATUS "ZLIB: ${ZLIB_INCLUDE_DIRS}") --endif() -diff --git a/thrift/lib/cpp/CMakeLists.txt b/thrift/lib/cpp/CMakeLists.txt -index 681622594c9..3df0b5717db 100644 ---- a/thrift/lib/cpp/CMakeLists.txt -+++ b/thrift/lib/cpp/CMakeLists.txt -@@ -77,8 +77,8 @@ target_link_libraries( - thrift-core - rpcmetadata - Folly::folly -+ ZLIB::ZLIB - ${OPENSSL_LIBRARIES} -- ${ZLIB_LIBRARIES} - ${ZSTD_LIBRARIES} - ) - diff --git a/external_imported/vcpkg/ports/fbthrift/portfile.cmake b/external_imported/vcpkg/ports/fbthrift/portfile.cmake index 016fac181..3cafd5feb 100644 --- a/external_imported/vcpkg/ports/fbthrift/portfile.cmake +++ b/external_imported/vcpkg/ports/fbthrift/portfile.cmake @@ -1,56 +1,64 @@ -vcpkg_fail_port_install(ON_ARCH "x86" "arm") - vcpkg_find_acquire_program(FLEX) vcpkg_find_acquire_program(BISON) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/fbthrift - REF v2021.06.14.00 - SHA512 e59465adcd57722626e5a4407529b164472cde3942bd100b3d6e92c5057f88f1a8544b7181a01e05ed3077ffd2b3811b687aa6741d08aedef6b79aea02305798 + REF v2022.03.21.00 + SHA512 8d2d9430dc3a4ecc23042cd9bcf4eee888824449d05d98baec408aef806b934d643e578d3876169f69966c846aeddbe0aa84416c4e020cba028a49d2fccfe7ab HEAD_REF master - PATCHES - fix-sodium-target.patch # fixed in master - fix-zlib.patch # fixed in master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DBISON_EXECUTABLE=${BISON} - -DFLEX_EXECUTABLE=${FLEX} + "-DBISON_EXECUTABLE=${BISON}" + "-DFLEX_EXECUTABLE=${FLEX}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/fbthrift) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/fbthrift) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # There should be no empty directories in vcpkg/packages/fbthrift_x64-linux file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/transport/test - ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/test - ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/util/test - ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/http2/server/test - ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/http2/common/test - ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/http2/test - ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/core/test - ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/inmemory/test - ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/protocol/test - ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/security/extensions/test - ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/security/test - ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/test - ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/frozen/test - ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/reflection/docs - ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/util/test - ${CURRENT_PACKAGES_DIR}/include/thrift/lib/py3/test - ${CURRENT_PACKAGES_DIR}/include/thrift/lib/py3/benchmark - ${CURRENT_PACKAGES_DIR}/include/thrift/lib/thrift/annotation + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/transport/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/util/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/http2/server/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/http2/common/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/http2/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/core/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/inmemory/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/protocol/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/security/extensions/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/security/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/frozen/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/reflection/docs" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/util/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/visitation/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/server/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/py3/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/py3/benchmark" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/thrift/annotation" ) vcpkg_copy_tools(TOOL_NAMES thrift1 AUTO_CLEAN) vcpkg_copy_pdbs() +if(EXISTS "${CURRENT_PACKAGES_DIR}/share/fbthrift/FBThriftConfig.cmake") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fbthrift/FBThriftConfig.cmake" + "${PACKAGE_PREFIX_DIR}/lib/cmake/fbthrift" "${PACKAGE_PREFIX_DIR}/share/fbthrift") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fbthrift/FBThriftConfig.cmake" + "${PACKAGE_PREFIX_DIR}/bin/thrift1.exe" "${PACKAGE_PREFIX_DIR}/tools/fbthrift/thrift1.exe") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fbthrift/FBThriftConfig.cmake" + "${PACKAGE_PREFIX_DIR}/bin/thrift1" "${PACKAGE_PREFIX_DIR}/tools/fbthrift/thrift1") +endif() + +# Only used internally and removed in master +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fbthrift/FBThriftTargets.cmake" "LOCATION_HH=\\\"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/thrift/compiler/location.hh\\\"" "") + # 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/fbthrift/vcpkg.json b/external_imported/vcpkg/ports/fbthrift/vcpkg.json index 4e9237e2c..8e9552787 100644 --- a/external_imported/vcpkg/ports/fbthrift/vcpkg.json +++ b/external_imported/vcpkg/ports/fbthrift/vcpkg.json @@ -1,9 +1,10 @@ { "name": "fbthrift", - "version-string": "2021.06.14.00", + "version-string": "2022.03.21.00", "description": "Facebook's branch of Apache Thrift, including a new C++ server.", "homepage": "https://github.com/facebook/fbthrift", - "supports": "x64", + "license": "Apache-2.0", + "supports": "x64 & static", "dependencies": [ "boost-context", "boost-filesystem", @@ -17,6 +18,14 @@ "gflags", "glog", "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "wangle", "zlib", "zstd" 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 f1ea01e6b..513dc966b 100644 --- a/external_imported/vcpkg/ports/ffmpeg/0004-fix-debug-build.patch +++ b/external_imported/vcpkg/ports/ffmpeg/0004-fix-debug-build.patch @@ -12,22 +12,19 @@ index bd2de34..fba948a 100755 *) optname="${opt%%=*}" optname="${optname#--}" -@@ -6152,8 +6153,13 @@ +@@ -6152,7 +6153,11 @@ enabled zlib && { check_pkg_config zlib zlib "zlib.h" zlibVersion || check_lib zlib zlib.h zlibVersion -lz; } -enabled bzlib && check_lib bzlib bzlib.h BZ2_bzlibVersion -lbz2 --enabled lzma && check_lib lzma lzma.h lzma_version_number -llzma +if enabled debug_configure; then + enabled bzlib && check_lib bzlib bzlib.h BZ2_bzlibVersion -lbz2d -+ enabled lzma && check_lib lzma lzma.h lzma_version_number -llzmad +else + enabled bzlib && check_lib bzlib bzlib.h BZ2_bzlibVersion -lbz2 -+ enabled lzma && check_lib lzma lzma.h lzma_version_number -llzma +fi + enabled lzma && check_lib lzma lzma.h lzma_version_number -llzma # On some systems dynamic loading requires no extra linker flags - check_lib libdl dlfcn.h "dlopen dlsym" || check_lib libdl dlfcn.h "dlopen dlsym" -ldl @@ -6350,7 +6350,11 @@ enabled librubberband && require_pkg_config librubberband "rubberband >= 1.8 enabled libshine && require_pkg_config libshine shine shine/layer3.h shine_encode_buffer enabled libsmbclient && { check_pkg_config libsmbclient smbclient libsmbclient.h smbc_init || diff --git a/external_imported/vcpkg/ports/ffmpeg/build.sh.in b/external_imported/vcpkg/ports/ffmpeg/build.sh.in index b7e53982c..c6f94fa87 100644 --- a/external_imported/vcpkg/ports/ffmpeg/build.sh.in +++ b/external_imported/vcpkg/ports/ffmpeg/build.sh.in @@ -91,11 +91,11 @@ OSX_ARCH_COUNT=0@OSX_ARCH_COUNT@ build_ffmpeg() { echo "=== CONFIGURING ===" - sh "$PATH_TO_SRC_DIR/configure" "--prefix=$PATH_TO_PACKAGE_DIR" @CONFIGURE_OPTIONS@ $@ + sh "$PATH_TO_SRC_DIR/configure" "--prefix=$PATH_TO_PACKAGE_DIR" "--cc=$CC" @CONFIGURE_OPTIONS@ $@ echo "=== BUILDING ===" - make -j${JOBS} + make -j${JOBS} V=1 echo "=== INSTALLING ===" diff --git a/external_imported/vcpkg/ports/ffmpeg/portfile.cmake b/external_imported/vcpkg/ports/ffmpeg/portfile.cmake index 974ce3941..76cc00805 100644 --- a/external_imported/vcpkg/ports/ffmpeg/portfile.cmake +++ b/external_imported/vcpkg/ports/ffmpeg/portfile.cmake @@ -1,51 +1,3 @@ -#Check for unsupported features - -if("ffmpeg" IN_LIST FEATURES) - vcpkg_fail_port_install(ON_TARGET "UWP" MESSAGE "Feature 'ffmpeg' does not support 'uwp'") -endif() - -if("ffplay" IN_LIST FEATURES) - vcpkg_fail_port_install(ON_TARGET "UWP" MESSAGE "Feature 'ffplay' does not support 'uwp'") -endif() - -if("ffprobe" IN_LIST FEATURES) - vcpkg_fail_port_install(ON_TARGET "UWP" MESSAGE "Feature 'ffprobe' does not support 'uwp'") -endif() - -if("avisynthplus" IN_LIST FEATURES) - if ((NOT VCPKG_TARGET_IS_WINDOWS) OR (VCPKG_LIBRARY_LINKAGE STREQUAL "static")) - message(FATAL_ERROR "Feature 'avisynthplus' does not support '!windows | static'") - endif() -endif() - -if("dav1d" IN_LIST FEATURES) - if (VCPKG_TARGET_IS_OSX) - message(FATAL_ERROR "Feature 'dav1d' does not support 'osx'") - endif() -endif() - -if("opencl" IN_LIST FEATURES) - vcpkg_fail_port_install(ON_TARGET "UWP" MESSAGE "Feature 'opencl' does not support 'uwp'") -endif() - -if("opengl" IN_LIST FEATURES) - if (VCPKG_TARGET_IS_UWP) - message(FATAL_ERROR "Feature 'opengl' does not support 'uwp") - endif() -endif() - -if("tesseract" IN_LIST FEATURES) - if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") - message(FATAL_ERROR "Feature 'tesseract' does not support 'static'") - endif() -endif() - -if("tensorflow" IN_LIST FEATURES) - if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") - message(FATAL_ERROR "Feature 'tensorflow' does not support 'static'") - endif() -endif() - if(VCPKG_TARGET_IS_WINDOWS) set(PATCHES 0017-Patch-for-ticket-9019-CUDA-Compile-Broken-Using-MSVC.patch) # https://trac.ffmpeg.org/ticket/9019 endif() @@ -66,9 +18,9 @@ vcpkg_from_github( 0011-Fix-x265-detection.patch 0012-Fix-ssl-110-detection.patch 0013-define-WINVER.patch - 0014-avfilter-dependency-fix.patch # http://ffmpeg.org/pipermail/ffmpeg-devel/2021-February/275819.html + 0014-avfilter-dependency-fix.patch # https://ffmpeg.org/pipermail/ffmpeg-devel/2021-February/275819.html 0015-Fix-xml2-detection.patch - 0016-configure-dnn-needs-avformat.patch # http://ffmpeg.org/pipermail/ffmpeg-devel/2021-May/279926.html + 0016-configure-dnn-needs-avformat.patch # https://ffmpeg.org/pipermail/ffmpeg-devel/2021-May/279926.html ${PATCHES} 0018-libaom-Dont-use-aom_codec_av1_dx_algo.patch 0019-libx264-Do-not-explicitly-set-X264_API_IMPORTS.patch @@ -82,12 +34,12 @@ endif() if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") # ffmpeg nasm build gives link error on x86, so fall back to yasm vcpkg_find_acquire_program(YASM) - get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY) - vcpkg_add_to_path(${YASM_EXE_PATH}) + get_filename_component(YASM_EXE_PATH "${YASM}" DIRECTORY) + vcpkg_add_to_path("${YASM_EXE_PATH}") else() vcpkg_find_acquire_program(NASM) - get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) - vcpkg_add_to_path(${NASM_EXE_PATH}) + get_filename_component(NASM_EXE_PATH "${NASM}" DIRECTORY) + vcpkg_add_to_path("${NASM_EXE_PATH}") endif() if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) @@ -133,29 +85,40 @@ if(VCPKG_TARGET_IS_WINDOWS) vcpkg_acquire_msys(MSYS_ROOT) endif() - set(SHELL ${MSYS_ROOT}/usr/bin/bash.exe) - if(VCPKG_TARGET_IS_MINGW) - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(OPTIONS "--target-os=mingw32 ${OPTIONS}") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(OPTIONS "--target-os=mingw64 ${OPTIONS}") - endif() - else() - set(OPTIONS "--toolchain=msvc ${OPTIONS}") - endif() + set(SHELL "${MSYS_ROOT}/usr/bin/bash.exe") else() set(SHELL /bin/sh) endif() +if(VCPKG_TARGET_IS_MINGW) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + string(APPEND OPTIONS " --target-os=mingw32") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + string(APPEND OPTIONS " --target-os=mingw64") + endif() +elseif(VCPKG_TARGET_IS_WINDOWS) + string(APPEND OPTIONS " --target-os=win32") +elseif(VCPKG_TARGET_IS_OSX) + string(APPEND OPTIONS " --target-os=darwin") +elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android") + string(APPEND OPTIONS " --target-os=android") +else() +endif() + vcpkg_cmake_get_vars(cmake_vars_file) include("${cmake_vars_file}") -if(VCPKG_TARGET_IS_OSX AND VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET) - set(OPTIONS "--extra-cflags=-mmacosx-version-min=${VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET} ${OPTIONS}") - set(OPTIONS "--extra-ldflags=-mmacosx-version-min=${VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET} ${OPTIONS}") +if(VCPKG_DETECTED_MSVC) + set(OPTIONS "--toolchain=msvc ${OPTIONS}") + # This is required because ffmpeg depends upon optimizations to link correctly + string(APPEND VCPKG_COMBINED_C_FLAGS_DEBUG " -O2") + string(REGEX REPLACE "(^| )-RTC1( |$)" " " VCPKG_COMBINED_C_FLAGS_DEBUG "${VCPKG_COMBINED_C_FLAGS_DEBUG}") + string(REGEX REPLACE "(^| )-Od( |$)" " " VCPKG_COMBINED_C_FLAGS_DEBUG "${VCPKG_COMBINED_C_FLAGS_DEBUG}") + string(REGEX REPLACE "(^| )-Ob0( |$)" " " VCPKG_COMBINED_C_FLAGS_DEBUG "${VCPKG_COMBINED_C_FLAGS_DEBUG}") endif() -set(ENV{${INCLUDE_VAR}} "${CURRENT_INSTALLED_DIR}/include${VCPKG_HOST_PATH_SEPARATOR}$ENV{${INCLUDE_VAR}}") +string(APPEND VCPKG_COMBINED_C_FLAGS_DEBUG " -I \"${CURRENT_INSTALLED_DIR}/include\"") +string(APPEND VCPKG_COMBINED_C_FLAGS_RELEASE " -I \"${CURRENT_INSTALLED_DIR}/include\"") set(_csc_PROJECT_PATH ffmpeg) @@ -490,80 +453,48 @@ else() endif() if (VCPKG_TARGET_IS_OSX) - # if the sysroot isn't set in the triplet we fall back to whatever CMake detected for us - if ("${VCPKG_OSX_SYSROOT}" STREQUAL "") - set(VCPKG_OSX_SYSROOT ${VCPKG_DETECTED_CMAKE_OSX_SYSROOT}) - endif() - set(OPTIONS "${OPTIONS} --disable-vdpau") # disable vdpau in OSX - set(OPTIONS "${OPTIONS} --extra-cflags=\"-isysroot ${VCPKG_OSX_SYSROOT}\"") - set(OPTIONS "${OPTIONS} --extra-ldflags=\"-isysroot ${VCPKG_OSX_SYSROOT}\"") - - list(JOIN VCPKG_OSX_ARCHITECTURES " " OSX_ARCHS) - LIST(LENGTH VCPKG_OSX_ARCHITECTURES OSX_ARCH_COUNT) endif() -set(OPTIONS_CROSS "") +set(OPTIONS_CROSS " --enable-cross-compile") + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + string(APPEND OPTIONS_CROSS " --arch=x86_64") +else() + string(APPEND OPTIONS_CROSS " --arch=${VCPKG_TARGET_ARCHITECTURE}") +endif() if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") if(VCPKG_TARGET_IS_WINDOWS) - set(OPTIONS_CROSS " --enable-cross-compile --target-os=win32 --arch=${VCPKG_TARGET_ARCHITECTURE}") vcpkg_find_acquire_program(GASPREPROCESSOR) foreach(GAS_PATH ${GASPREPROCESSOR}) get_filename_component(GAS_ITEM_PATH ${GAS_PATH} DIRECTORY) set(ENV{PATH} "$ENV{PATH}${VCPKG_HOST_PATH_SEPARATOR}${GAS_ITEM_PATH}") endforeach(GAS_PATH) - elseif(VCPKG_TARGET_IS_OSX AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "${VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR}") # VCPKG_TARGET_ARCHITECTURE = arm64 - # get the number of architectures requested - list(LENGTH VCPKG_OSX_ARCHITECTURES ARCHITECTURE_COUNT) - - # ideally we should check the CMAKE_HOST_SYSTEM_PROCESSOR, but that seems to be - # broken when inside a vcpkg port, so we only set it when doing a simple build - # for a single platform. multi-platform builds use a different script - if (ARCHITECTURE_COUNT LESS 2) - message(STATUS "Building on host: ${CMAKE_SYSTEM_PROCESSOR}") - set(OPTIONS_CROSS " --enable-cross-compile --target-os=darwin --arch=arm64 --extra-ldflags=-arch --extra-ldflags=arm64 --extra-cflags=-arch --extra-cflags=arm64 --extra-cxxflags=-arch --extra-cxxflags=arm64") - endif() endif() -elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - if(VCPKG_TARGET_IS_OSX) - set(OPTIONS_CROSS " --enable-cross-compile --target-os=darwin --arch=x86_64 --extra-ldflags=-arch --extra-ldflags=x86_64 --extra-cflags=-arch --extra-cflags=x86_64 --extra-cxxflags=-arch --extra-cxxflags=x86_64") - endif() -elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") -else() - message(FATAL_ERROR "Unsupported architecture") endif() if(VCPKG_TARGET_IS_UWP) set(ENV{LIBPATH} "$ENV{LIBPATH};$ENV{_WKITS10}references\\windows.foundation.foundationcontract\\2.0.0.0\\;$ENV{_WKITS10}references\\windows.foundation.universalapicontract\\3.0.0.0\\") - set(OPTIONS "${OPTIONS} --disable-programs") - set(OPTIONS "${OPTIONS} --extra-cflags=-DWINAPI_FAMILY=WINAPI_FAMILY_APP --extra-cflags=-D_WIN32_WINNT=0x0A00") - set(OPTIONS_CROSS " --enable-cross-compile --target-os=win32 --arch=${VCPKG_TARGET_ARCHITECTURE}") + string(APPEND OPTIONS " --disable-programs") + string(APPEND OPTIONS " --extra-cflags=-DWINAPI_FAMILY=WINAPI_FAMILY_APP --extra-cflags=-D_WIN32_WINNT=0x0A00") + string(APPEND OPTIONS " --extra-ldflags=-APPCONTAINER --extra-ldflags=WindowsApp.lib") endif() -set(OPTIONS_DEBUG "--debug") # Note: --disable-optimizations can't be used due to http://ffmpeg.org/pipermail/libav-user/2013-March/003945.html +# Note: --disable-optimizations can't be used due to https://ffmpeg.org/pipermail/libav-user/2013-March/003945.html +set(OPTIONS_DEBUG "--debug") set(OPTIONS_RELEASE "") set(OPTIONS "${OPTIONS} ${OPTIONS_CROSS}") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(OPTIONS "${OPTIONS} --disable-static --enable-shared") - if (VCPKG_TARGET_IS_UWP) - set(OPTIONS "${OPTIONS} --extra-ldflags=-APPCONTAINER --extra-ldflags=WindowsApp.lib") - endif() endif() if(VCPKG_TARGET_IS_MINGW) set(OPTIONS "${OPTIONS} --extra_cflags=-D_WIN32_WINNT=0x0601") elseif(VCPKG_TARGET_IS_WINDOWS) set(OPTIONS "${OPTIONS} --extra-cflags=-DHAVE_UNISTD_H=0") - if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") - set(OPTIONS_DEBUG "${OPTIONS_DEBUG} --extra-cflags=-MDd --extra-cxxflags=-MDd") - set(OPTIONS_RELEASE "${OPTIONS_RELEASE} --extra-cflags=-MD --extra-cxxflags=-MD") - else() - set(OPTIONS_DEBUG "${OPTIONS_DEBUG} --extra-cflags=-MTd --extra-cxxflags=-MTd") - set(OPTIONS_RELEASE "${OPTIONS_RELEASE} --extra-cflags=-MT --extra-cxxflags=-MT") - endif() endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -572,17 +503,34 @@ endif() set(ENV_LIB_PATH "$ENV{${LIB_PATH_VAR}}") +get_filename_component(CC_path "${VCPKG_DETECTED_CMAKE_C_COMPILER}" DIRECTORY) +get_filename_component(CC_filename "${VCPKG_DETECTED_CMAKE_C_COMPILER}" NAME) +set(ENV{CC} "${CC_filename}") +if(CC_path) + vcpkg_add_to_path(PREPEND "${CC_path}") +endif() + message(STATUS "Building Options: ${OPTIONS}") # Release build if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") message(STATUS "Building Release Options: ${OPTIONS_RELEASE}") set(ENV{${LIB_PATH_VAR}} "${CURRENT_INSTALLED_DIR}/lib${VCPKG_HOST_PATH_SEPARATOR}${ENV_LIB_PATH}") - set(ENV{CFLAGS} "${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_RELEASE}") - set(ENV{LDFLAGS} "${VCPKG_LINKER_FLAGS}") set(ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}/lib/pkgconfig") message(STATUS "Building ${_csc_PROJECT_PATH} for Release") - file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + # We use response files here as the only known way to handle spaces in paths + set(crsp "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/cflags.rsp") + file(WRITE "${crsp}" "${VCPKG_COMBINED_C_FLAGS_RELEASE}") + set(ldrsp "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/ldflags.rsp") + file(WRITE "${ldrsp}" "${VCPKG_COMBINED_SHARED_LINKER_FLAGS_RELEASE}") + set(ENV{CFLAGS} "@${crsp}") + # All tools except the msvc arm{,64} assembler accept @... as response file syntax. + # For that assembler, there is no known way to pass in flags. We must hope that not passing flags will work acceptably. + if(NOT VCPKG_DETECTED_MSVC OR NOT VCPKG_TARGET_ARCHITECTURE MATCHES "^arm") + set(ENV{ASFLAGS} "@${crsp}") + endif() + set(ENV{LDFLAGS} "@${ldrsp}") set(BUILD_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") set(CONFIGURE_OPTIONS "${OPTIONS} ${OPTIONS_RELEASE}") @@ -591,9 +539,9 @@ if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") configure_file("${CMAKE_CURRENT_LIST_DIR}/build.sh.in" "${BUILD_DIR}/build.sh" @ONLY) vcpkg_execute_required_process( - COMMAND ${SHELL} ./build.sh - WORKING_DIRECTORY ${BUILD_DIR} - LOGNAME build-${TARGET_TRIPLET}-rel + COMMAND "${SHELL}" ./build.sh + WORKING_DIRECTORY "${BUILD_DIR}" + LOGNAME "build-${TARGET_TRIPLET}-rel" ) endif() @@ -601,11 +549,19 @@ endif() if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") message(STATUS "Building Debug Options: ${OPTIONS_DEBUG}") set(ENV{${LIB_PATH_VAR}} "${CURRENT_INSTALLED_DIR}/debug/lib${VCPKG_HOST_PATH_SEPARATOR}${ENV_LIB_PATH}") - set(ENV{CFLAGS} "${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_DEBUG}") - set(ENV{LDFLAGS} "${VCPKG_LINKER_FLAGS}") + set(ENV{LDFLAGS} "${VCPKG_COMBINED_SHARED_LINKER_FLAGS_DEBUG}") set(ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig") message(STATUS "Building ${_csc_PROJECT_PATH} for Debug") - file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + set(crsp "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/cflags.rsp") + file(WRITE "${crsp}" "${VCPKG_COMBINED_C_FLAGS_DEBUG}") + set(ldrsp "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/ldflags.rsp") + file(WRITE "${ldrsp}" "${VCPKG_COMBINED_SHARED_LINKER_FLAGS_DEBUG}") + set(ENV{CFLAGS} "@${crsp}") + if(NOT VCPKG_DETECTED_MSVC OR NOT VCPKG_TARGET_ARCHITECTURE MATCHES "^arm") + set(ENV{ASFLAGS} "@${crsp}") + endif() + set(ENV{LDFLAGS} "@${ldrsp}") set(BUILD_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") set(CONFIGURE_OPTIONS "${OPTIONS} ${OPTIONS_DEBUG}") @@ -614,14 +570,14 @@ if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") configure_file("${CMAKE_CURRENT_LIST_DIR}/build.sh.in" "${BUILD_DIR}/build.sh" @ONLY) vcpkg_execute_required_process( - COMMAND ${SHELL} ./build.sh - WORKING_DIRECTORY ${BUILD_DIR} - LOGNAME build-${TARGET_TRIPLET}-dbg + COMMAND "${SHELL}" ./build.sh + WORKING_DIRECTORY "${BUILD_DIR}" + LOGNAME "build-${TARGET_TRIPLET}-dbg" ) endif() if(VCPKG_TARGET_IS_WINDOWS) - file(GLOB DEF_FILES ${CURRENT_PACKAGES_DIR}/lib/*.def ${CURRENT_PACKAGES_DIR}/debug/lib/*.def) + file(GLOB DEF_FILES "${CURRENT_PACKAGES_DIR}/lib/*.def" "${CURRENT_PACKAGES_DIR}/debug/lib/*.def") if(NOT VCPKG_TARGET_IS_MINGW) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") @@ -644,21 +600,21 @@ if(VCPKG_TARGET_IS_WINDOWS) file(TO_NATIVE_PATH "${DEF_FILE_DIR}/${OUT_FILE_NAME}" OUT_FILE_NATIVE) message(STATUS "Generating ${OUT_FILE_NATIVE}") vcpkg_execute_required_process( - COMMAND lib.exe /def:${DEF_FILE_NATIVE} /out:${OUT_FILE_NATIVE} ${LIB_MACHINE_ARG} - WORKING_DIRECTORY ${CURRENT_PACKAGES_DIR} - LOGNAME libconvert-${TARGET_TRIPLET} + COMMAND lib.exe "/def:${DEF_FILE_NATIVE}" "/out:${OUT_FILE_NATIVE}" ${LIB_MACHINE_ARG} + WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}" + LOGNAME "libconvert-${TARGET_TRIPLET}" ) endforeach() endif() - file(GLOB EXP_FILES ${CURRENT_PACKAGES_DIR}/lib/*.exp ${CURRENT_PACKAGES_DIR}/debug/lib/*.exp) - file(GLOB LIB_FILES ${CURRENT_PACKAGES_DIR}/bin/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX} ${CURRENT_PACKAGES_DIR}/debug/bin/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}) + file(GLOB EXP_FILES "${CURRENT_PACKAGES_DIR}/lib/*.exp" "${CURRENT_PACKAGES_DIR}/debug/lib/*.exp") + file(GLOB LIB_FILES "${CURRENT_PACKAGES_DIR}/bin/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/bin/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") if(VCPKG_TARGET_IS_MINGW) - file(GLOB LIB_FILES_2 ${CURRENT_PACKAGES_DIR}/bin/*.lib ${CURRENT_PACKAGES_DIR}/debug/bin/*.lib) + file(GLOB LIB_FILES_2 "${CURRENT_PACKAGES_DIR}/bin/*.lib" "${CURRENT_PACKAGES_DIR}/debug/bin/*.lib") endif() - list(APPEND FILES_TO_REMOVE ${EXP_FILES} ${LIB_FILES} ${LIB_FILES_2} ${DEF_FILES}) - if(FILES_TO_REMOVE) - file(REMOVE ${FILES_TO_REMOVE}) + set(files_to_remove ${EXP_FILES} ${LIB_FILES} ${LIB_FILES_2} ${DEF_FILES}) + if(files_to_remove) + file(REMOVE ${files_to_remove}) endif() endif() @@ -672,10 +628,10 @@ if("ffplay" IN_LIST FEATURES) vcpkg_copy_tools(TOOL_NAMES ffplay AUTO_CLEAN) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() vcpkg_copy_pdbs() @@ -773,8 +729,8 @@ list(REMOVE_DUPLICATES FFMPEG_DEPENDENCIES_DEBUG) list(REVERSE FFMPEG_DEPENDENCIES_RELEASE) list(REVERSE FFMPEG_DEPENDENCIES_DEBUG) -message("Dependencies (release): ${FFMPEG_DEPENDENCIES_RELEASE}") -message("Dependencies (debug): ${FFMPEG_DEPENDENCIES_DEBUG}") +message(STATUS "Dependencies (release): ${FFMPEG_DEPENDENCIES_RELEASE}") +message(STATUS "Dependencies (debug): ${FFMPEG_DEPENDENCIES_DEBUG}") # Handle version strings @@ -833,7 +789,7 @@ extract_version_from_component(LIBSWSCALE_VERSION COMPONENT libswscale) # Handle copyright -file(STRINGS ${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-rel-out.log LICENSE_STRING REGEX "License: .*" LIMIT_COUNT 1) +file(STRINGS "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-rel-out.log" LICENSE_STRING REGEX "License: .*" LIMIT_COUNT 1) if(LICENSE_STRING STREQUAL "License: LGPL version 2.1 or later") set(LICENSE_FILE "COPYING.LGPLv2.1") elseif(LICENSE_STRING STREQUAL "License: LGPL version 3 or later") @@ -844,11 +800,11 @@ elseif(LICENSE_STRING STREQUAL "License: GPL version 3 or later") set(LICENSE_FILE "COPYING.GPLv3") elseif(LICENSE_STRING STREQUAL "License: nonfree and unredistributable") set(LICENSE_FILE "COPYING.NONFREE") - file(WRITE ${SOURCE_PATH}/${LICENSE_FILE} ${LICENSE_STRING}) + file(WRITE "${SOURCE_PATH}/${LICENSE_FILE}" "${LICENSE_STRING}") else() message(FATAL_ERROR "Failed to identify license (${LICENSE_STRING})") endif() -configure_file(${CMAKE_CURRENT_LIST_DIR}/FindFFMPEG.cmake.in ${CURRENT_PACKAGES_DIR}/share/${PORT}/FindFFMPEG.cmake @ONLY) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${SOURCE_PATH}/${LICENSE_FILE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +configure_file("${CMAKE_CURRENT_LIST_DIR}/FindFFMPEG.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/FindFFMPEG.cmake" @ONLY) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/${LICENSE_FILE}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/ffmpeg/vcpkg.json b/external_imported/vcpkg/ports/ffmpeg/vcpkg.json index c5396743d..be2c4993a 100644 --- a/external_imported/vcpkg/ports/ffmpeg/vcpkg.json +++ b/external_imported/vcpkg/ports/ffmpeg/vcpkg.json @@ -1,12 +1,13 @@ { "name": "ffmpeg", "version": "4.4.1", - "port-version": 4, + "port-version": 12, "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." ], "homepage": "https://ffmpeg.org", + "license": null, "dependencies": [ { "name": "vcpkg-cmake", @@ -33,14 +34,12 @@ "name": "ffmpeg", "default-features": false, "features": [ - "ass", "avcodec", "avdevice", "avfilter", "avformat", "avresample", "bzip2", - "fontconfig", "freetype", "iconv", "lzma", @@ -80,7 +79,7 @@ "name": "ffmpeg", "default-features": false, "features": [ - "fribidi" + "ass" ], "platform": "!uwp" }, @@ -88,7 +87,7 @@ "name": "ffmpeg", "default-features": false, "features": [ - "modplug" + "fontconfig" ], "platform": "!uwp" }, @@ -96,7 +95,7 @@ "name": "ffmpeg", "default-features": false, "features": [ - "opencl" + "fribidi" ], "platform": "!uwp" }, @@ -104,7 +103,7 @@ "name": "ffmpeg", "default-features": false, "features": [ - "opengl" + "modplug" ], "platform": "!uwp" }, @@ -112,7 +111,7 @@ "name": "ffmpeg", "default-features": false, "features": [ - "openh264" + "opencl" ], "platform": "!uwp" }, @@ -120,9 +119,9 @@ "name": "ffmpeg", "default-features": false, "features": [ - "tensorflow" + "openh264" ], - "platform": "!static" + "platform": "!uwp" }, { "name": "ffmpeg", @@ -140,6 +139,14 @@ ], "platform": "!(uwp | arm)" }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "tensorflow" + ], + "platform": "x64 & !static & !uwp" + }, { "name": "ffmpeg", "default-features": false, @@ -160,9 +167,9 @@ "name": "ffmpeg", "default-features": false, "features": [ - "nvcodec" + "opengl" ], - "platform": "(windows | linux) & !uwp" + "platform": "!uwp & !(arm64 & windows)" }, { "name": "ffmpeg", @@ -170,7 +177,15 @@ "features": [ "tesseract" ], - "platform": "!(windows & arm) & !static" + "platform": "!(windows & arm) & !static & !uwp" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "nvcodec" + ], + "platform": "linux | (!osx & !uwp & !(arm64 & windows))" } ] }, @@ -278,6 +293,7 @@ }, "avisynthplus": { "description": "Reading of AviSynth script files", + "supports": "windows & !static", "dependencies": [ "avisynthplus", { @@ -300,6 +316,7 @@ }, "dav1d": { "description": "AV1 decoding via libdav1d", + "supports": "!osx", "dependencies": [ "dav1d" ] @@ -325,6 +342,7 @@ }, "ffmpeg": { "description": "Build the ffmpeg application", + "supports": "!uwp", "dependencies": [ { "name": "ffmpeg", @@ -339,6 +357,7 @@ }, "ffplay": { "description": "Build the ffplay application", + "supports": "!uwp", "dependencies": [ { "name": "ffmpeg", @@ -356,6 +375,7 @@ }, "ffprobe": { "description": "Build the ffprobe application", + "supports": "!uwp", "dependencies": [ { "name": "ffmpeg", @@ -423,18 +443,21 @@ }, "nvcodec": { "description": "Nvidia video decoding/encoding acceleration", + "supports": "linux | (!osx & !uwp & !(arm64 & windows))", "dependencies": [ "ffnvcodec" ] }, "opencl": { "description": "OpenCL processing", + "supports": "!uwp", "dependencies": [ "opencl" ] }, "opengl": { "description": "OpenGL rendering", + "supports": "!uwp", "dependencies": [ "opengl", "opengl-registry" @@ -539,12 +562,14 @@ }, "tensorflow": { "description": "TensorFlow as a DNN module backend for DNN based filters like sr", + "supports": "!static", "dependencies": [ "tensorflow" ] }, "tesseract": { "description": "Tesseract, needed for ocr filter", + "supports": "!static", "dependencies": [ "tesseract" ] diff --git a/external_imported/vcpkg/ports/ffnvcodec/vcpkg.json b/external_imported/vcpkg/ports/ffnvcodec/vcpkg.json index 7ef678a4b..47418dc0c 100644 --- a/external_imported/vcpkg/ports/ffnvcodec/vcpkg.json +++ b/external_imported/vcpkg/ports/ffnvcodec/vcpkg.json @@ -1,7 +1,8 @@ { "name": "ffnvcodec", "version": "11.1.5.0", + "port-version": 1, "description": "FFmpeg version of Nvidia Codec SDK headers.", "homepage": "https://github.com/FFmpeg/nv-codec-headers", - "supports": "(windows | linux) & !uwp" + "supports": "linux | (!osx & !uwp & !(arm64 & windows))" } diff --git a/external_imported/vcpkg/ports/fftw3/portfile.cmake b/external_imported/vcpkg/ports/fftw3/portfile.cmake index 45a9052e7..7d3c75f19 100644 --- a/external_imported/vcpkg/ports/fftw3/portfile.cmake +++ b/external_imported/vcpkg/ports/fftw3/portfile.cmake @@ -1,5 +1,5 @@ vcpkg_download_distfile(ARCHIVE - URLS "http://www.fftw.org/fftw-3.3.10.tar.gz" + URLS "https://www.fftw.org/fftw-3.3.10.tar.gz" FILENAME "fftw-3.3.10.tar.gz" SHA512 2d34b5ccac7b08740dbdacc6ebe451d8a34cf9d9bfec85a5e776e87adf94abfd803c222412d8e10fbaa4ed46f504aa87180396af1b108666cde4314a55610b40 ) diff --git a/external_imported/vcpkg/ports/fftw3/vcpkg.json b/external_imported/vcpkg/ports/fftw3/vcpkg.json index 53d493231..99fe9ed09 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": 2, + "port-version": 3, "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/fftwpp/vcpkg.json b/external_imported/vcpkg/ports/fftwpp/vcpkg.json index e702a1b93..175e29ab3 100644 --- a/external_imported/vcpkg/ports/fftwpp/vcpkg.json +++ b/external_imported/vcpkg/ports/fftwpp/vcpkg.json @@ -1,8 +1,8 @@ { "name": "fftwpp", - "version-string": "2019-12-19", - "port-version": 1, - "description": "FFTW++ is a C++ header/MPI transpose for Version 3 of the highly optimized FFTW (http://www.fftw.org) Fourier Transform library.", + "version-date": "2019-12-19", + "port-version": 2, + "description": "FFTW++ is a C++ header/MPI transpose for Version 3 of the highly optimized FFTW (https://www.fftw.org) Fourier Transform library.", "homepage": "https://www.fftw.org/", "dependencies": [ "fftw3" diff --git a/external_imported/vcpkg/ports/field3d/0001_fix_build_errors.patch b/external_imported/vcpkg/ports/field3d/0001_fix_build_errors.patch deleted file mode 100644 index 95149e39d..000000000 --- a/external_imported/vcpkg/ports/field3d/0001_fix_build_errors.patch +++ /dev/null @@ -1,148 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1610c2e..b012008 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -31,25 +31,17 @@ - - # Author : Nicholas Yue yue.nicholas@gmail.com - --CMAKE_MINIMUM_REQUIRED( VERSION 2.8 ) -+CMAKE_MINIMUM_REQUIRED( VERSION 3.17 ) - - PROJECT ( field3d ) - - set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake ) - - FIND_PACKAGE (Doxygen) --FIND_PACKAGE (HDF5 COMPONENTS C) --IF ( CMAKE_HOST_WIN32 ) --# f3dinfo relies on program_options but don't include it, since --# for some reason, unlike all the other boost components, a link is --# forced via a pragma. --FIND_PACKAGE (Boost COMPONENTS regex thread) --ELSE () --FIND_PACKAGE (Boost COMPONENTS regex thread program_options system) --FIND_PACKAGE (MPI) --ENDIF () -+FIND_PACKAGE (HDF5 COMPONENTS C REQUIRED) -+FIND_PACKAGE (Boost COMPONENTS regex thread program_options system REQUIRED) - --FIND_PACKAGE (ILMBase) -+FIND_PACKAGE (OpenEXR REQUIRED) - - # Allow the developer to select if Dynamic or Static libraries are built - OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON) -@@ -79,26 +71,14 @@ IF ( CMAKE_HOST_UNIX ) - ENDIF ( ) - IF ( CMAKE_HOST_WIN32 ) - ADD_DEFINITIONS ( -- -D_HAS_ITERATOR_DEBUGGING=0 - -D_CRT_SECURE_NO_WARNINGS=1 - ) - ENDIF ( ) - - SET ( LIB_TYPE SHARED ) - IF ( NOT BUILD_SHARED_LIBS ) -- IF ( CMAKE_HOST_WIN32 ) -- # User wants to build static libraries, so change the LIB_TYPE variable to CMake keyword 'STATIC' - SET ( LIB_TYPE STATIC ) - ADD_DEFINITIONS( -DFIELD3D_STATIC ) -- ENDIF() --ELSE () -- IF ( CMAKE_HOST_WIN32 ) -- ADD_DEFINITIONS ( -- -DOPENEXR_DLL -- -D_HDF5USEDLL_ -- -DHDF5CPP_USEDLL -- ) -- ENDIF() - ENDIF ( NOT BUILD_SHARED_LIBS ) - - ADD_LIBRARY ( Field3D ${LIB_TYPE} -@@ -147,24 +128,22 @@ IF ( CMAKE_HOST_UNIX ) - ${MPI_LIBRARIES} ) - ENDIF ( MPI_FOUND ) - LIST ( APPEND Field3D_Libraries_Shared -- Iex Half IlmThread Imath - pthread dl z ) - SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} ) - SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared} - ${Boost_LIBRARIES} ) - ENDIF ( ) - IF ( CMAKE_HOST_WIN32 ) -- # Add OpenEXR and zlib release/debug -- FOREACH ( lib Iex Half IlmThread Imath zdll ) -+ FOREACH ( lib zlib ) - LIST ( APPEND Field3D_Libraries_Shared - optimized ${lib} -- debug ${lib}_d ) -+ debug ${lib}d ) - ENDFOREACH() - SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} Shlwapi.lib) - SET ( Field3D_BIN_Libraries Field3D ${Boost_LIBRARIES} ) - ENDIF () - --TARGET_LINK_LIBRARIES ( Field3D ${Field3D_DSO_Libraries} ${Boost_LIBRARIES}) -+TARGET_LINK_LIBRARIES ( Field3D ${Field3D_DSO_Libraries} ${Boost_LIBRARIES} OpenEXR::IlmImf) - - # Parase version and soversion from export/ns.h - -@@ -214,33 +193,7 @@ ADD_EXECUTABLE ( f3dinfo - - TARGET_LINK_LIBRARIES ( f3dinfo ${Field3D_BIN_Libraries} ) - --# field3d - sparse_field_io --ADD_EXECUTABLE ( sparse_field_io -- apps/sample_code/sparse_field_io/main.cpp -- ) -- --TARGET_LINK_LIBRARIES ( sparse_field_io ${Field3D_BIN_Libraries} ) -- --# field3d - read --ADD_EXECUTABLE ( read -- apps/sample_code/read/main.cpp -- ) - --TARGET_LINK_LIBRARIES ( read ${Field3D_BIN_Libraries} ) -- --# field3d - mixed_types --ADD_EXECUTABLE ( mixed_types -- apps/sample_code/mixed_types/main.cpp -- ) -- --TARGET_LINK_LIBRARIES ( mixed_types ${Field3D_BIN_Libraries} ) -- --# field3d - create_and_write --ADD_EXECUTABLE ( create_and_write -- apps/sample_code/create_and_write/main.cpp -- ) -- --TARGET_LINK_LIBRARIES ( create_and_write ${Field3D_BIN_Libraries} ) - - IF (DOXYGEN_FOUND) - ADD_CUSTOM_TARGET ( doc -@@ -249,7 +202,7 @@ IF (DOXYGEN_FOUND) - WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY} - ) - IF (INSTALL_DOCS) -- INSTALL (DIRECTORY -+ INSTALL (DIRECTORY - ${CMAKE_HOME_DIRECTORY}/docs - DESTINATION ${CMAKE_INSTALL_PREFIX} - ) -@@ -263,12 +216,11 @@ INSTALL ( TARGETS - - FILE(GLOB Field3d_Includes "${CMAKE_CURRENT_SOURCE_DIR}/export/*.h") - --INSTALL ( FILES -- ${Field3d_Includes} -+INSTALL ( FILES -+ ${Field3d_Includes} - DESTINATION include/Field3D - ) - --INSTALL ( TARGETS f3dinfo -+INSTALL ( TARGETS f3dinfo - RUNTIME DESTINATION bin - ) -- diff --git a/external_imported/vcpkg/ports/field3d/0002_improve_win_compatibility.patch b/external_imported/vcpkg/ports/field3d/0002_improve_win_compatibility.patch deleted file mode 100644 index 08167be69..000000000 --- a/external_imported/vcpkg/ports/field3d/0002_improve_win_compatibility.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/include/UtilFoundation.h b/include/UtilFoundation.h -index 2eb6290..a449b5b 100644 ---- a/include/UtilFoundation.h -+++ b/include/UtilFoundation.h -@@ -90,6 +90,9 @@ - #ifndef WIN32_LEAN_AND_MEAN - #define WIN32_LEAN_AND_MEAN - #endif -+#ifndef NOMINMAX -+#define NOMINMAX -+#endif - - // needed for mutex stuff - #include -diff --git a/src/FieldMapping.cpp b/src/FieldMapping.cpp -index b1f1a1f..90612b1 100644 ---- a/src/FieldMapping.cpp -+++ b/src/FieldMapping.cpp -@@ -49,9 +49,6 @@ - #include "FieldMapping.h" - #include "Types.h" - --#ifdef WIN32 --#define isnan(__x__) _isnan(__x__) --#endif - - //----------------------------------------------------------------------------// - -diff --git a/src/Log.cpp b/src/Log.cpp -index f78229c..d095a50 100644 ---- a/src/Log.cpp -+++ b/src/Log.cpp -@@ -40,8 +40,9 @@ - */ - - //----------------------------------------------------------------------------// -- -+#ifndef _WIN32 - #include -+#endif - #include - #include - diff --git a/external_imported/vcpkg/ports/field3d/0003_hdf5_api.patch b/external_imported/vcpkg/ports/field3d/0003_hdf5_api.patch deleted file mode 100644 index 183a49c9e..000000000 --- a/external_imported/vcpkg/ports/field3d/0003_hdf5_api.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b57057f..e809880 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -35,6 +35,7 @@ CMAKE_MINIMUM_REQUIRED( VERSION 3.17 ) - - PROJECT ( field3d ) - -+add_definitions(-DH5_USE_110_API) - set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake ) - - FIND_PACKAGE (Doxygen) diff --git a/external_imported/vcpkg/ports/field3d/portfile.cmake b/external_imported/vcpkg/ports/field3d/portfile.cmake deleted file mode 100644 index a23e04249..000000000 --- a/external_imported/vcpkg/ports/field3d/portfile.cmake +++ /dev/null @@ -1,35 +0,0 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -endif() - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO imageworks/Field3D - REF 0cf75ad982917e0919f59e5cb3d483517d06d7da - SHA512 e6f137013dd7b64b51b2ec3cc3ed8f4dbfadb85858946f08393653d78136cf8f93ae124716db11358e325c5e64ba04802afd4b89ca36ad65a14dd3db17f3072c - HEAD_REF master - PATCHES - 0001_fix_build_errors.patch - 0002_improve_win_compatibility.patch - 0003_hdf5_api.patch # Switches the HDF5 default API for this port to 1.10 -) - -file(REMOVE ${SOURCE_PATH}/cmake/FindILMBase.cmake) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - "-DINSTALL_DOCS:BOOL=OFF" -) - -vcpkg_install_cmake() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) -endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/external_imported/vcpkg/ports/field3d/vcpkg.json b/external_imported/vcpkg/ports/field3d/vcpkg.json deleted file mode 100644 index 21ca20bdc..000000000 --- a/external_imported/vcpkg/ports/field3d/vcpkg.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "field3d", - "version-string": "1.7.3", - "port-version": 2, - "description": "An open source library for storing voxel data. It provides C++ classes that handle in-memory storage and a file format based on HDF5 that allows the C++ objects to be written to and read from disk.", - "homepage": "https://github.com/imageworks/Field3D", - "supports": "!uwp", - "dependencies": [ - "boost-foreach", - "boost-format", - "boost-program-options", - "boost-regex", - "boost-system", - "boost-test", - "boost-thread", - "boost-timer", - "hdf5", - "openexr" - ] -} diff --git a/external_imported/vcpkg/ports/fizz/0001-fix-libsodium.patch b/external_imported/vcpkg/ports/fizz/0001-fix-libsodium.patch new file mode 100644 index 000000000..454964212 --- /dev/null +++ b/external_imported/vcpkg/ports/fizz/0001-fix-libsodium.patch @@ -0,0 +1,35 @@ +diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt +index bb3e15e5..80c5051e 100644 +--- a/fizz/CMakeLists.txt ++++ b/fizz/CMakeLists.txt +@@ -64,7 +64,7 @@ endif() + + include(CheckAtomic) + +-find_package(Sodium REQUIRED) ++find_package(unofficial-sodium CONFIG REQUIRED) + + SET(FIZZ_SHINY_DEPENDENCIES "") + SET(FIZZ_LINK_LIBRARIES "") +@@ -255,7 +255,7 @@ target_link_libraries(fizz + PUBLIC + ${FOLLY_LIBRARIES} + ${OPENSSL_LIBRARIES} +- sodium ++ unofficial-sodium::sodium + Threads::Threads + ZLIB::ZLIB + ${ZSTD_LIBRARY} +diff --git a/fizz/cmake/fizz-config.cmake.in b/fizz/cmake/fizz-config.cmake.in +index 679b0e61..b28750fa 100644 +--- a/fizz/cmake/fizz-config.cmake.in ++++ b/fizz/cmake/fizz-config.cmake.in +@@ -26,7 +26,7 @@ endif() + set(FIZZ_LIBRARIES fizz::fizz) + + include(CMakeFindDependencyMacro) +-find_dependency(Sodium) ++find_dependency(unofficial-sodium CONFIG REQUIRED) + find_dependency(folly CONFIG) + find_dependency(ZLIB) + diff --git a/external_imported/vcpkg/ports/fizz/0002-fix-libevent.patch b/external_imported/vcpkg/ports/fizz/0002-fix-libevent.patch new file mode 100644 index 000000000..b07161d95 --- /dev/null +++ b/external_imported/vcpkg/ports/fizz/0002-fix-libevent.patch @@ -0,0 +1,30 @@ +diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt +index 80c5051..9f2e3e6 100644 +--- a/fizz/CMakeLists.txt ++++ b/fizz/CMakeLists.txt +@@ -92,10 +92,10 @@ endif() + + find_package(ZLIB REQUIRED) + +-find_package(Libevent CONFIG QUIET) +-if(TARGET event) ++find_package(Libevent CONFIG REQUIRED) ++if(TARGET libevent::core) + message(STATUS "Found libevent from package config") +- list(APPEND FIZZ_SHINY_DEPENDENCIES event) ++ list(APPEND FIZZ_SHINY_DEPENDENCIES libevent::core) + else() + find_package(Libevent MODULE REQUIRED) + list(APPEND FIZZ_LINK_LIBRARIES ${LIBEVENT_LIB}) +diff --git a/fizz/cmake/fizz-config.cmake.in b/fizz/cmake/fizz-config.cmake.in +index b28750f..282c42d 100644 +--- a/fizz/cmake/fizz-config.cmake.in ++++ b/fizz/cmake/fizz-config.cmake.in +@@ -29,6 +29,7 @@ include(CMakeFindDependencyMacro) + find_dependency(unofficial-sodium CONFIG REQUIRED) + find_dependency(folly CONFIG) + find_dependency(ZLIB) ++find_dependency(Libevent CONFIG) + + if (NOT fizz_FIND_QUIETLY) + message(STATUS "Found fizz: ${PACKAGE_PREFIX_DIR}") diff --git a/external_imported/vcpkg/ports/fizz/fix-zlib.patch b/external_imported/vcpkg/ports/fizz/fix-zlib.patch deleted file mode 100644 index 88b6fabe9..000000000 --- a/external_imported/vcpkg/ports/fizz/fix-zlib.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt -index 485e38fc..471d61a5 100644 ---- a/fizz/CMakeLists.txt -+++ b/fizz/CMakeLists.txt -@@ -87,6 +87,8 @@ else() - list(APPEND CMAKE_REQUIRED_INCLUDES ${LIBGFLAGS_INCLUDE_DIR}) - endif() - -+find_package(ZLIB REQUIRED) -+ - find_package(Libevent CONFIG QUIET) - if(TARGET event) - message(STATUS "Found libevent from package config") -@@ -246,6 +248,7 @@ target_link_libraries(fizz - ${OPENSSL_LIBRARIES} - sodium - Threads::Threads -+ ZLIB::ZLIB - PRIVATE - ${GLOG_LIBRARIES} - ${GFLAGS_LIBRARIES} -diff --git a/fizz/cmake/fizz-config.cmake.in b/fizz/cmake/fizz-config.cmake.in -index d9918469..679b0e61 100644 ---- a/fizz/cmake/fizz-config.cmake.in -+++ b/fizz/cmake/fizz-config.cmake.in -@@ -25,7 +25,10 @@ endif() - - set(FIZZ_LIBRARIES fizz::fizz) - -+include(CMakeFindDependencyMacro) - find_dependency(Sodium) -+find_dependency(folly CONFIG) -+find_dependency(ZLIB) - - if (NOT fizz_FIND_QUIETLY) - message(STATUS "Found fizz: ${PACKAGE_PREFIX_DIR}") diff --git a/external_imported/vcpkg/ports/fizz/portfile.cmake b/external_imported/vcpkg/ports/fizz/portfile.cmake index 8af6d336f..1fe719a78 100644 --- a/external_imported/vcpkg/ports/fizz/portfile.cmake +++ b/external_imported/vcpkg/ports/fizz/portfile.cmake @@ -3,38 +3,38 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebookincubator/fizz - REF v2021.06.14.00 - SHA512 ff55f933d55031128b5355707fd025649ad90d261d91ec5f9d793433a77e63d3c2527a7f0111d6a3151667ab29f4117f96a505bcb80c1a4a99bd60346f05f4de + REF v2022.03.21.00 + SHA512 81a7b764c2c2e17fd5df32a69ecb368eb01df04df6dbd1155a40b68fc39cda4f86ce81afc5c89425a5751ef7f4dbb8a40df8b5095685e72ce5e9043c0a74682e HEAD_REF master PATCHES - fix-zlib.patch + 0001-fix-libsodium.patch + 0002-fix-libevent.patch ) # Prefer installed config files file(REMOVE + ${SOURCE_PATH}/fizz/cmake/FindGMock.cmake ${SOURCE_PATH}/fizz/cmake/FindGflags.cmake ${SOURCE_PATH}/fizz/cmake/FindGlog.cmake + ${SOURCE_PATH}/fizz/cmake/FindLibevent.cmake ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/fizz" - PREFER_NINJA OPTIONS -DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF -DINCLUDE_INSTALL_DIR:STRING=include ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/fizz) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/fizz) vcpkg_copy_pdbs() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fizz/fizz-config.cmake" "lib/cmake/fizz" "share/fizz") -file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include -) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/fizz/tool/test" "${CURRENT_PACKAGES_DIR}/include/fizz/util/test") -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/fizz/vcpkg.json b/external_imported/vcpkg/ports/fizz/vcpkg.json index efc70e897..84d086bf1 100644 --- a/external_imported/vcpkg/ports/fizz/vcpkg.json +++ b/external_imported/vcpkg/ports/fizz/vcpkg.json @@ -1,13 +1,24 @@ { "name": "fizz", - "version-string": "2021.06.14.00", + "version-string": "2022.03.21.00", + "port-version": 1, "description": "a TLS 1.3 implementation by Facebook", "homepage": "https://github.com/facebookincubator/fizz", "dependencies": [ + "double-conversion", "fmt", "folly", + "libevent", "libsodium", "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zstd" ] } diff --git a/external_imported/vcpkg/ports/flann/fix-build-error.patch b/external_imported/vcpkg/ports/flann/fix-build-error.patch index 4f48aee55..5b5530eb0 100644 --- a/external_imported/vcpkg/ports/flann/fix-build-error.patch +++ b/external_imported/vcpkg/ports/flann/fix-build-error.patch @@ -23,12 +23,12 @@ index f4b94d2..33b2c26 100644 # set output path for tests set(TEST_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/test) -+option(BUILD_DYNAMIC "Build shared version of libs" ON) -+option(BUILD_STATIC "Build static version of libs" ON) ++option(BUILD_SHARED_LIBS "Build shared version of libs" ON) ++option(WITH_HDF5 "Build hdf5 library" OFF) option(BUILD_C_BINDINGS "Build C bindings" ON) option(BUILD_PYTHON_BINDINGS "Build Python bindings" ON) option(BUILD_MATLAB_BINDINGS "Build Matlab bindings" ON) -@@ -146,8 +148,8 @@ if (BUILD_CUDA_LIB) +@@ -146,8 +148,9 @@ if (BUILD_CUDA_LIB) endif(CUDA_FOUND) endif(BUILD_CUDA_LIB) @@ -36,6 +36,7 @@ index f4b94d2..33b2c26 100644 -pkg_check_modules(LZ4 REQUIRED liblz4) +find_package(PkgConfig) +find_package(lz4 CONFIG REQUIRED) ++set(PKG_EXTERNAL_DEPS "${PKG_EXTERNAL_DEPS} liblz4") #set the C/C++ include path to the "include" directory include_directories(BEFORE ${PROJECT_SOURCE_DIR}/src/cpp) @@ -43,13 +44,14 @@ diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in index 6b95a71..e8bb3f7 100644 --- a/cmake/Config.cmake.in +++ b/cmake/Config.cmake.in -@@ -1,5 +1,10 @@ +@@ -1,5 +1,11 @@ @PACKAGE_INIT@ +# Get definition of 'find_dependency' macro +include(CMakeFindDependencyMacro) +# Find lz4. This will create 'lz4::lz4' target +find_dependency(lz4) ++@CMAKE_EXTERNAL_DEPS@ + include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake") check_required_components("flann") @@ -85,7 +87,7 @@ index b421abb..474cd7e 100644 - add_library(flann_cpp SHARED "") - set_target_properties(flann_cpp PROPERTIES LINKER_LANGUAGE CXX) - target_link_libraries(flann_cpp -Wl,-whole-archive flann_cpp_s -Wl,-no-whole-archive) -+if(BUILD_STATIC) ++if(NOT BUILD_SHARED_LIBS) + add_library(flann_cpp_s STATIC ${CPP_SOURCES}) + target_link_libraries(flann_cpp_s PUBLIC lz4::lz4) + set_property(TARGET flann_cpp_s PROPERTY OUTPUT_NAME flann_cpp) @@ -103,7 +105,7 @@ index b421abb..474cd7e 100644 - if (BUILD_CUDA_LIB) - cuda_add_library(flann_cuda SHARED "") -+if(BUILD_DYNAMIC) ++if(BUILD_SHARED_LIBS) + if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC) + add_library(flann_cpp SHARED ${CPP_SOURCES}) + set_target_properties(flann_cpp PROPERTIES LINKER_LANGUAGE CXX) @@ -170,7 +172,7 @@ index b421abb..474cd7e 100644 if (USE_MPI AND HDF5_IS_PARALLEL) - add_executable(flann_mpi_server flann/mpi/flann_mpi_server.cpp) - target_link_libraries(flann_mpi_server flann_cpp ${HDF5_LIBRARIES} ${MPI_LIBRARIES} ${Boost_LIBRARIES}) -+ if(BUILD_DYNAMIC) ++ if(BUILD_SHARED_LIBS) + add_executable(flann_mpi_server flann/mpi/flann_mpi_server.cpp) + target_link_libraries(flann_mpi_server flann_cpp ${HDF5_LIBRARIES} ${MPI_LIBRARIES} ${Boost_LIBRARIES}) @@ -188,7 +190,7 @@ index b421abb..474cd7e 100644 - if (BUILD_C_BINDINGS) -+ if(BUILD_STATIC) ++ if(NOT BUILD_SHARED_LIBS) add_library(flann_s STATIC ${C_SOURCES}) - target_link_libraries(flann_s -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state) + target_link_libraries(flann_s PUBLIC lz4::lz4) @@ -200,7 +202,7 @@ index b421abb..474cd7e 100644 - + endif() + -+ if(BUILD_DYNAMIC) ++ if(BUILD_SHARED_LIBS) if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC) - add_library(flann SHARED "") + add_library(flann SHARED ${C_SOURCES}) @@ -236,12 +238,12 @@ index b421abb..474cd7e 100644 + endif() endif(WIN32) -+if(BUILD_STATIC) ++if(NOT BUILD_SHARED_LIBS) + list(APPEND FLANN_TARGETS_CPP "flann_cpp_s") + list(APPEND FLANN_TARGETS_C "flann_s") + list(APPEND FLANN_TARGETS_CUDA "flann_cuda_s") +endif() -+if(BUILD_DYNAMIC) ++if(BUILD_SHARED_LIBS) + list(APPEND FLANN_TARGETS_CPP "flann_cpp") + list(APPEND FLANN_TARGETS_C "flann") + list(APPEND FLANN_TARGETS_CUDA "flann_cuda") diff --git a/external_imported/vcpkg/ports/flann/fix-dependency-hdf5.patch b/external_imported/vcpkg/ports/flann/fix-dependency-hdf5.patch index 39df0a313..1d5e6ee01 100644 --- a/external_imported/vcpkg/ports/flann/fix-dependency-hdf5.patch +++ b/external_imported/vcpkg/ports/flann/fix-dependency-hdf5.patch @@ -1,16 +1,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7ff331a..155cabe 100644 +index 9f1dbcb74..5587c896e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -75,11 +75,17 @@ if (NOT PYTHON_EXECUTABLE) +@@ -77,11 +77,19 @@ if (NOT PYTHON_EXECUTABLE) endif() endif() +-find_hdf5() +if (WITH_HDF5) - find_hdf5() --if (NOT HDF5_FOUND) ++find_package(HDF5 CONFIG REQUIRED) + if (NOT HDF5_FOUND) - message(WARNING "hdf5 library not found, some tests will not be run") -+if (NOT hdf5_FOUND) + message(ERROR "hdf5 library not found") else() - include_directories(${HDF5_INCLUDE_DIR}) @@ -19,10 +19,13 @@ index 7ff331a..155cabe 100644 + elseif (TARGET hdf5::hdf5-static) + link_libraries(hdf5::hdf5-static) + endif() ++ set(PKG_EXTERNAL_DEPS "${PKG_EXTERNAL_DEPS} hdf5") ++ set(CMAKE_EXTERNAL_DEPS "find_dependency(HDF5)") +endif() endif() if (USE_MPI OR HDF5_IS_PARALLEL) + diff --git a/cmake/flann_utils.cmake b/cmake/flann_utils.cmake index 8aef8e0..747414f 100644 --- a/cmake/flann_utils.cmake diff --git a/external_imported/vcpkg/ports/flann/portfile.cmake b/external_imported/vcpkg/ports/flann/portfile.cmake index 4c1547715..ce9bb2d3b 100644 --- a/external_imported/vcpkg/ports/flann/portfile.cmake +++ b/external_imported/vcpkg/ports/flann/portfile.cmake @@ -14,31 +14,24 @@ vcpkg_from_github( vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES hdf5 WITH_HDF5 - cuda WITH_CUDA + cuda BUILD_CUDA_LIB ) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" FLANN_BUILD_STATIC) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" FLANN_BUILD_DYNAMIC) - -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA DISABLE_PARALLEL_CONFIGURE OPTIONS ${FEATURE_OPTIONS} - -DBUILD_DYNAMIC=${FLANN_BUILD_DYNAMIC} - -DBUILD_STATIC=${FLANN_BUILD_STATIC} - -DBUILD_CUDA_LIB=${WITH_CUDA} -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF -DBUILD_DOC=OFF -DBUILD_PYTHON_BINDINGS=OFF -DBUILD_MATLAB_BINDINGS=OFF + OPTIONS_DEBUG -DCMAKE_DEBUG_POSTFIX=d - -DHDF5_NO_FIND_PACKAGE_CONFIG_FILE=ON ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/external_imported/vcpkg/ports/flann/vcpkg.json b/external_imported/vcpkg/ports/flann/vcpkg.json index 0074e93dc..782fb321b 100644 --- a/external_imported/vcpkg/ports/flann/vcpkg.json +++ b/external_imported/vcpkg/ports/flann/vcpkg.json @@ -1,11 +1,20 @@ { "name": "flann", "version-date": "2019-04-07", - "port-version": 3, + "port-version": 5, "description": "Fast Library for Approximate Nearest Neighbors", "homepage": "https://github.com/mariusmuja/flann", + "license": "BSD-3-Clause", "dependencies": [ - "lz4" + "lz4", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "cuda": { diff --git a/external_imported/vcpkg/ports/flash-runtime-extensions/README.md b/external_imported/vcpkg/ports/flash-runtime-extensions/README.md new file mode 100644 index 000000000..6915690e5 --- /dev/null +++ b/external_imported/vcpkg/ports/flash-runtime-extensions/README.md @@ -0,0 +1,2 @@ +# flash-runtime-extensions +CMake port of FlashRuntimeExtensions for vcpkg diff --git a/external_imported/vcpkg/ports/flash-runtime-extensions/portfile.cmake b/external_imported/vcpkg/ports/flash-runtime-extensions/portfile.cmake new file mode 100644 index 000000000..9275d347c --- /dev/null +++ b/external_imported/vcpkg/ports/flash-runtime-extensions/portfile.cmake @@ -0,0 +1,23 @@ +set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO al-sabr/FlashRuntimeExtensions + REF v2.4 + SHA512 16db340a9c8d868c64b9771e3ac9a20e775fa145f36158e798733b788fd99d1ac101bfae93b8f88b0e5a0a530e0261c1fbdf7d367031dd3108c14ee00a106c10 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") \ No newline at end of file diff --git a/external_imported/vcpkg/ports/flash-runtime-extensions/vcpkg.json b/external_imported/vcpkg/ports/flash-runtime-extensions/vcpkg.json new file mode 100644 index 000000000..0fdd91d73 --- /dev/null +++ b/external_imported/vcpkg/ports/flash-runtime-extensions/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "flash-runtime-extensions", + "version": "2.4", + "port-version": 1, + "description": "Adobe AIR Native Extension API for Windows/MacOS/Linux", + "homepage": "https://github.com/al-sabr/FlashRuntimeExtensions", + "supports": "!(arm | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/flatbuffers/portfile.cmake b/external_imported/vcpkg/ports/flatbuffers/portfile.cmake index e0feff81b..5b879ad03 100644 --- a/external_imported/vcpkg/ports/flatbuffers/portfile.cmake +++ b/external_imported/vcpkg/ports/flatbuffers/portfile.cmake @@ -12,39 +12,40 @@ vcpkg_from_github( fix-uwp-build.patch ) -set(OPTIONS) -if(VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_IOS) - list(APPEND OPTIONS -DFLATBUFFERS_BUILD_FLATC=OFF -DFLATBUFFERS_BUILD_FLATHASH=OFF) +set(options "") +if(VCPKG_CROSSCOMPILING) + list(APPEND options -DFLATBUFFERS_BUILD_FLATC=OFF -DFLATBUFFERS_BUILD_FLATHASH=OFF) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DFLATBUFFERS_BUILD_TESTS=OFF -DFLATBUFFERS_BUILD_GRPCTEST=OFF - ${OPTIONS} + ${options} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/flatbuffers) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/flatbuffers) +vcpkg_fixup_pkgconfig() file(GLOB flatc_path ${CURRENT_PACKAGES_DIR}/bin/flatc*) if(flatc_path) - make_directory(${CURRENT_PACKAGES_DIR}/tools/flatbuffers) + make_directory("${CURRENT_PACKAGES_DIR}/tools/flatbuffers") get_filename_component(flatc_executable ${flatc_path} NAME) file( RENAME ${flatc_path} ${CURRENT_PACKAGES_DIR}/tools/flatbuffers/${flatc_executable} ) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/flatbuffers) + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/flatbuffers") +else() + file(APPEND "${CURRENT_PACKAGES_DIR}/share/flatbuffers/FlatbuffersConfig.cmake" +"include(\"\${CMAKE_CURRENT_LIST_DIR}/../../../${HOST_TRIPLET}/share/flatbuffers/FlatcTargets.cmake\")\n") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -vcpkg_fixup_pkgconfig() +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/flatbuffers/vcpkg.json b/external_imported/vcpkg/ports/flatbuffers/vcpkg.json index 911c5f189..8eceb524c 100644 --- a/external_imported/vcpkg/ports/flatbuffers/vcpkg.json +++ b/external_imported/vcpkg/ports/flatbuffers/vcpkg.json @@ -1,10 +1,24 @@ { "name": "flatbuffers", - "version-string": "2.0.0", - "port-version": 2, + "version": "2.0.0", + "port-version": 3, "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/" + "homepage": "https://google.github.io/flatbuffers/", + "dependencies": [ + { + "name": "flatbuffers", + "host": true + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/flint/portfile.cmake b/external_imported/vcpkg/ports/flint/portfile.cmake index 1f78e896a..cd8c8ed03 100644 --- a/external_imported/vcpkg/ports/flint/portfile.cmake +++ b/external_imported/vcpkg/ports/flint/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - set(FLINT_VERSION 2.8.0) set(FLINT_HASH "916285d13a55d12a041236195a9d7bbc5c1c3c30c3aa2f169efee6063b800d34f96ad3235f1c77285b04305ce685e5890169c984108d50d0c9ee7a77c3f6e73d") @@ -23,7 +21,7 @@ vcpkg_cmake_configure( OPTIONS -DPYTHON_EXECUTABLE=${PYTHON3} -DWITH_NTL=OFF - -DWITH_CBLAS=OFF + -DWITH_CBLAS=OFF ) vcpkg_cmake_install() @@ -36,4 +34,4 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS) ) endif() -file(INSTALL "${SOURCE_PATH}/gpl-2.0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/gpl-2.0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/flint/vcpkg.json b/external_imported/vcpkg/ports/flint/vcpkg.json index 533818fe5..9c85c6007 100644 --- a/external_imported/vcpkg/ports/flint/vcpkg.json +++ b/external_imported/vcpkg/ports/flint/vcpkg.json @@ -1,6 +1,7 @@ { "name": "flint", "version-semver": "2.8.0", + "port-version": 1, "description": "Fast Library for Number Theory", "homepage": "https://www.flintlib.org/", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/fltk/fltk_version.dat b/external_imported/vcpkg/ports/fltk/fltk_version.dat deleted file mode 100644 index 8ed486ab7..000000000 --- a/external_imported/vcpkg/ports/fltk/fltk_version.dat +++ /dev/null @@ -1 +0,0 @@ -1.3.7 \ No newline at end of file diff --git a/external_imported/vcpkg/ports/fltk/portfile.cmake b/external_imported/vcpkg/ports/fltk/portfile.cmake index 113afee63..c92446529 100644 --- a/external_imported/vcpkg/ports/fltk/portfile.cmake +++ b/external_imported/vcpkg/ports/fltk/portfile.cmake @@ -1,13 +1,11 @@ # FLTK has many improperly shared global variables that get duplicated into every DLL vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fltk/fltk - REF release-1.3.7 - SHA512 aad131027e88fac3fe73d7e0abfc2602cdc195388f14b29b58d654cb49b780e6ff2ef4270935730b45cd3d366f9e8c8fa3c27a4f17b1f6e8c8fd1f9a0a73c308 + REF release-1.3.8 + SHA512 197848d3b80a65cca936daf4f0b74609f0fe8332a4cd11af53385fb2aa45ad698b1e239a48732b118cd3cb189bc531711b72fb2eeeb85be887dc6c5a558fa4b3 PATCHES findlibsfix.patch config-path.patch @@ -15,10 +13,6 @@ vcpkg_from_github( fix-system-link.patch ) -# Remove these 2 lines when the next update -file(COPY ${CMAKE_CURRENT_LIST_DIR}/fltk_version.dat DESTINATION ${SOURCE_PATH}) -file(REMOVE ${SOURCE_PATH}/VERSION) - if (VCPKG_TARGET_ARCHITECTURE MATCHES "arm" OR VCPKG_TARGET_ARCHITECTURE MATCHES "arm64") set(OPTION_USE_GL "-DOPTION_USE_GL=OFF") else() diff --git a/external_imported/vcpkg/ports/fltk/vcpkg.json b/external_imported/vcpkg/ports/fltk/vcpkg.json index 96ab450d5..cdcd1134a 100644 --- a/external_imported/vcpkg/ports/fltk/vcpkg.json +++ b/external_imported/vcpkg/ports/fltk/vcpkg.json @@ -1,9 +1,10 @@ { "name": "fltk", - "version": "1.3.7", + "version": "1.3.8", "port-version": 1, "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": [ "libjpeg-turbo", "libpng", diff --git a/external_imported/vcpkg/ports/fluidsynth/portfile.cmake b/external_imported/vcpkg/ports/fluidsynth/portfile.cmake index d237b8d4a..fd9f48d46 100644 --- a/external_imported/vcpkg/ports/fluidsynth/portfile.cmake +++ b/external_imported/vcpkg/ports/fluidsynth/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO FluidSynth/fluidsynth - REF 6c807bdd37748411801e93c48fcd5789d5a6a278 #v2.2.4 - SHA512 5fab3b4d58fa47825cf6afc816828fb57879523b8d7659fb20deacdf5439e74fd4b0f2b3f03a8db89cc4106b3b36f2ec450a858e02af30245b6413db70060a11 + REF 8b00644751578ba67b709a827cbe5133d849d339 #v2.2.6 + SHA512 37361c6fdbb54eba78e59f03c9ca702129f0fb522721dfb4e744fdc9a8721e665728fa5606bc68c2fb2ce971b4829cfc472f0a7cd72ce3fe14b3a335b098f7ec HEAD_REF master PATCHES fix-dependencies.patch diff --git a/external_imported/vcpkg/ports/fluidsynth/vcpkg.json b/external_imported/vcpkg/ports/fluidsynth/vcpkg.json index 19da38b94..0cb01fc4b 100644 --- a/external_imported/vcpkg/ports/fluidsynth/vcpkg.json +++ b/external_imported/vcpkg/ports/fluidsynth/vcpkg.json @@ -1,9 +1,9 @@ { "name": "fluidsynth", - "version": "2.2.4", - "port-version": 1, + "version": "2.2.6", "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": "fluidsynth", diff --git a/external_imported/vcpkg/ports/fmt/fix-invalid-command.patch b/external_imported/vcpkg/ports/fmt/fix-invalid-command.patch new file mode 100644 index 000000000..c554188bd --- /dev/null +++ b/external_imported/vcpkg/ports/fmt/fix-invalid-command.patch @@ -0,0 +1,11 @@ +diff --git a/include/fmt/locale.h b/include/fmt/locale.h +index 7571b52..0a34eb4 100644 +--- a/include/fmt/locale.h ++++ b/include/fmt/locale.h +@@ -1,2 +1,6 @@ + #include "xchar.h" ++#ifdef _WIN32 ++#pragma message ("fmt/locale.h is deprecated, include fmt/format.h or fmt/xchar.h instead") ++#else + #warning fmt/locale.h is deprecated, include fmt/format.h or fmt/xchar.h instead ++#endif diff --git a/external_imported/vcpkg/ports/fmt/portfile.cmake b/external_imported/vcpkg/ports/fmt/portfile.cmake index f3c73cb02..10362875e 100644 --- a/external_imported/vcpkg/ports/fmt/portfile.cmake +++ b/external_imported/vcpkg/ports/fmt/portfile.cmake @@ -1,11 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fmtlib/fmt - REF 64dc8fbada9898fccddce0dda3cb0c9695712a3d # v8.1.0 - SHA512 83fafbaf0901147f8e835906ad6d0c0a41d26f9e4a59c82b99c1e052b0df2a74fbe5aac4fa7aa3eba1483adc9a80b36bb1ed32c7b93f369a66bdb388347f95ff + REF 8.1.1 + SHA512 794a47d7cb352a2a9f2c050a60a46b002e4157e5ad23e15a5afc668e852b1e1847aeee3cda79e266c789ff79310d792060c94976ceef6352e322d60b94e23189 HEAD_REF master PATCHES fix-write-batch.patch + fix-invalid-command.patch ) vcpkg_cmake_configure( diff --git a/external_imported/vcpkg/ports/fmt/vcpkg.json b/external_imported/vcpkg/ports/fmt/vcpkg.json index 3e90f8ba4..7386b40b6 100644 --- a/external_imported/vcpkg/ports/fmt/vcpkg.json +++ b/external_imported/vcpkg/ports/fmt/vcpkg.json @@ -1,6 +1,7 @@ { "name": "fmt", - "version": "8.1.0", + "version": "8.1.1", + "port-version": 1, "description": "Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.", "homepage": "https://github.com/fmtlib/fmt", "dependencies": [ diff --git a/external_imported/vcpkg/ports/folly/portfile.cmake b/external_imported/vcpkg/ports/folly/portfile.cmake index 0d195a055..79536aae7 100644 --- a/external_imported/vcpkg/ports/folly/portfile.cmake +++ b/external_imported/vcpkg/ports/folly/portfile.cmake @@ -1,9 +1,3 @@ -if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "x86" "arm" "arm64") -else() - vcpkg_fail_port_install(ON_ARCH "x86" "arm") -endif() - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) # Required to run build/generate_escape_tables.py et al. @@ -14,8 +8,8 @@ vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/folly - REF v2021.06.14.00 - SHA512 aee5adc1a44d9b193f3f41b5fc9fa7575c677d8bf27ed3a3b612a2fbe53505f82481ce78f13fb41ae3ca81ca25446426fbdfdc578f503f919b4af5abe56ad71c + REF v2022.03.21.00 + SHA512 4e0fda55f007179883af30024fe1d389642159b1b4c915f7ef1a3c1003c8c52e2370f53ffa79d5fa75533d33becfb946d2bcbb2abdc62b9a297f977403d13dd7 HEAD_REF main PATCHES reorder-glog-gflags.patch @@ -25,11 +19,11 @@ vcpkg_from_github( ) file(COPY - ${CMAKE_CURRENT_LIST_DIR}/FindLZ4.cmake - ${CMAKE_CURRENT_LIST_DIR}/FindSnappy.cmake - DESTINATION ${SOURCE_PATH}/CMake/ + "${CMAKE_CURRENT_LIST_DIR}/FindLZ4.cmake" + "${CMAKE_CURRENT_LIST_DIR}/FindSnappy.cmake" + DESTINATION "${SOURCE_PATH}/CMake/" ) -file(REMOVE ${SOURCE_PATH}/CMake/FindGFlags.cmake) +file(REMOVE "${SOURCE_PATH}/CMake/FindGFlags.cmake") if(VCPKG_CRT_LINKAGE STREQUAL static) set(MSVC_USE_STATIC_RUNTIME ON) @@ -54,9 +48,8 @@ feature(lz4 LZ4) feature(zstd Zstd) feature(snappy Snappy) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DMSVC_USE_STATIC_RUNTIME=${MSVC_USE_STATIC_RUNTIME} -DCMAKE_DISABLE_FIND_PACKAGE_LibDwarf=ON @@ -69,23 +62,23 @@ vcpkg_configure_cmake( ${FEATURE_OPTIONS} ) -vcpkg_install_cmake(ADD_BIN_TO_PATH) +vcpkg_cmake_install(ADD_BIN_TO_PATH) vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() # Release folly-targets.cmake does not link to the right libraries in debug mode. # We substitute with generator expressions so that the right libraries are linked for debug and release. set(FOLLY_TARGETS_CMAKE "${CURRENT_PACKAGES_DIR}/share/folly/folly-targets.cmake") FILE(READ ${FOLLY_TARGETS_CMAKE} _contents) -string(REPLACE "\${_IMPORT_PREFIX}/lib/zlib.lib" "ZLIB::ZLIB" _contents "${_contents}") -STRING(REPLACE "\${_IMPORT_PREFIX}/lib/" "\${_IMPORT_PREFIX}/\$<\$:debug/>lib/" _contents "${_contents}") -STRING(REPLACE "\${_IMPORT_PREFIX}/debug/lib/" "\${_IMPORT_PREFIX}/\$<\$:debug/>lib/" _contents "${_contents}") +string(REPLACE "\${VCPKG_IMPORT_PREFIX}/lib/zlib.lib" "ZLIB::ZLIB" _contents "${_contents}") +STRING(REPLACE "\${VCPKG_IMPORT_PREFIX}/lib/" "\${VCPKG_IMPORT_PREFIX}/\$<\$:debug/>lib/" _contents "${_contents}") +STRING(REPLACE "\${VCPKG_IMPORT_PREFIX}/debug/lib/" "\${VCPKG_IMPORT_PREFIX}/\$<\$:debug/>lib/" _contents "${_contents}") string(REPLACE "-vc140-mt.lib" "-vc140-mt\$<\$:-gd>.lib" _contents "${_contents}") FILE(WRITE ${FOLLY_TARGETS_CMAKE} "${_contents}") -FILE(READ ${CURRENT_PACKAGES_DIR}/share/folly/folly-config.cmake _contents) -FILE(WRITE ${CURRENT_PACKAGES_DIR}/share/folly/folly-config.cmake +FILE(READ "${CURRENT_PACKAGES_DIR}/share/folly/folly-config.cmake" _contents) +FILE(WRITE "${CURRENT_PACKAGES_DIR}/share/folly/folly-config.cmake" "include(CMakeFindDependencyMacro) find_dependency(Threads) find_dependency(glog CONFIG) @@ -93,9 +86,9 @@ find_dependency(gflags CONFIG REQUIRED) find_dependency(ZLIB) ${_contents}") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_fixup_pkgconfig() diff --git a/external_imported/vcpkg/ports/folly/vcpkg.json b/external_imported/vcpkg/ports/folly/vcpkg.json index 64d892bf5..dd9c35fec 100644 --- a/external_imported/vcpkg/ports/folly/vcpkg.json +++ b/external_imported/vcpkg/ports/folly/vcpkg.json @@ -1,10 +1,10 @@ { "name": "folly", - "version-string": "2021.06.14.00", - "port-version": 3, + "version-string": "2022.03.21.00", "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows", "homepage": "https://github.com/facebook/folly", - "supports": "x64 | (arm64 & !windows)", + "license": "Apache-2.0", + "supports": "(windows & x64 & !uwp) | (!windows & (x64 | arm64))", "dependencies": [ "boost-chrono", "boost-context", @@ -23,7 +23,15 @@ "gflags", "glog", "libevent", - "openssl" + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "default-features": [ "zlib" diff --git a/external_imported/vcpkg/ports/fontconfig/no-etc-symlinks.patch b/external_imported/vcpkg/ports/fontconfig/no-etc-symlinks.patch new file mode 100644 index 000000000..275797d65 --- /dev/null +++ b/external_imported/vcpkg/ports/fontconfig/no-etc-symlinks.patch @@ -0,0 +1,19 @@ +--- a/conf.d/link_confs.py 2022-03-24 04:13:59.000982000 +0900 ++++ b/conf.d/link_confs.py 2022-03-24 04:14:46.271964000 +0900 +@@ -4,6 +4,7 @@ + import sys + import argparse + import platform ++import shutil + + if __name__=='__main__': + parser = argparse.ArgumentParser() +@@ -32,7 +33,7 @@ + except FileNotFoundError: + pass + try: +- os.symlink(src, dst) ++ shutil.copyfile(src, dst) + except NotImplementedError: + # Not supported on this version of Windows + break diff --git a/external_imported/vcpkg/ports/fontconfig/portfile.cmake b/external_imported/vcpkg/ports/fontconfig/portfile.cmake index b074cdc52..1ad11bfb2 100644 --- a/external_imported/vcpkg/ports/fontconfig/portfile.cmake +++ b/external_imported/vcpkg/ports/fontconfig/portfile.cmake @@ -1,12 +1,14 @@ -set(FONTCONFIG_VERSION 2.13.94) +set(FONTCONFIG_VERSION 2.14.0) vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org OUT_SOURCE_PATH SOURCE_PATH REPO fontconfig/fontconfig REF ${FONTCONFIG_VERSION} - SHA512 815f999146970c7f0e6c15a21f218d4b3f75b26d4ef14d36711bc0a1de19e59cc62d6a2c53993dd38b963ae30820c4db29f103380d5001886d55b6a7df361154 + SHA512 0f36fa503c0277750ff253534f9305c9b4c86fd0d88a470e3b666080951714c51f13a69eecab382d0a7883a07494fc71730213e6086194a92aa5dfc075789e85 HEAD_REF master + PATCHES + no-etc-symlinks.patch ) vcpkg_find_acquire_program(GPERF) @@ -17,6 +19,8 @@ vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} OPTIONS -Ddoc=disabled + -Dcache-build=disabled + -Dtests=disabled ) vcpkg_install_meson(ADD_BIN_TO_PATH) @@ -65,21 +69,6 @@ endif() file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -# Build the fontconfig cache -if(NOT VCPKG_TARGET_IS_WINDOWS) - set(ENV{FONTCONFIG_PATH} "${CURRENT_PACKAGES_DIR}/etc/fonts") - set(ENV{FONTCONFIG_FILE} "${CURRENT_PACKAGES_DIR}/etc/fonts/fonts.conf") - vcpkg_execute_required_process(COMMAND "${CURRENT_PACKAGES_DIR}/bin/fc-cache${VCPKG_TARGET_EXECUTABLE_SUFFIX}" --verbose - WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin" - LOGNAME fc-cache-${TARGET_TRIPLET}) -endif() - -if(VCPKG_TARGET_IS_WINDOWS) - # Unnecessary make rule creating the fontconfig cache dir on windows. - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}LOCAL_APPDATA_FONTCONFIG_CACHE") -endif() - if(NOT VCPKG_TARGET_IS_LINUX) set(VCPKG_TARGET_IS_LINUX 0) # To not leave empty AND statements in the wrapper endif() diff --git a/external_imported/vcpkg/ports/fontconfig/vcpkg.json b/external_imported/vcpkg/ports/fontconfig/vcpkg.json index 4c84b6a6c..0ab7edc10 100644 --- a/external_imported/vcpkg/ports/fontconfig/vcpkg.json +++ b/external_imported/vcpkg/ports/fontconfig/vcpkg.json @@ -1,15 +1,14 @@ { "name": "fontconfig", - "version": "2.13.94", - "port-version": 4, + "version": "2.14.0", "description": "Library for configuring and customizing font access.", "homepage": "https://www.freedesktop.org/wiki/Software/fontconfig", + "license": "MIT", "dependencies": [ "dirent", "expat", "freetype", "gettext", - "json-c", "libiconv", { "name": "libuuid", diff --git a/external_imported/vcpkg/ports/freeglut/gcc10.patch b/external_imported/vcpkg/ports/freeglut/gcc10.patch deleted file mode 100644 index dc5193b6a..000000000 --- a/external_imported/vcpkg/ports/freeglut/gcc10.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/src/fg_gl2.h b/src/fg_gl2.h -index ab8ba5c..a1a52da 100644 ---- a/src/fg_gl2.h -+++ b/src/fg_gl2.h -@@ -67,13 +67,19 @@ typedef void (APIENTRY *FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index); - typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint); - typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); - --FGH_PFNGLGENBUFFERSPROC fghGenBuffers; --FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; --FGH_PFNGLBINDBUFFERPROC fghBindBuffer; --FGH_PFNGLBUFFERDATAPROC fghBufferData; --FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; --FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; --FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; -+#if __GNUC__ > 9 -+#define FG_ATTRIBUTE_COMMON __attribute__((__common__)) -+#else -+#define FG_ATTRIBUTE_COMMON -+#endif -+ -+FGH_PFNGLGENBUFFERSPROC FG_ATTRIBUTE_COMMON fghGenBuffers; -+FGH_PFNGLDELETEBUFFERSPROC FG_ATTRIBUTE_COMMON fghDeleteBuffers; -+FGH_PFNGLBINDBUFFERPROC FG_ATTRIBUTE_COMMON fghBindBuffer; -+FGH_PFNGLBUFFERDATAPROC FG_ATTRIBUTE_COMMON fghBufferData; -+FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC FG_ATTRIBUTE_COMMON fghEnableVertexAttribArray; -+FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC FG_ATTRIBUTE_COMMON fghDisableVertexAttribArray; -+FGH_PFNGLVERTEXATTRIBPOINTERPROC FG_ATTRIBUTE_COMMON fghVertexAttribPointer; - - # endif - diff --git a/external_imported/vcpkg/ports/freeglut/portfile.cmake b/external_imported/vcpkg/ports/freeglut/portfile.cmake index b281d12c7..714a393a6 100755 --- a/external_imported/vcpkg/ports/freeglut/portfile.cmake +++ b/external_imported/vcpkg/ports/freeglut/portfile.cmake @@ -1,61 +1,39 @@ -vcpkg_from_sourceforge( +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO freeglut/freeglut - REF 3.2.1 - FILENAME "freeglut-3.2.1.tar.gz" - SHA512 aced4bbcd36269ce6f4ee1982e0f9e3fffbf18c94f785d3215ac9f4809b992e166c7ada496ed6174e13d77c0f7ef3ca4c57d8a282e96cbbe6ff086339ade3b08 + REPO FreeGLUTProject/freeglut + REF v3.2.2 + SHA512 caaed8af95c2d0ecbc785229e26433978a0f606ae2b9f0b3cd794bb5bb70a1cc54d21f941a1a03e20c7e0fa3eba9d54a21d6e23e44f243899c0fdf146066cf29 + HEAD_REF master PATCHES - use_targets_to_export_x11_dependency.patch + x11-dependencies-export.patch macOS_Xquartz.patch - gcc10.patch fix-debug-macro.patch no_x64_enforcement.patch + windows-static-output-name.patch ) if(NOT VCPKG_TARGET_IS_WINDOWS) message("Freeglut currently requires the following libraries from the system package manager:\n opengl\n glu\n libx11\n xrandr\n xi\n xxf86vm\n\nThese can be installed on Ubuntu systems via apt-get install libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxrandr-dev libxxf86vm-dev\nOn macOS Xquartz is required.") endif() -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(FREEGLUT_STATIC OFF) - set(FREEGLUT_DYNAMIC ON) -else() - set(FREEGLUT_STATIC ON) - set(FREEGLUT_DYNAMIC OFF) -endif() - -# Patch header -file(READ ${SOURCE_PATH}/include/GL/freeglut_std.h FREEGLUT_STDH) -string(REGEX REPLACE "\"freeglut_static.lib\"" - "\"freeglut.lib\"" FREEGLUT_STDH "${FREEGLUT_STDH}") -string(REGEX REPLACE "\"freeglut_staticd.lib\"" - "\"freeglutd.lib\"" FREEGLUT_STDH "${FREEGLUT_STDH}") -file(WRITE ${SOURCE_PATH}/include/GL/freeglut_std.h "${FREEGLUT_STDH}") +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" FREEGLUT_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" FREEGLUT_DYNAMIC) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DFREEGLUT_BUILD_STATIC_LIBS=${FREEGLUT_STATIC} -DFREEGLUT_BUILD_SHARED_LIBS=${FREEGLUT_DYNAMIC} -DFREEGLUT_BUILD_DEMOS=OFF -DINSTALL_PDB=OFF # Installing pdbs failed on debug static. So, disable it and let vcpkg_copy_pdbs() do it ) - -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/FreeGLUT) +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeGLUT) +vcpkg_fixup_pkgconfig() # Rename static lib (otherwise it's incompatible with FindGLUT.cmake) 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/freeglut_static.lib ${CURRENT_PACKAGES_DIR}/lib/freeglut.lib) - endif() - if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/freeglut_staticd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/freeglutd.lib) - endif() - endif() - vcpkg_replace_string( "${CURRENT_PACKAGES_DIR}/include/GL/freeglut_std.h" "ifdef FREEGLUT_STATIC" @@ -66,14 +44,7 @@ endif() # Clean 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 "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/glut") -vcpkg_copy_pdbs() -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) - -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") - file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/glut) -endif() - -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) diff --git a/external_imported/vcpkg/ports/freeglut/use_targets_to_export_x11_dependency.patch b/external_imported/vcpkg/ports/freeglut/use_targets_to_export_x11_dependency.patch deleted file mode 100644 index 2f9e6b1bf..000000000 --- a/external_imported/vcpkg/ports/freeglut/use_targets_to_export_x11_dependency.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6f403af..4ced28a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -72,7 +72,7 @@ SET(FREEGLUT_HEADERS - include/GL/freeglut_ext.h - include/GL/freeglut_std.h - ) --IF(FREEGLUT_REPLACE_GLUT) -+IF(TRUE) - LIST(APPEND FREEGLUT_HEADERS - include/GL/glut.h - ) -@@ -312,8 +312,7 @@ ENDIF(CMAKE_COMPILER_IS_GNUCC) - INCLUDE(CheckIncludeFiles) - IF(UNIX AND NOT(ANDROID OR BLACKBERRY OR FREEGLUT_WAYLAND)) - FIND_PACKAGE(X11 REQUIRED) -- INCLUDE_DIRECTORIES(${X11_X11_INCLUDE_PATH}) -- LIST(APPEND LIBS ${X11_X11_LIB}) -+ LIST(APPEND LIBS X11::X11) - IF(X11_Xrandr_FOUND) - SET(HAVE_X11_EXTENSIONS_XRANDR_H TRUE) - LIST(APPEND LIBS ${X11_Xrandr_LIB}) diff --git a/external_imported/vcpkg/ports/freeglut/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/freeglut/vcpkg-cmake-wrapper.cmake index 5d57ad490..c8cfa2516 100644 --- a/external_imported/vcpkg/ports/freeglut/vcpkg-cmake-wrapper.cmake +++ b/external_imported/vcpkg/ports/freeglut/vcpkg-cmake-wrapper.cmake @@ -1,10 +1,33 @@ _find_package(${ARGS}) -if(GLUT_FOUND) - find_library(XRANDR_LIBRARY NAMES xrandr Xrandr) - if(XRANDR_LIBRARY) - list(APPEND GLUT_LIBRARIES ${XRANDR_LIBRARY}) - if(TARGET GLUT::GLUT) - set_property(TARGET GLUT::GLUT APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${XRANDR_LIBRARY}) +if(GLUT_FOUND AND UNIX AND NOT ANDROID) + cmake_policy(PUSH) + cmake_policy(SET CMP0012 NEW) + cmake_policy(SET CMP0054 NEW) + cmake_policy(SET CMP0057 NEW) + + if(GLUT_LINK_LIBRARIES) + # Since CMake 3.22, FindGLUT.cmake loads the glut pkg-config module. + # We need `-lglut` resolved to an absolute path. + set(GLUT_LIBRARIES "${GLUT_LINK_LIBRARIES}") + else() + find_package(X11) + # Before CMake 3.14, FindX11.cmake doesn't create imported targets. + # For X11, we simply assume shared linkage of system libs, + # so order and transitive usage requirements don't matter. + if(X11_Xrandr_FOUND AND NOT "Xrandr" IN_LIST GLUT_LIBRARIES) + list(APPEND GLUT_LIBRARIES "${X11_Xrandr_LIB}") + set_property(TARGET GLUT::GLUT APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${X11_Xrandr_LIB}") + endif() + # X11_xf86vmode_FOUND for CMake < 3.14 + if((X11_xf86vm_FOUND OR X11_xf86vmode_FOUND) AND NOT "Xxf86vm" IN_LIST GLUT_LIBRARIES) + list(APPEND GLUT_LIBRARIES "${X11_Xxf86vm_LIB}") + set_property(TARGET GLUT::GLUT APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${X11_Xxf86vm_LIB}") + endif() + if(X11_Xi_FOUND AND NOT GLUT_Xi_LIBRARY AND NOT "Xi" IN_LIST GLUT_LIBRARIES) + list(APPEND GLUT_LIBRARIES "${X11_Xi_LIB}") + set_property(TARGET GLUT::GLUT APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${X11_Xi_LIB}") endif() endif() + + cmake_policy(POP) endif() diff --git a/external_imported/vcpkg/ports/freeglut/vcpkg.json b/external_imported/vcpkg/ports/freeglut/vcpkg.json index dc95985d8..d1708bd73 100644 --- a/external_imported/vcpkg/ports/freeglut/vcpkg.json +++ b/external_imported/vcpkg/ports/freeglut/vcpkg.json @@ -1,7 +1,17 @@ { "name": "freeglut", - "version-string": "3.2.1", - "port-version": 7, + "version": "3.2.2", "description": "Open source implementation of GLUT with source and binary backwards compatibility.", - "homepage": "https://sourceforge.net/projects/freeglut/" + "homepage": "https://sourceforge.net/projects/freeglut/", + "license": null, + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/freeglut/windows-static-output-name.patch b/external_imported/vcpkg/ports/freeglut/windows-static-output-name.patch new file mode 100644 index 000000000..750d4bee0 --- /dev/null +++ b/external_imported/vcpkg/ports/freeglut/windows-static-output-name.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index aec0a27..73ccbdb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -429,7 +429,7 @@ IF(WIN32) + ENDIF() + IF(FREEGLUT_BUILD_STATIC_LIBS) + TARGET_COMPILE_DEFINITIONS(freeglut_static PUBLIC FREEGLUT_STATIC) +- IF(FREEGLUT_REPLACE_GLUT) ++ IF(1) + SET_TARGET_PROPERTIES(freeglut_static PROPERTIES OUTPUT_NAME ${LIBNAME}) + ENDIF() + ENDIF() +diff --git a/include/GL/freeglut_std.h b/include/GL/freeglut_std.h +index a5efb3b..6bdcdfb 100644 +--- a/include/GL/freeglut_std.h ++++ b/include/GL/freeglut_std.h +@@ -71,9 +71,9 @@ + /* Link with Win32 static freeglut lib */ + # if FREEGLUT_LIB_PRAGMAS + # if defined(NDEBUG) || !defined(_DEBUG) +-# pragma comment (lib, "freeglut_static.lib") ++# pragma comment (lib, "freeglut.lib") + # else +-# pragma comment (lib, "freeglut_staticd.lib") ++# pragma comment (lib, "freeglutd.lib") + # endif + # endif + diff --git a/external_imported/vcpkg/ports/freeglut/x11-dependencies-export.patch b/external_imported/vcpkg/ports/freeglut/x11-dependencies-export.patch new file mode 100644 index 000000000..814802f33 --- /dev/null +++ b/external_imported/vcpkg/ports/freeglut/x11-dependencies-export.patch @@ -0,0 +1,63 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6f403af..4ced28a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -72,7 +72,7 @@ SET(FREEGLUT_HEADERS + include/GL/freeglut_ext.h + include/GL/freeglut_std.h + ) +-IF(FREEGLUT_REPLACE_GLUT) ++IF(TRUE) + LIST(APPEND FREEGLUT_HEADERS + include/GL/glut.h + ) +@@ -319,23 +319,27 @@ IF(CMAKE_COMPILER_IS_GNUCC) + ENDIF() + ENDIF(CMAKE_COMPILER_IS_GNUCC) + ++SET(xlibs_private "") + INCLUDE(CheckIncludeFiles) + IF(UNIX AND NOT(ANDROID OR BLACKBERRY OR FREEGLUT_WAYLAND)) + FIND_PACKAGE(X11 REQUIRED) +- INCLUDE_DIRECTORIES(${X11_X11_INCLUDE_PATH}) +- LIST(APPEND LIBS ${X11_X11_LIB}) ++ LIST(APPEND LIBS X11::X11) ++ set(xlibs_private "-lX11") + IF(X11_Xrandr_FOUND) + SET(HAVE_X11_EXTENSIONS_XRANDR_H TRUE) +- LIST(APPEND LIBS ${X11_Xrandr_LIB}) ++ LIST(APPEND LIBS X11::Xrandr) ++ STRING(APPEND xlibs_private " -lXrandr") + ENDIF() +- IF(X11_xf86vmode_FOUND) ++ IF(X11_Xxf86vm_FOUND) + SET(HAVE_X11_EXTENSIONS_XF86VMODE_H TRUE) +- LIST(APPEND LIBS ${X11_Xxf86vm_LIB}) ++ LIST(APPEND LIBS X11::Xxf86vm) ++ STRING(APPEND xlibs_private " -lXxf86vm") + ENDIF() + IF(X11_Xinput_FOUND) + # Needed for multi-touch: + CHECK_INCLUDE_FILES("${X11_Xinput_INCLUDE_PATH}/X11/extensions/XInput2.h" HAVE_X11_EXTENSIONS_XINPUT2_H) +- LIST(APPEND LIBS ${X11_Xinput_LIB}) ++ LIST(APPEND LIBS X11::Xi) ++ STRING(APPEND xlibs_private " -lXi") + ELSE() + MESSAGE(FATAL_ERROR "Missing X11's XInput.h (X11/extensions/XInput.h)") + ENDIF() +@@ -586,13 +590,13 @@ ELSEIF(FREEGLUT_GLES) + ELSEIF(FREEGLUT_WAYLAND) + SET(PC_LIBS_PRIVATE "-lwayland-client -lwayland-cursor -lwayland-egl -lGLESv2 -lGLESv1_CM -lEGL -lxkbcommon -lm") + ELSE() +- SET(PC_LIBS_PRIVATE "-lX11 -lXxf86vm -lXrandr -lGLESv2 -lGLESv1_CM -lEGL -lm") ++ SET(PC_LIBS_PRIVATE "${xlibs_private} -lGLESv2 -lGLESv1_CM -lEGL -lm") + ENDIF() + ELSE() + IF(FREEGLUT_WAYLAND) + SET(PC_LIBS_PRIVATE "-lwayland-client -lwayland-cursor -lwayland-egl -lGL -lxkbcommon -lm") + ELSE() +- SET(PC_LIBS_PRIVATE "-lX11 -lXxf86vm -lXrandr -lGL -lm") ++ SET(PC_LIBS_PRIVATE "${xlibs_private} -lGL -lm") + ENDIF() + ENDIF() + # Client applications need to define FreeGLUT GLES version to diff --git a/external_imported/vcpkg/ports/freeimage/CMakeLists.txt b/external_imported/vcpkg/ports/freeimage/CMakeLists.txt index 2c2fb129e..d31c8aa05 100644 --- a/external_imported/vcpkg/ports/freeimage/CMakeLists.txt +++ b/external_imported/vcpkg/ports/freeimage/CMakeLists.txt @@ -9,15 +9,15 @@ if(MSVC) set(CMAKE_CXX_FLAGS "/wd4828 ${CMAKE_CXX_FLAGS}") endif() -find_package(ZLIB REQUIRED) -find_package(PNG REQUIRED) -find_package(JPEG REQUIRED) -find_package(TIFF REQUIRED) -find_package(OpenJPEG REQUIRED) -find_package(WebP REQUIRED) -find_package(JXR REQUIRED) -find_package(LibRaw REQUIRED) -find_package(OpenEXR REQUIRED) +find_package(ZLIB REQUIRED) +find_package(PNG REQUIRED) +find_package(JPEG REQUIRED) +find_package(TIFF REQUIRED) +find_package(OpenJPEG REQUIRED) +find_package(WebP CONFIG REQUIRED) +find_package(JXR REQUIRED) +find_package(LibRaw REQUIRED) +find_package(OpenEXR REQUIRED) option(BUILD_SHARED_LIBS "Build shared libraries" ON) option(INSTALL_HEADERS "Install the development headers" ON) @@ -93,7 +93,6 @@ target_include_directories(FreeImage PRIVATE ${REAL_SOURCE_DIR} ${TIFF_INCLUDE_DIRS} ${PNG_INCLUDE_DIRS} ${OPENJPEG_INCLUDE_DIRS} - ${WEBP_INCLUDE_DIRS} ${JXR_INCLUDE_DIRS} ${LibRaw_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} @@ -105,7 +104,7 @@ target_link_libraries(FreeImage ${ZLIB_LIBRARIES} ${TIFF_LIBRARIES} ${PNG_LIBRARIES} ${OPENJPEG_LIBRARIES} - ${WEBP_LIBRARIES} + WebP::webp WebP::webpdemux WebP::libwebpmux WebP::webpdecoder ${JXR_LIBRARIES} ${LibRaw_LIBRARIES} OpenEXR::IlmImf) @@ -150,7 +149,7 @@ find_dependency(PNG) find_dependency(JPEG) find_dependency(TIFF) find_dependency(OpenJPEG) -find_dependency(WebP) +find_dependency(WebP CONFIG) find_dependency(JXR) find_dependency(LibRaw) find_dependency(OpenEXR) diff --git a/external_imported/vcpkg/ports/freeimage/vcpkg.json b/external_imported/vcpkg/ports/freeimage/vcpkg.json index 3d68598ad..08fbf28d2 100644 --- a/external_imported/vcpkg/ports/freeimage/vcpkg.json +++ b/external_imported/vcpkg/ports/freeimage/vcpkg.json @@ -1,7 +1,7 @@ { "name": "freeimage", "version": "3.18.0", - "port-version": 21, + "port-version": 22, "description": "Support library for graphics image formats", "homepage": "https://sourceforge.net/projects/freeimage/", "dependencies": [ diff --git a/external_imported/vcpkg/ports/freerdp/portfile.cmake b/external_imported/vcpkg/ports/freerdp/portfile.cmake index 7eec08bc1..f9ec5abfa 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 647a48dfa7b19ef6bbfa68a69b5d87717541ef21 #2.4.0 - SHA512 c72072df6f2b3ebc1b632f2e3b40bdcc732e25e7c4ef97b93bc5c5351566b553f682b615e6383ac7c5a1b5ecf8ed0fa9a305ea8c904031d4c78d7c3179323032 + REF 2.5.0 + SHA512 7720306c8d0915578f6758f46ba0e0b8a81bbdcd1c80e08711576605142467f6735f644099e79a05113959fb30cd1070ca138a523537a41a7102880daf89c04c HEAD_REF master PATCHES DontInstallSystemRuntimeLibs.patch @@ -29,7 +29,7 @@ endif() get_filename_component(SOURCE_VERSION "${SOURCE_PATH}" NAME) file(WRITE "${SOURCE_PATH}/.source_version" "${SOURCE_VERSION}-vcpkg") -file(REMOVE ${SOURCE_PATH}/cmake/FindOpenSSL.cmake) # Remove outdated Module +file(REMOVE "${SOURCE_PATH}/cmake/FindOpenSSL.cmake") # Remove outdated Module vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES diff --git a/external_imported/vcpkg/ports/freerdp/vcpkg.json b/external_imported/vcpkg/ports/freerdp/vcpkg.json index d8c2cb661..ef18342f9 100644 --- a/external_imported/vcpkg/ports/freerdp/vcpkg.json +++ b/external_imported/vcpkg/ports/freerdp/vcpkg.json @@ -1,9 +1,9 @@ { "name": "freerdp", - "version": "2.4.0", - "port-version": 3, + "version": "2.5.0", "description": "A free implementation of the Remote Desktop Protocol (RDP)", "homepage": "https://github.com/FreeRDP/FreeRDP", + "license": "Apache-2.0", "supports": "!(arm | uwp)", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/freetds/portfile.cmake b/external_imported/vcpkg/ports/freetds/portfile.cmake index c3f0b5f94..41f2426b0 100644 --- a/external_imported/vcpkg/ports/freetds/portfile.cmake +++ b/external_imported/vcpkg/ports/freetds/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp" "linux" "osx") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO freetds/freetds diff --git a/external_imported/vcpkg/ports/freetds/vcpkg.json b/external_imported/vcpkg/ports/freetds/vcpkg.json index b653876fc..498c5d5dd 100644 --- a/external_imported/vcpkg/ports/freetds/vcpkg.json +++ b/external_imported/vcpkg/ports/freetds/vcpkg.json @@ -1,7 +1,7 @@ { "name": "freetds", - "version-string": "1.2.11", - "port-version": 1, + "version": "1.2.11", + "port-version": 2, "description": "Implementation of the Tabular Data Stream protocol", "homepage": "https://www.freetds.org", "supports": "windows & !uwp", diff --git a/external_imported/vcpkg/ports/freetype/fix-2.11-msvc-build.patch b/external_imported/vcpkg/ports/freetype/fix-2.11-msvc-build.patch deleted file mode 100644 index 49b7e8f2c..000000000 --- a/external_imported/vcpkg/ports/freetype/fix-2.11-msvc-build.patch +++ /dev/null @@ -1,152 +0,0 @@ -diff --git a/src/autofit/afglobal.c b/src/autofit/afglobal.c -index aedb74ddd..5d53dfb71 100644 ---- a/src/autofit/afglobal.c -+++ b/src/autofit/afglobal.c -@@ -19,6 +19,7 @@ - #include "afglobal.h" - #include "afranges.h" - #include "afshaper.h" -+#include "afws_dec.h" - #include - - -@@ -32,11 +33,6 @@ - #define FT_COMPONENT afglobal - - -- /* get writing system specific header files */ --#undef WRITING_SYSTEM --#define WRITING_SYSTEM( ws, WS ) /* empty */ --#include "afwrtsys.h" -- - #include "aferrors.h" - - -@@ -74,7 +70,7 @@ - af_writing_system_classes[] = - { - --#include "afwrtsys.h" -+#include "afws_itr.h" - - NULL /* do not remove */ - }; -diff --git a/src/autofit/aftypes.h b/src/autofit/aftypes.h -index e76b103ed..a036a0f56 100644 ---- a/src/autofit/aftypes.h -+++ b/src/autofit/aftypes.h -@@ -198,7 +198,6 @@ extern void* _af_debug_hints; - * outline according to the results of the glyph analyzer. - */ - --#define AFWRTSYS_H_ /* don't load header files */ - #undef WRITING_SYSTEM - #define WRITING_SYSTEM( ws, WS ) \ - AF_WRITING_SYSTEM_ ## WS, -@@ -207,14 +206,12 @@ extern void* _af_debug_hints; - typedef enum AF_WritingSystem_ - { - --#include "afwrtsys.h" -+#include "afws_itr.h" - - AF_WRITING_SYSTEM_MAX /* do not remove */ - - } AF_WritingSystem; - --#undef AFWRTSYS_H_ -- - - typedef struct AF_WritingSystemClassRec_ - { -diff --git a/src/autofit/afws_dec.h b/src/autofit/afws_dec.h -new file mode 100644 -index 000000000..39e707c5a ---- /dev/null -+++ b/src/autofit/afws_dec.h -@@ -0,0 +1,30 @@ -+/**************************************************************************** -+ * -+ * afws_dec.h -+ * -+ * Auto-fitter writing systems (specification only). -+ * -+ * Copyright (C) 2013-2021 by -+ * David Turner, Robert Wilhelm, and Werner Lemberg. -+ * -+ * This file is part of the FreeType project, and may only be used, -+ * modified, and distributed under the terms of the FreeType project -+ * license, LICENSE.TXT. By continuing to use, modify, or distribute -+ * this file you indicate that you have read the license and -+ * understand and accept it fully. -+ * -+ */ -+ -+ -+#ifndef AFWS_DEC_H_ -+#define AFWS_DEC_H_ -+ -+ /* Since preprocessor directives can't create other preprocessor */ -+ /* directives, we have to include the header files manually. */ -+ -+#include "afdummy.h" -+#include "aflatin.h" -+#include "afcjk.h" -+#include "afindic.h" -+ -+#endif /* AFWS_DEC_H_ */ -diff --git a/src/autofit/afwrtsys.h b/src/autofit/afws_itr.h -similarity index 66% -rename from src/autofit/afwrtsys.h -rename to src/autofit/afws_itr.h -index 39aa12112..2da77d459 100644 ---- a/src/autofit/afwrtsys.h -+++ b/src/autofit/afws_itr.h -@@ -1,6 +1,6 @@ - /**************************************************************************** - * -- * afwrtsys.h -+ * afws_itr.h - * - * Auto-fitter writing systems (specification only). - * -@@ -15,23 +15,8 @@ - * - */ - -- --#ifndef AFWRTSYS_H_ --#define AFWRTSYS_H_ -- -- /* Since preprocessor directives can't create other preprocessor */ -- /* directives, we have to include the header files manually. */ -- --#include "afdummy.h" --#include "aflatin.h" --#include "afcjk.h" --#include "afindic.h" -- --#endif /* AFWRTSYS_H_ */ -- -- -- /* The following part can be included multiple times. */ -- /* Define `WRITING_SYSTEM' as needed. */ -+ /* This header may be included multiple times. */ -+ /* Define `WRITING_SYSTEM' as needed. */ - - - /* Add new writing systems here. The arguments are the writing system */ -diff --git a/src/autofit/rules.mk b/src/autofit/rules.mk -index 19b3bcadb..a5438ecba 100644 ---- a/src/autofit/rules.mk -+++ b/src/autofit/rules.mk -@@ -48,7 +48,8 @@ AUTOF_DRV_H := $(AUTOF_DRV_SRC:%c=%h) \ - $(AUTOF_DIR)/afscript.h \ - $(AUTOF_DIR)/afstyles.h \ - $(AUTOF_DIR)/aftypes.h \ -- $(AUTOF_DIR)/afwrtsys.h -+ $(AUTOF_DIR)/afws_dec.h \ -+ $(AUTOF_DIR)/afws_itr.h - - - # AUTOF driver object(s) diff --git a/external_imported/vcpkg/ports/freetype/portfile.cmake b/external_imported/vcpkg/ports/freetype/portfile.cmake index 7cf312572..92e544fea 100644 --- a/external_imported/vcpkg/ports/freetype/portfile.cmake +++ b/external_imported/vcpkg/ports/freetype/portfile.cmake @@ -1,36 +1,35 @@ -set(FT_VERSION 2.11.0) +set(FT_VERSION 2.11.1) vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO freetype/freetype2 REF ${FT_VERSION} FILENAME freetype-${FT_VERSION}.tar.xz - SHA512 bf1991f3c382832586be1d21ae73c20840ee8546807ba60d0eb0215134545656c0c8de488f27357d4a4f6497d7cb540998cda98ec59061a3e640036fb209147d + SHA512 0848678482fbe20603a866f02da82c91122014d6f815ba4f1d9c03601c32e3ceb781f721c2b4427b6117d7c9742018af8dbb26566faf018595c70b50f8db3f08 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 fix-exports.patch - fix-2.11-msvc-build.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - zlib FT_WITH_ZLIB - bzip2 FT_WITH_BZIP2 - png FT_WITH_PNG - brotli FT_WITH_BROTLI + zlib FT_REQUIRE_ZLIB + bzip2 FT_REQUIRE_BZIP2 + png FT_REQUIRE_PNG + brotli FT_REQUIRE_BROTLI INVERTED_FEATURES - zlib CMAKE_DISABLE_FIND_PACKAGE_ZLIB - bzip2 CMAKE_DISABLE_FIND_PACKAGE_BZip2 - png CMAKE_DISABLE_FIND_PACKAGE_PNG - brotli CMAKE_DISABLE_FIND_PACKAGE_BrotliDec + zlib FT_DISABLE_ZLIB + bzip2 FT_DISABLE_BZIP2 + png FT_DISABLE_PNG + brotli FT_DISABLE_BROTLI ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=ON + -DFT_DISABLE_HARFBUZZ=ON ${FEATURE_OPTIONS} ) @@ -73,26 +72,8 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - if("zlib" IN_LIST FEATURES) - set(USE_ZLIB ON) - endif() - - if("bzip2" IN_LIST FEATURES) - set(USE_BZIP2 ON) - endif() - - if("png" IN_LIST FEATURES) - set(USE_PNG ON) - endif() - - if("brotli" IN_LIST FEATURES) - set(USE_BROTLI ON) - endif() - - configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" - "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) -endif() +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) file(COPY "${SOURCE_PATH}/docs/FTL.TXT" diff --git a/external_imported/vcpkg/ports/freetype/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/freetype/vcpkg-cmake-wrapper.cmake index 2f4656bf1..ee332c3c6 100644 --- a/external_imported/vcpkg/ports/freetype/vcpkg-cmake-wrapper.cmake +++ b/external_imported/vcpkg/ports/freetype/vcpkg-cmake-wrapper.cmake @@ -1,65 +1,64 @@ -_find_package(${ARGS}) - -if(@USE_ZLIB@) - find_package(ZLIB) -endif() - -if(@USE_BZIP2@) - find_package(BZip2) -endif() - -if(@USE_PNG@) - find_package(PNG) -endif() +cmake_policy(PUSH) +cmake_policy(SET CMP0012 NEW) +cmake_policy(SET CMP0054 NEW) -if(@USE_BROTLI@) - find_library(BROTLIDEC_LIBRARY_RELEASE NAMES brotlidec brotlidec-static PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH) - find_library(BROTLIDEC_LIBRARY_DEBUG NAMES brotlidec brotlidec-static brotlidecd brotlidec-staticd PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH) - find_library(BROTLICOMMON_LIBRARY_RELEASE NAMES brotlicommon brotlicommon-static PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH) - find_library(BROTLICOMMON_LIBRARY_DEBUG NAMES brotlicommon brotlicommon-static brotlicommond brotlicommon-staticd PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH) - include(SelectLibraryConfigurations) - select_library_configurations(BROTLIDEC) - select_library_configurations(BROTLICOMMON) -endif(@USE_BROTLI@) +_find_package(${ARGS}) -if(TARGET Freetype::Freetype) - if(@USE_ZLIB@) - set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES ZLIB::ZLIB) +if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") + if("@FT_REQUIRE_ZLIB@") + find_package(ZLIB) endif() - - if(@USE_BZIP2@) - set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES BZip2::BZip2) + if("@FT_REQUIRE_BZIP2@") + find_package(BZip2) endif() - - if(@USE_PNG@) - set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES PNG::PNG) + if("@FT_REQUIRE_PNG@") + find_package(PNG) endif() - if(@USE_BROTLI@) - if(BROTLIDEC_LIBRARY_DEBUG) - set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES $<$:${BROTLIDEC_LIBRARY_DEBUG}>) - set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES $<$:${BROTLICOMMON_LIBRARY_DEBUG}>) + if("@FT_REQUIRE_BROTLI@") + find_library(BROTLIDEC_LIBRARY_RELEASE NAMES brotlidec brotlidec-static PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH) + find_library(BROTLIDEC_LIBRARY_DEBUG NAMES brotlidec brotlidec-static brotlidecd brotlidec-staticd PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH) + find_library(BROTLICOMMON_LIBRARY_RELEASE NAMES brotlicommon brotlicommon-static PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH) + find_library(BROTLICOMMON_LIBRARY_DEBUG NAMES brotlicommon brotlicommon-static brotlicommond brotlicommon-staticd PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH) + include(SelectLibraryConfigurations) + select_library_configurations(BROTLIDEC) + select_library_configurations(BROTLICOMMON) + endif("@FT_REQUIRE_BROTLI@") + + if(TARGET Freetype::Freetype) + if("@FT_REQUIRE_ZLIB@") + set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES ZLIB::ZLIB) endif() - if(BROTLIDEC_LIBRARY_RELEASE) - set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES $<$>:${BROTLIDEC_LIBRARY_RELEASE}>) - set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES $<$>:${BROTLICOMMON_LIBRARY_RELEASE}>) + if("@FT_REQUIRE_BZIP2@") + set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES BZip2::BZip2) + endif() + if("@FT_REQUIRE_PNG@") + set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES PNG::PNG) + endif() + if("@FT_REQUIRE_BROTLI@") + if(BROTLIDEC_LIBRARY_DEBUG) + set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES "\$<\$:${BROTLIDEC_LIBRARY_DEBUG}>") + set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES "\$<\$:${BROTLICOMMON_LIBRARY_DEBUG}>") + endif() + if(BROTLIDEC_LIBRARY_RELEASE) + set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES "\$<\$>:${BROTLIDEC_LIBRARY_RELEASE}>") + set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES "\$<\$>:${BROTLICOMMON_LIBRARY_RELEASE}>") + endif() endif() - endif() -endif() - -if(FREETYPE_LIBRARIES) - if(@USE_ZLIB@) - list(APPEND FREETYPE_LIBRARIES ${ZLIB_LIBRARIES}) - endif() - - if(@USE_BZIP2@) - list(APPEND FREETYPE_LIBRARIES ${BZIP2_LIBRARIES}) - endif() - - if(@USE_PNG@) - list(APPEND FREETYPE_LIBRARIES ${PNG_LIBRARIES}) endif() - if(@USE_BROTLI@) - list(APPEND FREETYPE_LIBRARIES ${BROTLIDEC_LIBRARIES} ${BROTLICOMMON_LIBRARIES}) + if(FREETYPE_LIBRARIES) + if("@FT_REQUIRE_ZLIB@") + list(APPEND FREETYPE_LIBRARIES ${ZLIB_LIBRARIES}) + endif() + if("@FT_REQUIRE_BZIP2@") + list(APPEND FREETYPE_LIBRARIES ${BZIP2_LIBRARIES}) + endif() + if("@FT_REQUIRE_PNG@") + list(APPEND FREETYPE_LIBRARIES ${PNG_LIBRARIES}) + endif() + if("@FT_REQUIRE_BROTLI@") + list(APPEND FREETYPE_LIBRARIES ${BROTLIDEC_LIBRARIES} ${BROTLICOMMON_LIBRARIES}) + endif() endif() endif() +cmake_policy(POP) diff --git a/external_imported/vcpkg/ports/freetype/vcpkg.json b/external_imported/vcpkg/ports/freetype/vcpkg.json index 23f9e8133..68cb61868 100644 --- a/external_imported/vcpkg/ports/freetype/vcpkg.json +++ b/external_imported/vcpkg/ports/freetype/vcpkg.json @@ -1,7 +1,7 @@ { "name": "freetype", - "version-semver": "2.11.0", - "port-version": 2, + "version-semver": "2.11.1", + "port-version": 1, "description": "A library to render fonts.", "homepage": "https://www.freetype.org/", "dependencies": [ diff --git a/external_imported/vcpkg/ports/fribidi/meson-crosscompile.patch b/external_imported/vcpkg/ports/fribidi/meson-crosscompile.patch new file mode 100644 index 000000000..07368a087 --- /dev/null +++ b/external_imported/vcpkg/ports/fribidi/meson-crosscompile.patch @@ -0,0 +1,36 @@ +diff --git a/gen.tab/meson.build b/gen.tab/meson.build +index 8c21e98..1cd9960 100644 +--- a/gen.tab/meson.build ++++ b/gen.tab/meson.build +@@ -1,5 +1,10 @@ + # gen.tab + ++if get_option('pregenerated_tab') != '' ++ generated_tab_include_files = [] ++ fribidi_unicode_version_h = files() ++ add_project_arguments('-I' + get_option('pregenerated_tab'), language: 'c') ++else + native_cc = meson.get_compiler('c') + + # Don't pick up top-level config.h, as that has defines for the cross-compiler +@@ -75,7 +80,10 @@ foreach tab : tabs + input: gen_prog_inputs, + output: gen_prog_out, + command: [gen_exe, COMPRESSION, '@INPUT@', gen_prog_name], ++ install: true, ++ install_dir: 'share/fribidi/gen.tab', + capture: true) + + generated_tab_include_files += [tab_inc_file] + endforeach ++endif +diff --git a/meson_options.txt b/meson_options.txt +index f54a639..8f60205 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -8,3 +8,5 @@ option('tests', type : 'boolean', value : true, + description: 'Build tests') + option('fuzzer_ldflags', type : 'string', + description: 'Extra LDFLAGS used during linking of fuzzing binaries') ++option('pregenerated_tab', type: 'string', ++ description: 'Path to pregenerated table sources') diff --git a/external_imported/vcpkg/ports/fribidi/portfile.cmake b/external_imported/vcpkg/ports/fribidi/portfile.cmake index 5cc02fab8..712d03104 100644 --- a/external_imported/vcpkg/ports/fribidi/portfile.cmake +++ b/external_imported/vcpkg/ports/fribidi/portfile.cmake @@ -4,27 +4,53 @@ vcpkg_from_github( REF v1.0.11 SHA512 9ddb0dbfb28ee4f1d9dd5d46fe1fff75c5446bfdacaabf8647847c36ef72eec823f6e6d6d1369d67c292d680004f7113c9e69114a8fae1d73ab11a58c66a8b8a HEAD_REF master + PATCHES meson-crosscompile.patch ) -vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} +set(gen_tab_subdir "share/${PORT}/gen.tab") + +set(options "") +if(VCPKG_CROSSCOMPILING) + set(gen_tab "${CURRENT_HOST_INSTALLED_DIR}/${gen_tab_subdir}") + cmake_path(NATIVE_PATH gen_tab gen_tab) + set(options "-Dpregenerated_tab=${gen_tab}") +endif() + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${options} + -Ddocs=false + -Dbin=false + -Dtests=false ) -vcpkg_install_make(DISABLE_PARALLEL) +vcpkg_install_meson() vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() # Define static macro -file(READ ${CURRENT_PACKAGES_DIR}/include/fribidi/fribidi-common.h FRIBIDI_COMMON_H) +file(READ "${CURRENT_PACKAGES_DIR}/include/fribidi/fribidi-common.h" FRIBIDI_COMMON_H) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") string(REPLACE "#ifndef FRIBIDI_LIB_STATIC" "#if 0" FRIBIDI_COMMON_H "${FRIBIDI_COMMON_H}") else() string(REPLACE "#ifndef FRIBIDI_LIB_STATIC" "#if 1" FRIBIDI_COMMON_H "${FRIBIDI_COMMON_H}") endif() -file(WRITE ${CURRENT_PACKAGES_DIR}/include/fribidi/fribidi-common.h "${FRIBIDI_COMMON_H}") +file(WRITE "${CURRENT_PACKAGES_DIR}/include/fribidi/fribidi-common.h" "${FRIBIDI_COMMON_H}") + +if(VCPKG_CROSSCOMPILING) + file( + COPY "${gen_tab}/fribidi-unicode-version.h" + DESTINATION "${CURRENT_PACKAGES_DIR}/include/fribidi" + ) +else() + file( + COPY "${CURRENT_PACKAGES_DIR}/include/fribidi/fribidi-unicode-version.h" + DESTINATION "${CURRENT_PACKAGES_DIR}/${gen_tab_subdir}" + ) +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(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/fribidi/vcpkg.json b/external_imported/vcpkg/ports/fribidi/vcpkg.json index 2c76b9921..40ec254c5 100644 --- a/external_imported/vcpkg/ports/fribidi/vcpkg.json +++ b/external_imported/vcpkg/ports/fribidi/vcpkg.json @@ -1,7 +1,17 @@ { "name": "fribidi", "version": "1.0.11", - "port-version": 2, + "port-version": 3, "description": "GNU FriBidi is an implementation of the Unicode Bidirectional Algorithm (bidi)", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + { + "name": "fribidi", + "host": true + }, + { + "name": "vcpkg-tool-meson", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/ftxui/portfile.cmake b/external_imported/vcpkg/ports/ftxui/portfile.cmake index ed25f6254..47fba7224 100644 --- a/external_imported/vcpkg/ports/ftxui/portfile.cmake +++ b/external_imported/vcpkg/ports/ftxui/portfile.cmake @@ -1,12 +1,10 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ArthurSonzogni/FTXUI - REF 4188ee2c046ced00cd3accba4cde2318587f8c8a #0.11 - SHA512 c32d5abbd42b776935c851ca8510201f4856335ea5510ef5e126795a6be405a82ee4dc4526c60acebc1dc4a4e17c58d5027f219bc86628733e86d0e38885f99d + REF 81b7207121e41c3b838eca6f54396e4f676fa3d8 # 2.0.0 + SHA512 44a0617e591f5340090866dd02d786af5de948829b00839c6fd0fdb67e8a5ec71fadecaa433892773b2073668fb9cef62652479d9793bdf323c91ebb9595c7e5 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/ftxui/vcpkg.json b/external_imported/vcpkg/ports/ftxui/vcpkg.json index fb8400d95..b8ea87a96 100644 --- a/external_imported/vcpkg/ports/ftxui/vcpkg.json +++ b/external_imported/vcpkg/ports/ftxui/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ftxui", - "version-date": "2021-10-17", + "version-semver": "2.0.0", + "port-version": 1, "description": "C++ Functional Terminal User Interface", "homepage": "https://github.com/ArthurSonzogni/FTXUI", "license": "MIT", diff --git a/external_imported/vcpkg/ports/functions-framework-cpp/portfile.cmake b/external_imported/vcpkg/ports/functions-framework-cpp/portfile.cmake index 58b21e957..89123d06a 100644 --- a/external_imported/vcpkg/ports/functions-framework-cpp/portfile.cmake +++ b/external_imported/vcpkg/ports/functions-framework-cpp/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GoogleCloudPlatform/functions-framework-cpp - REF v1.0.0 - SHA512 caaf39014cc651f0f929fce60059592ce17dfa67ac3d93104d97b96c7a1e06e85c0945dfdff6169ac5a5193be84631e27b35877a4d5b022a7319f6476efa17be + REF v1.1.0 + SHA512 2dcedbded84fdd604724b4f2482ee531aaa640ebdbb69f77978e1af8943d9d7746152953953ebd89d8304ed3efbc334c620890142b0ba2e1239862e43a158364 HEAD_REF main ) diff --git a/external_imported/vcpkg/ports/functions-framework-cpp/vcpkg.json b/external_imported/vcpkg/ports/functions-framework-cpp/vcpkg.json index dbb15a285..ce0094b49 100644 --- a/external_imported/vcpkg/ports/functions-framework-cpp/vcpkg.json +++ b/external_imported/vcpkg/ports/functions-framework-cpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "functions-framework-cpp", - "version": "1.0.0", - "port-version": 1, + "version": "1.1.0", "description": "Functions Framework for C++.", "homepage": "https://github.com/GoogleCloudPlatform/functions-framework-cpp/", "license": "Apache-2.0", diff --git a/external_imported/vcpkg/ports/fuzzylite/portfile.cmake b/external_imported/vcpkg/ports/fuzzylite/portfile.cmake index cd79ecc7c..79ec38f10 100644 --- a/external_imported/vcpkg/ports/fuzzylite/portfile.cmake +++ b/external_imported/vcpkg/ports/fuzzylite/portfile.cmake @@ -6,17 +6,11 @@ vcpkg_from_github( HEAD_REF master ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set(FL_BUILD_SHARED ON) - set(FL_BUILD_STATIC OFF) -else() - set(FL_BUILD_SHARED OFF) - set(FL_BUILD_STATIC ON) -endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" FL_BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" FL_BUILD_SHARED) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/fuzzylite - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/fuzzylite" OPTIONS -DFL_BUILD_SHARED=${FL_BUILD_SHARED} -DFL_BUILD_STATIC=${FL_BUILD_STATIC} @@ -24,23 +18,23 @@ vcpkg_configure_cmake( -DFL_BUILD_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/fuzzylite-static.lib ${CURRENT_PACKAGES_DIR}/lib/fuzzylite.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/fuzzylite-static-debug.lib ${CURRENT_PACKAGES_DIR}/debug/lib/fuzzylite-debug.lib) -endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/fl/fuzzylite.h + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/fl/fuzzylite.h" "#elif defined(FL_IMPORT_LIBRARY)" "#elif 1" ) +elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/fl/fuzzylite.h" + "#elif defined(FL_IMPORT_LIBRARY)" + "#elif 0" + ) 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/fuzzylite/vcpkg.json b/external_imported/vcpkg/ports/fuzzylite/vcpkg.json index 2bddccc38..98bb4ba80 100644 --- a/external_imported/vcpkg/ports/fuzzylite/vcpkg.json +++ b/external_imported/vcpkg/ports/fuzzylite/vcpkg.json @@ -1,7 +1,15 @@ { "name": "fuzzylite", - "version-string": "6.0", - "port-version": 4, + "version": "6.0", + "port-version": 5, "description": "A fuzzy logic control library in C++", - "homepage": "https://github.com/fuzzylite/fuzzylite" + "homepage": "https://github.com/fuzzylite/fuzzylite", + "license": "GPL-3.0", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/g3log/portfile.cmake b/external_imported/vcpkg/ports/g3log/portfile.cmake index a9dc7c4c4..6cd6d0837 100644 --- a/external_imported/vcpkg/ports/g3log/portfile.cmake +++ b/external_imported/vcpkg/ports/g3log/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KjellKod/g3log diff --git a/external_imported/vcpkg/ports/g3log/vcpkg.json b/external_imported/vcpkg/ports/g3log/vcpkg.json index 7770e4a22..a1333a69b 100644 --- a/external_imported/vcpkg/ports/g3log/vcpkg.json +++ b/external_imported/vcpkg/ports/g3log/vcpkg.json @@ -1,7 +1,7 @@ { "name": "g3log", "version": "1.3.4", - "port-version": 1, + "port-version": 2, "description": "Asynchronous logger with Dynamic Sinks", "homepage": "https://github.com/KjellKod/g3log", "supports": "!(arm | uwp)" diff --git a/external_imported/vcpkg/ports/gainput/fix-build.patch b/external_imported/vcpkg/ports/gainput/fix-build.patch new file mode 100644 index 000000000..39fc9c777 --- /dev/null +++ b/external_imported/vcpkg/ports/gainput/fix-build.patch @@ -0,0 +1,44 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a443b66..61ff7b8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,11 +9,11 @@ option(GAINPUT_TESTS "Build Tests for Gainput" ON) + option(GAINPUT_BUILD_SHARED "BUILD_SHARED" ON) + option(GAINPUT_BUILD_STATIC "BUILD_STATIC" ON) + +-if(!WIN32) ++if(NOT WIN32) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra") + else() + set(XINPUT "Xinput9_1_0") +- if ( ${CMAKE_SYSTEM_VERSION} LESS 6.1 ) ++ if ( ${CMAKE_SYSTEM_VERSION} VERSION_LESS 6.1 ) + set(XINPUT, "xinput") + endif() + endif() +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index cb7232f..a6ae3d9 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -55,15 +55,21 @@ elseif(APPLE) + find_library(FOUNDATION Foundation) + find_library(IOKIT IOKit) + find_library(GAME_CONTROLLER GameController) ++ if (GAINPUT_BUILD_SHARED) + target_link_libraries(gainput ${FOUNDATION} ${IOKIT} ${GAME_CONTROLLER}) ++ endif() + if(IOS) + find_library(UIKIT UIKit) + find_library(COREMOTION CoreMotion) + find_library(QUARTZCORE QuartzCore) ++ if (GAINPUT_BUILD_SHARED) + target_link_libraries(gainput ${UIKIT} ${COREMOTION}) ++ endif() + else() + find_library(APPKIT AppKit) ++ if (GAINPUT_BUILD_SHARED) + target_link_libraries(gainput ${APPKIT}) ++ endif() + endif() + endif() + diff --git a/external_imported/vcpkg/ports/gainput/portfile.cmake b/external_imported/vcpkg/ports/gainput/portfile.cmake index 65ded761c..338147249 100644 --- a/external_imported/vcpkg/ports/gainput/portfile.cmake +++ b/external_imported/vcpkg/ports/gainput/portfile.cmake @@ -1,3 +1,7 @@ +if (VCPKG_TARGET_IS_OSX) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jkuhlmann/gainput @@ -5,23 +9,15 @@ vcpkg_from_github( SHA512 56fdc4c0613d7260861885b270ebe9e624e940175f41e3ac82516e2eb0d6d229e405fbcc2e54608e7d6751c1d8658b5b5e186153193badc6487274cb284a8cd6 HEAD_REF master PATCHES - "install_as_cmake_package.patch" + install_as_cmake_package.patch + fix-build.patch ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(GAINPUT_BUILD_SHARED OFF) - set(GAINPUT_BUILD_STATIC ON) -else() - set(GAINPUT_BUILD_SHARED ON) - set(GAINPUT_BUILD_STATIC OFF) -endif() -if(APPLE) - set(GAINPUT_BUILD_SHARED ON) -endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" GAINPUT_BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" GAINPUT_BUILD_SHARED) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DGAINPUT_BUILD_SHARED=${GAINPUT_BUILD_SHARED} -DGAINPUT_BUILD_STATIC=${GAINPUT_BUILD_STATIC} @@ -29,9 +25,10 @@ vcpkg_configure_cmake( -DGAINPUT_SAMPLES=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-gainput TARGET_PATH share/unofficial-gainput) +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-gainput CONFIG_PATH share/unofficial-gainput) + +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/gainput/vcpkg.json b/external_imported/vcpkg/ports/gainput/vcpkg.json index 85da1c0d1..5b8a8680b 100644 --- a/external_imported/vcpkg/ports/gainput/vcpkg.json +++ b/external_imported/vcpkg/ports/gainput/vcpkg.json @@ -1,7 +1,19 @@ { "name": "gainput", - "version-string": "1.0.0", - "port-version": 4, + "version": "1.0.0", + "port-version": 5, "description": "Gainput is a multiplatform C++ input library, supporting mouse, keyboard and controllers", - "homepage": "https://github.com/jkuhlmann/gainput" + "homepage": "https://github.com/jkuhlmann/gainput", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/gamedev-framework/portfile.cmake b/external_imported/vcpkg/ports/gamedev-framework/portfile.cmake index efdd5f2d4..1d32d1f96 100644 --- a/external_imported/vcpkg/ports/gamedev-framework/portfile.cmake +++ b/external_imported/vcpkg/ports/gamedev-framework/portfile.cmake @@ -2,10 +2,6 @@ if (VCPKG_HOST_IS_LINUX) message(WARNING "gamedev-framework requires gcc version 8.3 or later.") endif() -vcpkg_fail_port_install( - ON_ARCH "arm" -) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GamedevFramework/gf diff --git a/external_imported/vcpkg/ports/gamedev-framework/vcpkg.json b/external_imported/vcpkg/ports/gamedev-framework/vcpkg.json index e8b63f212..c00c80c35 100644 --- a/external_imported/vcpkg/ports/gamedev-framework/vcpkg.json +++ b/external_imported/vcpkg/ports/gamedev-framework/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gamedev-framework", "version-semver": "0.20.0", - "port-version": 1, + "port-version": 2, "maintainers": [ "Julien Bernard ", "Arthur Hugeat " diff --git a/external_imported/vcpkg/ports/gamenetworkingsockets/portfile.cmake b/external_imported/vcpkg/ports/gamenetworkingsockets/portfile.cmake index c0b2e487d..212d5ceea 100644 --- a/external_imported/vcpkg/ports/gamenetworkingsockets/portfile.cmake +++ b/external_imported/vcpkg/ports/gamenetworkingsockets/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ValveSoftware/GameNetworkingSockets - REF 9875f39ad3fae8c913daa310c7ff0a7a54b1e6c2 # v1.3.0 - SHA512 edf814ef10a11b67045d90d589a3bd6471fa46bc3f16cf1e83d1806df6bb48306dcda4096a2ff80fee78b24ce36d164cd46808680c9f5f8f546455fce7bf9aa0 + REF b99aa75ed9b1ec57d5c90ee009f8de8882eeca13 # v1.4.0 + SHA512 1776a6a66d2c6546a8a3d71123544ea9590ab6b123d4a92eebd38c0a195f09a55185b999250c518527e1d8983176732429901a2f781a883715e6695b597229f5 HEAD_REF master ) @@ -14,8 +14,9 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DGAMENETWORKINGSOCKETS_BUILD_TESTS=OFF - -DGAMENETWORKINGSOCKETS_BUILD_EXAMPLES=OFF + -DBUILD_TESTS=OFF + -DBUILD_EXAMPLES=OFF + -DBUILD_TOOLS=OFF -DUSE_CRYPTO=${CRYPTO_BACKEND} -DUSE_CRYPTO25519=${CRYPTO_BACKEND} ) diff --git a/external_imported/vcpkg/ports/gamenetworkingsockets/vcpkg.json b/external_imported/vcpkg/ports/gamenetworkingsockets/vcpkg.json index 84aff5eae..433753e0d 100644 --- a/external_imported/vcpkg/ports/gamenetworkingsockets/vcpkg.json +++ b/external_imported/vcpkg/ports/gamenetworkingsockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gamenetworkingsockets", - "version": "1.3.0", + "version": "1.4.0", "description": "GameNetworkingSockets is a basic transport layer for games.", "homepage": "https://github.com/ValveSoftware/GameNetworkingSockets", "license": "BSD-3-Clause", diff --git a/external_imported/vcpkg/ports/gasol/portfile.cmake b/external_imported/vcpkg/ports/gasol/portfile.cmake index 5d3ed6b59..b53522965 100644 --- a/external_imported/vcpkg/ports/gasol/portfile.cmake +++ b/external_imported/vcpkg/ports/gasol/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "arm" "arm64") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/external_imported/vcpkg/ports/gasol/vcpkg.json b/external_imported/vcpkg/ports/gasol/vcpkg.json index 8b979704f..aa06ae3c2 100644 --- a/external_imported/vcpkg/ports/gasol/vcpkg.json +++ b/external_imported/vcpkg/ports/gasol/vcpkg.json @@ -1,7 +1,8 @@ { "name": "gasol", - "version-string": "2018-01-04", - "port-version": 1, + "version-date": "2018-01-04", + "port-version": 2, "description": "A general Genetic Algorithm Solver in C++", - "homepage": "https://github.com/PytLab/GASol " + "homepage": "https://github.com/PytLab/GASol", + "supports": "!uwp & !arm" } diff --git a/external_imported/vcpkg/ports/gazebo/0001-Fix-deps.patch b/external_imported/vcpkg/ports/gazebo/0001-Fix-deps.patch new file mode 100644 index 000000000..a933d6884 --- /dev/null +++ b/external_imported/vcpkg/ports/gazebo/0001-Fix-deps.patch @@ -0,0 +1,102 @@ +diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake +index 4085b5aaeb..f89ac88333 100644 +--- a/cmake/SearchForStuff.cmake ++++ b/cmake/SearchForStuff.cmake +@@ -179,7 +179,7 @@ if (PKG_CONFIG_FOUND) + # (needed, at least, for MacOS) + + # Use system installation on UNIX and Apple, and internal copy on Windows +- if (UNIX OR APPLE) ++ if (true) + message (STATUS "Using system tinyxml.") + set (USE_EXTERNAL_TINYXML True) + elseif(WIN32) +@@ -225,7 +225,7 @@ if (PKG_CONFIG_FOUND) + # (needed, at least, for MacOS) + + # Use system installation on UNIX and Apple, and internal copy on Windows +- if (UNIX OR APPLE) ++ if (true) + message (STATUS "Using system tinyxml2.") + set (USE_EXTERNAL_TINYXML2 True) + elseif(WIN32) +@@ -513,7 +513,7 @@ if (PKG_CONFIG_FOUND) + endif () + + if (libavutil_FOUND AND libavformat_FOUND AND libavcodec_FOUND AND +- libswscale_FOUND) ++ libswscale_FOUND AND FFMPEG_FEATURE) + set (HAVE_FFMPEG TRUE) + else () + set (HAVE_FFMPEG FALSE) +@@ -538,7 +538,7 @@ if (PKG_CONFIG_FOUND) + ######################################## + # Find GNU Triangulation Surface Library + pkg_check_modules(gts gts) +- if (gts_FOUND) ++ if (GTS_FEATURE) + message (STATUS "Looking for GTS - found") + set (HAVE_GTS TRUE) + else () +@@ -551,13 +551,14 @@ if (PKG_CONFIG_FOUND) + # First and preferred option is to look for bullet standard pkgconfig, + # so check it first. if it is not present, check for the OSRF + # custom bullet2.82.pc file +- pkg_check_modules(BULLET bullet>=2.82) ++ find_package(BULLET CONFIG 2.82) + if (NOT BULLET_FOUND) + pkg_check_modules(BULLET bullet2.82>=2.82) + endif() + + if (BULLET_FOUND) + set (HAVE_BULLET TRUE) ++ set(BULLET_VERSION ${BULLET_VERSION_STRING}) + add_definitions( -DLIBBULLET_VERSION=${BULLET_VERSION} ) + else() + set (HAVE_BULLET FALSE) +@@ -572,7 +573,7 @@ if (PKG_CONFIG_FOUND) + ######################################## + # Find libusb + pkg_check_modules(libusb-1.0 libusb-1.0) +- if (NOT libusb-1.0_FOUND) ++ if (NO_LIBUSB_FEATURE) + BUILD_WARNING ("libusb-1.0 not found. USB peripherals support will be disabled.") + set (HAVE_USB OFF CACHE BOOL "HAVE USB" FORCE) + else() +@@ -648,7 +649,7 @@ endif () + ######################################## + # Find gdal + include (FindGDAL) +-if (NOT GDAL_FOUND) ++if (NO_GDAL_FEATURE) + message (STATUS "Looking for libgdal - not found") + BUILD_WARNING ("GDAL not found, Digital elevation terrains support will be disabled.") + set (HAVE_GDAL OFF CACHE BOOL "HAVE GDAL" FORCE) +@@ -718,7 +719,7 @@ endif() + ######################################## + # Find graphviz + include (${gazebo_cmake_dir}/FindGraphviz.cmake) +-if (NOT GRAPHVIZ_FOUND) ++if (NO_GRAPHVIZ_FEATURE) + message (STATUS "Looking for libgraphviz-dev - not found") + BUILD_WARNING ("Graphviz not found, Model editor's schematic view will be disabled.") + set (HAVE_GRAPHVIZ OFF CACHE BOOL "HAVE GRAPHVIZ" FORCE) +diff --git a/cmake/gazebo-config.cmake.in b/cmake/gazebo-config.cmake.in +index b57a90dd76..63ce97095e 100644 +--- a/cmake/gazebo-config.cmake.in ++++ b/cmake/gazebo-config.cmake.in +@@ -99,12 +99,13 @@ list(APPEND @PKG_NAME@_CFLAGS -I${GAZEBO_INSTALL_INCLUDE_DIR}/gazebo-@GAZEBO_MAJ + + if (GAZEBO_HAS_BULLET) + if (PKG_CONFIG_FOUND) +- pkg_check_modules(BULLET bullet>=2.82) ++ find_package(BULLET CONFIG 2.82) + if (NOT BULLET_FOUND) + pkg_check_modules(BULLET bullet2.82>=2.82) + endif() + + if (BULLET_FOUND) ++ set(BULLET_VERSION ${BULLET_VERSION_STRING}) + add_definitions(-DLIBBULLET_VERSION=${BULLET_VERSION}) + else() + message(FATAL_ERROR "Error: Bullet > 2.82 not found, please install libbullet2.82-dev.") diff --git a/external_imported/vcpkg/ports/gazebo/portfile.cmake b/external_imported/vcpkg/ports/gazebo/portfile.cmake new file mode 100644 index 000000000..603eab88a --- /dev/null +++ b/external_imported/vcpkg/ports/gazebo/portfile.cmake @@ -0,0 +1,52 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO osrf/gazebo + REF 382dcc3f36095a8d79b5bc9c8b8ad346e867c51d + SHA512 57638cd0b23b5f2bfd32fdc159d6cd77ca34e3bd695c225591979aef4b7271eac93d3706fa1ffa2340f90013267a4171bebe1e4c142f19ad2bf67963dfed627e + HEAD_REF gazebo11 + PATCHES + 0001-Fix-deps.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + openal HAVE_OPENAL + ffmpeg FFMPEG_FEATURE + gts GTS_FEATURE + INVERTED_FEATURES + simbody CMAKE_DISABLE_FIND_PACKAGE_Simbody + dart CMAKE_DISABLE_FIND_PACKAGE_DART + bullet CMAKE_DISABLE_FIND_PACKAGE_BULLET + libusb NO_LIBUSB_FEATURE + gdal NO_GDAL_FEATURE + graphviz NO_GRAPHVIZ_FEATURE +) + +vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/debug/bin") +vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/bin") +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DUSE_EXTERNAL_TINY_PROCESS_LIBRARY=ON + -DPKG_CONFIG_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf.exe + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/gazebo") +vcpkg_copy_pdbs() + +vcpkg_copy_tools( + TOOL_NAMES gazebo gz gzclient gzserver + AUTO_CLEAN +) +set(EXTRA_OGRE_LIBS Codec_EXR Codec_FreeImage Codec_STBI OgreBites OgreMain OgreMeshLodGenerator OgreOverlay OgrePaging OgreProperty OgreRTShaderSystem OgreTerrain OgreVolume Plugin_BSPSceneManager Plugin_DotScene Plugin_OctreeSceneManager Plugin_OctreeZone Plugin_ParticleFX Plugin_PCZSceneManager RenderSystem_Direct3D11 RenderSystem_GL RenderSystem_GL3Plus) +foreach(LIB IN LISTS EXTRA_OGRE_LIBS) + set(FILE_NAME "${CMAKE_SHARED_LIBRARY_PREFIX}${LIB}${CMAKE_SHARED_LIBRARY_SUFFIX}") + file(COPY "${CURRENT_INSTALLED_DIR}/bin/${FILE_NAME}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +endforeach() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/gazebo/vcpkg.json b/external_imported/vcpkg/ports/gazebo/vcpkg.json new file mode 100644 index 000000000..8f4bd5286 --- /dev/null +++ b/external_imported/vcpkg/ports/gazebo/vcpkg.json @@ -0,0 +1,125 @@ +{ + "name": "gazebo", + "version-date": "2022-01-20", + "description": "Open source robotics simulator.", + "homepage": "http://gazebosim.org", + "license": "Apache-2.0", + "dependencies": [ + "boost-asio", + "boost-date-time", + "boost-filesystem", + "boost-format", + "boost-interprocess", + "boost-iostreams", + "boost-program-options", + "boost-property-tree", + "boost-regex", + "boost-system", + "boost-thread", + "boost-uuid", + "ccd", + { + "name": "hdf5", + "features": [ + "cpp" + ] + }, + "ignition-common3", + "ignition-fuel-tools4", + "ignition-math6", + "ignition-msgs5", + "ignition-transport8", + "ogre", + { + "name": "pkgconf", + "host": true + }, + "protobuf", + "qwt", + "sdformat9", + "tbb", + "tiny-process-library", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "bullet", + "dart", + "ffmpeg", + "gdal", + "graphviz", + "gts", + "libusb", + "openal", + "simbody" + ], + "features": { + "bullet": { + "description": "Use the bullet physics engine", + "dependencies": [ + "bullet3" + ] + }, + "dart": { + "description": "Use the dart physics engine", + "dependencies": [ + "dartsim" + ] + }, + "ffmpeg": { + "description": "Enable audio-video capabilities", + "dependencies": [ + { + "name": "ffmpeg", + "features": [ + "avcodec", + "avformat", + "swscale" + ] + } + ] + }, + "gdal": { + "description": "Enable digital elevation terrains support", + "dependencies": [ + "gdal" + ] + }, + "graphviz": { + "description": "Enable model editor's schematic view", + "dependencies": [ + "graphviz" + ] + }, + "gts": { + "description": "Enable CSG support", + "dependencies": [ + "gts" + ] + }, + "libusb": { + "description": "Enable USB peripheral support", + "dependencies": [ + "libusb" + ] + }, + "openal": { + "description": "Enable audio support", + "dependencies": [ + "openal-soft" + ] + }, + "simbody": { + "description": "Use the simbody physics engine", + "dependencies": [ + "simbody" + ] + } + } +} diff --git a/external_imported/vcpkg/ports/gdal/0005-Fix-configure.patch b/external_imported/vcpkg/ports/gdal/0005-Fix-configure.patch index c29f62319..517047bc1 100644 --- a/external_imported/vcpkg/ports/gdal/0005-Fix-configure.patch +++ b/external_imported/vcpkg/ports/gdal/0005-Fix-configure.patch @@ -73,6 +73,18 @@ index 30cd613..43f1daf 100644 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)],,) diff --git a/external_imported/vcpkg/ports/gdal/0009-atlbase.patch b/external_imported/vcpkg/ports/gdal/0009-atlbase.patch new file mode 100644 index 000000000..b2c423e1c --- /dev/null +++ b/external_imported/vcpkg/ports/gdal/0009-atlbase.patch @@ -0,0 +1,72 @@ +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 new file mode 100644 index 000000000..e21fb8d77 --- /dev/null +++ b/external_imported/vcpkg/ports/gdal/0010-symprefix.patch @@ -0,0 +1,13 @@ +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 index 8a9832935..b31ed3546 100644 --- a/external_imported/vcpkg/ports/gdal/dependency_win.cmake +++ b/external_imported/vcpkg/ports/gdal/dependency_win.cmake @@ -1,254 +1,219 @@ macro(find_dependency_win) - # Setup libpng libraries + include path - set(PNG_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include") - set(PNG_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libpng16.lib" ) - set(PNG_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libpng16d.lib" ) - - # Setup zlib libraries + include path - set(ZLIB_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include" ) - set(ZLIB_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/zlib.lib" ) - set(ZLIB_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib" ) - - # Setup geos libraries + include path - set(GEOS_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include" ) - set(GEOS_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/geos_c.lib ${CURRENT_INSTALLED_DIR}/lib/geos.lib" ) - set(GEOS_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/geos_cd.lib ${CURRENT_INSTALLED_DIR}/debug/lib/geosd.lib" ) - - # Setup expat libraries + include path - set(EXPAT_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include" ) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(EXPAT_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libexpatMD.lib" ) - set(EXPAT_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libexpatdMD.lib" ) - else() - set(EXPAT_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libexpat.lib" ) - set(EXPAT_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libexpatd.lib" ) - endif() - - # Setup curl libraries + include path - set(CURL_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include" ) - if(EXISTS "${CURRENT_INSTALLED_DIR}/lib/libcurl.lib") - set(CURL_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libcurl.lib" ) - elseif(EXISTS "${CURRENT_INSTALLED_DIR}/lib/libcurl_imp.lib") - set(CURL_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libcurl_imp.lib" ) - endif() - if(EXISTS "${CURRENT_INSTALLED_DIR}/debug/lib/libcurl-d.lib") - set(CURL_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libcurl-d.lib" ) - elseif(EXISTS "${CURRENT_INSTALLED_DIR}/debug/lib/libcurl-d_imp.lib") - set(CURL_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libcurl-d_imp.lib" ) - endif() - - # Setup sqlite3 libraries + include path - set(SQLITE_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include" ) - set(SQLITE_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/sqlite3.lib" ) - set(SQLITE_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/sqlite3.lib" ) - - if ("postgresql" IN_LIST FEATURES) - # Setup PostgreSQL libraries + include path - set(PGSQL_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include" ) - set(PGSQL_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libpq.lib ${CURRENT_INSTALLED_DIR}/lib/libpgcommon.lib ${CURRENT_INSTALLED_DIR}/lib/libpgport.lib" ) - 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") - endif() - - # Setup OpenJPEG libraries + include path - set(OPENJPEG_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include" ) - set(OPENJPEG_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/openjp2.lib" ) - set(OPENJPEG_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/openjp2.lib" ) - - # Setup WebP libraries + include path - set(WEBP_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include" ) - set(WEBP_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/webp.lib" ) - set(WEBP_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/webpd.lib" ) - - # Setup libxml2 libraries + include path - set(XML2_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include" ) - set(XML2_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libxml2.lib" ) - set(XML2_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib" ) - - # Setup liblzma libraries + include path - set(LZMA_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include" ) - set(LZMA_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/lzma.lib" ) - set(LZMA_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/lzmad.lib" ) - - # Setup openssl libraries path - set(OPENSSL_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libcrypto.lib ${CURRENT_INSTALLED_DIR}/lib/libssl.lib" ) - set(OPENSSL_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libcrypto.lib ${CURRENT_INSTALLED_DIR}/debug/lib/libssl.lib" ) - - # Setup libiconv libraries path - set(ICONV_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/iconv.lib ${CURRENT_INSTALLED_DIR}/lib/charset.lib" ) - set(ICONV_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/iconv.lib ${CURRENT_INSTALLED_DIR}/debug/lib/charset.lib" ) - - # Setup jpeg libraries - if(EXISTS "${CURRENT_INSTALLED_DIR}/lib/jpeg.lib") - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" JPEG_INCLUDE) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/jpeg.lib" JPEG_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/jpeg.lib" JPEG_LIBRARY_DBG) - list(APPEND NMAKE_OPTIONS JPEG_EXTERNAL_LIB=1) - list(APPEND NMAKE_OPTIONS JPEGDIR=${JPEG_INCLUDE}) - list(APPEND NMAKE_OPTIONS_REL JPEG_LIB=${JPEG_LIBRARY_REL}) - list(APPEND NMAKE_OPTIONS_DBG JPEG_LIB=${JPEG_LIBRARY_DBG}) - endif() - - # Setup zstd libraries - if(EXISTS "${CURRENT_INSTALLED_DIR}/lib/zstd.lib") - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" ZSTD_INCLUDE) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/zstd.lib" ZSTD_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/zstdd.lib" ZSTD_LIBRARY_DBG) - list(APPEND NMAKE_OPTIONS ZSTD_CFLAGS=-I${ZSTD_INCLUDE}) - list(APPEND NMAKE_OPTIONS_REL ZSTD_LIBS=${ZSTD_LIBRARY_REL}) - list(APPEND NMAKE_OPTIONS_DBG ZSTD_LIBS=${ZSTD_LIBRARY_DBG}) - endif() - - # Setup tiff libraries - if(EXISTS "${CURRENT_INSTALLED_DIR}/lib/tiff.lib") - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" TIFF_INCLUDE) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/tiff.lib" TIFF_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/tiffd.lib" TIFF_LIBRARY_DBG) - list(APPEND NMAKE_OPTIONS TIFF_INC=-I${TIFF_INCLUDE}) - list(APPEND NMAKE_OPTIONS TIFF_OPTS=-DBIGTIFF_SUPPORT) - list(APPEND NMAKE_OPTIONS_REL TIFF_LIB=${TIFF_LIBRARY_REL}) - list(APPEND NMAKE_OPTIONS_DBG TIFF_LIB=${TIFF_LIBRARY_DBG}) - endif() - - # Setup geotiff libraries - if(EXISTS "${CURRENT_INSTALLED_DIR}/lib/geotiff_i.lib") - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" GEOTIFF_INCLUDE) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/geotiff_i.lib" GEOTIFF_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/geotiff_d_i.lib" GEOTIFF_LIBRARY_DBG) - list(APPEND NMAKE_OPTIONS GEOTIFF_INC=-I${GEOTIFF_INCLUDE}) - list(APPEND NMAKE_OPTIONS_REL GEOTIFF_LIB=${GEOTIFF_LIBRARY_REL}) - list(APPEND NMAKE_OPTIONS_DBG GEOTIFF_LIB=${GEOTIFF_LIBRARY_DBG}) - endif() - - # Setup Xerces libraries - if(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() - - # Setup freexl libraries - if(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() - - # Setup Cryptopp libraries - if(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() - - # Setup netcdf libraries - if("netcdf" IN_LIST FEATURES) - x_vcpkg_pkgconfig_get_modules( - PREFIX NETCDF - MODULES --msvc-syntax netcdf - INCLUDE_DIRS - LIBS - ) - string(REGEX REPLACE "^/I" "" NETCDF_INC_DIR "${NETCDF_INCLUDE_DIRS}") - list(APPEND NMAKE_OPTIONS NETCDF_PLUGIN=NO) - list(APPEND NMAKE_OPTIONS NETCDF_SETTING=yes) - list(APPEND NMAKE_OPTIONS "NETCDF_INC_DIR=${NETCDF_INC_DIR}") - list(APPEND NMAKE_OPTIONS_REL "NETCDF_LIB=${NETCDF_LIBS_RELEASE}") - list(APPEND NMAKE_OPTIONS_DBG "NETCDF_LIB=${NETCDF_LIBS_DEBUG}") - endif() - - # Setup hdf5 libraries - 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_PLUGIN=NO) - list(APPEND NMAKE_OPTIONS "HDF5_DIR=${HDF5_DIR}") - 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() - - # Setup libkml libraries - if(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() - - if("mysql-libmysql" IN_LIST FEATURES OR "mysql-libmariadb" IN_LIST FEATURES) - # Setup MySQL libraries + include path - if("mysql-libmysql" IN_LIST FEATURES) - set(MYSQL_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include/mysql" ) - set(MYSQL_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libmysql.lib" ) - set(MYSQL_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libmysql.lib" ) - endif() - - if("mysql-libmariadb" IN_LIST FEATURES) - set(MYSQL_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include/mysql" ) - set(MYSQL_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libmariadb.lib" ) - set(MYSQL_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libmariadb.lib" ) - endif() - endif() - - if ("libspatialite" IN_LIST FEATURES) - # Setup spatialite libraries + include path - set(SPATIALITE_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include/spatialite" ) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(SPATIALITE_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/librttopo.lib" "${CURRENT_INSTALLED_DIR}/lib/spatialite.lib") - set(SPATIALITE_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/librttopo.lib" "${CURRENT_INSTALLED_DIR}/debug/lib/spatialite.lib") + # 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() - set(SPATIALITE_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/spatialite.lib" ) - set(SPATIALITE_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/spatialite.lib" ) + # 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() - set(HAVE_SPATIALITE "-DHAVE_SPATIALITE") - list(APPEND NMAKE_OPTIONS SPATIALITE_412_OR_LATER=yes) - endif() - - if ("cfitsio" IN_LIST FEATURES) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" FITS_INCLUDE) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/cfitsio.lib" FITS_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/cfitsio.lib" FITS_LIBRARY_DBG) - list(APPEND NMAKE_OPTIONS FITS_PLUGIN=YES) - list(APPEND NMAKE_OPTIONS FITS_INC_DIR=${FITS_INCLUDE}) - list(APPEND NMAKE_OPTIONS_REL FITS_LIB=${FITS_LIBRARY_REL}) - list(APPEND NMAKE_OPTIONS_DBG FITS_LIB=${FITS_LIBRARY_DBG}) - 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/portfile.cmake b/external_imported/vcpkg/ports/gdal/portfile.cmake index 8fa9bf04b..5d75c1421 100644 --- a/external_imported/vcpkg/ports/gdal/portfile.cmake +++ b/external_imported/vcpkg/ports/gdal/portfile.cmake @@ -5,6 +5,8 @@ set(GDAL_PATCHES 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) @@ -13,115 +15,61 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/gdal - REF d699b38a744301368070ef780f797340da4a9c3c # 3.4.0 - SHA512 709523740a51a0a2a144debcfa5fbc5a5b3d93cc3632856cfbc37f7ca52f2e83f4942d9a27d4c723ee19d2397cc91a4b1ba4543547afdfefb3980a7ba6684bd7 + REF v3.4.2 + SHA512 4dadfaefb4924e17395b2d8b695e185e91e9ad28b4b8666b64f11f40164411974f8ade747592060b515907ee73bf335610698c5e53e56a8937a89ddfffc3d66b HEAD_REF master PATCHES ${GDAL_PATCHES} ) # `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) - set(NATIVE_DATA_DIR "${CURRENT_PACKAGES_DIR}/share/gdal") - set(NATIVE_HTML_DIR "${CURRENT_PACKAGES_DIR}/share/gdal/html") - - set(NMAKE_OPTIONS "") - set(NMAKE_OPTIONS_REL "") - set(NMAKE_OPTIONS_DBG "") - - x_vcpkg_pkgconfig_get_modules(PREFIX PROJ MODULES --msvc-syntax proj INCLUDE_DIRS LIBS) + if (VCPKG_CRT_LINKAGE STREQUAL "static") + set(LINKAGE_FLAGS "/MT") + else() + set(LINKAGE_FLAGS "/MD") + endif() - include("${CMAKE_CURRENT_LIST_DIR}/dependency_win.cmake") - find_dependency_win() + 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("mysql-libmysql" IN_LIST FEATURES OR "mysql-libmariadb" IN_LIST FEATURES) - list(APPEND NMAKE_OPTIONS "MYSQL_INC_DIR=${MYSQL_INCLUDE_DIR}") - list(APPEND NMAKE_OPTIONS_REL "MYSQL_LIB=${MYSQL_LIBRARY_REL}") - list(APPEND NMAKE_OPTIONS_DBG "MYSQL_LIB=${MYSQL_LIBRARY_DBG}") + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + list(APPEND NMAKE_OPTIONS "WIN64=YES") endif() - list(APPEND NMAKE_OPTIONS - "DATADIR=${NATIVE_DATA_DIR}" - "HTMLDIR=${NATIVE_HTML_DIR}" - "GEOS_DIR=${GEOS_INCLUDE_DIR}" - "GEOS_CFLAGS=-I${GEOS_INCLUDE_DIR} -DHAVE_GEOS" - "PROJ_INCLUDE=${PROJ_INCLUDE_DIRS}" - "EXPAT_DIR=${EXPAT_INCLUDE_DIR}" - "EXPAT_INCLUDE=-I${EXPAT_INCLUDE_DIR}" - "CURL_INC=-I${CURL_INCLUDE_DIR}" - "SQLITE_INC=-I${SQLITE_INCLUDE_DIR} ${HAVE_SPATIALITE}" - "PG_INC_DIR=${PGSQL_INCLUDE_DIR}" - OPENJPEG_ENABLED=YES - "OPENJPEG_CFLAGS=-I${OPENJPEG_INCLUDE_DIR}" - OPENJPEG_VERSION=20100 - WEBP_ENABLED=YES - "WEBP_CFLAGS=-I${WEBP_INCLUDE_DIR}" - "LIBXML2_INC=-I${XML2_INCLUDE_DIR}" - PNG_EXTERNAL_LIB=1 - "PNGDIR=${PNG_INCLUDE_DIR}" - "ZLIB_INC=-I${ZLIB_INCLUDE_DIR}" - ZLIB_EXTERNAL_LIB=1 - MSVC_VER=1900 - ) + if(VCPKG_TARGET_IS_UWP) + list(APPEND NMAKE_OPTIONS "SYM_PREFIX=" "EXTRA_LINKER_FLAGS=/APPCONTAINER WindowsApp.lib") + endif() - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - list(APPEND NMAKE_OPTIONS WIN64=YES) + 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) + list(APPEND NMAKE_OPTIONS "SSEFLAGS=/DNO_SSSE" "AVXFLAGS=/DNO_AVX") endif() if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") - list(APPEND NMAKE_OPTIONS CURL_CFLAGS=-DCURL_STATICLIB) - list(APPEND NMAKE_OPTIONS DLLBUILD=0) - list(APPEND NMAKE_OPTIONS "PROJ_FLAGS=-DPROJ_STATIC -DPROJ_VERSION=5") + list(APPEND NMAKE_OPTIONS "DLLBUILD=0") else() - # Enables PDBs for release and debug builds - list(APPEND NMAKE_OPTIONS WITH_PDB=1) - list(APPEND NMAKE_OPTIONS DLLBUILD=1) - endif() - - if (VCPKG_CRT_LINKAGE STREQUAL "static") - set(LINKAGE_FLAGS "/MT") - else() - set(LINKAGE_FLAGS "/MD") + list(APPEND NMAKE_OPTIONS "DLLBUILD=1" "WITH_PDB=1") endif() - list(APPEND NMAKE_OPTIONS_REL - ${NMAKE_OPTIONS} - "GDAL_HOME=${CURRENT_PACKAGES_DIR}" - "CXX_CRT_FLAGS=${LINKAGE_FLAGS}" - "PROJ_LIBRARY=${PROJ_LIBS_RELEASE}" - "PNG_LIB=${PNG_LIBRARY_REL}" - "GEOS_LIB=${GEOS_LIBRARY_REL}" - "EXPAT_LIB=${EXPAT_LIBRARY_REL}" - "CURL_LIB=${CURL_LIBRARY_REL} wsock32.lib wldap32.lib winmm.lib" - "SQLITE_LIB=${SQLITE_LIBRARY_REL} ${SPATIALITE_LIBRARY_REL}" - "OPENJPEG_LIB=${OPENJPEG_LIBRARY_REL}" - "WEBP_LIBS=${WEBP_LIBRARY_REL}" - "LIBXML2_LIB=${XML2_LIBRARY_REL} ${ICONV_LIBRARY_REL} ${LZMA_LIBRARY_REL}" - "ZLIB_LIB=${ZLIB_LIBRARY_REL}" - "PG_LIB=${PGSQL_LIBRARY_REL} Secur32.lib Shell32.lib Advapi32.lib Crypt32.lib Gdi32.lib ${OPENSSL_LIBRARY_REL}" - ) - - list(APPEND NMAKE_OPTIONS_DBG - ${NMAKE_OPTIONS} - "GDAL_HOME=${CURRENT_PACKAGES_DIR}/debug" - "CXX_CRT_FLAGS=${LINKAGE_FLAGS}d" - "PROJ_LIBRARY=${PROJ_LIBS_DEBUG}" - "PNG_LIB=${PNG_LIBRARY_DBG}" - "GEOS_LIB=${GEOS_LIBRARY_DBG}" - "EXPAT_LIB=${EXPAT_LIBRARY_DBG}" - "CURL_LIB=${CURL_LIBRARY_DBG} wsock32.lib wldap32.lib winmm.lib" - "SQLITE_LIB=${SQLITE_LIBRARY_DBG} ${SPATIALITE_LIBRARY_DBG}" - "OPENJPEG_LIB=${OPENJPEG_LIBRARY_DBG}" - "WEBP_LIBS=${WEBP_LIBRARY_DBG}" - "LIBXML2_LIB=${XML2_LIBRARY_DBG} ${ICONV_LIBRARY_DBG} ${LZMA_LIBRARY_DBG}" - "ZLIB_LIB=${ZLIB_LIBRARY_DBG}" - "PG_LIB=${PGSQL_LIBRARY_DBG} Secur32.lib Shell32.lib Advapi32.lib Crypt32.lib Gdi32.lib ${OPENSSL_LIBRARY_DBG}" - DEBUG=1 - ) + include("${CMAKE_CURRENT_LIST_DIR}/dependency_win.cmake") + find_dependency_win() if("tools" IN_LIST FEATURES) list(APPEND NMAKE_OPTIONS_REL "BUILD_TOOLS=1") @@ -134,15 +82,13 @@ if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) vcpkg_install_nmake( SOURCE_PATH "${SOURCE_PATH}/gdal" TARGET devinstall + OPTIONS + ${NMAKE_OPTIONS} OPTIONS_RELEASE - "${NMAKE_OPTIONS_REL}" + ${NMAKE_OPTIONS_REL} OPTIONS_DEBUG - "${NMAKE_OPTIONS_DBG}" - ) - - if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/gdal/html") - endif() + ${NMAKE_OPTIONS_DBG} + ) if("tools" IN_LIST FEATURES) set(GDAL_EXES @@ -172,8 +118,8 @@ if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) ogrinfo ogrlineref ogrtindex - ) - # vcpkg_copy_tools removed the bin directories for us so no need to remove again + ) + # 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") @@ -239,6 +185,11 @@ else() 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) @@ -319,9 +270,9 @@ else() --with-pcidsk=no --with-pcraster=no --with-pcre=no + --with-pcre2=no --with-pdfium=no --with-podofo=no - --with-poppler=no --with-qhull=no --with-rasdaman=no --with-rasterlite2=no @@ -388,8 +339,8 @@ else() 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") + 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`/../../..") @@ -397,10 +348,29 @@ else() 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() endif() -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +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) -# Handle copyright +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) diff --git a/external_imported/vcpkg/ports/gdal/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/gdal/vcpkg-cmake-wrapper.cmake index 0b555b250..305de834e 100644 --- a/external_imported/vcpkg/ports/gdal/vcpkg-cmake-wrapper.cmake +++ b/external_imported/vcpkg/ports/gdal/vcpkg-cmake-wrapper.cmake @@ -70,6 +70,36 @@ function(_gdal_add_dependency target 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() if(GDAL_FOUND) cmake_policy(PUSH) cmake_policy(SET CMP0057 NEW) @@ -80,17 +110,22 @@ if(GDAL_FOUND) _gdal_add_dependency(CURL::libcurl CURL CONFIG) _gdal_add_dependency(expat::expat expat CONFIG) _gdal_add_dependency(GEOS::geos_c geos CONFIG) - _gdal_add_dependency(GIF::GIF GIF) + 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 WIN32 OR MINGW) + 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 CONFIG) + _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() @@ -105,6 +140,8 @@ if(GDAL_FOUND) _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") diff --git a/external_imported/vcpkg/ports/gdal/vcpkg.json b/external_imported/vcpkg/ports/gdal/vcpkg.json index 262bc17b5..766fe35a8 100644 --- a/external_imported/vcpkg/ports/gdal/vcpkg.json +++ b/external_imported/vcpkg/ports/gdal/vcpkg.json @@ -1,27 +1,37 @@ { "name": "gdal", - "version-semver": "3.4.0", - "port-version": 6, + "version-semver": "3.4.2", "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", - "supports": "!uwp", + "license": null, "dependencies": [ + { + "name": "atlmfc", + "platform": "windows & !uwp" + }, "curl", "expat", "geos", - "giflib", + { + "name": "giflib", + "platform": "!windows | mingw" + }, { "name": "json-c", "platform": "!windows | mingw" }, "libgeotiff", + { + "name": "libiconv", + "platform": "windows & !mingw" + }, "libjpeg-turbo", "liblzma", "libpng", "libwebp", "libxml2", "openjpeg", - "proj4", + "proj", "sqlite3", "tiff", { @@ -65,6 +75,18 @@ "netcdf-c" ] }, + "poppler": { + "description": "Enable poppler support", + "dependencies": [ + { + "name": "poppler", + "default-features": false, + "features": [ + "private-api" + ] + } + ] + }, "postgresql": { "description": "Enable PostgreSQL support", "dependencies": [ @@ -94,7 +116,6 @@ ] }, "system-libraries": { - "$supports": "!windows", "description": "Include drivers which need additional libraries" }, "tools": { diff --git a/external_imported/vcpkg/ports/geogram/portfile.cmake b/external_imported/vcpkg/ports/geogram/portfile.cmake index 76a240210..490838775 100644 --- a/external_imported/vcpkg/ports/geogram/portfile.cmake +++ b/external_imported/vcpkg/ports/geogram/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO alicevision/geogram diff --git a/external_imported/vcpkg/ports/geogram/vcpkg.json b/external_imported/vcpkg/ports/geogram/vcpkg.json index 79374c8cb..e7c40ee36 100644 --- a/external_imported/vcpkg/ports/geogram/vcpkg.json +++ b/external_imported/vcpkg/ports/geogram/vcpkg.json @@ -1,7 +1,7 @@ { "name": "geogram", "version": "1.7.6", - "port-version": 1, + "port-version": 2, "description": "Geogram is a programming library of geometric algorithms.", "homepage": "https://gforge.inria.fr/projects/geogram/", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/geographiclib/portfile.cmake b/external_imported/vcpkg/ports/geographiclib/portfile.cmake index a5c71f8f7..592d0dc63 100644 --- a/external_imported/vcpkg/ports/geographiclib/portfile.cmake +++ b/external_imported/vcpkg/ports/geographiclib/portfile.cmake @@ -19,13 +19,6 @@ else () set (LIB_TYPE "STATIC") endif () -if (tools IN_LIST FEATURES) - vcpkg_fail_port_install ( - MESSAGE "Cannot build GeographicLib tools for UWP" - ON_TARGET uwp - ) -endif () - vcpkg_configure_cmake ( SOURCE_PATH ${SOURCE_PATH} OPTIONS diff --git a/external_imported/vcpkg/ports/geographiclib/vcpkg.json b/external_imported/vcpkg/ports/geographiclib/vcpkg.json index 69c49bc99..321cd04ec 100644 --- a/external_imported/vcpkg/ports/geographiclib/vcpkg.json +++ b/external_imported/vcpkg/ports/geographiclib/vcpkg.json @@ -1,12 +1,13 @@ { "name": "geographiclib", "version": "1.52", - "port-version": 1, + "port-version": 2, "description": "GeographicLib, a C++ library for performing geographic conversions", "homepage": "https://geographiclib.sourceforge.io", "features": { "tools": { - "description": "The GeographicLib tools" + "description": "The GeographicLib tools", + "supports": "!uwp" } } } diff --git a/external_imported/vcpkg/ports/getdns/disable-docs.patch b/external_imported/vcpkg/ports/getdns/disable-docs.patch new file mode 100644 index 000000000..ffa7afa56 --- /dev/null +++ b/external_imported/vcpkg/ports/getdns/disable-docs.patch @@ -0,0 +1,42 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 413709da..d3dd03f0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1039,9 +1039,9 @@ configure_file(src/version.c.in version.c) + + set(version ${PACKAGE_VERSION}) + set(date ${API_VERSION}) +-file(GLOB mans doc/*.3.in) +-file(MAKE_DIRECTORY man3) +-foreach (man ${mans}) ++#file(GLOB mans doc/*.3.in) ++#file(MAKE_DIRECTORY man3) ++if (FALSE) + get_filename_component(out ${man} NAME_WE) + configure_file(${man} man3/${out}.3 @ONLY) + +@@ -1061,7 +1061,7 @@ foreach (man ${mans}) + configure_file(${man} man3/${alt}.3 @ONLY) + endif () + endforeach() +-endforeach() ++endif() + + set(prefix ${CMAKE_INSTALL_PREFIX}) + configure_file(getdns.pc.in getdns.pc @ONLY) +@@ -1099,11 +1099,11 @@ if (BUILD_GETDNS_SERVER_MON) + endif () + + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/getdns DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3 DESTINATION share/man) ++#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3 DESTINATION share/man) + +-set(docdir share/doc/getdns) +-install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${docdir}) +-install(FILES spec/index.html DESTINATION ${docdir}/spec) ++#set(docdir share/doc/getdns) ++#install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${docdir}) ++#install(FILES spec/index.html DESTINATION ${docdir}/spec) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/getdns.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + + install(CODE "message(\"\ diff --git a/external_imported/vcpkg/ports/getdns/portfile.cmake b/external_imported/vcpkg/ports/getdns/portfile.cmake index c1411e621..07a11fe80 100644 --- a/external_imported/vcpkg/ports/getdns/portfile.cmake +++ b/external_imported/vcpkg/ports/getdns/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - set(GETDNS_VERSION 1.7.0) set(GETDNS_HASH d09b8bdd0b4a3df2d25b9689166226da83a5a7eb2c7436487dc637539ac6077624a4d66cf684c4e6c4911561872c6bd191af3afd90d275b1662e4c6c47773ef6) @@ -12,12 +10,17 @@ vcpkg_download_distfile(ARCHIVE SHA512 ${GETDNS_HASH} ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${GETDNS_VERSION} +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" + PATCHES disable-docs.patch ) +if(VCPKG_TARGET_IS_WINDOWS AND 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() + vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -44,6 +47,6 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_fixup_pkgconfig() -vcpkg_fixup_pkgconfig() \ 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/getdns/vcpkg.json b/external_imported/vcpkg/ports/getdns/vcpkg.json index 9f657dcd1..98b9d3304 100644 --- a/external_imported/vcpkg/ports/getdns/vcpkg.json +++ b/external_imported/vcpkg/ports/getdns/vcpkg.json @@ -1,8 +1,10 @@ { "name": "getdns", "version": "1.7.0", + "port-version": 3, "description": "GetDNS is a modern asynchronous DNS API", "homepage": "https://getdnsapi.net/", + "license": "BSD-3-Clause", "supports": "!uwp", "dependencies": [ "libidn2", diff --git a/external_imported/vcpkg/ports/getopt-win32/getopt.h.patch b/external_imported/vcpkg/ports/getopt-win32/getopt.h.patch new file mode 100644 index 000000000..58435f481 --- /dev/null +++ b/external_imported/vcpkg/ports/getopt-win32/getopt.h.patch @@ -0,0 +1,50 @@ +commit 81c35ed14e07138e44b5b30f52fbc2bb26ae1fed +Author: Max Khon +Date: Mon Jan 24 23:05:24 2022 +0700 + + Rename "extern C" macros as MS VC C++ headers use _END_EXTERN_C macro + +diff --git a/getopt.h b/getopt.h +index 5ed4a46..5e33682 100644 +--- a/getopt.h ++++ b/getopt.h +@@ -57,12 +57,12 @@ EXPRESSLY ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + + // Change behavior for C\C++ + #ifdef __cplusplus +- #define _BEGIN_EXTERN_C extern "C" { +- #define _END_EXTERN_C } ++ #define _GETOPT_BEGIN_EXTERN_C extern "C" { ++ #define _GETOPT_END_EXTERN_C } + #define _GETOPT_THROW throw() + #else +- #define _BEGIN_EXTERN_C +- #define _END_EXTERN_C ++ #define _GETOPT_BEGIN_EXTERN_C ++ #define _GETOPT_END_EXTERN_C + #define _GETOPT_THROW + #endif + +@@ -81,7 +81,7 @@ EXPRESSLY ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + #include + #include + +-_BEGIN_EXTERN_C ++_GETOPT_BEGIN_EXTERN_C + + extern _GETOPT_API int optind; + extern _GETOPT_API int opterr; +@@ -113,10 +113,10 @@ _BEGIN_EXTERN_C + extern _GETOPT_API int getopt_long_w(int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index) _GETOPT_THROW; + extern _GETOPT_API int getopt_long_only_w(int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index) _GETOPT_THROW; + +-_END_EXTERN_C ++_GETOPT_END_EXTERN_C + +- #undef _BEGIN_EXTERN_C +- #undef _END_EXTERN_C ++ #undef _GETOPT_BEGIN_EXTERN_C ++ #undef _GETOPT_END_EXTERN_C + #undef _GETOPT_THROW + #undef _GETOPT_API + diff --git a/external_imported/vcpkg/ports/getopt-win32/portfile.cmake b/external_imported/vcpkg/ports/getopt-win32/portfile.cmake index 2e80cf943..041c8ad30 100644 --- a/external_imported/vcpkg/ports/getopt-win32/portfile.cmake +++ b/external_imported/vcpkg/ports/getopt-win32/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( REF 0.1 SHA512 40e2a901241a5d751cec741e5de423c8f19b105572c7cae18adb6e69be0b408efc6c9a2ecaeb62f117745eac0d093f30d6b91d88c1a27e1f7be91f0e84fdf199 HEAD_REF master + PATCHES getopt.h.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) diff --git a/external_imported/vcpkg/ports/getopt-win32/vcpkg.json b/external_imported/vcpkg/ports/getopt-win32/vcpkg.json index 8f68d57f2..a53db8ae7 100644 --- a/external_imported/vcpkg/ports/getopt-win32/vcpkg.json +++ b/external_imported/vcpkg/ports/getopt-win32/vcpkg.json @@ -1,8 +1,9 @@ { "name": "getopt-win32", "version-string": "0.1", - "port-version": 1, + "port-version": 2, "description": "An implementation of getopt.", "homepage": "https://github.com/libimobiledevice-win32", + "license": "LGPL-3.0-only", "supports": "windows" } diff --git a/external_imported/vcpkg/ports/gettext/0004-Fix-uwp-tools-build.patch b/external_imported/vcpkg/ports/gettext/0004-Fix-uwp-tools-build.patch new file mode 100644 index 000000000..65dfce570 --- /dev/null +++ b/external_imported/vcpkg/ports/gettext/0004-Fix-uwp-tools-build.patch @@ -0,0 +1,116 @@ +--- a/gettext-runtime/gnulib-lib/fcntl.c 2022-01-11 11:11:28.406622100 +0700 ++++ b/gettext-runtime/gnulib-lib/fcntl.c 2022-01-11 11:11:03.406190800 +0700 +@@ -38,6 +38,10 @@ + # 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 + # include "msvc-nothrow.h" +--- a/gettext-tools/gnulib-lib/fcntl.c 2022-01-11 11:11:28.406622100 +0700 ++++ b/gettext-tools/gnulib-lib/fcntl.c 2022-01-11 11:11:03.406190800 +0700 +@@ -38,6 +38,10 @@ + # 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 + # include "msvc-nothrow.h" +--- a/gettext-tools/src/hostname.c 2022-01-12 01:41:13.725124300 +0700 ++++ b/gettext-tools/src/hostname.c 2022-01-12 01:47:39.384274300 +0700 +@@ -35,15 +35,15 @@ + /* Get gethostname(). */ + #include + ++#if !HAVE_GETHOSTNAME + #ifdef WIN32_NATIVE + /* Native Woe32 API lacks gethostname() but has GetComputerName() instead. */ + # include + #else + /* Some systems, like early Solaris versions, lack gethostname() but + have uname() instead. */ +-# if !HAVE_GETHOSTNAME +-# include +-# endif ++# include ++#endif + #endif + + /* Get MAXHOSTNAMELEN. */ +@@ -56,6 +56,9 @@ + + /* Support for using gethostbyname(). */ + #if HAVE_GETHOSTBYNAME ++#if HAVE_WINSOCK2_H ++# include ++#else + # include + # include /* defines AF_INET, AF_INET6 */ + # include /* declares ntohs(), defines struct sockaddr_in */ +@@ -77,6 +80,7 @@ + # endif + # include /* defines struct hostent, declares gethostbyname() */ + #endif ++#endif + + /* Include this after , to avoid a syntax error on BeOS. */ + #include +@@ -250,7 +254,7 @@ + static char * + xgethostname () + { +-#ifdef WIN32_NATIVE ++#ifdef WIN32_NATIVE && !HAVE_GETHOSTNAME + char hostname[MAX_COMPUTERNAME_LENGTH+1]; + DWORD size = sizeof (hostname); + +--- a/libtextstyle/lib/fcntl.c 2020-06-27 03:00:38.000000000 +0700 ++++ b/libtextstyle/lib/fcntl.c 2022-01-11 11:10:29.936269800 +0700 +@@ -38,6 +38,10 @@ + # 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 + # include "msvc-nothrow.h" +--- a/libtextstyle/lib/isatty.c 2020-06-27 03:00:40.000000000 +0700 ++++ b/libtextstyle/lib/isatty.c 2022-01-11 11:19:04.852685700 +0700 +@@ -99,6 +99,7 @@ + BOOL result = FALSE; + ULONG processId; + ++#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY != WINAPI_FAMILY_APP) + #if !(_WIN32_WINNT >= _WIN32_WINNT_VISTA) + if (!initialized) + initialize (); +@@ -137,6 +138,7 @@ + CloseHandle (processHandle); + } + } ++#endif // !WINAPI_FAMILY_APP + return result; + } + +--- a/libtextstyle/lib/unistd.in.h 2020-07-08 08:33:18.000000000 +0700 ++++ b/libtextstyle/lib/unistd.in.h 2022-01-11 22:11:46.402435600 +0700 +@@ -828,7 +828,7 @@ + Null terminate it if the name is shorter than LEN. + If the host name is longer than LEN, set errno = EINVAL and return -1. + Return 0 if successful, otherwise set errno and return -1. */ +-# if @UNISTD_H_HAVE_WINSOCK2_H@ ++# if !@HAVE_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # undef gethostname + # define gethostname rpl_gethostname diff --git a/external_imported/vcpkg/ports/gettext/portfile.cmake b/external_imported/vcpkg/ports/gettext/portfile.cmake index 8fafa8080..bd46f930b 100644 --- a/external_imported/vcpkg/ports/gettext/portfile.cmake +++ b/external_imported/vcpkg/ports/gettext/portfile.cmake @@ -26,6 +26,7 @@ vcpkg_extract_source_archive_ex( PATCHES 0002-Fix-uwp-build.patch 0003-Fix-win-unicode-paths.patch + 0004-Fix-uwp-tools-build.patch rel_path.patch android.patch gettext-tools_woe32dll_gettextsrc-exports.c.patch diff --git a/external_imported/vcpkg/ports/gettext/vcpkg.json b/external_imported/vcpkg/ports/gettext/vcpkg.json index e1aec428b..aa6ebb5f3 100644 --- a/external_imported/vcpkg/ports/gettext/vcpkg.json +++ b/external_imported/vcpkg/ports/gettext/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gettext", "version": "0.21", - "port-version": 8, + "port-version": 9, "description": "GNU gettext provides libintl and a set of tools to help produce multi-lingual messages.", "homepage": "https://www.gnu.org/software/gettext/", "dependencies": [ diff --git a/external_imported/vcpkg/ports/gherkin-c/fix-include-path.patch b/external_imported/vcpkg/ports/gherkin-c/fix-include-path.patch new file mode 100644 index 000000000..ddaf80d31 --- /dev/null +++ b/external_imported/vcpkg/ports/gherkin-c/fix-include-path.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 74b9ffb..6af4645 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -60,7 +60,7 @@ LIST(APPEND GHERKIN_SRS + ) + + add_library(gherkin ${GHERKIN_SRS}) +-target_include_directories(gherkin PUBLIC "$") ++target_include_directories(gherkin PUBLIC "$" "$") + + if (BUILD_GHERKIN_TESTS) + LIST(APPEND GENERATE_TOKEN +@@ -96,7 +96,7 @@ if (BUILD_GHERKIN_TESTS) + ENDFOREACH() + endif() + +-set(include_install_dir "include") ++set(include_install_dir "include/gherkin-c") + set(lib_install_dir "lib/") + set(bin_install_dir "bin/") + set(config_install_dir "lib/cmake/") diff --git a/external_imported/vcpkg/ports/gherkin-c/fix-install-error.patch b/external_imported/vcpkg/ports/gherkin-c/fix-install-error.patch new file mode 100644 index 000000000..a695e0c7b --- /dev/null +++ b/external_imported/vcpkg/ports/gherkin-c/fix-install-error.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3227bf5..74b9ffb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -131,7 +131,3 @@ install( + # NAMESPACE "${namespace}" + # DESTINATION "${config_install_dir}") + +-add_custom_target(install_${PROJECT_NAME} +- $(MAKE) install +- DEPENDS gherkin +- COMMENT "Installing ${PROJECT_NAME}") diff --git a/external_imported/vcpkg/ports/gherkin-c/portfile.cmake b/external_imported/vcpkg/ports/gherkin-c/portfile.cmake index 68c2049d1..3e4a7ad0a 100644 --- a/external_imported/vcpkg/ports/gherkin-c/portfile.cmake +++ b/external_imported/vcpkg/ports/gherkin-c/portfile.cmake @@ -4,19 +4,20 @@ vcpkg_from_github( REF dd180edc7d092311f2e90a0c4957061156d39dd3 SHA512 c6b38ab0e7a0fd1061d86b0ff9d9140f8c3d6f15cfc1673e947254c6c03a66d3e6aae5b267b074aa10fa30ba2850190c9e9ea7c12e340e4f8c5575b9bf31bab3 HEAD_REF master + PATCHES + fix-install-error.patch + fix-include-path.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_GHERKIN_TESTS=OFF ) -vcpkg_install_cmake() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - +vcpkg_cmake_install() vcpkg_copy_pdbs() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/gherkin-c RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/gherkin-c" RENAME copyright) diff --git a/external_imported/vcpkg/ports/gherkin-c/vcpkg.json b/external_imported/vcpkg/ports/gherkin-c/vcpkg.json index 462f19b78..a91fd90b5 100644 --- a/external_imported/vcpkg/ports/gherkin-c/vcpkg.json +++ b/external_imported/vcpkg/ports/gherkin-c/vcpkg.json @@ -1,6 +1,12 @@ { "name": "gherkin-c", - "version-string": "2019-10-07", - "port-version": 2, - "description": "Gherkin parser/compiler in C" + "version-date": "2019-10-07", + "port-version": 3, + "description": "Gherkin parser/compiler in C", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/giflib/portfile.cmake b/external_imported/vcpkg/ports/giflib/portfile.cmake index bf9a3b262..8a58b690a 100644 --- a/external_imported/vcpkg/ports/giflib/portfile.cmake +++ b/external_imported/vcpkg/ports/giflib/portfile.cmake @@ -29,6 +29,4 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() -file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/gif) - file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/giflib/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/giflib/vcpkg-cmake-wrapper.cmake deleted file mode 100644 index f688cff96..000000000 --- a/external_imported/vcpkg/ports/giflib/vcpkg-cmake-wrapper.cmake +++ /dev/null @@ -1,3 +0,0 @@ -find_path(GIF_INCLUDE_DIR gif_lib.h PATH_SUFFIXES include PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) - -_find_package(${ARGS}) diff --git a/external_imported/vcpkg/ports/giflib/vcpkg.json b/external_imported/vcpkg/ports/giflib/vcpkg.json index 6cbbf622c..2e950baed 100644 --- a/external_imported/vcpkg/ports/giflib/vcpkg.json +++ b/external_imported/vcpkg/ports/giflib/vcpkg.json @@ -1,9 +1,10 @@ { "name": "giflib", "version": "5.2.1", - "port-version": 1, + "port-version": 2, "description": "A library for reading and writing gif images.", "homepage": "https://sourceforge.net/projects/giflib/", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/glfw3/portfile.cmake b/external_imported/vcpkg/ports/glfw3/portfile.cmake index 2f1195eef..c95a6d6b3 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 7d5a16ce714f0b5f4efa3262de22e4d948851525 #v3.3.5 - SHA512 46f21d34eb4f7c3721fb42d5e817e208d7c70c2fbf1f1d61200ec22c052c9e93989ee3c693ec6b6c3498e5f61388286cfa97b97e10326548e94b6586b87184f7 + REF 45ce5ddd197d5c58f50fdd3296a5131c894e5527 #v3.3.7 + SHA512 0802b499cb56f5c4f575304279aafe7d812443fcf3dbfa75178cfba7a3693fb88731ae5dd29c6937598ba977de156d92af1ea99929b70ff72ed8429693f301c7 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/glfw3/vcpkg.json b/external_imported/vcpkg/ports/glfw3/vcpkg.json index 6edaff10a..ef22ea545 100644 --- a/external_imported/vcpkg/ports/glfw3/vcpkg.json +++ b/external_imported/vcpkg/ports/glfw3/vcpkg.json @@ -1,8 +1,9 @@ { "name": "glfw3", - "version-semver": "3.3.6", + "version-semver": "3.3.7", "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", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/glib/portfile.cmake b/external_imported/vcpkg/ports/glib/portfile.cmake index f44148415..8ef135df7 100644 --- a/external_imported/vcpkg/ports/glib/portfile.cmake +++ b/external_imported/vcpkg/ports/glib/portfile.cmake @@ -1,6 +1,3 @@ -# Glib uses winapi functions not available in WindowsStore -vcpkg_fail_port_install(ON_TARGET "UWP") - # Glib relies on DllMain on Windows if (VCPKG_TARGET_IS_WINDOWS) vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) @@ -8,11 +5,11 @@ if (VCPKG_TARGET_IS_WINDOWS) endif() set(GLIB_MAJOR_MINOR 2.70) -set(GLIB_PATCH 1) +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 639317c98ab72ad853608ab4d395484daff135c0222556c51ca93fd8533c5759db14478beda964e4feb02bb2737a46a4eda25063f98a9c6ba6ae4bc5d74bf5e1) + SHA512 3dfb45a9b6fe67fcf185f5cbb3985b6f1da17caf9c6f01e638d8fe4a6271ea1a30b0cf4ca8f43728bd29a8ac13b05a34e1cf262ade7795f0c0d0a2c0b90b1ff8) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH @@ -94,7 +91,7 @@ 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() - + IF(VCPKG_TARGET_IS_WINDOWS) set(SYSTEM_LIBRARIES dnsapi iphlpapi winmm lshlwapi) else() diff --git a/external_imported/vcpkg/ports/glib/vcpkg.json b/external_imported/vcpkg/ports/glib/vcpkg.json index 15e16ec92..6ad02e28c 100644 --- a/external_imported/vcpkg/ports/glib/vcpkg.json +++ b/external_imported/vcpkg/ports/glib/vcpkg.json @@ -1,7 +1,6 @@ { "name": "glib", - "version": "2.70.1", - "port-version": 1, + "version": "2.70.5", "description": "Portable, general-purpose utility library.", "homepage": "https://developer.gnome.org/glib/", "supports": "!uwp & !(windows & static)", diff --git a/external_imported/vcpkg/ports/glibmm/build-support-vs2022-builds.patch b/external_imported/vcpkg/ports/glibmm/build-support-vs2022-builds.patch new file mode 100644 index 000000000..b1efb9c20 --- /dev/null +++ b/external_imported/vcpkg/ports/glibmm/build-support-vs2022-builds.patch @@ -0,0 +1,41 @@ +commit b3a77c3f0b7dd2e1405a781ac9a76f648779d7fa +Author: Chun-wei Fan +Date: Tue Nov 9 14:28:14 2021 +0800 + + Build: Support VS2022 builds + + Make these builds distinct from the Visual Studio 2019 builds. + +diff --git a/MSVC_NMake/detectenv-msvc.mak b/MSVC_NMake/detectenv-msvc.mak +index 6933505d..16d57810 100644 +--- a/MSVC_NMake/detectenv-msvc.mak ++++ b/MSVC_NMake/detectenv-msvc.mak +@@ -98,9 +98,12 @@ PDBVER = 14 + !if $(VCVERSION) > 1909 && $(VCVERSION) < 1920 + VSVER_SUFFIX = 1 + VSVER = 15 +-!elseif $(VCVERSION) > 1919 && $(VCVERSION) < 2000 ++!elseif $(VCVERSION) > 1919 && $(VCVERSION) < 1930 + VSVER_SUFFIX = 2 + VSVER = 16 ++!elseif $(VCVERSION) > 1929 && $(VCVERSION) < 2000 ++VSVER_SUFFIX = 3 ++VSVER = 17 + !else + VSVER = $(PDBVER) + !endif +diff --git a/meson.build b/meson.build +index b7c7f77e..a2ee5ef3 100644 +--- a/meson.build ++++ b/meson.build +@@ -231,7 +231,9 @@ if is_msvc + add_project_arguments(disabled_warnings, language: 'cpp') + + if use_msvc14x_toolset_ver +- if cpp_compiler.version().version_compare('>=19.20') ++ if cpp_compiler.version().version_compare('>=19.30') ++ msvc14x_toolset_ver = '-vc143' ++ elif cpp_compiler.version().version_compare('>=19.20') + msvc14x_toolset_ver = '-vc142' + elif cpp_compiler.version().version_compare('>=19.10') + msvc14x_toolset_ver = '-vc141' diff --git a/external_imported/vcpkg/ports/glibmm/portfile.cmake b/external_imported/vcpkg/ports/glibmm/portfile.cmake index 35d444280..4e81c03de 100644 --- a/external_imported/vcpkg/ports/glibmm/portfile.cmake +++ b/external_imported/vcpkg/ports/glibmm/portfile.cmake @@ -1,14 +1,16 @@ # Glib uses winapi functions not available in WindowsStore vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnome.org/pub/GNOME/sources/glibmm/2.68/glibmm-2.68.1.tar.xz" - FILENAME "glibmm-2.68.1.tar.xz" - SHA512 ca164f986da651e66bb5b98a760853e73d57ff84e035809d4c3b2c0a1b6ddf8ca68ffc49a71d0e0b2e14eca1c00e2e727e3bf3821e0b2b3a808397c3d33c6d5c + URLS "https://ftp.gnome.org/pub/GNOME/sources/glibmm/2.70/glibmm-2.70.0.tar.xz" + FILENAME "glibmm-2.70.0.tar.xz" + SHA512 059cab7f0b865303cef3cba6c4f3a29ae4e359aba428f5e79cea6fedd3f1e082199f673323cf804902cee14b91739598fbc6ff706ec36f19c4d793d032782518 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} + PATCHES + build-support-vs2022-builds.patch ) vcpkg_configure_meson( @@ -20,7 +22,11 @@ vcpkg_configure_meson( vcpkg_install_meson() vcpkg_copy_pdbs() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/glibmm-2.68/proc" "${CURRENT_PACKAGES_DIR}/lib/glibmm-2.68/proc") +# intentionally 2.68 - glib does not install glibmm-2.70 files +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/lib/glibmm-2.68/proc" + "${CURRENT_PACKAGES_DIR}/lib/glibmm-2.68/proc" +) vcpkg_fixup_pkgconfig() diff --git a/external_imported/vcpkg/ports/glibmm/vcpkg.json b/external_imported/vcpkg/ports/glibmm/vcpkg.json index 086505958..65316647d 100644 --- a/external_imported/vcpkg/ports/glibmm/vcpkg.json +++ b/external_imported/vcpkg/ports/glibmm/vcpkg.json @@ -1,9 +1,10 @@ { "name": "glibmm", - "version": "2.68.1", - "port-version": 2, + "version": "2.70.0", + "port-version": 1, "description": "This is glibmm, a C++ API for parts of glib that are useful for C++.", "homepage": "https://www.gtkmm.org.", + "license": "LGPL-2.1-or-later", "supports": "!uwp", "dependencies": [ "gettext", 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 new file mode 100644 index 000000000..31219437b --- /dev/null +++ b/external_imported/vcpkg/ports/glog/fix_glog_CMAKE_MODULE_PATH.patch @@ -0,0 +1,77 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 28e2688..cf87798 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -843,36 +843,6 @@ 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 +-) +- + 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 ++++ b/glog-config.cmake.in +@@ -5,7 +5,6 @@ endif (CMAKE_VERSION VERSION_LESS @glog_CMake_VERSION@) + @PACKAGE_INIT@ + + include (CMakeFindDependencyMacro) +-include (${CMAKE_CURRENT_LIST_DIR}/glog-modules.cmake) + + @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 new file mode 100644 index 000000000..529715ff0 --- /dev/null +++ b/external_imported/vcpkg/ports/glog/fix_log_every_n.patch @@ -0,0 +1,848 @@ +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 7b882e1fa..9f62ec379 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 808330e..de0e477 100644 +index 62ebbcc..28e2688 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -44,7 +44,7 @@ include (CTest) - include (DetermineGflagsNamespace) +@@ -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) - if (WITH_GFLAGS) + find_package (GTest) diff --git a/external_imported/vcpkg/ports/glog/nogdi-nominmax.patch b/external_imported/vcpkg/ports/glog/nogdi-nominmax.patch new file mode 100644 index 000000000..83ee58cb5 --- /dev/null +++ b/external_imported/vcpkg/ports/glog/nogdi-nominmax.patch @@ -0,0 +1,59 @@ +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 8487cc192..5738ba092 100644 --- a/external_imported/vcpkg/ports/glog/portfile.cmake +++ b/external_imported/vcpkg/ports/glog/portfile.cmake @@ -1,26 +1,29 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/glog - REF v0.4.0 - SHA512 b585f1819ade2075f6b61dc5aaca5c3f9d25601dba2bd08b6c49b96ac5f79db23c6b7f2042df003f7130497dd7241fcaa8b107d1f97385cb66ce52d3c554b176 + REF v0.5.0 + SHA512 445e4338f3d81cd0b065f2da9c6ce343c243263ca144cea424ef97531a4e9e09c06ffd6942ac01c5213a8003c75cfbbede3c4028d12f0134f23ff29314769c1a HEAD_REF master PATCHES glog_disable_debug_postfix.patch + fix_glog_CMAKE_MODULE_PATH.patch + fix_log_every_n.patch + nogdi-nominmax.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_fixup_cmake_targets(CONFIG_PATH lib/cmake/glog) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/glog) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +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 6a0da077d..3c0296ec8 100644 --- a/external_imported/vcpkg/ports/glog/vcpkg.json +++ b/external_imported/vcpkg/ports/glog/vcpkg.json @@ -1,10 +1,18 @@ { "name": "glog", - "version-string": "0.4.0", - "port-version": 4, + "version": "0.5.0", "description": "C++ implementation of the Google logging module", "homepage": "https://github.com/google/glog", + "license": null, "dependencies": [ - "gflags" + "gflags", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/glslang/portfile.cmake b/external_imported/vcpkg/ports/glslang/portfile.cmake index 08609f2a7..e153195dc 100644 --- a/external_imported/vcpkg/ports/glslang/portfile.cmake +++ b/external_imported/vcpkg/ports/glslang/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/glslang - REF 2fb89a0072ae7316af1c856f22663fde4928128a #11.6.0 - SHA512 e22b85bb0c98d35c80f06dd6352d98c34ea0b965c5bec077d122d9aa346293672a11aec4964b410db8a6050c70dbc0a46fbbb599e178424d78234608075c110e + REF 11.8.0 + SHA512 b60d328fab6d5319e49fbf8aeb86c31a7c8dfb4bc75d39c081cbb72f90750fd98f2a4f3ab091614187ad9e0d2e27471f9dab7ca5547cabb856d17bff694f8c98 HEAD_REF master PATCHES ignore-crt.patch @@ -52,4 +52,4 @@ file(COPY DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" ) -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/glslang/vcpkg.json b/external_imported/vcpkg/ports/glslang/vcpkg.json index e17f25a97..b09ee8ded 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.6.0", + "version": "11.8.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/gmmlib/portfile.cmake b/external_imported/vcpkg/ports/gmmlib/portfile.cmake index eef38b622..4fb8c4520 100644 --- a/external_imported/vcpkg/ports/gmmlib/portfile.cmake +++ b/external_imported/vcpkg/ports/gmmlib/portfile.cmake @@ -24,5 +24,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/igdgmm/GmmLib/Scripts") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/igdgmm/GmmLib/Resource") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/igdgmm/GmmLib/GlobalInfo") +vcpkg_fixup_pkgconfig() + # Handle copyright configure_file("${SOURCE_PATH}/LICENSE.md" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/external_imported/vcpkg/ports/gmmlib/vcpkg.json b/external_imported/vcpkg/ports/gmmlib/vcpkg.json index 96a697a3d..cd2ee1825 100644 --- a/external_imported/vcpkg/ports/gmmlib/vcpkg.json +++ b/external_imported/vcpkg/ports/gmmlib/vcpkg.json @@ -1,8 +1,10 @@ { "name": "gmmlib", "version": "21.3.2", + "port-version": 1, "description": "Intel(R) Graphics Memory Management Library", "homepage": "https://github.com/intel/gmmlib", + "license": "MIT", "supports": "linux", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/gmp/adddef.patch b/external_imported/vcpkg/ports/gmp/adddef.patch deleted file mode 100644 index c2276ffc1..000000000 --- a/external_imported/vcpkg/ports/gmp/adddef.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/SMP/libgmp.def b/SMP/libgmp.def -index 289f0e2d1..632274ab2 100644 ---- a/SMP/libgmp.def -+++ b/SMP/libgmp.def -@@ -16,6 +16,7 @@ __gmp_randclear - __gmp_urandomb_ui - __gmp_urandomm_ui - __gmp_asprintf -+__gmp_vasprintf - __gmp_fprintf - __gmp_printf - __gmp_snprintf diff --git a/external_imported/vcpkg/ports/gmp/msvc_symbol.patch b/external_imported/vcpkg/ports/gmp/msvc_symbol.patch new file mode 100644 index 000000000..c416595b3 --- /dev/null +++ b/external_imported/vcpkg/ports/gmp/msvc_symbol.patch @@ -0,0 +1,28 @@ +diff --git a/configure.ac b/configure.ac +index cafdb3c71..bd92bc4bb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2703,8 +2703,8 @@ Use "--disable-static --enable-shared" to build just a DLL.]) + # + if test "$enable_shared" = yes; then + GMP_LDFLAGS="$GMP_LDFLAGS -no-undefined -Wl,--export-all-symbols" +- LIBGMP_LDFLAGS="$LIBGMP_LDFLAGS -Wl,--output-def,.libs/libgmp-3.dll.def" +- LIBGMPXX_LDFLAGS="$LIBGMP_LDFLAGS -Wl,--output-def,.libs/libgmpxx-3.dll.def" ++ #LIBGMP_LDFLAGS="$LIBGMP_LDFLAGS -Wl,--output-def,.libs/libgmp-3.dll.def" ++ #LIBGMPXX_LDFLAGS="$LIBGMP_LDFLAGS -Wl,--output-def,.libs/libgmpxx-3.dll.def" + LIBGMP_DLL=1 + fi + ;; +diff --git a/gmp-h.in b/gmp-h.in +index 3d449d427..18a03b753 100644 +--- a/gmp-h.in ++++ b/gmp-h.in +@@ -398,7 +398,7 @@ typedef __mpq_struct *mpq_ptr; + + /* Microsoft's C compiler accepts __inline */ + #ifdef _MSC_VER +-#define __GMP_EXTERN_INLINE __inline ++#define __GMP_EXTERN_INLINE static __inline + #endif + + /* Recent enough Sun C compilers want "inline" */ diff --git a/external_imported/vcpkg/ports/gmp/portfile.cmake b/external_imported/vcpkg/ports/gmp/portfile.cmake index 6007ad9c6..b4acb3047 100644 --- a/external_imported/vcpkg/ports/gmp/portfile.cmake +++ b/external_imported/vcpkg/ports/gmp/portfile.cmake @@ -2,116 +2,78 @@ if(EXISTS "${CURRENT_INSTALLED_DIR}/include/gmp.h" OR "${CURRENT_INSTALLED_DIR}/ message(FATAL_ERROR "Can't build ${PORT} if mpir is installed. Please remove mpir, and try install ${PORT} again if you need it.") endif() -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO ShiftMediaProject/gmp - REF 0018c44e8dfcc3b64b43e0aea4b3f419f0b65fd0 #v6.2.1-2 - SHA512 2405e2536ca9fe0b890f44f54c936ac0e4b5a9ebe6a19e1c48a9c21b7211d2a1b45865852e3c65a98a6735216a4e27bea75c0fd6e52efeed4baecd95da9895a5 - HEAD_REF master - PATCHES - vs.build.patch - runtime.patch - adddef.patch - ) +vcpkg_download_distfile( + ARCHIVE + URLS https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz + FILENAME gmp-6.2.1.tar.xz + SHA512 c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84 +) - yasm_tool_helper(OUT_VAR YASM) - file(TO_NATIVE_PATH "${YASM}" YASM) +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(PATCHES yasm.patch + msvc_symbol.patch) +endif() - if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set(CONFIGURATION_RELEASE ReleaseDLL) - set(CONFIGURATION_DEBUG DebugDLL) - else() - set(CONFIGURATION_RELEASE Release) - set(CONFIGURATION_DEBUG Debug) - endif() +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + REF gmp-6.2.1 + PATCHES + ${PATCHES} + tools.patch +) - if(VCPKG_TARGET_IS_UWP) - string(APPEND CONFIGURATION_RELEASE WinRT) - string(APPEND CONFIGURATION_DEBUG WinRT) +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(ENV{CCAS} "${CURRENT_HOST_INSTALLED_DIR}/tools/yasm/yasm${VCPKG_HOST_EXECUTABLE_SUFFIX}") + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(asmflag win64) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(asmflag win32) endif() + set(ENV{ASMFLAGS} "-Xvc -f ${asmflag} -pgas -rraw") + set(OPTIONS ac_cv_func_memset=yes + "gmp_cv_asm_w32=.word" + ) + +endif() - #Setup YASM integration - set(_porjectfile) - if(VCPKG_TARGET_IS_UWP) - set(_porjectfile "${SOURCE_PATH}/SMP/libgmp_winrt.vcxproj") - else() - set(_porjectfile "${SOURCE_PATH}/SMP/libgmp.vcxproj") - endif() - set(_file "${_porjectfile}") - file(READ "${_file}" _contents) - string(REPLACE [[]] - "" - _contents "${_contents}") - string(REPLACE [[]] - "" - _contents "${_contents}") - file(WRITE "${_file}" "${_contents}") +if(VCPKG_CROSSCOMPILING) + # Silly trick to make configure accept CC_FOR_BUILD but in reallity CC_FOR_BUILD is deactivated. + 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") +endif() - vcpkg_install_msbuild( - USE_VCPKG_INTEGRATION - SOURCE_PATH ${SOURCE_PATH} - PROJECT_SUBPATH SMP/libgmp.sln - PLATFORM ${TRIPLET_SYSTEM_ARCH} - LICENSE_SUBPATH COPYING.LESSERv3 - TARGET Rebuild - RELEASE_CONFIGURATION ${CONFIGURATION_RELEASE} - DEBUG_CONFIGURATION ${CONFIGURATION_DEBUG} - SKIP_CLEAN - OPTIONS "/p:YasmPath=${YASM}" - ) - get_filename_component(SOURCE_PATH_SUFFIX "${SOURCE_PATH}" NAME) - file(RENAME "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${SOURCE_PATH_SUFFIX}/msvc/include" "${CURRENT_PACKAGES_DIR}/include") - set(PACKAGE_VERSION 6.2.1) - set(PACKAGE_NAME gmp) - set(prefix "${CURRENT_INSTALLED_DIR}") - set(exec_prefix "\${prefix}") - set(libdir "\${prefix}/lib") - set(includedir "\${prefix}/include") - set(LIBS -lgmp) - configure_file("${SOURCE_PATH}/gmp.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gmp.pc" @ONLY) - configure_file("${SOURCE_PATH}/gmpxx.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gmpxx.pc" @ONLY) - set(prefix "${CURRENT_INSTALLED_DIR}/debug") - set(exec_prefix "\${prefix}") - set(libdir "\${prefix}/lib") - set(includedir "\${prefix}/../include") - set(LIBS -lgmpd) - configure_file("${SOURCE_PATH}/gmp.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gmp.pc" @ONLY) - configure_file("${SOURCE_PATH}/gmpxx.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gmpxx.pc" @ONLY) - vcpkg_fixup_pkgconfig() - if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/gmp.h" - "#if defined(DLL_EXPORT) && defined(NO_ASM)" - "#if 1") - endif() -else() - vcpkg_download_distfile( - ARCHIVE - URLS https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz - FILENAME gmp-6.2.1.tar.xz - SHA512 c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84 - ) +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS + ${OPTIONS} + --enable-cxx +) - vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF gmp-6.2.1 - PATCHES - tools.patch - ) +set(tool_names bases fac fib jacobitab psqr trialdivtab) +list(TRANSFORM tool_names PREPEND "gen-") +list(TRANSFORM tool_names APPEND "${VCPKG_HOST_EXECUTABLE_SUFFIX}") - vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} - AUTOCONFIG - OPTIONS - --enable-cxx - ) +if(VCPKG_CROSSCOMPILING) + list(TRANSFORM tool_names PREPEND "${CURRENT_HOST_INSTALLED_DIR}/manual-tools/${PORT}/") + file(COPY ${tool_names} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/" ) + if(NOT VCPKG_BUILD_TYPE) + file(COPY ${tool_names} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/" ) + endif() +endif() - vcpkg_install_make() - vcpkg_fixup_pkgconfig() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_install_make() - # # Handle copyright - file(INSTALL "${SOURCE_PATH}/COPYINGv3" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +if(NOT VCPKG_CROSSCOMPILING) + list(TRANSFORM tool_names PREPEND "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/") + file(COPY ${tool_names} DESTINATION "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}" ) endif() + +vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYINGv3" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/external_imported/vcpkg/ports/gmp/runtime.patch b/external_imported/vcpkg/ports/gmp/runtime.patch deleted file mode 100644 index f219e3dc7..000000000 --- a/external_imported/vcpkg/ports/gmp/runtime.patch +++ /dev/null @@ -1,180 +0,0 @@ -diff --git a/SMP/smp.props b/SMP/smp.props -index fc70bd8..d515523 100644 ---- a/SMP/smp.props -+++ b/SMP/smp.props -@@ -86,7 +86,7 @@ - - - -- lib$(RootNamespace)d -+ $(RootNamespace)d - $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated -@@ -94,7 +94,7 @@ - MSB8012 - - -- lib$(RootNamespace)d -+ $(RootNamespace)d - $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated -@@ -118,7 +118,7 @@ - MSB8012 - - -- lib$(RootNamespace) -+ $(RootNamespace) - $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated -@@ -126,7 +126,7 @@ - MSB8012 - - -- lib$(RootNamespace) -+ $(RootNamespace) - $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated -@@ -159,6 +159,7 @@ - $(OutDir)\lib\x86\$(TargetName).pdb - false - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDebug - - - $(OutDir)\lib\x86\$(TargetName)$(TargetExt) -@@ -177,6 +178,7 @@ - $(OutDir)\lib\x64\$(TargetName).pdb - false - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDebug - - - $(OutDir)\lib\x64\$(TargetName)$(TargetExt) -@@ -196,6 +198,7 @@ - $(IntDir)$(TargetName).pdb - false - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDebugDLL - - - $(OutDir)\bin\x86\$(TargetName)$(TargetExt) -@@ -219,6 +222,7 @@ - $(IntDir)$(TargetName).pdb - false - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDebugDLL - - - $(OutDir)\bin\x64\$(TargetName)$(TargetExt) -@@ -248,6 +252,7 @@ - SingleFile - $(OutDir)\lib\x86\$(TargetName).pdb - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreaded - - - $(OutDir)\lib\x86\$(TargetName)$(TargetExt) -@@ -273,6 +278,7 @@ - SingleFile - $(OutDir)\lib\x64\$(TargetName).pdb - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreaded - - - $(OutDir)\lib\x64\$(TargetName)$(TargetExt) -@@ -297,6 +303,7 @@ - $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) - $(IntDir)$(TargetName).pdb - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDLL - - - true -@@ -328,6 +335,7 @@ - $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) - $(IntDir)$(TargetName).pdb - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDLL - - - true -diff --git a/SMP/smp_winrt.props b/SMP/smp_winrt.props -index cb5f090..19b2b8d 100644 ---- a/SMP/smp_winrt.props -+++ b/SMP/smp_winrt.props -@@ -97,7 +97,7 @@ - - - -- lib$(RootNamespace)d_winrt -+ l$(RootNamespace)d - $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated -@@ -105,7 +105,7 @@ - MSB8012 - - -- lib$(RootNamespace)d_winrt -+ $(RootNamespace)d - $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated -@@ -113,7 +113,7 @@ - MSB8012 - - -- $(RootNamespace)d_winrt -+ $(RootNamespace)d - $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated -@@ -121,7 +121,7 @@ - MSB8012 - - -- $(RootNamespace)d_winrt -+ $(RootNamespace)d - $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated -@@ -129,7 +129,7 @@ - MSB8012 - - -- lib$(RootNamespace)_winrt -+ $(RootNamespace) - $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated -@@ -137,7 +137,7 @@ - MSB8012 - - -- lib$(RootNamespace)_winrt -+ $(RootNamespace) - $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated -@@ -145,7 +145,7 @@ - MSB8012 - - -- $(RootNamespace)_winrt -+ $(RootNamespace) - $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated -@@ -153,7 +153,7 @@ - MSB8012 - - -- $(RootNamespace)_winrt -+ $(RootNamespace) - $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated diff --git a/external_imported/vcpkg/ports/gmp/vcpkg.json b/external_imported/vcpkg/ports/gmp/vcpkg.json index f907a9bab..8393feed1 100644 --- a/external_imported/vcpkg/ports/gmp/vcpkg.json +++ b/external_imported/vcpkg/ports/gmp/vcpkg.json @@ -1,19 +1,21 @@ { "name": "gmp", - "version-string": "6.2.1", - "port-version": 7, + "version": "6.2.1", + "port-version": 9, "description": "The GNU Multiple Precision Arithmetic Library", "homepage": "https://gmplib.org", "supports": "!(windows & (arm | arm64))", "dependencies": [ { - "name": "vs-yasm", - "host": true, - "platform": "windows" + "name": "gmp", + "host": true }, { - "name": "yasm-tool", + "name": "yasm", "host": true, + "features": [ + "tools" + ], "platform": "windows" } ] diff --git a/external_imported/vcpkg/ports/gmp/vs.build.patch b/external_imported/vcpkg/ports/gmp/vs.build.patch deleted file mode 100644 index 4c04d0c16..000000000 --- a/external_imported/vcpkg/ports/gmp/vs.build.patch +++ /dev/null @@ -1,172 +0,0 @@ -diff --git a/SMP/smp.props b/SMP/smp.props -index e2ed214..fc70bd8 100644 ---- a/SMP/smp.props -+++ b/SMP/smp.props -@@ -87,7 +87,7 @@ - - - lib$(RootNamespace)d -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -95,7 +95,7 @@ - - - lib$(RootNamespace)d -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -103,7 +103,7 @@ - - - $(RootNamespace)d -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -111,7 +111,7 @@ - - - $(RootNamespace)d -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -119,7 +119,7 @@ - - - lib$(RootNamespace) -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -127,7 +127,7 @@ - - - lib$(RootNamespace) -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -135,7 +135,7 @@ - - - $(RootNamespace) -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -143,7 +143,7 @@ - - - $(RootNamespace) -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -diff --git a/SMP/smp_winrt.props b/SMP/smp_winrt.props -index 9b453a5..cb5f090 100644 ---- a/SMP/smp_winrt.props -+++ b/SMP/smp_winrt.props -@@ -98,7 +98,7 @@ - - - lib$(RootNamespace)d_winrt -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -106,7 +106,7 @@ - - - lib$(RootNamespace)d_winrt -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -114,7 +114,7 @@ - - - $(RootNamespace)d_winrt -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -122,7 +122,7 @@ - - - $(RootNamespace)d_winrt -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -130,7 +130,7 @@ - - - lib$(RootNamespace)_winrt -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -138,7 +138,7 @@ - - - lib$(RootNamespace)_winrt -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -146,7 +146,7 @@ - - - $(RootNamespace)_winrt -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -154,7 +154,7 @@ - - - $(RootNamespace)_winrt -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -diff --git a/gmp.pc.in b/gmp.pc.in -index bf1c799..d0c81be 100644 ---- a/gmp.pc.in -+++ b/gmp.pc.in -@@ -8,4 +8,4 @@ Description: GNU Multiple Precision Arithmetic Library - URL: https://gmplib.org - Version: @PACKAGE_VERSION@ - Cflags: -I${includedir} --Libs: -L${libdir} -lgmp -+Libs: -L${libdir} @LIBS@ -diff --git a/gmpxx.pc.in b/gmpxx.pc.in -index 181cc70..2b697ce 100644 ---- a/gmpxx.pc.in -+++ b/gmpxx.pc.in -@@ -9,4 +9,4 @@ URL: https://gmplib.org - Version: @PACKAGE_VERSION@ - Requires: gmp - Cflags: -I${includedir} --Libs: -L${libdir} -lgmpxx -+Libs: -L${libdir} @LIBS@ diff --git a/external_imported/vcpkg/ports/gmp/yasm.patch b/external_imported/vcpkg/ports/gmp/yasm.patch new file mode 100644 index 000000000..8ea6ac356 --- /dev/null +++ b/external_imported/vcpkg/ports/gmp/yasm.patch @@ -0,0 +1,83 @@ +diff --git a/acinclude.m4 b/acinclude.m4 +index 86175ce42..8228d20dc 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -1649,7 +1649,7 @@ AC_DEFUN([GMP_TRY_ASSEMBLE], + [cat >conftest.s <&AC_FD_CC + ifelse([$2],,:,[$2]) +@@ -2382,7 +2382,7 @@ for tmp_underscore in "" "_"; do + ${tmp_gsym_prefix}main$gmp_cv_asm_label_suffix + addl $ ${tmp_underscore}_GLOBAL_OFFSET_TABLE_, %ebx + EOF +- gmp_compile="$CCAS $CFLAGS $CPPFLAGS $lt_prog_compiler_pic conftest.s >&AC_FD_CC && $CC $CFLAGS $CPPFLAGS $lt_prog_compiler_pic conftest.$OBJEXT >&AC_FD_CC" ++ gmp_compile="$CCAS $CPPFLAGS $ASMFLAGS $lt_prog_compiler_pic conftest.s >&AC_FD_CC && $CC $CPPFLAGS $ASMFLAGS $lt_prog_compiler_pic conftest.$OBJEXT >&AC_FD_CC" + if AC_TRY_EVAL(gmp_compile); then + if test "$tmp_underscore" = "_"; then + gmp_cv_asm_x86_got_underscore=yes +@@ -2556,7 +2556,7 @@ movq-bug) + AC_MSG_WARN([+----------------------------------------------------------]) + AC_MSG_WARN([| WARNING WARNING WARNING]) + AC_MSG_WARN([| Host CPU has MMX code, but the assembler]) +- AC_MSG_WARN([| $CCAS $CFLAGS $CPPFLAGS]) ++ AC_MSG_WARN([| $CCAS $CPPFLAGS $ASMFLAGS]) + AC_MSG_WARN([| has the Solaris 2.6 and 2.7 bug where register to register]) + AC_MSG_WARN([| movq operands are reversed.]) + AC_MSG_WARN([| Non-MMX replacements will be used.]) +diff --git a/mpn/Makeasm.am b/mpn/Makeasm.am +index 5d7306c22..75692128d 100644 +--- a/mpn/Makeasm.am ++++ b/mpn/Makeasm.am +@@ -32,7 +32,7 @@ + # COMPILE minus CC. + # + COMPILE_FLAGS = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ASMFLAGS) ++ $(CPPFLAGS) $(ASMFLAGS) + + # Flags used for preprocessing (in ansi2knr rules). + # +diff --git a/mpn/Makefile.in b/mpn/Makefile.in +index 2bc061012..59c805976 100644 +--- a/mpn/Makefile.in ++++ b/mpn/Makefile.in +@@ -403,7 +403,7 @@ EXTRA_DIST = asm-defs.m4 cpp-ccas m4-ccas $(TARG_DIST) + # COMPILE minus CC. + # + COMPILE_FLAGS = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ASMFLAGS) ++ $(CPPFLAGS) $(ASMFLAGS) + + + # Flags used for preprocessing (in ansi2knr rules). +diff --git a/tests/Makefile.in b/tests/Makefile.in +index 9742a4016..430603cef 100644 +--- a/tests/Makefile.in ++++ b/tests/Makefile.in +@@ -666,7 +666,7 @@ SUBDIRS = . devel mpn mpz mpq mpf rand misc cxx + # COMPILE minus CC. + # + COMPILE_FLAGS = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ASMFLAGS) ++ $(CPPFLAGS) $(ASMFLAGS) + + + # Flags used for preprocessing (in ansi2knr rules). +diff --git a/tune/Makefile.in b/tune/Makefile.in +index f82cd13e2..351bcd9b1 100644 +--- a/tune/Makefile.in ++++ b/tune/Makefile.in +@@ -549,7 +549,7 @@ TUNE_MPN_SRCS_BASIC = div_qr_2.c bdiv_q.c bdiv_qr.c \ + # COMPILE minus CC. + # + COMPILE_FLAGS = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ASMFLAGS) ++ $(CPPFLAGS) $(ASMFLAGS) + + + # Flags used for preprocessing (in ansi2knr rules). diff --git a/external_imported/vcpkg/ports/gobject-introspection/0001-g-ir-tool-template.in.patch b/external_imported/vcpkg/ports/gobject-introspection/0001-g-ir-tool-template.in.patch new file mode 100644 index 000000000..c3d4e35de --- /dev/null +++ b/external_imported/vcpkg/ports/gobject-introspection/0001-g-ir-tool-template.in.patch @@ -0,0 +1,23 @@ +--- a/tools/g-ir-tool-template.in 2021-09-17 23:02:42.601052000 +0700 ++++ b/tools/g-ir-tool-template.in 2021-12-29 21:41:52.987141900 +0700 +@@ -59,7 +59,7 @@ + builtins.__dict__['GIRDIR'] = [girdir] + + # Again, relative paths first so that the installation prefix is relocatable +-pylibdir = os.path.abspath(os.path.join(filedir, '..', 'lib', 'gobject-introspection')) ++pylibdir = os.path.abspath(os.path.join(filedir, '..', '..', 'lib', 'gobject-introspection')) + + # EXT_SUFFIX for py3 SO for py2 + py_mod_suffix = sysconfig.get_config_var('EXT_SUFFIX') or sysconfig.get_config_var('SO') +@@ -91,6 +91,11 @@ + + sys.path.insert(0, pylibdir) + ++pkg_config_path = os.getenv('PKG_CONFIG_PATH', '') ++if pkg_config_path: ++ pkg_config_path = os.pathsep + pkg_config_path ++os.environ['PKG_CONFIG_PATH'] = os.path.normpath(os.path.join(pylibdir, '..', 'pkgconfig')) + pkg_config_path ++ + from giscanner.utils import dll_dirs + dll_dirs = dll_dirs() + dll_dirs.add_dll_dirs(['gio-2.0']) diff --git a/external_imported/vcpkg/ports/gobject-introspection/0002-cross-build.patch b/external_imported/vcpkg/ports/gobject-introspection/0002-cross-build.patch new file mode 100644 index 000000000..aa962c9d0 --- /dev/null +++ b/external_imported/vcpkg/ports/gobject-introspection/0002-cross-build.patch @@ -0,0 +1,60 @@ +--- a/gir/meson.build 2021-09-17 23:02:42.502052000 +0700 ++++ b/gir/meson.build 2022-01-05 02:31:25.960457800 +0700 +@@ -42,7 +42,7 @@ + install_data(gir_files, install_dir: girdir) + + scanner_command = [ +- find_program('g-ir-scanner', native: true), ++ find_program('g-ir-scanner'), + '--output=@OUTPUT@', + '--no-libtool', + '--quiet', +@@ -495,6 +495,7 @@ + ) + + typelibs = [] ++gircompiler = find_program('g-ir-compiler') + if get_option('gi_cross_binary_wrapper') != '' + gircompiler_command = [get_option('gi_cross_binary_wrapper'), gircompiler.full_path(), ] + else +@@ -510,7 +511,7 @@ + typelibs += custom_target('generate-typelib-@0@'.format(gir).underscorify(), + input: gir, + output: '@BASENAME@.typelib', +- depends: [gobject_gir, gircompiler, ], ++ depends: [gobject_gir, ], + command: gircompiler_command, + install: true, + install_dir: typelibdir, +--- a/tools/meson.build 2021-09-17 23:02:42.601052000 +0700 ++++ b/tools/meson.build 2022-01-05 02:36:06.103763400 +0700 +@@ -64,7 +64,9 @@ + install: true, + c_args: custom_c_args, + ) +-meson.override_find_program('g-ir-compiler', gircompiler) ++if not get_option('gi_cross_use_prebuilt_gi') ++ meson.override_find_program('g-ir-compiler', gircompiler) ++endif + + girgenerate = executable('g-ir-generate', 'generate.c', + dependencies: [ +@@ -74,11 +76,15 @@ + install: true, + c_args: custom_c_args, + ) +-meson.override_find_program('g-ir-generate', girgenerate) ++if not get_option('gi_cross_use_prebuilt_gi') ++ meson.override_find_program('g-ir-generate', girgenerate) ++endif + + girinspect = executable('g-ir-inspect', 'g-ir-inspect.c', + dependencies: girepo_dep, + install: true, + c_args: custom_c_args, + ) +-meson.override_find_program('g-ir-inspect', girinspect) ++if not get_option('gi_cross_use_prebuilt_gi') ++ meson.override_find_program('g-ir-inspect', girinspect) ++endif +\ No newline at end of file diff --git a/external_imported/vcpkg/ports/gobject-introspection/portfile.cmake b/external_imported/vcpkg/ports/gobject-introspection/portfile.cmake new file mode 100644 index 000000000..56e6be53e --- /dev/null +++ b/external_imported/vcpkg/ports/gobject-introspection/portfile.cmake @@ -0,0 +1,82 @@ + +set(GI_MAJOR_MINOR 1.70) +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 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + 0001-g-ir-tool-template.in.patch + 0002-cross-build.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 + NOT (CMAKE_HOST_WIN32 AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")) + list(APPEND OPTIONS_RELEASE -Dgi_cross_use_prebuilt_gi=true) +endif() + +vcpkg_configure_meson( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS_DEBUG + ${OPTIONS_DEBUG} + OPTIONS_RELEASE + ${OPTIONS_RELEASE} + ADDITIONAL_NATIVE_BINARIES + flex='${FLEX}' + bison='${BISON}' + ADDITIONAL_CROSS_BINARIES + flex='${FLEX}' + bison='${BISON}' + g-ir-annotation-tool='${CURRENT_HOST_INSTALLED_DIR}/tools/gobject-introspection/g-ir-annotation-tool' + g-ir-compiler='${CURRENT_HOST_INSTALLED_DIR}/tools/gobject-introspection/g-ir-compiler${VCPKG_HOST_EXECUTABLE_SUFFIX}' + g-ir-scanner='${CURRENT_HOST_INSTALLED_DIR}/tools/gobject-introspection/g-ir-scanner' +) + +vcpkg_host_path_list(APPEND ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}/lib/pkgconfig") +vcpkg_host_path_list(APPEND ENV{LIB} "${CURRENT_INSTALLED_DIR}/lib") +vcpkg_install_meson(ADD_BIN_TO_PATH) + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +set(GI_TOOLS + g-ir-compiler + g-ir-generate + g-ir-inspect +) +set(GI_SCRIPTS + g-ir-annotation-tool + g-ir-scanner +) + +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}") + file(WRITE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/${script}" "${_contents}") + + file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/${script}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${script}") +endforeach() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/man") + +set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) # _giscanner.lib diff --git a/external_imported/vcpkg/ports/gobject-introspection/vcpkg.json b/external_imported/vcpkg/ports/gobject-introspection/vcpkg.json new file mode 100644 index 000000000..e7996b925 --- /dev/null +++ b/external_imported/vcpkg/ports/gobject-introspection/vcpkg.json @@ -0,0 +1,31 @@ +{ + "name": "gobject-introspection", + "version": "1.70.0", + "port-version": 1, + "description": "A middleware layer between C libraries (using GObject) and language bindings.", + "homepage": "https://gi.readthedocs.io/en/latest/", + "supports": "!static & (native | (windows & x86))", + "dependencies": [ + { + "name": "cairo", + "default-features": false, + "features": [ + "gobject" + ] + }, + "glib", + { + "name": "glib", + "host": true + }, + { + "name": "gobject-introspection", + "host": true + }, + "python3", + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/google-cloud-cpp/portfile.cmake b/external_imported/vcpkg/ports/google-cloud-cpp/portfile.cmake index 132cd00e9..40ed37f4b 100644 --- a/external_imported/vcpkg/ports/google-cloud-cpp/portfile.cmake +++ b/external_imported/vcpkg/ports/google-cloud-cpp/portfile.cmake @@ -1,19 +1,21 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp - REF v1.35.0 - SHA512 99eabb37ff32ddaf8f646415b50f3843e89fb119646428c16f03060c2787c8d86fa1ac0919ee60c4f6c7a3b71a14eb828ae26a7fc26d928543d72c7ba3268bff + REF v1.39.0 + SHA512 d61ebcdb6680797f20147ee1d37b9d29c82e8c7267b944a346685bfa607cf0b7f1772854874b967f19b4f54ddcefc94a771a4686cafcd6a5fed426d64e553205 HEAD_REF main + PATCHES + support_absl_cxx17.patch ) vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/grpc") set(GOOGLE_CLOUD_CPP_ENABLE "${FEATURES}") 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") vcpkg_cmake_configure( @@ -74,7 +76,7 @@ endforeach() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake" "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" - "${CURRENT_PACKAGES_DIR}/debug/share") + "${CURRENT_PACKAGES_DIR}/debug/share") 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 new file mode 100644 index 000000000..5697fd3a9 --- /dev/null +++ b/external_imported/vcpkg/ports/google-cloud-cpp/support_absl_cxx17.patch @@ -0,0 +1,32 @@ +diff --git a//CMakeLists.txt b/CMakeLists.txt +index 4d03fee..42bb13c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -43,6 +43,14 @@ if (APPLE AND NOT DEFINED CMAKE_CXX_STANDARD) + set(CMAKE_CXX_STANDARD 11) + endif () + ++find_package(absl CONFIG REQUIRED) ++ ++# Use CMAKE_CXX_STANDARD=17 if ABSL_USE_CXX17 is set ++if (ABSL_USE_CXX17) ++ message(STATUS "Found absl uses CXX17, enable CXX17 feature.") ++ set(CMAKE_CXX_STANDARD 17) ++endif () ++ + if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0) + message( +diff --git a/google/cloud/internal/port_platform.h b/google/cloud/internal/port_platform.h +index f02cb7a..0ea8c9c 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" ++#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 + + // Abort the build if the version of the compiler is too old. With CMake we diff --git a/external_imported/vcpkg/ports/google-cloud-cpp/vcpkg.json b/external_imported/vcpkg/ports/google-cloud-cpp/vcpkg.json index 80b6204f3..5036979e7 100644 --- a/external_imported/vcpkg/ports/google-cloud-cpp/vcpkg.json +++ b/external_imported/vcpkg/ports/google-cloud-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "google-cloud-cpp", - "version": "1.35.0", + "version": "1.39.0", + "port-version": 1, "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", @@ -25,100 +26,763 @@ "storage" ], "features": { + "accessapproval": { + "description": "Access Approval API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "accesscontextmanager": { + "description": "Access Context Manager API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "apigateway": { + "description": "API Gateway API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "apigeeconnect": { + "description": "Apigee Connect API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "appengine": { + "description": "App Engine Admin API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "artifactregistry": { + "description": "Artifact Registry API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "asset": { + "description": "Cloud Asset API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "assuredworkloads": { + "description": "Assured Workloads API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "automl": { + "description": "Cloud AutoML 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": [ - "grpc", { - "name": "grpc", - "host": true - }, - "protobuf", + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "bigtable": { + "description": "The Google Cloud Bigtable C++ client library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "billing": { + "description": "Cloud Billing Budget API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "binaryauthorization": { + "description": "Binary Authorization API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "channel": { + "description": "Cloud Channel API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "cloudbuild": { + "description": "Cloud Build API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "composer": { + "description": "Cloud Composer C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "contactcenterinsights": { + "description": "Contact Center AI Insights API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "container": { + "description": "Kubernetes Engine API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "containeranalysis": { + "description": "Container Analysis API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "datacatalog": { + "description": "Google Cloud Data Catalog API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "datamigration": { + "description": "Database Migration API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "dataproc": { + "description": "Cloud Dataproc API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "debugger": { + "description": "Stackdriver Debugger 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": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "documentai": { + "description": "Cloud Document AI API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "eventarc": { + "description": "Eventarc API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "experimental-storage-grpc": { + "description": "The GCS+gRPC plugin", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common", + "storage" + ] + } + ] + }, + "filestore": { + "description": "Cloud Filestore API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "functions": { + "description": "Cloud Functions API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "gameservices": { + "description": "Game Services API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "gkehub": { + "description": "GKE Hub C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "grpc-common": { + "description": "Dependencies used by all gRPC-based libraries", + "dependencies": [ + "grpc", + { + "name": "grpc", + "host": true + }, + "protobuf", + { + "name": "protobuf", + "host": true + } + ] + }, + "iam": { + "description": "The Google Cloud IAM C++ client library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "iap": { + "description": "Cloud Identity-Aware Proxy API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "ids": { + "description": "Cloud IDS API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "iot": { + "description": "Cloud IoT API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "kms": { + "description": "Cloud Key Management Service (KMS) API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "language": { + "description": "Cloud Natural Language API 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": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "memcache": { + "description": "Cloud Memorystore for Memcached API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "monitoring": { + "description": "Cloud Monitoring API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "networkmanagement": { + "description": "Network Management API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "notebooks": { + "description": "Notebooks API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "orgpolicy": { + "description": "Organization Policy API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "oslogin": { + "description": "Cloud OS Login API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "policytroubleshooter": { + "description": "Policy Troubleshooter API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "privateca": { + "description": "Certificate Authority API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "profiler": { + "description": "Cloud Profiler API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "pubsub": { + "description": "The Google Cloud Bigtable C++ client library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "recommender": { + "description": "Recommender C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "redis": { + "description": "Google Cloud Memorystore for Redis API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "resourcemanager": { + "description": "Cloud Resource Manager API C++ Client Library", + "dependencies": [ { - "name": "protobuf", - "host": true + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] } ] }, - "bigtable": { - "description": "The Google Cloud Bigtable C++ client library", + "resourcesettings": { + "description": "Resource Settings API C++ Client Library", "dependencies": [ - "grpc", { - "name": "grpc", - "host": true - }, - "protobuf", + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "retail": { + "description": "Retail API C++ Client Library", + "dependencies": [ { - "name": "protobuf", - "host": true + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] } ] }, - "experimental-storage-grpc": { - "description": "The GCS+gRPC plugin", + "scheduler": { + "description": "Cloud Scheduler API C++ Client Library", "dependencies": [ { "name": "google-cloud-cpp", "default-features": false, "features": [ - "storage" + "grpc-common" ] - }, - "grpc", + } + ] + }, + "secretmanager": { + "description": "The Google Cloud Secret Manager C++ client library", + "dependencies": [ { - "name": "grpc", - "host": true - }, - "protobuf", + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "securitycenter": { + "description": "Security Command Center API C++ Client Library", + "dependencies": [ { - "name": "protobuf", - "host": true + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] } ] }, - "iam": { - "description": "The Google Cloud IAM C++ client library", + "servicecontrol": { + "description": "Service Control API C++ Client Library", "dependencies": [ - "grpc", { - "name": "grpc", - "host": true - }, - "protobuf", + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "servicedirectory": { + "description": "Service Directory API C++ Client Library", + "dependencies": [ { - "name": "protobuf", - "host": true + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] } ] }, - "pubsub": { - "description": "The Google Cloud Bigtable C++ client library", + "servicemanagement": { + "description": "Service Management API C++ Client Library", "dependencies": [ - "grpc", { - "name": "grpc", - "host": true - }, - "protobuf", + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "serviceusage": { + "description": "Service Usage API C++ Client Library", + "dependencies": [ { - "name": "protobuf", - "host": true + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "shell": { + "description": "Cloud Shell API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] } ] }, "spanner": { "description": "The Google Cloud Spanner C++ client library", "dependencies": [ - "grpc", - { - "name": "grpc", - "host": true - }, - "protobuf", { - "name": "protobuf", - "host": true + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] } ] }, @@ -134,6 +798,174 @@ }, "nlohmann-json" ] + }, + "storagetransfer": { + "description": "Storage Transfer API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "talent": { + "description": "Cloud Talent Solution API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "tasks": { + "description": "The Google Cloud Tasks C++ client library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "texttospeech": { + "description": "Cloud Text-to-Speech API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "tpu": { + "description": "Cloud TPU API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "trace": { + "description": "Stackdriver Trace API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "translate": { + "description": "Cloud Translation API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "videointelligence": { + "description": "Cloud Video Intelligence API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "vision": { + "description": "Cloud Vision API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "vmmigration": { + "description": "VM Migration API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "vpcaccess": { + "description": "Serverless VPC Access API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "webrisk": { + "description": "Web Risk API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "websecurityscanner": { + "description": "Web Security Scanner API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "workflows": { + "description": "Workflow Executions API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] } } } diff --git a/external_imported/vcpkg/ports/gperf/portfile.cmake b/external_imported/vcpkg/ports/gperf/portfile.cmake index 8531426fc..1e589d7c9 100644 --- a/external_imported/vcpkg/ports/gperf/portfile.cmake +++ b/external_imported/vcpkg/ports/gperf/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) vcpkg_download_distfile(ARCHIVE diff --git a/external_imported/vcpkg/ports/gperf/vcpkg.json b/external_imported/vcpkg/ports/gperf/vcpkg.json index 248f4da4c..da0d637c4 100644 --- a/external_imported/vcpkg/ports/gperf/vcpkg.json +++ b/external_imported/vcpkg/ports/gperf/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gperf", - "version-string": "3.1", - "port-version": 2, + "version": "3.1", + "port-version": 3, "description": "GNU perfect hash function generator", "homepage": "https://www.gnu.org/software/gperf/" } diff --git a/external_imported/vcpkg/ports/gperftools/portfile.cmake b/external_imported/vcpkg/ports/gperftools/portfile.cmake index 00b72fefc..4d03e0e07 100644 --- a/external_imported/vcpkg/ports/gperftools/portfile.cmake +++ b/external_imported/vcpkg/ports/gperftools/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gperftools/gperftools diff --git a/external_imported/vcpkg/ports/gperftools/vcpkg.json b/external_imported/vcpkg/ports/gperftools/vcpkg.json index 6aeb5dd81..556db9a29 100644 --- a/external_imported/vcpkg/ports/gperftools/vcpkg.json +++ b/external_imported/vcpkg/ports/gperftools/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gperftools", "version-date": "2019-09-02", - "port-version": 2, + "port-version": 3, "description": "A set of tools for performance profiling and memory checking", "homepage": "https://github.com/gperftools/gperftools", "supports": "!(arm | arm64 | uwp)", diff --git a/external_imported/vcpkg/ports/graphviz/portfile.cmake b/external_imported/vcpkg/ports/graphviz/portfile.cmake index 6a4b45106..3310b5be7 100644 --- a/external_imported/vcpkg/ports/graphviz/portfile.cmake +++ b/external_imported/vcpkg/ports/graphviz/portfile.cmake @@ -1,3 +1,5 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + vcpkg_from_gitlab( GITLAB_URL https://gitlab.com OUT_SOURCE_PATH SOURCE_PATH @@ -9,8 +11,29 @@ vcpkg_from_gitlab( 0001-Fix-build.patch ) -vcpkg_acquire_msys(MSYS_ROOT PACKAGES gawk) -vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") +if(VCPKG_TARGET_IS_OSX) + message("${PORT} currently requires the following libraries from the system package manager:\n libtool\n\nThey can be installed with brew install libtool") +elseif(VCPKG_TARGET_IS_LINUX) + message("${PORT} currently requires the following libraries from the system package manager:\n libtool\n\nThey can be installed with apt-get install libtool") +else() + vcpkg_download_distfile( + LTDL_H_PATH + URLS "https://gitlab.com/graphviz/graphviz-windows-dependencies/-/raw/141d3a21be904fa8dc2ae3ed01d36684db07a35d/${VCPKG_TARGET_ARCHITECTURE}/include/ltdl.h" + FILENAME ltdl.h + SHA512 f2d20e849e35060536265f47014c40eb70e57dacd600a9db112fc465fbfa6a66217b44a8c3dc33039c260a27f09d9034b329b03cc28c32a22ec503fcd17b78cd + ) + file(COPY ${LTDL_H_PATH} DESTINATION ${SOURCE_PATH}/lib/common) + set(EXTRA_CMAKE_OPTION "-DLTDL_INCLUDE_DIR=${SOURCE_PATH}/lib/common") +endif() + +if(NOT VCPKG_TARGET_IS_WINDOWS) + set(EXTRA_CMAKE_OPTION "-DCMAKE_INSTALL_RPATH=${CURRENT_INSTALLED_DIR}/lib") +endif() + +if(VCPKG_HOST_IS_WINDOWS) + vcpkg_acquire_msys(MSYS_ROOT PACKAGES gawk) + vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") +endif() vcpkg_find_acquire_program(BISON) vcpkg_find_acquire_program(FLEX) @@ -19,15 +42,14 @@ vcpkg_find_acquire_program(PYTHON3) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - DISABLE_PARALLEL_CONFIGURE OPTIONS - -DBISON_EXECUTABLE=${BISON} - -DFLEX_EXECUTABLE=${FLEX} - -DGIT_EXECUTABLE=${GIT} - -DPython3_EXECUTABLE=${PYTHON3} - -DPKG_CONFIG_EXECUTABLE=${CURRENT_INSTALLED_DIR}/tools/pkgconf/pkgconf - -Denable_ltdl=OFF + "-DBISON_EXECUTABLE=${BISON}" + "-DFLEX_EXECUTABLE=${FLEX}" + "-DGIT_EXECUTABLE=${GIT}" + "-DPython3_EXECUTABLE=${PYTHON3}" + "-DPKG_CONFIG_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf" + ${EXTRA_CMAKE_OPTION} ) vcpkg_cmake_install() @@ -40,7 +62,18 @@ vcpkg_copy_tools( AUTO_CLEAN ) -# # Handle copyright +if(VCPKG_TARGET_IS_WINDOWS) + file(GLOB PLUGINS "${CURRENT_PACKAGES_DIR}/bin/gvplugin_*") + file(COPY ${PLUGINS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + vcpkg_execute_required_process( + COMMAND dot -c + WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}" + LOGNAME configure-plugins + ) + file(COPY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/config6" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") +endif() + +# Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -vcpkg_fixup_pkgconfig() + +vcpkg_fixup_pkgconfig() diff --git a/external_imported/vcpkg/ports/graphviz/vcpkg.json b/external_imported/vcpkg/ports/graphviz/vcpkg.json index 249daf03c..2419d09af 100644 --- a/external_imported/vcpkg/ports/graphviz/vcpkg.json +++ b/external_imported/vcpkg/ports/graphviz/vcpkg.json @@ -1,16 +1,20 @@ { "name": "graphviz", "version-semver": "2.49.1", - "port-version": 1, + "port-version": 3, "description": "Graph Visualization Tools", "homepage": "https://graphviz.org/", + "license": "EPL-1.0", "dependencies": [ "cairo", "getopt", "libffi", "libgd", "pango", - "pkgconf", + { + "name": "pkgconf", + "host": true + }, { "name": "vcpkg-cmake", "host": true diff --git a/external_imported/vcpkg/ports/grpc/00001-fix-uwp.patch b/external_imported/vcpkg/ports/grpc/00001-fix-uwp.patch index 80146babb..a7f353d70 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 1911144984..8f78306f77 100644 +index 7a97604..4967c4f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -181,6 +181,9 @@ if(UNIX) +@@ -215,6 +215,9 @@ if(UNIX) endif() if(WIN32) set(_gRPC_PLATFORM_WINDOWS ON) @@ -12,17 +12,17 @@ index 1911144984..8f78306f77 100644 endif() # Use C99 standard -@@ -219,6 +222,9 @@ if(MSVC) +@@ -259,6 +262,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") + if(_gRPC_PLATFORM_UWP) + add_definitions(-DGRPC_ARES=0) + endif() + # Silences thousands of trucation warnings + set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4503") endif() - if (MINGW) - add_definitions(-D_WIN32_WINNT=0x600) -@@ -286,6 +292,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR}) +@@ -336,6 +342,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR}) # ``.proto`` files # function(protobuf_generate_grpc_cpp) @@ -33,7 +33,7 @@ index 1911144984..8f78306f77 100644 if(NOT ARGN) message(SEND_ERROR "Error: PROTOBUF_GENERATE_GRPC_CPP() called without any proto files") return() -@@ -358,6 +368,7 @@ if (gRPC_BUILD_GRPC_RUBY_PLUGIN) +@@ -408,6 +418,7 @@ if (gRPC_BUILD_GRPC_RUBY_PLUGIN) list(APPEND _gRPC_PLUGIN_LIST grpc_ruby_plugin) endif () @@ -41,7 +41,7 @@ index 1911144984..8f78306f77 100644 add_custom_target(plugins DEPENDS ${_gRPC_PLUGIN_LIST} ) -@@ -376,6 +387,7 @@ add_custom_target(tools_cxx +@@ -424,6 +435,7 @@ add_custom_target(tools_cxx add_custom_target(tools DEPENDS tools_c tools_cxx) @@ -49,21 +49,8 @@ index 1911144984..8f78306f77 100644 protobuf_generate_grpc_cpp( src/proto/grpc/channelz/channelz.proto -diff --git a/src/core/lib/iomgr/resource_quota.cc b/src/core/lib/iomgr/resource_quota.cc -index dbe84e3466..cda40b6435 100644 ---- a/src/core/lib/iomgr/resource_quota.cc -+++ b/src/core/lib/iomgr/resource_quota.cc -@@ -945,7 +945,7 @@ bool grpc_resource_user_alloc(grpc_resource_user* resource_user, size_t size, - void grpc_resource_user_free(grpc_resource_user* resource_user, size_t size) { - gpr_mu_lock(&resource_user->mu); - grpc_resource_quota* resource_quota = resource_user->resource_quota; -- gpr_atm prior = gpr_atm_no_barrier_fetch_add(&resource_quota->used, -size); -+ gpr_atm prior = gpr_atm_no_barrier_fetch_add(&resource_quota->used, -static_cast(size)); - GPR_ASSERT(prior >= static_cast(size)); - bool was_zero_or_negative = resource_user->free_pool <= 0; - resource_user->free_pool += static_cast(size); 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 59432cff36..fed574d5bc 100644 +index 5d2bdc1..e9870c2 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/00003-undef-base64-macro.patch b/external_imported/vcpkg/ports/grpc/00003-undef-base64-macro.patch index 3f540a534..be182659d 100644 --- a/external_imported/vcpkg/ports/grpc/00003-undef-base64-macro.patch +++ b/external_imported/vcpkg/ports/grpc/00003-undef-base64-macro.patch @@ -1,13 +1,13 @@ diff --git a/src/core/lib/transport/transport.cc b/src/core/lib/transport/transport.cc -index 99a32980aa..f55db67113 100644 +index 5d74ec2..89494b5 100644 --- a/src/core/lib/transport/transport.cc +++ b/src/core/lib/transport/transport.cc -@@ -97,6 +97,8 @@ void grpc_stream_ref_init(grpc_stream_refcount* refcount, int /*initial_refs*/, - refcount, &refcount->slice_refcount); +@@ -77,6 +77,8 @@ void grpc_stream_ref_init(grpc_stream_refcount* refcount, int /*initial_refs*/, + : nullptr); } +#undef move64 + - static void move64(uint64_t* from, uint64_t* to) { + static void move64bits(uint64_t* from, uint64_t* to) { *to += *from; *from = 0; 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 e30e94f3d..0d1abe7f8 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,12 +1,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index e09f8fcc1e..ec1714687e 100644 +index 14514b7..497470c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -278,7 +278,7 @@ elseif(UNIX) - endif() +@@ -323,7 +323,7 @@ include(cmake/xxhash.cmake) + include(cmake/zlib.cmake) if(WIN32) -- set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 crypt32) +- set(_gRPC_BASELIB_LIBRARIES ws2_32 crypt32) + set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 crypt32 gdi32) endif() diff --git a/external_imported/vcpkg/ports/grpc/00006-fix-uwp-error.patch b/external_imported/vcpkg/ports/grpc/00006-fix-uwp-error.patch new file mode 100644 index 000000000..871e170c4 --- /dev/null +++ b/external_imported/vcpkg/ports/grpc/00006-fix-uwp-error.patch @@ -0,0 +1,13 @@ +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/00010-add-feature-absl-sync.patch b/external_imported/vcpkg/ports/grpc/00010-add-feature-absl-sync.patch index 2c7df5c87..75d986d61 100644 --- a/external_imported/vcpkg/ports/grpc/00010-add-feature-absl-sync.patch +++ b/external_imported/vcpkg/ports/grpc/00010-add-feature-absl-sync.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index ae06ea3..8b64438 100644 +index 497470c..9c07732 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -2180,6 +2180,8 @@ target_link_libraries(grpc +@@ -2196,6 +2196,8 @@ target_link_libraries(grpc ${_gRPC_UPB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::flat_hash_map @@ -10,8 +10,8 @@ index ae06ea3..8b64438 100644 + absl::synchronization absl::inlined_vector absl::bind_front - absl::statusor -@@ -2733,6 +2735,8 @@ target_link_libraries(grpc_unsecure + absl::hash +@@ -2753,6 +2755,8 @@ target_link_libraries(grpc_unsecure ${_gRPC_UPB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::flat_hash_map @@ -21,7 +21,7 @@ index ae06ea3..8b64438 100644 absl::bind_front absl::statusor diff --git a/cmake/abseil-cpp.cmake b/cmake/abseil-cpp.cmake -index c89ba26..68ae4fd 100644 +index c89ba26..81212b9 100644 --- a/cmake/abseil-cpp.cmake +++ b/cmake/abseil-cpp.cmake @@ -35,3 +35,6 @@ elseif(gRPC_ABSL_PROVIDER STREQUAL "package") @@ -31,4 +31,3 @@ index c89ba26..68ae4fd 100644 + if (gRPC_ABSL_SYNC_ENABLE) + add_definitions(-DGPR_ABSEIL_SYNC=1) + endif() -\ No newline at end of file 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 ea425c963..7ff404a8e 100644 --- a/external_imported/vcpkg/ports/grpc/00012-fix-use-cxx17.patch +++ b/external_imported/vcpkg/ports/grpc/00012-fix-use-cxx17.patch @@ -1,17 +1,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4573027..4615602 100644 +index 9c07732..54b4b23 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -271,6 +271,12 @@ include(cmake/upb.cmake) +@@ -321,6 +321,11 @@ include(cmake/ssl.cmake) + include(cmake/upb.cmake) include(cmake/xxhash.cmake) include(cmake/zlib.cmake) - + +if (ABSL_USE_CXX17) + message(STATUS "Found absl uses CXX17, enable CXX17 feature.") + set(CMAKE_CXX_STANDARD 17) +endif() -+ - if(_gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_IOS) - set(_gRPC_ALLTARGETS_LIBRARIES ${CMAKE_DL_LIBS} m pthread) - elseif(_gRPC_PLATFORM_ANDROID) + + if(WIN32) + set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 crypt32 gdi32) diff --git a/external_imported/vcpkg/ports/grpc/00014-pkgconfig-upbdefs.patch b/external_imported/vcpkg/ports/grpc/00014-pkgconfig-upbdefs.patch index 2aa257b3e..01e064e3b 100644 --- a/external_imported/vcpkg/ports/grpc/00014-pkgconfig-upbdefs.patch +++ b/external_imported/vcpkg/ports/grpc/00014-pkgconfig-upbdefs.patch @@ -1,11 +1,11 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index f7d677c..d527ff4 100644 +index 54b4b23..83fab3b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -17705,7 +17705,7 @@ generate_pkgconfig( +@@ -17276,7 +17276,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_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_variant" + "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" - "-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" "" diff --git a/external_imported/vcpkg/ports/grpc/portfile.cmake b/external_imported/vcpkg/ports/grpc/portfile.cmake index a00153725..11705ec43 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 fc662b7964384b701af5bd3ce6994d2180080eb4 # v1.41.0 - SHA512 ebb534b5d55f1a84c5ee2ea75f2ef871819d278966dec2610877c2f8ddd87bae80a63cbab0393fb37b81844f261327848821ac641b55963583288e6ec3b94e62 + REF 591d56e1300b6d11948e1b821efac785a295989c # v1.44.0 + SHA512 b24f82768eed95b017a499ffb539af1f59d6916ab2da5ffb1de344ea7b0b7df536d1bb29a9bcb273bd84bc1f11b62383dc6c7df62e50d57621228f5aeeca6d5d HEAD_REF master PATCHES 00001-fix-uwp.patch @@ -14,6 +14,7 @@ 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 diff --git a/external_imported/vcpkg/ports/grpc/vcpkg.json b/external_imported/vcpkg/ports/grpc/vcpkg.json index e8577e6de..63b1b33dd 100644 --- a/external_imported/vcpkg/ports/grpc/vcpkg.json +++ b/external_imported/vcpkg/ports/grpc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "grpc", - "version-semver": "1.41.0", + "version-semver": "1.44.0", "description": "An RPC library and framework", "homepage": "https://github.com/grpc/grpc", "dependencies": [ diff --git a/external_imported/vcpkg/ports/gsoap/portfile.cmake b/external_imported/vcpkg/ports/gsoap/portfile.cmake index 3ba596bc4..d60732746 100644 --- a/external_imported/vcpkg/ports/gsoap/portfile.cmake +++ b/external_imported/vcpkg/ports/gsoap/portfile.cmake @@ -1,7 +1,5 @@ message(FATAL_ERROR "gsoap does not offer permanent public downloads of its sources; all versions except the latest are removed from sourceforge. Therefore, vcpkg cannot support this library directly in the central catalog. If you would like to use gsoap, you can use this port as a starting point (${CMAKE_CURRENT_LIST_DIR}) and update it to use a permanent commercial copy or the latest public download. Do not report issues with this library to the vcpkg GitHub.") -vcpkg_fail_port_install(ON_TARGET "Linux" "OSX" "UWP" ON_ARCH "arm" "arm64") - vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO gsoap2 @@ -52,7 +50,7 @@ file(COPY ${SOURCE_PATH}/gsoap/custom DESTINATION ${CURRENT_PACKAGES_DIR}/share/ file(COPY ${SOURCE_PATH}/gsoap/plugin DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) # Cleanup surplus empty directory -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/gsoap/plugin/.deps") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/gsoap/plugin/.deps") # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/external_imported/vcpkg/ports/gsoap/vcpkg.json b/external_imported/vcpkg/ports/gsoap/vcpkg.json index ffa37c5d2..4fce1bad3 100644 --- a/external_imported/vcpkg/ports/gsoap/vcpkg.json +++ b/external_imported/vcpkg/ports/gsoap/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gsoap", "version": "2.8.112", + "port-version": 1, "description": "The gSOAP toolkit is a C and C++ software development toolkit for SOAP and REST XML Web services and generic C/C++ XML data bindings.", "homepage": "https://sourceforge.net/projects/gsoap2/", "supports": "!(linux | osx | arm | uwp)" diff --git a/external_imported/vcpkg/ports/gstreamer/gstreamer-disable-hot-doc.patch b/external_imported/vcpkg/ports/gstreamer/gstreamer-disable-hot-doc.patch new file mode 100644 index 000000000..e952046f7 --- /dev/null +++ b/external_imported/vcpkg/ports/gstreamer/gstreamer-disable-hot-doc.patch @@ -0,0 +1,34 @@ +diff --git a/meson.build b/meson.build +index 4a2eb27..1316366 100644 +--- a/meson.build ++++ b/meson.build +@@ -70,19 +70,19 @@ endif + + # Ordered list of subprojects (dict has no ordering guarantees) + subprojects = [ +- ['gstreamer', {'build-hotdoc': true}], +- ['gst-plugins-base', {'option': get_option('base'), 'build-hotdoc': true}], +- ['gst-plugins-good', {'option': get_option('good'), 'build-hotdoc': true}], ++ ['gstreamer', {'build-hotdoc': false}], ++ ['gst-plugins-base', {'option': get_option('base'), 'build-hotdoc': false}], ++ ['gst-plugins-good', {'option': get_option('good'), 'build-hotdoc': false}], + ['libnice', { 'option': get_option('libnice'), 'match_gst_version': false}], + ['gst-plugins-bad', { 'option': get_option('bad'), 'build-hotdoc': true}], +- ['gst-plugins-ugly', { 'option': get_option('ugly'), 'build-hotdoc': true}], +- ['gst-libav', { 'option': get_option('libav'), 'build-hotdoc': true}], +- ['gst-rtsp-server', { 'option': get_option('rtsp_server'), 'build-hotdoc': true}], +- ['gst-devtools', { 'option': get_option('devtools'), 'build-hotdoc': true }], ++ ['gst-plugins-ugly', { 'option': get_option('ugly'), 'build-hotdoc': false}], ++ ['gst-libav', { 'option': get_option('libav'), 'build-hotdoc': false}], ++ ['gst-rtsp-server', { 'option': get_option('rtsp_server'), 'build-hotdoc': false}], ++ ['gst-devtools', { 'option': get_option('devtools'), 'build-hotdoc': false }], + ['gst-integration-testsuites', { 'option': get_option('devtools') }], +- ['gst-editing-services', { 'option': get_option('ges'), 'build-hotdoc': true}], +- ['gstreamer-vaapi', { 'option': get_option('vaapi'), 'build-hotdoc': true}], +- ['gst-omx', { 'option': get_option('omx'), 'build-hotdoc': true}], ++ ['gst-editing-services', { 'option': get_option('ges'), 'build-hotdoc': false}], ++ ['gstreamer-vaapi', { 'option': get_option('vaapi'), 'build-hotdoc': false}], ++ ['gst-omx', { 'option': get_option('omx'), 'build-hotdoc': false}], + ['gstreamer-sharp', { 'option': get_option('sharp') }], + ['pygobject', { 'option': get_option('python'), 'match_gst_version': false }], + ['gst-python', { 'option': get_option('python')}], diff --git a/external_imported/vcpkg/ports/gstreamer/gstreamer-disable-no-unused.patch b/external_imported/vcpkg/ports/gstreamer/gstreamer-disable-no-unused.patch new file mode 100644 index 000000000..4fd3e068f --- /dev/null +++ b/external_imported/vcpkg/ports/gstreamer/gstreamer-disable-no-unused.patch @@ -0,0 +1,15 @@ +diff --git a/meson.build b/meson.build +index bed8c4e..772809e 100644 +--- a/meson.build ++++ b/meson.build +@@ -435,8 +435,9 @@ if cc.has_header('execinfo.h') + endif + endif + ++build_system = build_machine.system() + gst_debug = get_option('gst_debug') +-if not gst_debug ++if not gst_debug and build_system != 'windows' + add_project_arguments(['-Wno-unused'], language: 'c') + endif + diff --git a/external_imported/vcpkg/ports/gstreamer/plugin-base-disable-no-unused.patch b/external_imported/vcpkg/ports/gstreamer/plugin-base-disable-no-unused.patch new file mode 100644 index 000000000..dbd5d345f --- /dev/null +++ b/external_imported/vcpkg/ports/gstreamer/plugin-base-disable-no-unused.patch @@ -0,0 +1,26 @@ +diff --git a/meson.build b/meson.build +index 9b00253..495671e 100644 +--- a/meson.build ++++ b/meson.build +@@ -388,10 +388,11 @@ int32x4_t testfunc(int16_t *a, int16_t *b) { + endif + endif + ++build_system = build_machine.system() + if gst_dep.type_name() == 'internal' + gst_proj = subproject('gstreamer') + +- if not gst_proj.get_variable('gst_debug') ++ if not gst_proj.get_variable('gst_debug') and build_system != 'windows' + message('GStreamer debug system is disabled') + add_project_arguments('-Wno-unused', language: 'c') + else +@@ -404,7 +405,7 @@ else + #include + #ifdef GST_DISABLE_GST_DEBUG + #error "debugging disabled, make compiler fail" +-#endif''' , dependencies: gst_dep) ++#endif''' , dependencies: gst_dep) and build_system != 'windows' + message('GStreamer debug system is disabled') + add_project_arguments('-Wno-unused', language: 'c') + else diff --git a/external_imported/vcpkg/ports/gstreamer/plugins-ugly-disable-doc.patch b/external_imported/vcpkg/ports/gstreamer/plugins-ugly-disable-doc.patch new file mode 100644 index 000000000..46adcbeeb --- /dev/null +++ b/external_imported/vcpkg/ports/gstreamer/plugins-ugly-disable-doc.patch @@ -0,0 +1,16 @@ +diff --git a/meson.build b/meson.build +index c5c78fc..14be48c 100644 +--- a/meson.build ++++ b/meson.build +@@ -281,7 +281,11 @@ if find_program('xgettext', required : get_option('nls')).found() + cdata.set('ENABLE_NLS', 1) + subdir('po') + endif ++ ++enable_doc = get_option('doc') ++if enable_doc.enabled() + subdir('docs') ++endif + subdir('scripts') + + # Set release date diff --git a/external_imported/vcpkg/ports/gstreamer/portfile.cmake b/external_imported/vcpkg/ports/gstreamer/portfile.cmake index 6739f0bdd..25cfb74b8 100644 --- a/external_imported/vcpkg/ports/gstreamer/portfile.cmake +++ b/external_imported/vcpkg/ports/gstreamer/portfile.cmake @@ -1,11 +1,10 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp" "emscripten" "wasm32" "android" "ios") - vcpkg_from_github( OUT_SOURCE_PATH GST_BUILD_SOURCE_PATH REPO gstreamer/gst-build REF 1.19.2 SHA512 d6b8e9fc195a60dfb83fe8a49040c21ca5603e3ada2036d56851e6e61a1cd2653ad45f33e39388bde859dfb4806f4a60d9dbfac5fe41b6d2a8b395c44d4525e3 HEAD_REF master + PATCHES gstreamer-disable-hot-doc.patch ) vcpkg_from_github( OUT_SOURCE_PATH GST_SOURCE_PATH @@ -13,10 +12,12 @@ vcpkg_from_github( REF 1.19.2 SHA512 6070f1febf2a1bcc6e68f1e03c1b76891db210773065696e26fac20f0bd3ff47e1634222a49f93a10f6e47717ff21084c9ae0feed6a20facb9650aeb879cc380 HEAD_REF master + PATCHES gstreamer-disable-no-unused.patch ) if(VCPKG_TARGET_IS_WINDOWS) - list(APPEND PLUGIN_BASE_PATCHES plugins-base-use-zlib.patch) + list(APPEND PLUGIN_BASE_PATCHES plugins-base-use-zlib.patch plugin-base-disable-no-unused.patch) list(APPEND PLUGIN_GOOD_PATCHES plugins-good-use-zlib.patch) + list(APPEND PLUGIN_UGLY_PATCHES plugins-ugly-disable-doc.patch) endif() vcpkg_from_github( OUT_SOURCE_PATH GST_PLUGIN_BASE_SOURCE_PATH @@ -47,6 +48,7 @@ vcpkg_from_github( REF 1.19.2 SHA512 70dcd4a36d3bd35f680eaa3c980842fbb57f55f17d1453c6a95640709b1b33a263689bf54caa367154267d281e5474686fedaa980de24094de91886a57b6547a HEAD_REF master + PATCHES ${PLUGIN_UGLY_PATCHES} ) vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org @@ -57,15 +59,27 @@ vcpkg_from_gitlab( HEAD_REF master ) -file(RENAME ${GST_SOURCE_PATH} ${GST_BUILD_SOURCE_PATH}/subprojects/gstreamer) -file(RENAME ${GST_PLUGIN_BASE_SOURCE_PATH} ${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-base) -file(RENAME ${GST_PLUGIN_GOOD_SOURCE_PATH} ${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-good) -file(RENAME ${GST_PLUGIN_BAD_SOURCE_PATH} ${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-bad) -file(RENAME ${GST_PLUGIN_UGLY_SOURCE_PATH} ${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-ugly) -file(RENAME ${GST_MESON_PORTS_SOURCE_PATH} ${GST_BUILD_SOURCE_PATH}/subprojects/gl-headers) +if (NOT EXISTS "${GST_BUILD_SOURCE_PATH}/subprojects/gstreamer") + file(RENAME "${GST_SOURCE_PATH}" "${GST_BUILD_SOURCE_PATH}/subprojects/gstreamer") +endif() +if (NOT EXISTS "${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-base") + file(RENAME "${GST_PLUGIN_BASE_SOURCE_PATH}" "${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-base") +endif() +if (NOT EXISTS "${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-good") + file(RENAME "${GST_PLUGIN_GOOD_SOURCE_PATH}" "${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-good") +endif() +if (NOT EXISTS "${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-bad") + file(RENAME "${GST_PLUGIN_BAD_SOURCE_PATH}" "${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-bad") +endif() +if (NOT EXISTS "${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-ugly") + file(RENAME "${GST_PLUGIN_UGLY_SOURCE_PATH}" "${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-ugly") +endif() +if (NOT EXISTS "${GST_BUILD_SOURCE_PATH}/subprojects/gl-headers") + file(RENAME "${GST_MESON_PORTS_SOURCE_PATH}" "${GST_BUILD_SOURCE_PATH}/subprojects/gl-headers") +endif() if(VCPKG_TARGET_IS_OSX) - # In Darwin platform, there can be an old version of `bison`, + # In Darwin platform, there can be an old version of `bison`, # Which can't be used for `gst-build`. It requires 2.4+ vcpkg_find_acquire_program(BISON) execute_process( @@ -82,10 +96,21 @@ if(VCPKG_TARGET_IS_OSX) endif() # make tools like 'glib-mkenums' visible -get_filename_component(GLIB_TOOL_DIR ${CURRENT_INSTALLED_DIR}/tools/glib ABSOLUTE) +get_filename_component(GLIB_TOOL_DIR "${CURRENT_INSTALLED_DIR}/tools/glib" ABSOLUTE) message(STATUS "Using glib tools: ${GLIB_TOOL_DIR}") -vcpkg_add_to_path(PREPEND ${GLIB_TOOL_DIR}) +vcpkg_add_to_path(PREPEND "${GLIB_TOOL_DIR}") +if ("x264" IN_LIST FEATURES) + set(PLUGIN_UGLY_X264 enabled) +else() + set(PLUGIN_UGLY_X264 disabled) +endif() + +if("plugins-base" IN_LIST FEATURES) + set(PLUGIN_BASE_SUPPORT enabled) +else() + set(PLUGIN_BASE_SUPPORT disabled) +endif() if("plugins-bad" IN_LIST FEATURES) # requires 'libdrm', 'dssim', 'libmicrodns' message(FATAL_ERROR "The feature 'plugins-bad' is not supported in this port version") @@ -99,6 +124,18 @@ else() set(PLUGIN_UGLY_SUPPORT disabled) endif() +if ("gl-graphene" IN_LIST FEATURES) + set(GL_GRAPHENE enabled) +else() + set(GL_GRAPHENE disabled) +endif() + +if ("flac" IN_LIST FEATURES) + set(PLUGIN_GOOD_FLAC enabled) +else() + set(PLUGIN_GOOD_FLAC disabled) +endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(LIBRARY_LINKAGE "shared") else() @@ -122,7 +159,7 @@ vcpkg_add_to_path("${GIT_DIR}") # https://github.com/GStreamer/gst-plugins-ugly/blob/1.18.4/meson_options.txt # vcpkg_configure_meson( - SOURCE_PATH ${GST_BUILD_SOURCE_PATH} + SOURCE_PATH "${GST_BUILD_SOURCE_PATH}" OPTIONS # gstreamer -Dgstreamer:default_library=${LIBRARY_LINKAGE} @@ -136,17 +173,21 @@ vcpkg_configure_meson( -Dgstreamer:tests=disabled -Dgstreamer:benchmarks=disabled -Dgstreamer:tools=disabled + -Dgstreamer:doc=disabled -Dgstreamer:introspection=disabled -Dgstreamer:nls=disabled # gst-plugins-base + -Dbase=${PLUGIN_BASE_SUPPORT} -Dgst-plugins-base:default_library=${LIBRARY_LINKAGE} -Dgst-plugins-base:examples=disabled -Dgst-plugins-base:tests=disabled + -Dgst-plugins-base:doc=disabled -Dgst-plugins-base:tools=disabled -Dgst-plugins-base:introspection=disabled -Dgst-plugins-base:nls=disabled -Dgst-plugins-base:orc=disabled -Dgst-plugins-base:pango=disabled + -Dgst-plugins-base:gl-graphene=${GL_GRAPHENE} # gst-plugins-good -Dgst-plugins-good:default_library=${LIBRARY_LINKAGE} -Dgst-plugins-good:qt5=disabled @@ -157,8 +198,10 @@ vcpkg_configure_meson( -Dgst-plugins-good:vpx=auto # libvpx -Dgst-plugins-good:examples=disabled -Dgst-plugins-good:tests=disabled + -Dgst-plugins-good:doc=disabled -Dgst-plugins-good:nls=disabled -Dgst-plugins-good:orc=disabled + -Dgst-plugins-good:flac=${PLUGIN_GOOD_FLAC} # gst-plugins-bad -Dbad=${PLUGIN_BAD_SUPPORT} -Dgst-plugins-bad:default_library=${LIBRARY_LINKAGE} @@ -166,6 +209,7 @@ vcpkg_configure_meson( -Dgst-plugins-bad:hls-crypto=openssl -Dgst-plugins-bad:examples=disabled -Dgst-plugins-bad:tests=disabled + -Dgst-plugins-bad:doc=disabled -Dgst-plugins-bad:introspection=disabled -Dgst-plugins-bad:nls=${LIBRARY_LINKAGE} -Dgst-plugins-bad:orc=disabled @@ -173,8 +217,10 @@ vcpkg_configure_meson( -Dugly=${PLUGIN_UGLY_SUPPORT} -Dgst-plugins-ugly:default_library=${LIBRARY_LINKAGE} -Dgst-plugins-ugly:tests=disabled + -Dgst-plugins-ugly:doc=disabled -Dgst-plugins-ugly:nls=disabled -Dgst-plugins-ugly:orc=disabled + -Dgst-plugins-ugly:x264=${PLUGIN_UGLY_X264} # see ${GST_BUILD_SOURCE_PATH}/meson_options.txt -Dpython=disabled -Dlibav=disabled @@ -214,50 +260,48 @@ vcpkg_configure_meson( -Dgst-plugins-bad:glib-asserts=disabled -Dgst-plugins-bad:glib-checks=disabled ) -if(VCPKG_TARGET_IS_WINDOWS) - # note: can't find where z.lib comes from. replace it to appropriate library name manually - get_filename_component(BUILD_NINJA_DBG ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/build.ninja ABSOLUTE) - vcpkg_replace_string(${BUILD_NINJA_DBG} "z.lib" "zlibd.lib") - get_filename_component(BUILD_NINJA_REL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/build.ninja ABSOLUTE) - vcpkg_replace_string(${BUILD_NINJA_REL} "z.lib" "zlib.lib") - vcpkg_replace_string(${BUILD_NINJA_REL} "\"-Wno-unused\"" "") # todo: may need a patch for `gst_debug=false` -endif() + vcpkg_install_meson() # Remove duplicated GL headers (we already have `opengl-registry`) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/KHR - ${CURRENT_PACKAGES_DIR}/include/GL +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/KHR" + "${CURRENT_PACKAGES_DIR}/include/GL" ) -file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/include/gst/gl/gstglconfig.h - ${CURRENT_PACKAGES_DIR}/include/gstreamer-1.0/gst/gl/gstglconfig.h +file(RENAME "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/include/gst/gl/gstglconfig.h" + "${CURRENT_PACKAGES_DIR}/include/gstreamer-1.0/gst/gl/gstglconfig.h" ) - -file(INSTALL ${GST_BUILD_SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share - ${CURRENT_PACKAGES_DIR}/debug/libexec - ${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/include - ${CURRENT_PACKAGES_DIR}/libexec - ${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/include +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/libexec" + "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/include" + "${CURRENT_PACKAGES_DIR}/libexec" + "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/include" ) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin - ${CURRENT_PACKAGES_DIR}/bin + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" + "${CURRENT_PACKAGES_DIR}/bin" ) - set(PREFIX ${CMAKE_SHARED_LIBRARY_PREFIX}) - set(SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/${PREFIX}gstreamer-full-1.0${SUFFIX} - ${CURRENT_PACKAGES_DIR}/lib/${PREFIX}gstreamer-full-1.0${SUFFIX} + set(PREFIX "${CMAKE_SHARED_LIBRARY_PREFIX}") + set(SUFFIX "${CMAKE_SHARED_LIBRARY_SUFFIX}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/${PREFIX}gstreamer-full-1.0${SUFFIX}" + "${CURRENT_PACKAGES_DIR}/lib/${PREFIX}gstreamer-full-1.0${SUFFIX}" ) endif() + if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - file(GLOB DBG_BINS ${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.dll - ${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.pdb - ) - file(COPY ${DBG_BINS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - file(GLOB REL_BINS ${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/*.dll - ${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/*.pdb + if (NOT VCPKG_BUILD_TYPE) + file(GLOB DBG_BINS "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.dll" + "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.pdb" + ) + file(COPY ${DBG_BINS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + endif() + file(GLOB REL_BINS "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/*.dll" + "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/*.pdb" ) - file(COPY ${REL_BINS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(COPY ${REL_BINS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin") file(REMOVE ${DBG_BINS} ${REL_BINS}) endif() + vcpkg_fixup_pkgconfig() + +file(INSTALL "${GST_BUILD_SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/gstreamer/vcpkg.json b/external_imported/vcpkg/ports/gstreamer/vcpkg.json index ca0ed44eb..43bfd15e6 100644 --- a/external_imported/vcpkg/ports/gstreamer/vcpkg.json +++ b/external_imported/vcpkg/ports/gstreamer/vcpkg.json @@ -1,11 +1,11 @@ { "name": "gstreamer", "version": "1.19.2", - "port-version": 2, + "port-version": 5, "description": "GStreamer open-source multimedia framework core library", "homepage": "https://gstreamer.freedesktop.org/", "license": "LGPL-2.0", - "supports": "(windows | osx) & (x64 | x86)", + "supports": "!linux & !uwp", "dependencies": [ { "name": "cairo", @@ -26,7 +26,6 @@ "name": "glib", "host": true }, - "graphene", "libnice", "libxml2", { @@ -44,25 +43,68 @@ } ], "default-features": [ + "plugins-base", "plugins-good", "plugins-ugly" ], "features": { + "flac": { + "description": "FLAC audio codec plugin", + "supports": "!arm", + "dependencies": [ + "libflac" + ] + }, + "gl-graphene": { + "description": "Use Graphene in OpenGL plugin", + "supports": "!arm", + "dependencies": [ + "graphene" + ] + }, "plugins-bad": { "description": "'Bad' GStreamer plugins and helper libraries", "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "rawparse" + ], + "platform": "!arm" + }, "openh264" ] }, + "plugins-base": { + "description": "'Base' GStreamer plugins and helper libraries", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "gl-graphene", + "rawparse" + ], + "platform": "!arm" + } + ] + }, "plugins-good": { "description": "'Good' GStreamer plugins and helper libraries", "dependencies": [ "bzip2", + { + "name": "gstreamer", + "default-features": false, + "features": [ + "flac" + ], + "platform": "!arm" + }, "jack2", - "libflac", "libjpeg-turbo", "libpng", - "libraw", "libvpx", "mpg123", "speex", @@ -71,6 +113,27 @@ }, "plugins-ugly": { "description": "'Ugly' GStreamer plugins and helper libraries", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "x264" + ], + "platform": "!arm" + } + ] + }, + "rawparse": { + "description": "Build with libraw support", + "supports": "!arm", + "dependencies": [ + "libraw" + ] + }, + "x264": { + "description": "Colon separated list of additional x264 library paths, e.g. for 10-bit version", + "supports": "!arm", "dependencies": [ "x264" ] diff --git a/external_imported/vcpkg/ports/gtest/clang-tidy-no-lint.patch b/external_imported/vcpkg/ports/gtest/clang-tidy-no-lint.patch new file mode 100644 index 000000000..588a1d637 --- /dev/null +++ b/external_imported/vcpkg/ports/gtest/clang-tidy-no-lint.patch @@ -0,0 +1,13 @@ +diff --git a/googletest/include/gtest/gtest-matchers.h b/googletest/include/gtest/gtest-matchers.h +index 2bd3dcf6..12cd60f6 100644 +--- a/googletest/include/gtest/gtest-matchers.h ++++ b/googletest/include/gtest/gtest-matchers.h +@@ -403,6 +403,7 @@ class MatcherBase : private MatcherDescriberInterface { + }; + + void Destroy() { ++ // NOLINTNEXTLINE + if (IsShared() && buffer_.shared->Unref()) { + vtable_->shared_destroy(buffer_.shared); + } + diff --git a/external_imported/vcpkg/ports/gtest/portfile.cmake b/external_imported/vcpkg/ports/gtest/portfile.cmake index 524ac7c32..b2bff3768 100644 --- a/external_imported/vcpkg/ports/gtest/portfile.cmake +++ b/external_imported/vcpkg/ports/gtest/portfile.cmake @@ -9,23 +9,22 @@ vcpkg_from_github( SHA512 6fcc7827e4c4d95e3ae643dd65e6c4fc0e3d04e1778b84f6e06e390410fe3d18026c131d828d949d2f20dde6327d30ecee24dcd3ef919e21c91e010d149f3a28 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) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DBUILD_GMOCK=ON - -DBUILD_GTEST=ON - -DCMAKE_DEBUG_POSTFIX=d -Dgtest_force_shared_crt=${GTEST_FORCE_SHARED_CRT} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/GTest TARGET_PATH share/GTest) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/GTest) file( INSTALL diff --git a/external_imported/vcpkg/ports/gtest/remove-werror.patch b/external_imported/vcpkg/ports/gtest/remove-werror.patch new file mode 100644 index 000000000..96eba0202 --- /dev/null +++ b/external_imported/vcpkg/ports/gtest/remove-werror.patch @@ -0,0 +1,20 @@ +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 100b83fad..9bd6e0194 100644 --- a/external_imported/vcpkg/ports/gtest/vcpkg.json +++ b/external_imported/vcpkg/ports/gtest/vcpkg.json @@ -1,7 +1,18 @@ { "name": "gtest", "version-semver": "1.11.0", - "port-version": 3, + "port-version": 5, "description": "GoogleTest and GoogleMock testing frameworks", - "homepage": "https://github.com/google/googletest" + "homepage": "https://github.com/google/googletest", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/gtk/0003-vs2022-rc.patch b/external_imported/vcpkg/ports/gtk/0003-vs2022-rc.patch deleted file mode 100644 index 634ce1582..000000000 --- a/external_imported/vcpkg/ports/gtk/0003-vs2022-rc.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/gtk/gtk-win32.rc.body.in b/gtk/gtk-win32.rc.body.in -index b876a6ddf51846236f2c77e4c529b0c0a84e303e..fc2dfd2ed31ed518cc8238bd5b5602cc4a343f02 100644 ---- a/gtk/gtk-win32.rc.body.in -+++ b/gtk/gtk-win32.rc.body.in -@@ -1,5 +1,5 @@ --#include --#include -+#define WIN32_LEAN_AND_MEAN -+#include - - GTK_ICON ICON "gtk.ico" - -diff --git a/tools/generate-uac-manifest.py b/tools/generate-uac-manifest.py -index ede6ba5044c3f11112f5e8f36dea8f1aaa14a70d..62f063a8bb6d00201ca42a28eb33e560179a41f5 100644 ---- a/tools/generate-uac-manifest.py -+++ b/tools/generate-uac-manifest.py -@@ -24,7 +24,7 @@ def main(): - help='require admin access to application') - parser.add_argument('--input-resource-file', dest='resource', - default=None, -- help='existing .rc file to embed UAC manifest (do not generate a new .rc file), must have included winuser.h in it') -+ help='existing .rc file to embed UAC manifest (do not generate a new .rc file), must have included windows.h in it') - parser.add_argument('--output-dir', dest='outdir', - default=None, - help='directory to output resulting files') -@@ -92,7 +92,8 @@ def write_rc_file(name, resource, outdir): - - if resource is None: - outfile = open(output_file_base_name + '.rc', 'w+') -- outfile.write('#include ') -+ outfile.write('#define WIN32_LEAN_AND_MEAN\n') -+ outfile.write('#include \n') - else: - if resource != output_file_base_name + '.rc': - outfile = open(output_file_base_name + '.rc', 'w+') diff --git a/external_imported/vcpkg/ports/gtk/portfile.cmake b/external_imported/vcpkg/ports/gtk/portfile.cmake index 3583b051c..8c7595e60 100644 --- a/external_imported/vcpkg/ports/gtk/portfile.cmake +++ b/external_imported/vcpkg/ports/gtk/portfile.cmake @@ -1,16 +1,15 @@ -set(GTK_VERSION 4.4.0) +set(GTK_VERSION 4.6.0) vcpkg_from_gitlab( GITLAB_URL https://gitlab.gnome.org/ OUT_SOURCE_PATH SOURCE_PATH REPO GNOME/gtk - REF f1f197e3b94a55d5cbfaae2498f991a0ae733b32 #v4.4.0 - SHA512 80ffc2c2a2baae4a4097470a41d0b10d5df9086e60daa520aad845fe571e03486c4f87e295ae4f05aa0069df80fe40ad7655de4f9aecc21c2482bbe0b2b6e2fb + REF 70cb61fb7104c76a15bc6494a10e6ff1d470f6d8 #v4.6.0 + SHA512 dba6ce5a8306f9dda290f3785d6d15aee67c66329ab0756b7b7573387c1a512e96d3b53b24ed342ce7376832dcac20fb24025f2b8986f74d91a88e4fcf3de6ae HEAD_REF master # branch name PATCHES 0001-build.patch 0002-windows-build.patch - 0003-vs2022-rc.patch # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4063 0004-macos-build.patch ) diff --git a/external_imported/vcpkg/ports/gtk/vcpkg.json b/external_imported/vcpkg/ports/gtk/vcpkg.json index c34f28d3b..4966aae5b 100644 --- a/external_imported/vcpkg/ports/gtk/vcpkg.json +++ b/external_imported/vcpkg/ports/gtk/vcpkg.json @@ -1,9 +1,9 @@ { "name": "gtk", - "version": "4.4.0", - "port-version": 1, + "version": "4.6.0", "description": "Portable library for creating graphical user interfaces.", "homepage": "https://www.gtk.org/", + "license": "LGPL-2.0-only", "dependencies": [ "atk", { diff --git a/external_imported/vcpkg/ports/gtkmm/portfile.cmake b/external_imported/vcpkg/ports/gtkmm/portfile.cmake index 397543904..634367eae 100644 --- a/external_imported/vcpkg/ports/gtkmm/portfile.cmake +++ b/external_imported/vcpkg/ports/gtkmm/portfile.cmake @@ -1,9 +1,7 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnome.org/pub/GNOME/sources/gtkmm/4.4/gtkmm-4.4.0.tar.xz" - FILENAME "gtkmm-4.4.0.tar.xz" - SHA512 d6f20213e9ea7a13e2b9822f220a5cdeaef9a9406abee813e0eebdb540839f25f4c19cc7669c24184bef471f5529a7897cd16ee679266148f3181dd2cfa39eb4 + URLS "https://ftp.gnome.org/pub/GNOME/sources/gtkmm/4.6/gtkmm-4.6.0.tar.xz" + FILENAME "gtkmm-4.6.0.tar.xz" + SHA512 d1040be44d133cfa016efc581b79c5303806d0d441b57dcc22bd84a05c3e7934f9b7b894e71d7f4a0be332daba3dd58ef558f58070b83bf8a9de7d1027d92199 ) vcpkg_extract_source_archive_ex( diff --git a/external_imported/vcpkg/ports/gtkmm/vcpkg.json b/external_imported/vcpkg/ports/gtkmm/vcpkg.json index c8bf80be5..47cbec9f5 100644 --- a/external_imported/vcpkg/ports/gtkmm/vcpkg.json +++ b/external_imported/vcpkg/ports/gtkmm/vcpkg.json @@ -1,8 +1,9 @@ { "name": "gtkmm", - "version": "4.4.0", + "version": "4.6.0", "description": "gtkmm is the official C++ interface for the popular GUI library GTK+.", "homepage": "https://www.gtkmm.org/", + "license": "LGPL-3.0-or-later", "supports": "!uwp", "dependencies": [ "atk", diff --git a/external_imported/vcpkg/ports/gtl/portfile.cmake b/external_imported/vcpkg/ports/gtl/portfile.cmake new file mode 100644 index 000000000..ed16730c1 --- /dev/null +++ b/external_imported/vcpkg/ports/gtl/portfile.cmake @@ -0,0 +1,21 @@ +#header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO greg7mdp/gtl + REF 1.00 + SHA512 842a5e2634919a04fdd87995a8ada2f949c51a070a7c175043e0f9105a93248325023f85b28f9406276c2912a0fb4015a2e9ba30113d4a0214492da0dc5e5716 + HEAD_REF main +) + +# Use greg7mdp/gtl's own build process, skipping examples and tests +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) +vcpkg_cmake_install() + +# Delete redundant directories +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/share/doc") + +# Put the licence file where vcpkg expects it +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/gtl/vcpkg.json b/external_imported/vcpkg/ports/gtl/vcpkg.json new file mode 100644 index 000000000..b6b93c45f --- /dev/null +++ b/external_imported/vcpkg/ports/gtl/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "gtl", + "version": "1.0.0", + "description": "Greg's Template Library of useful classes.", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/guetzli/CMakeLists.txt b/external_imported/vcpkg/ports/guetzli/CMakeLists.txt index d24b2326d..af5eea6c7 100644 --- a/external_imported/vcpkg/ports/guetzli/CMakeLists.txt +++ b/external_imported/vcpkg/ports/guetzli/CMakeLists.txt @@ -17,6 +17,8 @@ list(REMOVE_ITEM guetzli_srcs "guetzli/guetzli.cc") add_library(guetzli_lib ${guetzli_srcs}) +target_compile_features(guetzli_lib PUBLIC cxx_std_11) + add_executable(guetzli guetzli/guetzli.cc) target_link_libraries(guetzli_lib ${butteraugli_library} ${PNG_LIBRARIES}) diff --git a/external_imported/vcpkg/ports/guetzli/portfile.cmake b/external_imported/vcpkg/ports/guetzli/portfile.cmake index d22602418..828730701 100644 --- a/external_imported/vcpkg/ports/guetzli/portfile.cmake +++ b/external_imported/vcpkg/ports/guetzli/portfile.cmake @@ -9,17 +9,16 @@ vcpkg_from_github( PATCHES butteraugli.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -DDISABLE_INSTALL_TOOLS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/guetzli) +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/guetzli") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/guetzli RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/guetzli" RENAME copyright) diff --git a/external_imported/vcpkg/ports/guetzli/vcpkg.json b/external_imported/vcpkg/ports/guetzli/vcpkg.json index 632289677..05da33a62 100644 --- a/external_imported/vcpkg/ports/guetzli/vcpkg.json +++ b/external_imported/vcpkg/ports/guetzli/vcpkg.json @@ -1,11 +1,15 @@ { "name": "guetzli", - "version-string": "2020-09-14", - "port-version": 1, + "version-date": "2020-09-14", + "port-version": 2, "description": "Perceptual JPEG encoder", "homepage": "https://github.com/google/guetzli", "dependencies": [ "butteraugli", - "libpng" + "libpng", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/h3/portfile.cmake b/external_imported/vcpkg/ports/h3/portfile.cmake index 880bcb98f..f691fe780 100644 --- a/external_imported/vcpkg/ports/h3/portfile.cmake +++ b/external_imported/vcpkg/ports/h3/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( @@ -25,4 +24,4 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/debug/include") -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/h3/vcpkg.json b/external_imported/vcpkg/ports/h3/vcpkg.json index 6e1c8ebee..183a69dfe 100644 --- a/external_imported/vcpkg/ports/h3/vcpkg.json +++ b/external_imported/vcpkg/ports/h3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "h3", "version-semver": "3.7.2", + "port-version": 1, "description": "A Hexagonal Hierarchical Geospatial Indexing System", "homepage": "https://github.com/uber/h3", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/harfbuzz/fix-macos-build.diff b/external_imported/vcpkg/ports/harfbuzz/fix-macos-build.diff new file mode 100644 index 000000000..3d0f8b5ce --- /dev/null +++ b/external_imported/vcpkg/ports/harfbuzz/fix-macos-build.diff @@ -0,0 +1,43 @@ +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/harfbuzzConfig.cmake.in b/external_imported/vcpkg/ports/harfbuzz/harfbuzzConfig.cmake.in index a142735cf..d4db3ea41 100644 --- a/external_imported/vcpkg/ports/harfbuzz/harfbuzzConfig.cmake.in +++ b/external_imported/vcpkg/ports/harfbuzz/harfbuzzConfig.cmake.in @@ -1,5 +1,6 @@ # For old projects where the minimum CMake version is lower than 3.3. cmake_policy(SET CMP0057 NEW) +include(CMakeFindDependencyMacro) if(TARGET harfbuzz) return() @@ -14,9 +15,7 @@ if(HARFBUZZ_LIBRARY_DEBUG) endif() find_library(HARFBUZZ_LIBRARY_RELEASE NAMES harfbuzz PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH) -if(HARFBUZZ_LIBRARY_RELEASE) - target_link_libraries(harfbuzz INTERFACE $<$>:${HARFBUZZ_LIBRARY_RELEASE}>) -endif() +target_link_libraries(harfbuzz INTERFACE $<$>:${HARFBUZZ_LIBRARY_RELEASE}>) set(HARFBUZZ_FEATURES @FEATURES@) @@ -25,7 +24,7 @@ if(APPLE) target_link_libraries(harfbuzz INTERFACE ${APPLICATIONSERVICES_LIBRARY}) endif() -find_package(freetype CONFIG REQUIRED) +find_dependency(freetype CONFIG) target_link_libraries(harfbuzz INTERFACE freetype) if ("graphite2" IN_LIST HARFBUZZ_FEATURES) @@ -53,9 +52,20 @@ if ("glib" IN_LIST HARFBUZZ_FEATURES) endif() if ("icu" IN_LIST HARFBUZZ_FEATURES) - find_package(ICU 61 COMPONENTS uc REQUIRED) + find_dependency(ICU 61 COMPONENTS uc) 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) +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() diff --git a/external_imported/vcpkg/ports/harfbuzz/portfile.cmake b/external_imported/vcpkg/ports/harfbuzz/portfile.cmake index 816dec15a..d12203416 100644 --- a/external_imported/vcpkg/ports/harfbuzz/portfile.cmake +++ b/external_imported/vcpkg/ports/harfbuzz/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO harfbuzz/harfbuzz - REF 3.0.0 - SHA512 69999ad86bde56ef689392a521143b6ad14b6719860772c3d4c343358997049a48c79e8f302fe0a7f3b0d930b476ddf440def874a1269b50ae79d020bcd073b5 + REF 3.2.0 + SHA512 5d8c629416c0bc557b83e8d9d731d41b9e8ee3abc74590e65ed6ca67d74d3a440d038134313f17a7b1b14ef0fc1ecf8bb87113fdcf5f0c8d3dc3d2eeb9b08c18 HEAD_REF master PATCHES # This patch is a workaround that is needed until the following issues are resolved upstream: @@ -11,6 +11,7 @@ vcpkg_from_github( # 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 ) if("icu" IN_LIST FEATURES) diff --git a/external_imported/vcpkg/ports/harfbuzz/vcpkg.json b/external_imported/vcpkg/ports/harfbuzz/vcpkg.json index 58ccedd5f..7b444a360 100644 --- a/external_imported/vcpkg/ports/harfbuzz/vcpkg.json +++ b/external_imported/vcpkg/ports/harfbuzz/vcpkg.json @@ -1,7 +1,7 @@ { "name": "harfbuzz", - "version-semver": "3.0.0", - "port-version": 1, + "version-semver": "3.2.0", + "port-version": 2, "description": "HarfBuzz OpenType text shaping engine", "homepage": "https://github.com/harfbuzz/harfbuzz", "dependencies": [ diff --git a/external_imported/vcpkg/ports/hdf5/portfile.cmake b/external_imported/vcpkg/ports/hdf5/portfile.cmake index 674832603..6383a4826 100644 --- a/external_imported/vcpkg/ports/hdf5/portfile.cmake +++ b/external_imported/vcpkg/ports/hdf5/portfile.cmake @@ -1,7 +1,5 @@ # highfive should be updated together with hdf5 -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO HDFGroup/hdf5 @@ -104,25 +102,25 @@ if(FEATURES MATCHES "tools") 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 ) - + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") list(TRANSFORM HDF5_TOOLS REPLACE "^(.+)$" "\\1-shared") else() endif() - + foreach(HDF5_TOOL IN LISTS HDF5_TOOLS) if (NOT EXISTS "${CURRENT_PACKAGES_DIR}/bin/${HDF5_TOOL}${VCPKG_TARGET_EXECUTABLE_SUFFIX}" OR NOT EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/${HDF5_TOOL}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") list(REMOVE_ITEM HDF5_TOOLS "${HDF5_TOOL}") endif() endforeach() - + vcpkg_copy_tools(TOOL_NAMES ${HDF5_TOOLS} AUTO_CLEAN) endif() if ("utils" IN_LIST FEATURES) vcpkg_copy_tools( - TOOL_NAMES mirror_server mirror_server_stop + TOOL_NAMES mirror_server mirror_server_stop AUTO_CLEAN ) endif() diff --git a/external_imported/vcpkg/ports/hdf5/vcpkg.json b/external_imported/vcpkg/ports/hdf5/vcpkg.json index 9eb90bed5..d535ebfa5 100644 --- a/external_imported/vcpkg/ports/hdf5/vcpkg.json +++ b/external_imported/vcpkg/ports/hdf5/vcpkg.json @@ -1,7 +1,7 @@ { "name": "hdf5", "version": "1.12.1", - "port-version": 3, + "port-version": 4, "description": "HDF5 is a data model, library, and file format for storing and managing data", "homepage": "https://www.hdfgroup.org/downloads/hdf5/", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/hexl/portfile.cmake b/external_imported/vcpkg/ports/hexl/portfile.cmake index e6946232a..bbfbed2a9 100644 --- a/external_imported/vcpkg/ports/hexl/portfile.cmake +++ b/external_imported/vcpkg/ports/hexl/portfile.cmake @@ -1,6 +1,3 @@ -# This library only supports "x64" architecture -vcpkg_fail_port_install(ON_ARCH "x86" "arm" "arm64") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO intel/hexl diff --git a/external_imported/vcpkg/ports/hexl/vcpkg.json b/external_imported/vcpkg/ports/hexl/vcpkg.json index 2b3adb897..7d75fd4b5 100644 --- a/external_imported/vcpkg/ports/hexl/vcpkg.json +++ b/external_imported/vcpkg/ports/hexl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "hexl", "version": "1.2.3", + "port-version": 1, "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)", diff --git a/external_imported/vcpkg/ports/hps/portfile.cmake b/external_imported/vcpkg/ports/hps/portfile.cmake new file mode 100644 index 000000000..2104177fe --- /dev/null +++ b/external_imported/vcpkg/ports/hps/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jl2922/hps + REF 8d1403697a2fad6ddf02c7afb190596ca68b2105 + SHA512 e0c22de8a684891a5b6faa968c72782ffb44c5359ce53a4cbd74abf5e1b6d5d1ff30ce96a4fc4c38fc7a0222d6874eab47b76c5a87fce1c43285a915d0f55814 + HEAD_REF master +) + +# Install header files +file(INSTALL + DIRECTORY + "${SOURCE_PATH}/src/" + DESTINATION + "${CURRENT_PACKAGES_DIR}/include/${PORT}" + FILES_MATCHING PATTERN "*.h" ) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/${PORT}/benchmark") + +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/hps/usage b/external_imported/vcpkg/ports/hps/usage new file mode 100644 index 000000000..198508212 --- /dev/null +++ b/external_imported/vcpkg/ports/hps/usage @@ -0,0 +1,4 @@ +The package hps is header only and can be used from CMake via: + + find_path(HPS_INCLUDE_DIRS "hps/hps.h") + target_include_directories(main PRIVATE ${HPS_INCLUDE_DIRS}) diff --git a/external_imported/vcpkg/ports/hps/vcpkg.json b/external_imported/vcpkg/ports/hps/vcpkg.json new file mode 100644 index 000000000..2e57b3269 --- /dev/null +++ b/external_imported/vcpkg/ports/hps/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "hps", + "version-date": "2022-01-18", + "description": "A C++11 High Performance Serialization Library.", + "homepage": "https://github.com/jl2922/hps", + "license": "MIT" +} diff --git a/external_imported/vcpkg/ports/hpx/fix-cmakecache-paths.patch b/external_imported/vcpkg/ports/hpx/fix-cmakecache-paths.patch new file mode 100644 index 000000000..5a9e1b3ca --- /dev/null +++ b/external_imported/vcpkg/ports/hpx/fix-cmakecache-paths.patch @@ -0,0 +1,22 @@ +diff --git a/cmake/HPX_ForwardCacheVariables.cmake b/cmake/HPX_ForwardCacheVariables.cmake +index 7c434085a76..34cc47c7750 100644 +--- a/cmake/HPX_ForwardCacheVariables.cmake ++++ b/cmake/HPX_ForwardCacheVariables.cmake +@@ -23,6 +23,17 @@ set(_cache_var_file_template + ) + set(_cache_variables) + foreach(_var IN LISTS cache_vars) ++ if(HPX_WITH_VCPKG) ++ # avoid writing directory names into cache file ++ string(FIND ${_var} "_DIR" _pos) ++ if(NOT ${_pos} EQUAL -1) ++ continue() ++ endif() ++ string(FIND ${_var} "_PATH" _pos) ++ if(NOT ${_pos} EQUAL -1) ++ continue() ++ endif() ++ endif() + set(_cache_variables "${_cache_variables}set(${_var} ${${_var}})\n") + endforeach() + diff --git a/external_imported/vcpkg/ports/hpx/fix-dependency-hwloc.patch b/external_imported/vcpkg/ports/hpx/fix-dependency-hwloc.patch new file mode 100644 index 000000000..b829acd0c --- /dev/null +++ b/external_imported/vcpkg/ports/hpx/fix-dependency-hwloc.patch @@ -0,0 +1,15 @@ +diff --git a/cmake/FindHwloc.cmake b/cmake/FindHwloc.cmake +index cdede78..6967abf 100644 +--- a/cmake/FindHwloc.cmake ++++ b/cmake/FindHwloc.cmake +@@ -71,6 +71,9 @@ if(NOT TARGET Hwloc::hwloc) + add_library(Hwloc::hwloc INTERFACE IMPORTED) + target_include_directories(Hwloc::hwloc SYSTEM INTERFACE ${HWLOC_INCLUDE_DIR}) + target_link_libraries(Hwloc::hwloc INTERFACE ${HWLOC_LIBRARIES}) +- ++ if(APPLE) ++ target_link_libraries(Hwloc::hwloc INTERFACE "-framework CoreFoundation" "-framework IOKit") ++ endif() ++ + mark_as_advanced(HWLOC_ROOT HWLOC_LIBRARY HWLOC_INCLUDE_DIR) + endif() diff --git a/external_imported/vcpkg/ports/hpx/portfile.cmake b/external_imported/vcpkg/ports/hpx/portfile.cmake index 21fe93429..9cbdf361f 100644 --- a/external_imported/vcpkg/ports/hpx/portfile.cmake +++ b/external_imported/vcpkg/ports/hpx/portfile.cmake @@ -1,4 +1,3 @@ - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( @@ -7,6 +6,9 @@ vcpkg_from_github( REF 1.7.1 SHA512 6bdb294da393a198abf81d5f63799a066334755eed0fda40bbfc4e9a774b6e19a3e5ad7ab45c989d31f3797e7b547bb552c29f51b552d9a79d166f86aee375a3 HEAD_REF stable + PATCHES + fix-dependency-hwloc.patch + fix-cmakecache-paths.patch ) set(HPX_WITH_MALLOC system) @@ -93,6 +95,5 @@ vcpkg_fixup_pkgconfig() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/hpxcxx" "\"${CURRENT_PACKAGES_DIR}\"" "os.path.dirname(os.path.dirname(os.path.realpath(__file__)))") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/hpxcxx" "\"${CURRENT_PACKAGES_DIR}/debug\"" "os.path.dirname(os.path.dirname(os.path.realpath(__file__)))") -file(REMOVE "${CURRENT_PACKAGES_DIR}/share/hpx/HPXCacheVariables.cmake") vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/hpx/vcpkg.json b/external_imported/vcpkg/ports/hpx/vcpkg.json index 10896b3f2..c82018a75 100644 --- a/external_imported/vcpkg/ports/hpx/vcpkg.json +++ b/external_imported/vcpkg/ports/hpx/vcpkg.json @@ -1,12 +1,13 @@ { "name": "hpx", "version-semver": "1.7.1", - "port-version": 3, + "port-version": 5, "description": [ "The C++ Standards Library for Concurrency and Parallelism", "HPX is a C++ Standards Library for Concurrency and Parallelism. It implements all of the corresponding facilities as defined by the C++ Standard. Additionally, in HPX we implement functionalities proposed as part of the ongoing C++ standardization process. We also extend the C++ Standard APIs to the distributed case." ], "homepage": "https://github.com/STEllAR-GROUP/hpx", + "license": "BSL-1.0", "dependencies": [ "asio", "boost-accumulators", diff --git a/external_imported/vcpkg/ports/hunspell/0004-add-win-arm64.patch b/external_imported/vcpkg/ports/hunspell/0004-add-win-arm64.patch new file mode 100644 index 000000000..271bc7888 --- /dev/null +++ b/external_imported/vcpkg/ports/hunspell/0004-add-win-arm64.patch @@ -0,0 +1,529 @@ +diff --git a/msvc/Hunspell.sln b/msvc/Hunspell.sln +index dabd755..9b0d996 100644 +--- a/msvc/Hunspell.sln ++++ b/msvc/Hunspell.sln +@@ -11,46 +11,66 @@ Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug_dll|Win32 = Debug_dll|Win32 + Debug_dll|x64 = Debug_dll|x64 ++ Debug_dll|ARM64 = Debug_dll|ARM64 + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 ++ Debug|ARM64 = Debug|ARM64 + Release_dll|Win32 = Release_dll|Win32 + Release_dll|x64 = Release_dll|x64 ++ Release_dll|ARM64 = Release_dll|ARM64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 ++ Release|ARM64 = Release|ARM64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Debug_dll|Win32.ActiveCfg = Debug_dll|Win32 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Debug_dll|Win32.Build.0 = Debug_dll|Win32 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Debug_dll|x64.ActiveCfg = Debug_dll|x64 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Debug_dll|x64.Build.0 = Debug_dll|x64 ++ {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Debug_dll|ARM64.ActiveCfg = Debug_dll|ARM64 ++ {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Debug_dll|ARM64.Build.0 = Debug_dll|ARM64 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Debug|Win32.ActiveCfg = Debug|Win32 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Debug|Win32.Build.0 = Debug|Win32 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Debug|x64.ActiveCfg = Debug|x64 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Debug|x64.Build.0 = Debug|x64 ++ {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Debug|ARM64.ActiveCfg = Debug|ARM64 ++ {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Debug|ARM64.Build.0 = Debug|ARM64 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release_dll|Win32.ActiveCfg = Release_dll|Win32 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release_dll|Win32.Build.0 = Release_dll|Win32 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release_dll|x64.ActiveCfg = Release_dll|x64 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release_dll|x64.Build.0 = Release_dll|x64 ++ {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release_dll|ARM64.ActiveCfg = Release_dll|ARM64 ++ {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release_dll|ARM64.Build.0 = Release_dll|ARM64 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release|Win32.ActiveCfg = Release|Win32 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release|Win32.Build.0 = Release|Win32 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release|x64.ActiveCfg = Release|x64 + {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release|x64.Build.0 = Release|x64 ++ {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release|ARM64.ActiveCfg = Release|ARM64 ++ {53609BB3-D874-465C-AF7B-DF626DB0D89B}.Release|ARM64.Build.0 = Release|ARM64 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug_dll|Win32.ActiveCfg = Debug|Win32 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug_dll|Win32.Build.0 = Debug|Win32 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug_dll|x64.ActiveCfg = Debug|x64 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug_dll|x64.Build.0 = Debug|x64 ++ {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug_dll|ARM64.ActiveCfg = Debug|ARM64 ++ {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug_dll|ARM64.Build.0 = Debug|ARM64 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug|Win32.ActiveCfg = Debug|Win32 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug|Win32.Build.0 = Debug|Win32 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug|x64.ActiveCfg = Debug|x64 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug|x64.Build.0 = Debug|x64 ++ {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug|ARM64.ActiveCfg = Debug|ARM64 ++ {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Debug|ARM64.Build.0 = Debug|ARM64 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Release_dll|Win32.ActiveCfg = Release|Win32 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Release_dll|Win32.Build.0 = Release|Win32 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Release_dll|x64.ActiveCfg = Release|x64 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Release_dll|x64.Build.0 = Release|x64 ++ {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Release_dll|ARM64.ActiveCfg = Release|ARM64 ++ {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Release_dll|ARM64.Build.0 = Release|ARM64 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Release|Win32.ActiveCfg = Release|Win32 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Release|Win32.Build.0 = Release|Win32 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Release|x64.ActiveCfg = Release|x64 + {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Release|x64.Build.0 = Release|x64 ++ {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Release|ARM64.ActiveCfg = Release|ARM64 ++ {6A0453F4-B12A-4810-B9A2-8AB059316ED7}.Release|ARM64.Build.0 = Release|ARM64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE +diff --git a/msvc/hunspell.vcxproj b/msvc/hunspell.vcxproj +index d4817a5..b8afa73 100644 +--- a/msvc/hunspell.vcxproj ++++ b/msvc/hunspell.vcxproj +@@ -9,6 +9,10 @@ + Debug + x64 + ++ ++ Debug ++ ARM64 ++ + + Release + Win32 +@@ -17,6 +21,10 @@ + Release + x64 + ++ ++ Release ++ ARM64 ++ + + + {6A0453F4-B12A-4810-B9A2-8AB059316ED7} +@@ -37,6 +45,12 @@ + MultiByte + true + ++ ++ Application ++ v141 ++ MultiByte ++ true ++ + + Application + v140_xp +@@ -47,6 +61,11 @@ + v140_xp + MultiByte + ++ ++ Application ++ v141 ++ MultiByte ++ + + + +@@ -56,12 +75,18 @@ + + + ++ ++ ++ + + + + + + ++ ++ ++ + + + <_ProjectFileVersion>14.0.25420.1 +@@ -75,6 +100,10 @@ + true + $(Platform)\$(Configuration)\$(ProjectName)\ + ++ ++ true ++ $(Platform)\$(Configuration)\$(ProjectName)\ ++ + + $(SolutionDir)$(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ +@@ -84,6 +113,10 @@ + false + $(Platform)\$(Configuration)\$(ProjectName)\ + ++ ++ false ++ $(Platform)\$(Configuration)\$(ProjectName)\ ++ + + + Disabled +@@ -128,6 +161,27 @@ + + + ++ ++ ++ Disabled ++ ..\src\hunspell;..\src\parsers;.;%(AdditionalIncludeDirectories) ++ W32;WIN32;_DEBUG;_CONSOLE;HUNSPELL_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ EnableFastChecks ++ MultiThreadedDebug ++ ++ ++ Level4 ++ ProgramDatabase ++ $(IntDir)$(ProjectName).pdb ++ 4127;4267;4706 ++ ++ ++ true ++ Console ++ ++ ++ ++ + + + Full +@@ -176,6 +230,30 @@ + + + ++ ++ ++ Full ++ AnySuitable ++ ..\src\hunspell;..\src\parsers;.;%(AdditionalIncludeDirectories) ++ W32;WIN32;NDEBUG;_CONSOLE;HUNSPELL_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ MultiThreaded ++ ++ ++ $(IntDir)$(ProjectName).pdb ++ Level4 ++ ++ ++ 4127;4267;4706 ++ ++ ++ true ++ Console ++ true ++ true ++ ++ ++ ++ + + + +diff --git a/msvc/libhunspell.vcxproj b/msvc/libhunspell.vcxproj +index 9a875ca..b7ed6b2 100644 +--- a/msvc/libhunspell.vcxproj ++++ b/msvc/libhunspell.vcxproj +@@ -9,6 +9,10 @@ + Debug_dll + x64 + ++ ++ Debug_dll ++ x64 ++ + + Debug + Win32 +@@ -17,6 +21,10 @@ + Debug + x64 + ++ ++ Debug ++ ARM64 ++ + + Release_dll + Win32 +@@ -24,6 +32,10 @@ + + Release_dll + x64 ++ ++ ++ Release_dll ++ ARM64 + + + Release +@@ -33,6 +45,10 @@ + Release + x64 + ++ ++ Release ++ ARM64 ++ + + + {53609BB3-D874-465C-AF7B-DF626DB0D89B} +@@ -53,6 +69,12 @@ + false + MultiByte + ++ ++ DynamicLibrary ++ v141 ++ false ++ MultiByte ++ + + DynamicLibrary + v140_xp +@@ -67,6 +89,13 @@ + MultiByte + true + ++ ++ DynamicLibrary ++ v141 ++ false ++ MultiByte ++ true ++ + + StaticLibrary + v140_xp +@@ -80,6 +109,13 @@ + false + MultiByte + true ++ ++ ++ StaticLibrary ++ v141 ++ false ++ MultiByte ++ true + + + StaticLibrary +@@ -93,6 +129,12 @@ + false + MultiByte + ++ ++ StaticLibrary ++ v140_xp ++ false ++ MultiByte ++ + + + +@@ -102,24 +144,36 @@ + + + ++ ++ ++ + + + + + + ++ ++ ++ + + + + + + ++ ++ ++ + + + + + + ++ ++ ++ + + + <_ProjectFileVersion>14.0.25420.1 +@@ -141,6 +195,10 @@ + + $(Platform)\$(Configuration)\$(ProjectName)\ + ++ ++ ++ $(Platform)\$(Configuration)\$(ProjectName)\ ++ + + $(SolutionDir)$(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ +@@ -150,12 +208,23 @@ + true + $(Platform)\$(Configuration)\$(ProjectName)\ + ++ ++ true ++ $(Platform)\$(Configuration)\$(ProjectName)\ ++ + + $(Platform)\$(Configuration)\$(ProjectName)\ + ++ ++ $(Platform)\$(Configuration)\$(ProjectName)\ ++ + + $(Platform)\$(Configuration)\$(ProjectName)\ + ++ ++ $(Platform)\$(Configuration)\$(ProjectName)\ ++ ++ + + + echo N | copy /-Y ..\src\hunspell\hunvisapi.h.in ..\src\hunspell\hunvisapi.h +@@ -196,6 +265,25 @@ + + + ++ ++ ++ echo N | copy /-Y ..\src\hunspell\hunvisapi.h.in ..\src\hunspell\hunvisapi.h ++ ++ ++ Disabled ++ ..\src\hunspell;.;%(AdditionalIncludeDirectories) ++ WIN32;_DEBUG;_WINDOWS;_USRDLL;HUNSPELL_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ false ++ EnableFastChecks ++ MultiThreadedDebug ++ ++ ++ Level4 ++ ProgramDatabase ++ 4706;4251;4267 ++ ++ ++ + + + echo N | copy /-Y ..\src\hunspell\hunvisapi.h.in ..\src\hunspell\hunvisapi.h +@@ -250,6 +338,34 @@ + false + + ++ ++ ++ echo N | copy /-Y ..\src\hunspell\hunvisapi.h.in ..\src\hunspell\hunvisapi.h ++ ++ ++ Full ++ AnySuitable ++ ..\src\hunspell;.;%(AdditionalIncludeDirectories) ++ WIN32;NDEBUG;_WINDOWS;_USRDLL;HUNSPELL_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ true ++ MultiThreaded ++ true ++ ++ ++ $(IntDir)$(ProjectName).pdb ++ Level4 ++ ++ ++ 4706;4251;4267 ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ false ++ ++ + + + echo N | copy /-Y ..\src\hunspell\hunvisapi.h.in ..\src\hunspell\hunvisapi.h +@@ -315,6 +431,39 @@ + Windows + + ++ ++ ++ echo N | copy /-Y ..\src\hunspell\hunvisapi.h.in ..\src\hunspell\hunvisapi.h ++ ++ ++ Full ++ AnySuitable ++ ..\src\hunspell;.;%(AdditionalIncludeDirectories) ++ WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBHUNSPELL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ ++ ++ $(IntDir)$(ProjectName).pdb ++ Level4 ++ ++ ++ 4706;4251;4267 ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ false ++ true ++ true ++ ++ ++ Windows ++ ++ + + + echo N | copy /-Y ..\src\hunspell\hunvisapi.h.in ..\src\hunspell\hunvisapi.h +@@ -366,6 +515,31 @@ + + + ++ ++ ++ echo N | copy /-Y ..\src\hunspell\hunvisapi.h.in ..\src\hunspell\hunvisapi.h ++ ++ ++ Disabled ++ ..\src\hunspell;.;%(AdditionalIncludeDirectories) ++ WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;BUILDING_LIBHUNSPELL;%(PreprocessorDefinitions) ++ false ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ ++ $(IntDir)$(ProjectName).pdb ++ Level4 ++ ProgramDatabase ++ 4706;4251;4267 ++ ++ ++ true ++ Windows ++ ++ ++ ++ + + + diff --git a/external_imported/vcpkg/ports/hunspell/portfile.cmake b/external_imported/vcpkg/ports/hunspell/portfile.cmake index 053d1dda4..6c82edd18 100644 --- a/external_imported/vcpkg/ports/hunspell/portfile.cmake +++ b/external_imported/vcpkg/ports/hunspell/portfile.cmake @@ -1,15 +1,14 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO hunspell/hunspell REF v1.7.0 SHA512 8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903 HEAD_REF master - PATCHES + PATCHES 0001_fix_unistd.patch 0002-disable-test.patch 0003-fix-win-build.patch + 0004-add-win-arm64.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -19,28 +18,30 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS 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) elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") set(HUNSPELL_ARCH x64) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(HUNSPELL_ARCH ARM64) else() message(FATAL_ERROR "unsupported architecture") endif() - + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(HUNSPELL_CONFIGURATION _dll) else() set(HUNSPELL_CONFIGURATION ) endif() - + if("tools" IN_LIST FEATURES) set(HSP_TARGET hunspell) else() set(HSP_TARGET libhunspell) endif() - + vcpkg_install_msbuild( SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH "msvc/Hunspell.sln" @@ -63,14 +64,14 @@ else() vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/gettext/bin") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} - OPTIONS + OPTIONS AUTOCONFIG ADDITIONAL_MSYS_PACKAGES gzip ) #install-pkgconfDATA: vcpkg_build_make(BUILD_TARGET dist LOGFILE_ROOT build-dist) 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() diff --git a/external_imported/vcpkg/ports/hunspell/vcpkg.json b/external_imported/vcpkg/ports/hunspell/vcpkg.json index 61065b019..ae1c6d393 100644 --- a/external_imported/vcpkg/ports/hunspell/vcpkg.json +++ b/external_imported/vcpkg/ports/hunspell/vcpkg.json @@ -1,10 +1,10 @@ { "name": "hunspell", "version": "1.7.0", - "port-version": 6, + "port-version": 8, "description": "The most popular spellchecking library.", "homepage": "https://github.com/hunspell/hunspell", - "supports": "!((arm | uwp) & windows)", + "supports": "!uwp", "dependencies": [ "libiconv" ], diff --git a/external_imported/vcpkg/ports/hwloc/fix_shared_win_build.patch b/external_imported/vcpkg/ports/hwloc/fix_shared_win_build.patch index 20ce59f7b..dcfadbd48 100644 --- a/external_imported/vcpkg/ports/hwloc/fix_shared_win_build.patch +++ b/external_imported/vcpkg/ports/hwloc/fix_shared_win_build.patch @@ -1,56 +1,30 @@ diff --git a/configure.ac b/configure.ac -index 44180d1aa..6bba9c435 100644 +index 8af26ec..0d52b00 100644 --- a/configure.ac +++ b/configure.ac -@@ -101,10 +101,11 @@ AM_PROG_CC_C_O - m4_version_prereq([2.70], [], [AC_PROG_CC_C99]) - CFLAGS=$CFLAGS_save - --AC_ARG_VAR(CC_FOR_BUILD,[build system C compiler]) --AS_IF([test -z "$CC_FOR_BUILD"],[ -- AC_SUBST([CC_FOR_BUILD], [$CC]) --]) -+# only needed to run/build dolib.exe which can be replaced with a bash script.... -+# AC_ARG_VAR(CC_FOR_BUILD,[build system C compiler]) -+# AS_IF([test -z "$CC_FOR_BUILD"],[ -+# AC_SUBST([CC_FOR_BUILD], [$CC]) -+# ]) - - #################################################################### - # CLI arguments -@@ -132,6 +133,8 @@ AS_IF([test "$enable_embedded_mode" != "yes"], +@@ -127,6 +127,8 @@ AS_IF([test "$enable_embedded_mode" != "yes"], #################################################################### AC_SUBST([libhwloc_so_version]) +libhwloc_so_version_current_minus_age=`expr [[ $libhwloc_so_version=~ ([[:digit:]]+):[[:digit:]]+:([[:digit:]]+) ]] && real_so_ver=$(expr ${BASH_REMATCH[1]} - ${BASH_REMATCH[2]})` +AC_SUBST(libhwloc_so_version_current_minus_age) + AC_SUBST([libhwloc_so_name]) # Setup the hwloc core - HWLOC_SETUP_CORE([], [], [AC_MSG_ERROR([Cannot build hwloc core])], [1]) diff --git a/hwloc/Makefile.am b/hwloc/Makefile.am -index 48cc81c5b..5aac67d4f 100644 +index 4b3800a..f96473c 100644 --- a/hwloc/Makefile.am +++ b/hwloc/Makefile.am -@@ -191,16 +191,15 @@ if HWLOC_HAVE_WINDOWS +@@ -189,11 +189,10 @@ if HWLOC_HAVE_WINDOWS LC_MESSAGES=C export LC_MESSAGES -ldflags += -Xlinker --output-def -Xlinker .libs/libhwloc.def if HWLOC_HAVE_MS_LIB --dolib$(EXEEXT): dolib.c -- $(CC_FOR_BUILD) $< -o $@ --.libs/libhwloc.lib: libhwloc.la dolib$(EXEEXT) -- [ ! -r .libs/libhwloc.def ] || ./dolib$(EXEEXT) "$(HWLOC_MS_LIB)" $(HWLOC_MS_LIB_ARCH) .libs/libhwloc.def $(libhwloc_so_version) .libs/libhwloc.lib -+# dolib$(EXEEXT): dolib.c -+# $(CC_FOR_BUILD) $< -o $@ -+# .libs/libhwloc.lib: libhwloc.la dolib$(EXEEXT) -+# [ ! -r .libs/libhwloc.def ] || ./dolib$(EXEEXT) "$(HWLOC_MS_LIB)" $(HWLOC_MS_LIB_ARCH) .libs/libhwloc.def $(libhwloc_so_version) .libs/libhwloc.lib -+.libs/libhwloc.lib: libhwloc.la -+ [ ! -r .libs/libhwloc.def ] || "$(HWLOC_MS_LIB)" /machine:$(HWLOC_MS_LIB_ARCH) /def:.libs/libhwloc.def /name:libhwloc-$(libhwloc_so_version_current_minus_age) /out:.libs/libhwloc.lib + .libs/libhwloc.lib: libhwloc.la +- [ ! -r .libs/libhwloc.def ] || "$(HWLOC_MS_LIB)" -machine:$(HWLOC_MS_LIB_ARCH) -def:.libs/libhwloc.def -name:libhwloc-$(libhwloc_so_name) -out:.libs/libhwloc.lib ++# [ ! -r .libs/libhwloc.def ] || "$(HWLOC_MS_LIB)" -machine:$(HWLOC_MS_LIB_ARCH) -def:.libs/libhwloc.def -name:libhwloc-$(libhwloc_so_name) -out:.libs/libhwloc.lib all-local: .libs/libhwloc.lib --clean-local: -- $(RM) dolib$(EXEEXT) endif HWLOC_HAVE_MS_LIB - install-exec-hook: diff --git a/external_imported/vcpkg/ports/hwloc/portfile.cmake b/external_imported/vcpkg/ports/hwloc/portfile.cmake index edc6f5cd9..2109cf414 100644 --- a/external_imported/vcpkg/ports/hwloc/portfile.cmake +++ b/external_imported/vcpkg/ports/hwloc/portfile.cmake @@ -1,10 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO open-mpi/hwloc - REF 5e185ccfff2728fa351cea41f6d9fefebfb88078 # hwloc-2.5.0 - SHA512 96f6421c40eede3a3c273a1ffa06accc43767421d5fb7b402a83caea1ef1a3bb8282c08ed94bc696296f37f3df80cd86403dac1012f2218b674569c8afcf3de9 - PATCHES fix_wrong_ifdef.patch - fix_shared_win_build.patch + REF 6fa8466a9c9c28de8ca3bd9e879c426edd85decf # hwloc-2.7.0 + SHA512 33bcc30362ba27076eacc83327a9d6235e2914a3c64536631e05e2d44c2c12b0176d55cc42ec0dc3c80682b977a83e60bd3a41f3ef486581cf8afa62ad2e9516 + PATCHES + fix_shared_win_build.patch ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) @@ -14,6 +14,8 @@ endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") list(APPEND OPTIONS "HWLOC_LDFLAGS=-no-undefined") +elseif(VCPKG_TARGET_IS_OSX) + list(APPEND OPTIONS "HWLOC_LDFLAGS=-framework CoreFoundation") endif() vcpkg_configure_make( @@ -45,7 +47,14 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/hwloc/bin/hwloc-compress-dir") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/hwloc/bin/hwloc-compress-dir" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") endif() if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/hwloc/debug/bin/hwloc-compress-dir") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/hwloc/debug/bin/hwloc-compress-dir" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/hwloc/debug/bin/hwloc-compress-dir" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..") +endif() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/hwloc/bin/hwloc-gather-topology") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/hwloc/bin/hwloc-gather-topology" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/hwloc/debug/bin/hwloc-gather-topology") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/hwloc/debug/bin/hwloc-gather-topology" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..") endif() # Handle copyright diff --git a/external_imported/vcpkg/ports/hwloc/vcpkg.json b/external_imported/vcpkg/ports/hwloc/vcpkg.json index 4910da26b..139760ba4 100644 --- a/external_imported/vcpkg/ports/hwloc/vcpkg.json +++ b/external_imported/vcpkg/ports/hwloc/vcpkg.json @@ -1,12 +1,12 @@ { "name": "hwloc", - "version": "2.5.0", - "port-version": 1, + "version": "2.7.0", "maintainers": "bgoglin", "description": [ "Portable Hardware Locality (hwloc)", "The Portable Hardware Locality (hwloc) software package provides a portable abstraction (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, including NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. It also gathers various system attributes such as cache and memory information as well as the locality of I/O devices such as network interfaces, InfiniBand HCAs or GPUs." ], "homepage": "https://github.com/open-mpi/hwloc", + "license": "BSD-2-Clause", "supports": "!uwp" } diff --git a/external_imported/vcpkg/ports/icu/disable-escapestr-tool.patch b/external_imported/vcpkg/ports/icu/disable-escapestr-tool.patch index 620fcde2a..5c42e56e7 100644 --- a/external_imported/vcpkg/ports/icu/disable-escapestr-tool.patch +++ b/external_imported/vcpkg/ports/icu/disable-escapestr-tool.patch @@ -1,10 +1,10 @@ diff --git a/source/tools/Makefile.in b/source/tools/Makefile.in -index c3f81d6..dc41af3 100644 +index e0896f1..5ead980 100644 --- a/source/tools/Makefile.in +++ b/source/tools/Makefile.in @@ -19,9 +19,9 @@ SUBDIRS = toolutil ctestfw makeconv genrb genbrk \ gencnval gensprep icuinfo genccode gencmn icupkg pkgdata \ - gentest gennorm2 gencfu gendict + gentest gennorm2 gencfu gendict icuexportdata -ifneq (@platform_make_fragment_name@,mh-cygwin-msvc) -SUBDIRS += escapesrc diff --git a/external_imported/vcpkg/ports/icu/fix-win-build.patch b/external_imported/vcpkg/ports/icu/fix-win-build.patch new file mode 100644 index 000000000..0c2e46cfb --- /dev/null +++ b/external_imported/vcpkg/ports/icu/fix-win-build.patch @@ -0,0 +1,35 @@ +diff --git a/source/configure.ac b/source/configure.ac +index 425fdc7..97210f8 100644 +--- a/source/configure.ac ++++ b/source/configure.ac +@@ -114,6 +114,15 @@ AC_ARG_ENABLE([icu-config], + esac], [enable_icu_config=true]) + AC_SUBST(INSTALL_ICU_CONFIG, [$enable_icu_config]) + ++AC_ARG_ENABLE([icu-build-win], ++ AS_HELP_STRING([--enable-icu-build-win], [install icu-build-win]), ++ [case "${enableval}" in ++ yes) enable_icu_build_win=true ;; ++ no) enable_icu_build_win=false ;; ++ *) AC_MSG_ERROR([bad value '${enableval}' for --enable-icu-build-win]) ;; ++ esac], [enable_icu_build_win=true]) ++AC_SUBST(INSTALL_ICU_BUILD_WIN, [$enable_icu_build_win]) ++ + # Check whether to build debug libraries + AC_MSG_CHECKING([whether to build debug libraries]) + enabled=no +@@ -263,12 +272,14 @@ ICU_CHECK_MH_FRAG + # Checks for libraries and other host specific stuff + # On HP/UX, don't link to -lm from a shared lib because it isn't + # PIC (at least on 10.2) ++if test "$enable_icu_build_win" = no; then + case "${host}" in + *-*-hpux*) AC_CHECK_LIB(m, floor, LIB_M="-lm") ;; + + *) AC_CHECK_LIB(m, floor) + LIB_M="" ;; + esac ++fi + AC_SUBST(LIB_M) + + # Check whether to build shared libraries diff --git a/external_imported/vcpkg/ports/icu/portfile.cmake b/external_imported/vcpkg/ports/icu/portfile.cmake index 32c03bc50..1383c2bba 100644 --- a/external_imported/vcpkg/ports/icu/portfile.cmake +++ b/external_imported/vcpkg/ports/icu/portfile.cmake @@ -1,6 +1,4 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - -set(ICU_VERSION_MAJOR 69) +set(ICU_VERSION_MAJOR 70) set(ICU_VERSION_MINOR 1) set(VERSION "${ICU_VERSION_MAJOR}.${ICU_VERSION_MINOR}") set(VERSION2 "${ICU_VERSION_MAJOR}_${ICU_VERSION_MINOR}") @@ -10,8 +8,9 @@ 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 d4aeb781715144ea6e3c6b98df5bbe0490bfa3175221a1d667f3e6851b7bd4a638fa4a37d4a921ccb31f02b5d15a6dded9464d98051964a86f7b1cde0ff0aab7 + SHA512 0b26ae7207155cb65a8fdb25f7b2fa4431e74b12bccbed0884a17feaae3c96833d12451064dd152197fd6ea5fd3adfd95594284a463e66c82e0d860f645880c9 ) + vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} @@ -22,11 +21,16 @@ vcpkg_extract_source_archive_ex( fix-extra.patch mingw-dll-install.patch disable-static-prefix.patch # https://gitlab.kitware.com/cmake/cmake/-/issues/16617; also mingw. + fix-win-build.patch ) vcpkg_find_acquire_program(PYTHON3) set(ENV{PYTHON} "${PYTHON3}") +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND CONFIGURE_OPTIONS --enable-icu-build-win) +endif() + list(APPEND CONFIGURE_OPTIONS --disable-samples --disable-tests --disable-layoutex) list(APPEND CONFIGURE_OPTIONS_RELEASE --disable-debug --enable-release) @@ -47,7 +51,9 @@ endif() vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG PROJECT_SUBPATH source + ADDITIONAL_MSYS_PACKAGES autoconf-archive OPTIONS ${CONFIGURE_OPTIONS} OPTIONS_RELEASE ${CONFIGURE_OPTIONS_RELEASE} OPTIONS_DEBUG ${CONFIGURE_OPTIONS_DEBUG} @@ -191,6 +197,5 @@ vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread m) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/icu/bin/icu-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../") -# Handle copyright -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) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/icu/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/icu/vcpkg-cmake-wrapper.cmake index 7d7a818a0..cb9d60157 100644 --- a/external_imported/vcpkg/ports/icu/vcpkg-cmake-wrapper.cmake +++ b/external_imported/vcpkg/ports/icu/vcpkg-cmake-wrapper.cmake @@ -1,5 +1,5 @@ list(FIND ARGS "COMPONENTS" COMPONENTS_IDX) -if(NOT COMPONENTS_IDX EQUAL -1) +if(COMPONENTS_IDX EQUAL -1) _find_package(${ARGS} COMPONENTS data) else() _find_package(${ARGS}) diff --git a/external_imported/vcpkg/ports/icu/vcpkg.json b/external_imported/vcpkg/ports/icu/vcpkg.json index 990030910..e3fec7996 100644 --- a/external_imported/vcpkg/ports/icu/vcpkg.json +++ b/external_imported/vcpkg/ports/icu/vcpkg.json @@ -1,7 +1,6 @@ { "name": "icu", - "version": "69.1", - "port-version": 16, + "version": "70.1", "description": "Mature and widely used Unicode and localization library.", "homepage": "https://icu.unicode.org/home", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/idevicerestore/libcurl_d.patch b/external_imported/vcpkg/ports/idevicerestore/fix-vcxproj.patch similarity index 58% rename from external_imported/vcpkg/ports/idevicerestore/libcurl_d.patch rename to external_imported/vcpkg/ports/idevicerestore/fix-vcxproj.patch index 1d9d3f3d7..79ff322b3 100644 --- a/external_imported/vcpkg/ports/idevicerestore/libcurl_d.patch +++ b/external_imported/vcpkg/ports/idevicerestore/fix-vcxproj.patch @@ -1,9 +1,12 @@ diff --git a/idevicerestore.vcxproj b/idevicerestore.vcxproj -index fa209fae..cf89306b 100644 +index fa209fa..6afa088 100644 --- a/idevicerestore.vcxproj -+++ b/idevicerestore.vcxproj -@@ -94,7 +94,7 @@ ++++ b/idevicerestore.vcxproj +@@ -92,9 +92,10 @@ + Disabled + true _MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS ++ 4996 - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl.lib;%(AdditionalDependencies) @@ -11,8 +14,11 @@ index fa209fae..cf89306b 100644 -@@ -105,7 +105,7 @@ +@@ -103,9 +104,10 @@ + Disabled + true _MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS ++ 4996 - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl.lib;%(AdditionalDependencies) @@ -20,4 +26,19 @@ index fa209fae..cf89306b 100644 - +@@ -116,6 +118,7 @@ + true + true + _MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS ++ 4996 + + + true +@@ -131,6 +134,7 @@ + true + true + _MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS ++ 4996 + + + true diff --git a/external_imported/vcpkg/ports/idevicerestore/portfile.cmake b/external_imported/vcpkg/ports/idevicerestore/portfile.cmake index 5cd1acef9..0bc503cea 100644 --- a/external_imported/vcpkg/ports/idevicerestore/portfile.cmake +++ b/external_imported/vcpkg/ports/idevicerestore/portfile.cmake @@ -1,13 +1,11 @@ -vcpkg_fail_port_install(ON_TARGET "linux" "osx") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libimobiledevice-win32/idevicerestore REF 1.0.12 SHA512 ba623be56c2f37853516d7d4c32e16f1ec72f33d512f18aa812ce6830af4b9e389f7af5321888dd0ddd168e282b652e379b60f90970680e213eabf489f406915 HEAD_REF msvc-master - PATCHES - libcurl_d.patch + PATCHES + fix-vcxproj.patch fix-libgen.h-cannot-be-found.patch ) diff --git a/external_imported/vcpkg/ports/idevicerestore/vcpkg.json b/external_imported/vcpkg/ports/idevicerestore/vcpkg.json index c2d9b175e..056ccaf12 100644 --- a/external_imported/vcpkg/ports/idevicerestore/vcpkg.json +++ b/external_imported/vcpkg/ports/idevicerestore/vcpkg.json @@ -1,7 +1,7 @@ { "name": "idevicerestore", - "version-string": "1.0.12", - "port-version": 5, + "version": "1.0.12", + "port-version": 7, "description": "Restore/upgrade firmware of iOS devices", "supports": "windows", "dependencies": [ diff --git a/external_imported/vcpkg/ports/ignition-common3/vcpkg.json b/external_imported/vcpkg/ports/ignition-common3/vcpkg.json index ce71be39d..700d243cb 100644 --- a/external_imported/vcpkg/ports/ignition-common3/vcpkg.json +++ b/external_imported/vcpkg/ports/ignition-common3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ignition-common3", "version-string": "3.9.0", - "port-version": 1, + "port-version": 2, "description": "Common libraries for robotics applications", "homepage": "https://ignitionrobotics.org/libs/common", "dependencies": [ @@ -17,7 +17,7 @@ "ignition-modularscripts", { "name": "libuuid", - "platform": "!windows & !uwp" + "platform": "!windows & !uwp & !osx" }, "tinyxml2" ] diff --git a/external_imported/vcpkg/ports/ignition-msgs5/portfile.cmake b/external_imported/vcpkg/ports/ignition-msgs5/portfile.cmake index ea5458590..23a05709d 100644 --- a/external_imported/vcpkg/ports/ignition-msgs5/portfile.cmake +++ b/external_imported/vcpkg/ports/ignition-msgs5/portfile.cmake @@ -1,6 +1,5 @@ -# Explicitly disable cross-compilation until the upstream discussion +# Cross-compilation is disabled until the upstream discussion # https://github.com/ignitionrobotics/ign-msgs/issues/34 is solved -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) @@ -8,5 +7,4 @@ ignition_modular_library(NAME msgs VERSION "5.3.0" SHA512 55c167d00b60ae6da0144a9495e9ac8aed61fcbdc61e057e75d31261e335c573543d60e28a7dc195a7c9849c5c6eb0e088d4f4e79fd927e83470a3f1fabef60e PATCHES - "01-protobuf.patch") - + "01-protobuf.patch") diff --git a/external_imported/vcpkg/ports/ignition-msgs5/vcpkg.json b/external_imported/vcpkg/ports/ignition-msgs5/vcpkg.json index 24c072d73..d215d8c47 100644 --- a/external_imported/vcpkg/ports/ignition-msgs5/vcpkg.json +++ b/external_imported/vcpkg/ports/ignition-msgs5/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ignition-msgs5", - "version-string": "5.3.0", - "port-version": 3, + "version": "5.3.0", + "port-version": 4, "description": "Middleware protobuf messages for robotics", "supports": "!(arm | uwp)", "dependencies": [ diff --git a/external_imported/vcpkg/ports/ignition-msgs6/portfile.cmake b/external_imported/vcpkg/ports/ignition-msgs6/portfile.cmake index f79c5aabd..41f29fa1e 100644 --- a/external_imported/vcpkg/ports/ignition-msgs6/portfile.cmake +++ b/external_imported/vcpkg/ports/ignition-msgs6/portfile.cmake @@ -1,10 +1,8 @@ -# Explicitly disable cross-compilation until the upstream discussion +# Cross-compilation is explicitly disabled until the upstream discussion # https://github.com/ignitionrobotics/ign-msgs/issues/34 is solved -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) ignition_modular_library(NAME msgs VERSION "6.0.0" SHA512 d1d6f6602ae33ec95b36c5df7815b06970f349492ef0309d8aacbaf2dca0c3e7314bbd64890a2554485fbd52f148a90b7bf54dceb0b3a1dd40eeb1f5bdb9613c) - diff --git a/external_imported/vcpkg/ports/ignition-msgs6/vcpkg.json b/external_imported/vcpkg/ports/ignition-msgs6/vcpkg.json index 995f166e1..df11c0d2f 100644 --- a/external_imported/vcpkg/ports/ignition-msgs6/vcpkg.json +++ b/external_imported/vcpkg/ports/ignition-msgs6/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ignition-msgs6", - "version-string": "6.0.0", - "port-version": 2, + "version": "6.0.0", + "port-version": 3, "description": "Middleware protobuf messages for robotics", "supports": "!(arm | uwp)", "dependencies": [ diff --git a/external_imported/vcpkg/ports/ignition-transport4/portfile.cmake b/external_imported/vcpkg/ports/ignition-transport4/portfile.cmake index cdab5c0a6..09a868c14 100644 --- a/external_imported/vcpkg/ports/ignition-transport4/portfile.cmake +++ b/external_imported/vcpkg/ports/ignition-transport4/portfile.cmake @@ -4,4 +4,7 @@ ignition_modular_library(NAME transport VERSION "4.0.0" SHA512 d4125044c21fdd6754f3b8b06f372df3f858080d5d33e97ed7a8ef8f6fb9857d562082aad41c89ea9146a33b1c3814305d33c5c8f8bcde66a16477b4a01655b4 # This can be removed when the pc file of libuuid on Windows is fixed - DISABLE_PKGCONFIG_INSTALL) + DISABLE_PKGCONFIG_INSTALL + PATCHES + uuid-osx.patch + ) diff --git a/external_imported/vcpkg/ports/ignition-transport4/uuid-osx.patch b/external_imported/vcpkg/ports/ignition-transport4/uuid-osx.patch new file mode 100644 index 000000000..c18d8caea --- /dev/null +++ b/external_imported/vcpkg/ports/ignition-transport4/uuid-osx.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5453cd0..10c2ad4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -58,6 +58,8 @@ ign_find_package(CPPZMQ REQUIRED PRIVATE + # Find uuid + if (MSVC) + message (STATUS "UUID: Using Windows RPC UuidCreate function\n") ++elseif (APPLE) ++ message (STATUS "Use system uuid header") + else() + ign_find_package(UUID REQUIRED) + endif() +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 6683e64..33669ab 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -18,7 +18,7 @@ target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME} + ) + + # Windows system library provides UUID +-if (NOT MSVC) ++if (NOT MSVC AND NOT APPLE) + target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME} + PUBLIC + UUID::UUID diff --git a/external_imported/vcpkg/ports/ignition-transport4/vcpkg.json b/external_imported/vcpkg/ports/ignition-transport4/vcpkg.json index 4b315b85e..b7e6b193e 100644 --- a/external_imported/vcpkg/ports/ignition-transport4/vcpkg.json +++ b/external_imported/vcpkg/ports/ignition-transport4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ignition-transport4", - "version-string": "4.0.0", - "port-version": 3, + "version": "4.0.0", + "port-version": 5, "description": "Transport middleware for robotics", "dependencies": [ "cppzmq", @@ -10,7 +10,7 @@ "ignition-msgs1", { "name": "libuuid", - "platform": "!windows & !uwp" + "platform": "!windows & !uwp & !osx" }, "protobuf", "zeromq" diff --git a/external_imported/vcpkg/ports/ignition-transport8/vcpkg.json b/external_imported/vcpkg/ports/ignition-transport8/vcpkg.json index 6d9f810c0..8dd933199 100644 --- a/external_imported/vcpkg/ports/ignition-transport8/vcpkg.json +++ b/external_imported/vcpkg/ports/ignition-transport8/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ignition-transport8", "version-string": "8.1.0", - "port-version": 1, + "port-version": 2, "description": "Transport middleware for robotics", "dependencies": [ "cppzmq", @@ -9,7 +9,7 @@ "ignition-msgs5", { "name": "libuuid", - "platform": "!windows & !uwp" + "platform": "!windows & !uwp & !osx" }, "protobuf", "sqlite3", diff --git a/external_imported/vcpkg/ports/ignition-transport9/portfile.cmake b/external_imported/vcpkg/ports/ignition-transport9/portfile.cmake index cd224b3f7..fcd8e6b46 100644 --- a/external_imported/vcpkg/ports/ignition-transport9/portfile.cmake +++ b/external_imported/vcpkg/ports/ignition-transport9/portfile.cmake @@ -4,4 +4,7 @@ ignition_modular_library(NAME transport VERSION "9.0.0" SHA512 c3edb7a8a063b4aa5826838ae08c8ec2b3d14563492022df632a719409c95272f4f6a43d91f0c317e44b85921b5aedc1685670b81a7baa949f01af3b3534d76e # This can be removed when the pc file of sqlite3 is available ( https://github.com/microsoft/vcpkg/issues/14327 ) - DISABLE_PKGCONFIG_INSTALL) + DISABLE_PKGCONFIG_INSTALL + PATCHES + uuid-osx.patch + ) diff --git a/external_imported/vcpkg/ports/ignition-transport9/uuid-osx.patch b/external_imported/vcpkg/ports/ignition-transport9/uuid-osx.patch new file mode 100644 index 000000000..350a0b43d --- /dev/null +++ b/external_imported/vcpkg/ports/ignition-transport9/uuid-osx.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 084b6da..6fd212d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -70,6 +70,8 @@ ign_find_package(CPPZMQ REQUIRED PRIVATE + # Find uuid + if (MSVC) + message (STATUS "UUID: Using Windows RPC UuidCreate function\n") ++elseif (APPLE) ++ message (STATUS "Use system uuid header") + else() + ign_find_package(UUID REQUIRED) + endif() +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 9777240..9e860a9 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -31,7 +31,7 @@ target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME} + ) + + # Windows system library provides UUID +-if (NOT MSVC) ++if (NOT MSVC AND NOT APPLE) + target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME} + PUBLIC + UUID::UUID diff --git a/external_imported/vcpkg/ports/ignition-transport9/vcpkg.json b/external_imported/vcpkg/ports/ignition-transport9/vcpkg.json index 9e9147c0d..cfbbf4d87 100644 --- a/external_imported/vcpkg/ports/ignition-transport9/vcpkg.json +++ b/external_imported/vcpkg/ports/ignition-transport9/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ignition-transport9", - "version-string": "9.0.0", - "port-version": 1, + "version": "9.0.0", + "port-version": 3, "description": "Transport middleware for robotics", "dependencies": [ "cppzmq", @@ -9,7 +9,7 @@ "ignition-msgs6", { "name": "libuuid", - "platform": "!windows & !uwp" + "platform": "!windows & !uwp & !osx" }, "protobuf", "sqlite3", diff --git a/external_imported/vcpkg/ports/igraph/portfile.cmake b/external_imported/vcpkg/ports/igraph/portfile.cmake index 393103603..4061978e1 100644 --- a/external_imported/vcpkg/ports/igraph/portfile.cmake +++ b/external_imported/vcpkg/ports/igraph/portfile.cmake @@ -4,9 +4,9 @@ # - 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.6/igraph-0.9.6.tar.gz" - FILENAME "igraph-0.9.6.tar.gz" - SHA512 2e83b81d7a5a0e526f0ad4ad12a7e31e8205f702715061c0c07155d66fcef30ccdb9dad962c50a26b00f4da0fe0e337e51294ff6c3b03cd855b6dfc41b54e306 + 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 ) vcpkg_extract_source_archive_ex( diff --git a/external_imported/vcpkg/ports/igraph/vcpkg.json b/external_imported/vcpkg/ports/igraph/vcpkg.json index e8e536ed7..f5a73ff0e 100644 --- a/external_imported/vcpkg/ports/igraph/vcpkg.json +++ b/external_imported/vcpkg/ports/igraph/vcpkg.json @@ -1,8 +1,9 @@ { "name": "igraph", - "version": "0.9.6", + "version": "0.9.8", "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", { diff --git a/external_imported/vcpkg/ports/iir1/portfile.cmake b/external_imported/vcpkg/ports/iir1/portfile.cmake index 0cd648c67..41dbf465f 100644 --- a/external_imported/vcpkg/ports/iir1/portfile.cmake +++ b/external_imported/vcpkg/ports/iir1/portfile.cmake @@ -12,7 +12,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) +vcpkg_cmake_config_fixup(PACKAGE_NAME iir CONFIG_PATH lib/cmake/iir) vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/iir1/vcpkg.json b/external_imported/vcpkg/ports/iir1/vcpkg.json index db60d1efb..92b672b1e 100644 --- a/external_imported/vcpkg/ports/iir1/vcpkg.json +++ b/external_imported/vcpkg/ports/iir1/vcpkg.json @@ -1,6 +1,7 @@ { "name": "iir1", "version": "1.9.0", + "port-version": 1, "description": "Realtime C++ filter library", "homepage": "https://github.com/berndporr/iir1", "license": "MIT", diff --git a/external_imported/vcpkg/ports/imath/portfile.cmake b/external_imported/vcpkg/ports/imath/portfile.cmake index ca245a1cb..e8e38f8be 100644 --- a/external_imported/vcpkg/ports/imath/portfile.cmake +++ b/external_imported/vcpkg/ports/imath/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AcademySoftwareFoundation/Imath - REF v3.1.3 - SHA512 a11f5e736bc49098d735c7903f186c15b03efbec082a8cf2e6635546368035cec0d36c7ae64bfd01bd8eeffb2dd247b8dab19e440a3e1fe33008edacc1268f75 + REF v3.1.5 + SHA512 8344e42c75d8e4bb21facb837535f0c9e4a9489d9edebcc25d5d3c6063535f2bf54e4517d8fca3fedada248457aa07c9bd77d6e843a9d115278fc154de2cdc9d HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/imath/vcpkg.json b/external_imported/vcpkg/ports/imath/vcpkg.json index c8bc20ac6..01ef7a9d6 100644 --- a/external_imported/vcpkg/ports/imath/vcpkg.json +++ b/external_imported/vcpkg/ports/imath/vcpkg.json @@ -1,9 +1,9 @@ { "name": "imath", - "version": "3.1.3", - "port-version": 1, + "version": "3.1.5", "description": "Imath is a C++ and Python library of 2D and 3D vector, matrix, and math operations for computer graphics.", "homepage": "https://github.com/AcademySoftwareFoundation/Imath", + "license": "BSD-3-Clause", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/imgui-sfml/005-fix-imtextureid-define.patch b/external_imported/vcpkg/ports/imgui-sfml/005-fix-imtextureid-define.patch deleted file mode 100644 index 7444e00e5..000000000 --- a/external_imported/vcpkg/ports/imgui-sfml/005-fix-imtextureid-define.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/imconfig-SFML.h b/imconfig-SFML.h -index ddfe05d..bd7174e 100644 ---- a/imconfig-SFML.h -+++ b/imconfig-SFML.h -@@ -24,4 +24,3 @@ - static_cast(z * 255.f), static_cast(w * 255.f)); \ - } - --#define ImTextureID unsigned int diff --git a/external_imported/vcpkg/ports/imgui-sfml/portfile.cmake b/external_imported/vcpkg/ports/imgui-sfml/portfile.cmake index 3e84f0df1..deb2e8e42 100644 --- a/external_imported/vcpkg/ports/imgui-sfml/portfile.cmake +++ b/external_imported/vcpkg/ports/imgui-sfml/portfile.cmake @@ -3,13 +3,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eliasdaler/imgui-sfml - REF 9cc8c57a4565551087be0d9aeb3ae55490aa1207 #v2.4 - SHA512 d44d85e44d17d05c4e21f71acbf5bf544364a9bbe4871be896edd29f9926948cd1ea7627b7d54524f7da64c494638fc126744ced57ea7997a4b712dd26eb6183 + REF 004efd85a590343e8c9d166dc9d2524c199c9450 #v2.5 + SHA512 feb11f0a52f89eedc5af4c686b71290a48d69e7bc371f29536eb51752d00b6879d642625f494035d2ccc0500878757709afa2a3810ac17496506db754a3a4ed6 HEAD_REF master PATCHES 0001-fix_find_package.patch 004-fix-find-sfml.patch - 005-fix-imtextureid-define.patch ) vcpkg_cmake_configure( diff --git a/external_imported/vcpkg/ports/imgui-sfml/vcpkg.json b/external_imported/vcpkg/ports/imgui-sfml/vcpkg.json index b0fbb4250..a01204e05 100644 --- a/external_imported/vcpkg/ports/imgui-sfml/vcpkg.json +++ b/external_imported/vcpkg/ports/imgui-sfml/vcpkg.json @@ -1,9 +1,9 @@ { "name": "imgui-sfml", - "version": "2.4", - "port-version": 1, + "version": "2.5", "description": "ImGui binding for use with SFML", "homepage": "https://github.com/eliasdaler/imgui-sfml", + "license": "MIT", "dependencies": [ "imgui", "opengl", diff --git a/external_imported/vcpkg/ports/imgui/portfile.cmake b/external_imported/vcpkg/ports/imgui/portfile.cmake index dd53a98e2..c342a637a 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 15b4a064f9244c430e65214f7249b615fb394321 - SHA512 d83403caf37efbffb29d902f7ea7d52596525f1bf7d1258671ffd5ea17f810c63541b2142dee1c9cf12c16fde697373972cbabd3957b1fcb87c9e1aa22ebbc4e + REF 1ee252772ae9c0a971d06257bb5c89f628fa696a + SHA512 942cd8e39f490c15d90b6feb6f919ebeab8f6f8f9aacfcbf552daef24b0f7e637ad5f630767a52fd9993d84a80b5954c7b05f7400a9f96b6b739cf5680368119 HEAD_REF docking ) else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ocornut/imgui - REF v1.86 - SHA512 e84fdc0839e96e53dcbe3a5d13bbd0def860c09bafa709b22f8371d5c710f5c90f6957e5f12813156ed0c4d0fa2b56c5e3be701206f7770749ce169818697229 + REF v1.87 + SHA512 3255b06698ab9c8951953e1e0b6d160d64adfa4c011b21a4288547292a7f8fff586875faf9dae0677818bde65bd7e98da92f16f6beb1e6a66aa835edf32e8ce2 HEAD_REF master ) endif() diff --git a/external_imported/vcpkg/ports/imgui/vcpkg.json b/external_imported/vcpkg/ports/imgui/vcpkg.json index e616fd164..b5b624bef 100644 --- a/external_imported/vcpkg/ports/imgui/vcpkg.json +++ b/external_imported/vcpkg/ports/imgui/vcpkg.json @@ -1,8 +1,9 @@ { "name": "imgui", - "version": "1.86", + "version": "1.87", "description": "Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies.", "homepage": "https://github.com/ocornut/imgui", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/immer/portfile.cmake b/external_imported/vcpkg/ports/immer/portfile.cmake index c6c2a0bb0..f2cae1a90 100644 --- a/external_imported/vcpkg/ports/immer/portfile.cmake +++ b/external_imported/vcpkg/ports/immer/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO arximboldi/immer - REF a11df7243cb516a1aeffc83c31366d7259c79e82 - SHA512 7aefa894d57167e8606ffd20c78490731885da610da084ffdc4ee677e40c7a3b4edcd0fbf74e354fc68866d09ec7a35a7c549f78ce91f2f1a84bb6ccc605e135 + REF a1271fa712342f5c6dfad876820da17e10c28214 + SHA512 7ea544c88b7a3742ebeedabe5ff7ba78178b3523c1c8564b5c0daae4044dda22340b0531e1382618557d1c118222da4a7ce06dde02e4bc05833514dde1cf2dd1 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/immer/vcpkg.json b/external_imported/vcpkg/ports/immer/vcpkg.json index c52c0f02c..df1f3ea4f 100644 --- a/external_imported/vcpkg/ports/immer/vcpkg.json +++ b/external_imported/vcpkg/ports/immer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "immer", - "version-date": "2021-05-03", + "version-date": "2022-02-12", "description": "Postmodern immutable and persistent data structures for C++", "homepage": "https://sinusoid.es/immer/", "dependencies": [ diff --git a/external_imported/vcpkg/ports/implot/CMakeLists.txt b/external_imported/vcpkg/ports/implot/CMakeLists.txt index 5d23a83c0..6807c550d 100644 --- a/external_imported/vcpkg/ports/implot/CMakeLists.txt +++ b/external_imported/vcpkg/ports/implot/CMakeLists.txt @@ -10,6 +10,7 @@ set(CMAKE_DEBUG_POSTFIX d) add_library(${PROJECT_NAME} "") add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) +target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_11) target_include_directories( ${PROJECT_NAME} PUBLIC diff --git a/external_imported/vcpkg/ports/implot/portfile.cmake b/external_imported/vcpkg/ports/implot/portfile.cmake index ba1241c5e..37d13429d 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.12 - SHA512 972bb831150a8b7c5fddb828c9d6928b493186ae587c8c5ea679c4fe499459892f175181c529e37195f72e09854ec8c698b77ae39e60295f831ad67e4a5f3358 + REF v0.13 + SHA512 ed653a14f1174b1689c7b8e5761455644e41e75a3cdf5a76d96adf8e286893418660809c1c158fa405c1c48a82752ae9c3b8e1eb14bd0015081604cdb44d95f4 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/implot/vcpkg.json b/external_imported/vcpkg/ports/implot/vcpkg.json index 0bd23ce03..73df80238 100644 --- a/external_imported/vcpkg/ports/implot/vcpkg.json +++ b/external_imported/vcpkg/ports/implot/vcpkg.json @@ -1,8 +1,9 @@ { "name": "implot", - "version": "0.12", + "version": "0.13", "description": "Advanced 2D Plotting for Dear ImGui", "homepage": "https://github.com/epezent/implot", + "license": "MIT", "dependencies": [ "imgui", { diff --git a/external_imported/vcpkg/ports/infoware/portfile.cmake b/external_imported/vcpkg/ports/infoware/portfile.cmake index e8b0703a8..2e0d4bdab 100644 --- a/external_imported/vcpkg/ports/infoware/portfile.cmake +++ b/external_imported/vcpkg/ports/infoware/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ThePhD/infoware diff --git a/external_imported/vcpkg/ports/infoware/vcpkg.json b/external_imported/vcpkg/ports/infoware/vcpkg.json index 7b3956395..1836379c9 100644 --- a/external_imported/vcpkg/ports/infoware/vcpkg.json +++ b/external_imported/vcpkg/ports/infoware/vcpkg.json @@ -2,6 +2,7 @@ "$reason": "Note that independent usage and testing may work, but it seems to fail in CI environments for potential cross-compilation, and is thusly noted here to note break how vcpkg builds things!", "name": "infoware", "version-date": "2021-06-16", + "port-version": 1, "description": "C++ Library for pulling system and hardware information, without hitting the command line.", "homepage": "https://github.com/ThePhD/infoware", "supports": "!(arm | uwp)", diff --git a/external_imported/vcpkg/ports/intel-ipsec/CMakeLists.txt b/external_imported/vcpkg/ports/intel-ipsec/CMakeLists.txt deleted file mode 100644 index 4d778eb30..000000000 --- a/external_imported/vcpkg/ports/intel-ipsec/CMakeLists.txt +++ /dev/null @@ -1,59 +0,0 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 3.9) -PROJECT(ipsec 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 () - -FIND_PROGRAM(MAKE make) -IF (NOT MAKE) - MESSAGE(FATAL_ERROR "MAKE not found") -ENDIF () - -IF (EXEC_ENV STREQUAL "Windows") - FIND_PROGRAM(MAKE nmake) - IF (NOT MAKE) - MESSAGE(FATAL_ERROR "nmake not found") - ENDIF () -ENDIF () - -SET(MAKE_FLAGS) - -IF (EXEC_ENV STREQUAL Windows) - LIST(APPEND MAKE_FLAGS /f win_x64.mak) -ENDIF () - -IF (CMAKE_BUILD_TYPE STREQUAL Debug) - LIST(APPEND MAKE_FLAGS DEBUG=y) -ENDIF () - -IF (LIBRARY_LINKAGE STREQUAL "static") - LIST(APPEND MAKE_FLAGS SHARED=n) -ENDIF () - -MESSAGE(STATUS "${MAKE_FLAGS}") -ADD_CUSTOM_TARGET(ipsec-mb ALL - COMMAND ${MAKE} -j ${MAKE_FLAGS} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/ -# VERBATIM - ) - -SET(LIB_PATH ${CMAKE_SOURCE_DIR}/) -IF (LIBRARY_LINKAGE STREQUAL "dynamic") - STRING(APPEND LIB_PATH libIPSec_MB.so) -ELSEIF (LIBRARY_LINKAGE STREQUAL "static") - STRING(APPEND LIB_PATH libIPSec_MB.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}/) diff --git a/external_imported/vcpkg/ports/intel-ipsec/always-generate-pdb.patch b/external_imported/vcpkg/ports/intel-ipsec/always-generate-pdb.patch new file mode 100644 index 000000000..24894e4e7 --- /dev/null +++ b/external_imported/vcpkg/ports/intel-ipsec/always-generate-pdb.patch @@ -0,0 +1,80 @@ +From 19d3b3fca689fb87e819b0b27bc74d1f52fcd2c8 Mon Sep 17 00:00:00 2001 +From: Billy Robert O'Neal III +Date: Wed, 12 Jan 2022 12:40:30 +0000 +Subject: [PATCH] lib: generate PDB in release build on Windows + +PDBs are necessary for postmortem debugging and for teams to get reports +from Watson, so they should be built for released software too. This +change always passes /DEBUG to the MSVC linker. That switch controls +whether a PDB is generated (as in "generate debugging information") not +a statement that the resulting files are the debug specific version of +your library. + +/DEBUG changes the default values of /INCREMENTAL (to on) and /OPT:REF +and /OPT:ICF to off, so those are changed back to incremental off and +linker optimizations on in debug builds. + +This missing PDB issue was discovered in fixing intel-ipsec's port in +vcpkg to build on Windows (https://github.com/microsoft/vcpkg/pull/22269). + +intel-ipsec-mb vcpkg PR link is https://github.com/microsoft/vcpkg/pull/5586 +--- + lib/win_x64.mak | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/lib/win_x64.mak b/lib/win_x64.mak +index 89162feb..bb62b2ea 100644 +--- a/lib/win_x64.mak ++++ b/lib/win_x64.mak +@@ -12,7 +12,7 @@ + # * Neither the name of Intel Corporation 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 +@@ -71,14 +71,14 @@ LIB_DIR = .\ + + !ifdef DEBUG + OPT = $(DEBUG_OPT) +-DCFLAGS = /DDEBUG /Z7 ++DCFLAGS = /DDEBUG + DAFLAGS = -gcv8 +-DLFLAGS = /DEBUG ++DLFLAGS = /DEBUG /INCREMENTAL:NO + !else + OPT = /O2 /Oi + DCFLAGS = + DAFLAGS = +-DLFLAGS = /RELEASE ++DLFLAGS = /RELEASE /DEBUG /OPT:REF /OPT:ICF /INCREMENTAL:NO + !endif + + !if "$(SAFE_DATA)" != "n" +@@ -98,7 +98,7 @@ DAFLAGS = $(DAFLAGS) -DSAFE_LOOKUP + + CC = cl + CFLAGS_ALL = $(EXTRA_CFLAGS) /DNO_COMPAT_IMB_API_053 /I. /Iinclude /Ino-aesni \ +- /nologo /Y- /W3 /WX- /Gm- /fp:precise /EHsc ++ /nologo /Y- /W3 /WX- /Gm- /fp:precise /EHsc /Z7 + + CFLAGS = $(CFLAGS_ALL) $(OPT) $(DCFLAGS) + CFLAGS_NO_SIMD = $(CFLAGS_ALL) /Od $(DCFLAGS) +@@ -633,6 +633,7 @@ install: + -copy /Y /V /B $(LIBBASE).lib "$(INSTDIR)" + -copy /Y /V /A intel-ipsec-mb.h "$(INSTDIR)" + !if "$(SHARED)" == "y" ++ -copy /Y /V /B $(LIB_DIR)\$(LIBBASE).pdb "$(INSTDIR)" + -copy /Y /V /B $(LIB_DIR)\$(LIBBASE).dll "$(INSTDIR)" + -copy /Y /V /B $(LIB_DIR)\$(LIBBASE).dll "%windir%\system32" + !endif +@@ -641,6 +642,7 @@ uninstall: + !if "$(SHARED)" == "y" + -del /Q "%windir%\system32\$(LIBBASE).dll" + -del /Q "$(INSTDIR)\$(LIBBASE).dll" ++ -del /Q "$(INSTDIR)\$(LIBBASE).pdb" + !endif + -del /Q "$(INSTDIR)\$(LIBBASE).def" + -del /Q "$(INSTDIR)\$(LIBBASE).exp" diff --git a/external_imported/vcpkg/ports/intel-ipsec/intel-ipsec-targets-implib.cmake.in b/external_imported/vcpkg/ports/intel-ipsec/intel-ipsec-targets-implib.cmake.in new file mode 100644 index 000000000..1a907fc97 --- /dev/null +++ b/external_imported/vcpkg/ports/intel-ipsec/intel-ipsec-targets-implib.cmake.in @@ -0,0 +1,5 @@ +set_property(TARGET IPSEC::ipsec APPEND PROPERTY IMPORTED_CONFIGURATIONS @INTEL_IPSEC_CONFIGURATION@) +set_target_properties(IPSEC::ipsec PROPERTIES + IMPORTED_LOCATION_@INTEL_IPSEC_CONFIGURATION@ "${_IMPORT_PREFIX}/@INTEL_IPSEC_LOCATION@" + IMPORTED_IMPLIB_@INTEL_IPSEC_CONFIGURATION@ "${_IMPORT_PREFIX}/@INTEL_IPSEC_IMPLIB@" + ) diff --git a/external_imported/vcpkg/ports/intel-ipsec/intel-ipsec-targets.cmake.in b/external_imported/vcpkg/ports/intel-ipsec/intel-ipsec-targets.cmake.in new file mode 100644 index 000000000..0f5983c96 --- /dev/null +++ b/external_imported/vcpkg/ports/intel-ipsec/intel-ipsec-targets.cmake.in @@ -0,0 +1,4 @@ +set_property(TARGET IPSEC::ipsec APPEND PROPERTY IMPORTED_CONFIGURATIONS @INTEL_IPSEC_CONFIGURATION@) +set_target_properties(IPSEC::ipsec PROPERTIES + IMPORTED_LOCATION_@INTEL_IPSEC_CONFIGURATION@ "${_IMPORT_PREFIX}/@INTEL_IPSEC_LOCATION@" + ) diff --git a/external_imported/vcpkg/ports/intel-ipsec/intel-ipsecConfig.cmake b/external_imported/vcpkg/ports/intel-ipsec/intel-ipsecConfig.cmake deleted file mode 100644 index 3861032d5..000000000 --- a/external_imported/vcpkg/ports/intel-ipsec/intel-ipsecConfig.cmake +++ /dev/null @@ -1,17 +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(ROOT "${CMAKE_CURRENT_LIST_FILE}" PATH) -GET_FILENAME_COMPONENT(ROOT "${ROOT}" PATH) -GET_FILENAME_COMPONENT(ROOT "${ROOT}" PATH) - -SET_LIBRARY_TARGET("IPSEC" "ipsec" "${ROOT}/debug/lib/libIPSec_MB.a" "${ROOT}/lib/libIPSec_MB.a" "${ROOT}/include/intel-ipsec") diff --git a/external_imported/vcpkg/ports/intel-ipsec/intel-ipsecConfig.cmake.in b/external_imported/vcpkg/ports/intel-ipsec/intel-ipsecConfig.cmake.in new file mode 100644 index 000000000..cc722d53b --- /dev/null +++ b/external_imported/vcpkg/ports/intel-ipsec/intel-ipsecConfig.cmake.in @@ -0,0 +1,16 @@ +if(TARGET IPSEC::ipsec) + return() +endif() + +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) # intel-ipsec +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) # share +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) # package root +add_library(IPSEC::ipsec @INTEL_IPSEC_STATIC_OR_SHARED@ IMPORTED) +set_target_properties(IPSEC::ipsec PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include") +set(IPSEC_ipsec_FOUND 1) + +get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +file(GLOB CONFIG_FILES "${_DIR}/intel-ipsec-targets-*.cmake") +foreach(f ${CONFIG_FILES}) + include(${f}) +endforeach() diff --git a/external_imported/vcpkg/ports/intel-ipsec/portfile.cmake b/external_imported/vcpkg/ports/intel-ipsec/portfile.cmake index 3218d67b0..eb945e1f9 100644 --- a/external_imported/vcpkg/ports/intel-ipsec/portfile.cmake +++ b/external_imported/vcpkg/ports/intel-ipsec/portfile.cmake @@ -1,58 +1,105 @@ -IF (VCPKG_TARGET_IS_WINDOWS) - SET(EXEC_ENV "Windows") -ELSE () - SET(EXEC_ENV "${VCPKG_CMAKE_SYSTEM_NAME}") -ENDIF () - -IF (NOT EXEC_ENV STREQUAL "Linux") - MESSAGE(FATAL_ERROR "Intel(R) Multi-Buffer Crypto for IPsec Library currently only supports Linux/Windows 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) Multi-Buffer Crypto for IPsec 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 intel/intel-ipsec-mb - REF v0.52 - SHA512 3b115fb6df53801800a63a3b62198165824a9262d579a7696f1ec365a5680282b172ffac742fe6453ae53b97043c19136adf558a85a0e51d163b27be2abc9e63 - HEAD_REF master +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO intel/intel-ipsec-mb + REF bde82c8737edc04d80549f0a68225ede7e5cefd #v1.1 + SHA512 f41dcde88b062e8ec2327987c6d36cd4f74a5e4fea386cc1ef8364f1dc432a2db02ca7d3312c0471b443cf93e815af6d74a4819c249afd6777aa91693b2546e5 + HEAD_REF master + PATCHES + always-generate-pdb.patch # https://github.com/intel/intel-ipsec-mb/pull/93 ) -VCPKG_FIND_ACQUIRE_PROGRAM(NASM) - -EXEC_PROGRAM(${NASM} - ARGS -v - OUTPUT_VARIABLE NASM_OUTPUT - ) -STRING(REGEX REPLACE "NASM version ([0-9]+\\.[0-9]+\\.[0-9]+).*" "\\1" - NASM_VERSION - ${NASM_OUTPUT}) -IF (NASM_VERSION VERSION_LESS 2.13.03) - MESSAGE(FATAL_ERROR "NASM version 2.13.03 (or newer) is required to build this package") -ENDIF () - -GET_FILENAME_COMPONENT(NASM_PATH ${NASM} DIRECTORY) -SET(ENV{PATH} " $ENV{PATH};${NASM_PATH} ") - -VCPKG_CONFIGURE_CMAKE( - SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR} - PREFER_NINJA - OPTIONS - -DSOURCE_PATH=${SOURCE_PATH} - -DEXEC_ENV=${VCPKG_CMAKE_SYSTEM_NAME} - -DLIBRARY_LINKAGE=${VCPKG_LIBRARY_LINKAGE} -) +vcpkg_find_acquire_program(NASM) +get_filename_component(NASM_DIR "${NASM}" DIRECTORY) +vcpkg_add_to_path(PREPEND "${NASM_DIR}") + +vcpkg_list(SET MAKE_OPTIONS) +set(INTEL_IPSEC_STATIC_OR_SHARED SHARED) +if ("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") + vcpkg_list(APPEND MAKE_OPTIONS SHARED=n) + set(INTEL_IPSEC_STATIC_OR_SHARED STATIC) +endif() + +set(DEBUG_LIB "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib") +set(RELEASE_LIB "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib") + +if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + vcpkg_build_nmake( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH lib + PROJECT_NAME win_x64.mak + OPTIONS ${MAKE_OPTIONS} + OPTIONS_DEBUG DEBUG=y + ) + + if(NOT "${VCPKG_BUILD_TYPE}" STREQUAL "release") + file(INSTALL "${DEBUG_LIB}/libIPSec_MB.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + set(INTEL_IPSEC_CONFIGURATION "DEBUG") + if ("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") + set(INTEL_IPSEC_LOCATION "debug/lib/libIPSec_MB.lib") + configure_file("${CMAKE_CURRENT_LIST_DIR}/intel-ipsec-targets.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/intel-ipsec-targets-debug.cmake" @ONLY) + else() + file(INSTALL "${DEBUG_LIB}/libIPSec_MB.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${DEBUG_LIB}/libIPSec_MB.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${DEBUG_LIB}/libIPSec_MB.exp" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + set(INTEL_IPSEC_LOCATION "debug/bin/libIPSec_MB.dll") + set(INTEL_IPSEC_IMPLIB "debug/lib/libIPSec_MB.lib") + configure_file("${CMAKE_CURRENT_LIST_DIR}/intel-ipsec-targets-implib.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/intel-ipsec-targets-debug.cmake" @ONLY) + endif() + endif() + + file(INSTALL "${RELEASE_LIB}/libIPSec_MB.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + set(INTEL_IPSEC_CONFIGURATION "RELEASE") + if ("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") + set(INTEL_IPSEC_LOCATION "lib/libIPSec_MB.lib") + configure_file("${CMAKE_CURRENT_LIST_DIR}/intel-ipsec-targets.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/intel-ipsec-targets-release.cmake" @ONLY) + else() + file(INSTALL "${RELEASE_LIB}/libIPSec_MB.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${RELEASE_LIB}/libIPSec_MB.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${RELEASE_LIB}/libIPSec_MB.exp" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + set(INTEL_IPSEC_LOCATION "bin/libIPSec_MB.dll") + set(INTEL_IPSEC_IMPLIB "lib/libIPSec_MB.lib") + configure_file("${CMAKE_CURRENT_LIST_DIR}/intel-ipsec-targets-implib.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/intel-ipsec-targets-release.cmake" @ONLY) + endif() +else() + if ("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") + set(LIB_SUFFIX ".a") + else() + set(LIB_SUFFIX ".so") + endif() + + find_program(MAKE make REQUIRED) + if(NOT "${VCPKG_BUILD_TYPE}" STREQUAL "release") + message(STATUS "Building ${TARGET_TRIPLET}-dbg") + set(INTEL_IPSEC_CONFIGURATION "DEBUG") + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + file(COPY "${SOURCE_PATH}/" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + vcpkg_execute_build_process( + COMMAND "${MAKE}" "-j${VCPKG_CONCURRENCY}" ${MAKE_OPTIONS} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib" + LOGNAME "build-${TARGET_TRIPLET}-dbg" + ) + + file(INSTALL "${DEBUG_LIB}/libIPSec_MB${LIB_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + set(INTEL_IPSEC_LOCATION "debug/lib/libIPSec_MB${LIB_SUFFIX}") + configure_file("${CMAKE_CURRENT_LIST_DIR}/intel-ipsec-targets.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/intel-ipsec-targets-debug.cmake" @ONLY) + endif() + + message(STATUS "Building ${TARGET_TRIPLET}-rel") + set(INTEL_IPSEC_CONFIGURATION "RELEASE") + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + file(COPY "${SOURCE_PATH}/" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + vcpkg_execute_build_process( + COMMAND "${MAKE}" -j ${MAKE_OPTIONS} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib" + LOGNAME "build-${TARGET_TRIPLET}-rel" + ) -VCPKG_INSTALL_CMAKE() + file(INSTALL "${RELEASE_LIB}/libIPSec_MB${LIB_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + set(INTEL_IPSEC_LOCATION "lib/libIPSec_MB${LIB_SUFFIX}") + configure_file("${CMAKE_CURRENT_LIST_DIR}/intel-ipsec-targets.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/intel-ipsec-targets-release.cmake" @ONLY) +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}/intel-ipsecConfig.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) +file(INSTALL "${SOURCE_PATH}/lib/intel-ipsec-mb.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +configure_file("${CMAKE_CURRENT_LIST_DIR}/intel-ipsecConfig.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/intel-ipsecConfig.cmake" @ONLY) +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/intel-ipsec/vcpkg.json b/external_imported/vcpkg/ports/intel-ipsec/vcpkg.json index eb8da35ce..2083fbf77 100644 --- a/external_imported/vcpkg/ports/intel-ipsec/vcpkg.json +++ b/external_imported/vcpkg/ports/intel-ipsec/vcpkg.json @@ -1,6 +1,6 @@ { "name": "intel-ipsec", - "version-string": "0.52", - "port-version": 2, - "description": "Intel(R) Multi-Buffer Crypto for IPsec Library" + "version": "1.1", + "description": "Intel(R) Multi-Buffer Crypto for IPsec Library", + "supports": "x64 & (windows | linux) & !uwp" } diff --git a/external_imported/vcpkg/ports/intelrdfpmathlib/portfile.cmake b/external_imported/vcpkg/ports/intelrdfpmathlib/portfile.cmake index 9aad26f84..5b05fd56b 100644 --- a/external_imported/vcpkg/ports/intelrdfpmathlib/portfile.cmake +++ b/external_imported/vcpkg/ports/intelrdfpmathlib/portfile.cmake @@ -13,16 +13,15 @@ vcpkg_extract_source_archive_ex( set(LIB_SOURCE_PATH "${SOURCE_PATH}/LIBRARY") -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION "${LIB_SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${LIB_SOURCE_PATH}") -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${LIB_SOURCE_PATH}" - PREFER_NINJA OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Handle copyright -file(INSTALL ${SOURCE_PATH}/eula.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/IntelRDFPMathLib RENAME copyright) +file(INSTALL "${SOURCE_PATH}/eula.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/intelrdfpmathlib/vcpkg.json b/external_imported/vcpkg/ports/intelrdfpmathlib/vcpkg.json index 661c295ad..1be8cccde 100644 --- a/external_imported/vcpkg/ports/intelrdfpmathlib/vcpkg.json +++ b/external_imported/vcpkg/ports/intelrdfpmathlib/vcpkg.json @@ -1,6 +1,12 @@ { "name": "intelrdfpmathlib", "version-string": "20U2", - "port-version": 2, - "description": "Intel(R) Decimal Floating-Point Math Library" + "port-version": 3, + "description": "Intel(R) Decimal Floating-Point Math Library", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/irrlicht/portfile.cmake b/external_imported/vcpkg/ports/irrlicht/portfile.cmake index 9641f8fdd..37f4ee26e 100644 --- a/external_imported/vcpkg/ports/irrlicht/portfile.cmake +++ b/external_imported/vcpkg/ports/irrlicht/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") - vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO irrlicht/Irrlicht%20SDK @@ -12,7 +10,16 @@ vcpkg_from_sourceforge( fix-osx-compilation.patch ) -configure_file(${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY) +if(VCPKG_TARGET_IS_LINUX) + message( +"Irrlicht currently requires the following libraries from the system package manager: + libgl1-mesa + xf86vmode + +These can be installed on Ubuntu systems via sudo apt-get install libgl1-mesa-dev libxxf86vm-dev") +endif() + +configure_file("${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" "${SOURCE_PATH}/CMakeLists.txt" COPYONLY) vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -25,7 +32,7 @@ vcpkg_check_features( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED_LIB) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DIRR_SHARED_LIB=${SHARED_LIB} ${FEATURE_OPTIONS} @@ -36,15 +43,15 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup() if("tools" IN_LIST FEATURES) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/irrlicht/) + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/irrlicht/") endif() -file(WRITE ${CURRENT_PACKAGES_DIR}/share/irrlicht/irrlicht-config.cmake "include(\${CMAKE_CURRENT_LIST_DIR}/irrlicht-targets.cmake)") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/irrlicht/irrlicht-config.cmake" "include(\${CMAKE_CURRENT_LIST_DIR}/irrlicht-targets.cmake)") vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/irrlicht) + file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/irrlicht") endif() -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/irrlicht/vcpkg.json b/external_imported/vcpkg/ports/irrlicht/vcpkg.json index 2f348b948..1815c8040 100644 --- a/external_imported/vcpkg/ports/irrlicht/vcpkg.json +++ b/external_imported/vcpkg/ports/irrlicht/vcpkg.json @@ -1,7 +1,7 @@ { "name": "irrlicht", "version-string": "1.8.4", - "port-version": 12, + "port-version": 13, "description": "The Irrlicht Engine is an open source realtime 3D engine written in C++. It is cross-platform, using D3D, OpenGL and its own software renderers.", "homepage": "http://irrlicht.sourceforge.net", "supports": "!(arm | uwp)", diff --git a/external_imported/vcpkg/ports/itk/cufftw.patch b/external_imported/vcpkg/ports/itk/cufftw.patch deleted file mode 100644 index 17365fb2f..000000000 --- a/external_imported/vcpkg/ports/itk/cufftw.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 0f47aae05217884193a39690c2beef566f4ed3b1 Mon Sep 17 00:00:00 2001 -From: Stephen Aylward -Date: Sat, 25 Apr 2020 20:15:21 -0400 -Subject: [PATCH] BUG: CUFFTW paths were not being set and unnecessary FFTW - files used - -FindFFTW sets the FFTW_INCLUDES variable. The FFTW_INCLUDE_PATH var is -specific to FFTW (not used by CUFFTW). - -FFTWGlobalConfiguration file is only needed if FFTW is being used, -not if CUFFT is being used. ---- - CMake/FindFFTW.cmake | 2 +- - Modules/Filtering/FFT/CMakeLists.txt | 2 +- - Modules/Filtering/FFT/src/CMakeLists.txt | 9 +++++---- - 3 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/CMake/FindFFTW.cmake b/CMake/FindFFTW.cmake -index 785edc2b628..e1935899cab 100644 ---- a/CMake/FindFFTW.cmake -+++ b/CMake/FindFFTW.cmake -@@ -62,7 +62,7 @@ if(ITK_USE_FFTWD OR ITK_USE_FFTWF) - find_path(FFTW_INCLUDE_PATH fftw3.h ${FFTW_INC_SEARCHPATH}) - endif() - -- if(FFTW_INCLUDE_PATH) -+ if(FFTW_INCLUDE_PATH OR CUFFTW_INCLUDE_PATH) - if(ITK_USE_CUFFTW) - file(TO_CMAKE_PATH "${CUFFTW_INCLUDE_PATH}" CUFFTW_INCLUDE_PATH) - set(FFTW_INCLUDE ${CUFFTW_INCLUDE_PATH}) -diff --git a/Modules/Filtering/FFT/CMakeLists.txt b/Modules/Filtering/FFT/CMakeLists.txt -index 7d9d1900b56..713530149cb 100644 ---- a/Modules/Filtering/FFT/CMakeLists.txt -+++ b/Modules/Filtering/FFT/CMakeLists.txt -@@ -5,5 +5,5 @@ if(ITK_USE_CUFFTW) - else() - set(ITKFFT_LIBRARIES ITKFFT) - endif() --set(ITKFFT_INCLUDE_DIRS ${FFTW_INCLUDE_PATH}) -+set(ITKFFT_INCLUDE_DIRS ${FFTW_INCLUDE}) - itk_module_impl() -diff --git a/Modules/Filtering/FFT/src/CMakeLists.txt b/Modules/Filtering/FFT/src/CMakeLists.txt -index 3f3137b8cd4..bde3ee906f8 100644 ---- a/Modules/Filtering/FFT/src/CMakeLists.txt -+++ b/Modules/Filtering/FFT/src/CMakeLists.txt -@@ -1,7 +1,8 @@ --set(ITKFFT_SRCS -- itkFFTWGlobalConfiguration.cxx -- itkComplexToComplexFFTImageFilter.cxx -- ) -+set(ITKFFT_SRCS itkComplexToComplexFFTImageFilter.cxx) -+ -+if( ITK_USE_FFTWF OR ITK_USE_FFTWD AND NOT ITK_USE_CUFFTW) -+ list(APPEND ITKFFT_SRCS itkFFTWGlobalConfiguration.cxx ) -+endif() - - itk_module_add_library(ITKFFT ${ITKFFT_SRCS}) - diff --git a/external_imported/vcpkg/ports/itk/hdf5.patch b/external_imported/vcpkg/ports/itk/hdf5.patch deleted file mode 100644 index 091594cda..000000000 --- a/external_imported/vcpkg/ports/itk/hdf5.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/Modules/ThirdParty/HDF5/CMakeLists.txt b/Modules/ThirdParty/HDF5/CMakeLists.txt -index a700ecdfb..0a683a52b 100644 ---- a/Modules/ThirdParty/HDF5/CMakeLists.txt -+++ b/Modules/ThirdParty/HDF5/CMakeLists.txt -@@ -25,11 +25,11 @@ endif() - ") - endif() - -- set(ITKHDF5_LIBRARIES ) -- if(BUILD_SHARED_LIBS) -- list(APPEND ITKHDF5_LIBRARIES ${HDF5_C_SHARED_LIBRARY} ${HDF5_CXX_SHARED_LIBRARY}) -+ set(ITKHDF5_LIBRARIES) -+ if(HDF5_BUILD_SHARED_LIBS) -+ list(APPEND ITKHDF5_LIBRARIES hdf5::hdf5_cpp-shared hdf5::hdf5-shared) - else() -- list(APPEND ITKHDF5_LIBRARIES ${HDF5_C_STATIC_LIBRARY} ${HDF5_CXX_STATIC_LIBRARY}) -+ list(APPEND ITKHDF5_LIBRARIES hdf5::hdf5_cpp-static hdf5::hdf5-static) - endif() - - set(ITKHDF5_INCLUDE_DIRS diff --git a/external_imported/vcpkg/ports/itk/portfile.cmake b/external_imported/vcpkg/ports/itk/portfile.cmake index 12eb0bf43..b36ce928a 100644 --- a/external_imported/vcpkg/ports/itk/portfile.cmake +++ b/external_imported/vcpkg/ports/itk/portfile.cmake @@ -3,19 +3,16 @@ vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO InsightSoftwareConsortium/ITK - REF d3286c9cc04ba16cc8f73de9a98fbcd7c02f3c7b - SHA512 c358449870d580aeb10e32f8be0ca39e8a76d8dc06fda973788fafb5971333e546611c399190be49d40f5f3c18a1105d9699eef271a560aff25ce168a396926e + REF 95800fd4d4b08678a6c0ebb63eb242893025b660 #5.2.1 + SHA512 fe703bc6ed681cb9983d7d6e21c8ffa7650337e470c09a7241de58a463c23e315516b1a81a18c14f682706056a0ec66932b63d2e24945bdcea03169bc1122bb2 HEAD_REF master PATCHES - hdf5.patch double-conversion.patch openjpeg.patch openjpeg2.patch var_libraries.patch wrapping.patch - python_gpu_wrapping.patch opencl.patch - cufftw.patch use-the-lrintf-intrinsic.patch ) @@ -29,6 +26,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "tbb" Module_ITKTBB "rtk" Module_RTK "tools" RTK_BUILD_APPLICATIONS + "opencv" Module_ITKVideoBridgeOpenCV # There are a lot of more (remote) modules and options in ITK # feel free to add those as a feature ) @@ -111,6 +109,12 @@ if("python" IN_LIST FEATURES) ) #ITK_PYTHON_SITE_PACKAGES_SUFFIX should be set to the install dir of the site-packages within vcpkg endif() +if("opencv" IN_LIST FEATURES) + message(STATUS "${PORT} includes the ITKVideoBridgeOpenCV") + list(APPEND ADDITIONAL_OPTIONS + -DModule_ITKVideoBridgeOpenCV:BOOL=ON + ) +endif() set(USE_64BITS_IDS OFF) if (VCPKG_TARGET_ARCHITECTURE STREQUAL x64 OR VCPKG_TARGET_ARCHITECTURE STREQUAL arm64) @@ -194,9 +198,9 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/cmake") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE "${CURRENT_PACKAGES_DIR}/include/ITK-5.1/vcl_where_root_dir.h") +file(REMOVE "${CURRENT_PACKAGES_DIR}/include/ITK-5.3/vcl_where_root_dir.h") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ITK-5.1/itk_eigen.h" "include(${SOURCE_PATH}/CMake/UseITK.cmake)" "include(UseITK)") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ITK-5.1/itk_eigen.h" "message(STATUS \"From ITK: Eigen3_DIR: ${CURRENT_INSTALLED_DIR}/share/eigen3\")" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ITK-5.3/itk_eigen.h" "include(${SOURCE_PATH}/CMake/UseITK.cmake)" "include(UseITK)") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ITK-5.3/itk_eigen.h" "message(STATUS \"From ITK: Eigen3_DIR: ${CURRENT_INSTALLED_DIR}/share/eigen3\")" "") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/itk/python_gpu_wrapping.patch b/external_imported/vcpkg/ports/itk/python_gpu_wrapping.patch deleted file mode 100644 index 37367d979..000000000 --- a/external_imported/vcpkg/ports/itk/python_gpu_wrapping.patch +++ /dev/null @@ -1,178 +0,0 @@ -diff --git a/CMake/itkOpenCL.cmake b/CMake/itkOpenCL.cmake -index 0ccbe144d..fa381524f 100644 ---- a/CMake/itkOpenCL.cmake -+++ b/CMake/itkOpenCL.cmake -@@ -48,7 +48,7 @@ if(ITK_USE_GPU) - ) - set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_FILE} - PROPERTIES GENERATED ON) -- set(${SRC_VAR} ${${SRC_VAR}} ${OUTPUT_FILE}) -+ set(${SRC_VAR} ${${SRC_VAR}} ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_FILE}) - endmacro() - - macro(write_gpu_kernels GPUKernels GPU_SRC) -diff --git a/Modules/Core/Common/include/itkMacro.h b/Modules/Core/Common/include/itkMacro.h -index 1816f722a..3a6a8aee5 100644 ---- a/Modules/Core/Common/include/itkMacro.h -+++ b/Modules/Core/Common/include/itkMacro.h -@@ -1141,7 +1141,7 @@ compilers. - #define itkGetVectorMacro(name, type, count) \ - virtual type * Get##name() const { return this->m_##name; } - --/**\def itkGPUKernelClassMacro -+/**\def class itkGPUKernelClassMacro - * Construct a non-templatized helper class that - * provides the GPU kernel source code as a const char* - */ -@@ -1150,7 +1150,7 @@ compilers. - * Workaround KWstyle bug \ \ - * \ingroup ITKCommon \ \ - */ \ -- class kernel \ -+ kernel \ - { \ - public: \ - static const char * \ -diff --git a/Modules/Core/GPUCommon/include/itkGPUImageOps.h b/Modules/Core/GPUCommon/include/itkGPUImageOps.h -index f4eb8f33b..fbdf3d757 100644 ---- a/Modules/Core/GPUCommon/include/itkGPUImageOps.h -+++ b/Modules/Core/GPUCommon/include/itkGPUImageOps.h -@@ -23,7 +23,7 @@ - namespace itk - { - /** Create a helper GPU Kernel class for GPUImageOps */ --itkGPUKernelClassMacro(GPUImageOpsKernel); -+class itkGPUKernelClassMacro(GPUImageOpsKernel); - - /** \class GPUImageOps - * -diff --git a/Modules/Core/GPUCommon/include/itkGPUReduction.h b/Modules/Core/GPUCommon/include/itkGPUReduction.h -index 524a5cd01..1b3ce91e9 100644 ---- a/Modules/Core/GPUCommon/include/itkGPUReduction.h -+++ b/Modules/Core/GPUCommon/include/itkGPUReduction.h -@@ -26,7 +26,7 @@ - namespace itk - { - /** Create a helper GPU Kernel class for GPUReduction */ --itkGPUKernelClassMacro(GPUReductionKernel); -+class itkGPUKernelClassMacro(GPUReductionKernel); - - /** - * \class GPUReduction -diff --git a/Modules/Core/GPUFiniteDifference/include/itkGPUDenseFiniteDifferenceImageFilter.h b/Modules/Core/GPUFiniteDifference/include/itkGPUDenseFiniteDifferenceImageFilter.h -index 853801cec..2fccf0bc5 100644 ---- a/Modules/Core/GPUFiniteDifference/include/itkGPUDenseFiniteDifferenceImageFilter.h -+++ b/Modules/Core/GPUFiniteDifference/include/itkGPUDenseFiniteDifferenceImageFilter.h -@@ -24,7 +24,7 @@ - namespace itk - { - /** Create a helper GPU Kernel class for GPUDenseFiniteDifferenceImageFilter */ --itkGPUKernelClassMacro(GPUDenseFiniteDifferenceImageFilterKernel); -+class ITKGPUFiniteDifference_EXPORT itkGPUKernelClassMacro(GPUDenseFiniteDifferenceImageFilterKernel); - - /** - * \class GPUDenseFiniteDifferenceImageFilter -diff --git a/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUGradientNDAnisotropicDiffusionFunction.h b/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUGradientNDAnisotropicDiffusionFunction.h -index 4245ff914..1b21b709e 100644 ---- a/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUGradientNDAnisotropicDiffusionFunction.h -+++ b/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUGradientNDAnisotropicDiffusionFunction.h -@@ -54,7 +54,7 @@ namespace itk - */ - - /** Create a helper GPU Kernel class for GPUGradientNDAnisotropicDiffusionFunction */ --itkGPUKernelClassMacro(GPUGradientNDAnisotropicDiffusionFunctionKernel); -+class itkGPUKernelClassMacro(GPUGradientNDAnisotropicDiffusionFunctionKernel); - - template - class ITK_TEMPLATE_EXPORT GPUGradientNDAnisotropicDiffusionFunction -diff --git a/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUScalarAnisotropicDiffusionFunction.h b/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUScalarAnisotropicDiffusionFunction.h -index 305f6490e..d0d433080 100644 ---- a/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUScalarAnisotropicDiffusionFunction.h -+++ b/Modules/Filtering/GPUAnisotropicSmoothing/include/itkGPUScalarAnisotropicDiffusionFunction.h -@@ -32,7 +32,7 @@ namespace itk - * */ - - /** Create a helper GPU Kernel class for GPUScalarAnisotropicDiffusionFunction */ --itkGPUKernelClassMacro(GPUScalarAnisotropicDiffusionFunctionKernel); -+class itkGPUKernelClassMacro(GPUScalarAnisotropicDiffusionFunctionKernel); - - template - class ITK_TEMPLATE_EXPORT GPUScalarAnisotropicDiffusionFunction : public GPUAnisotropicDiffusionFunction -diff --git a/Modules/Filtering/GPUImageFilterBase/include/itkGPUCastImageFilter.h b/Modules/Filtering/GPUImageFilterBase/include/itkGPUCastImageFilter.h -index 23530ac5c..e1b83f696 100644 ---- a/Modules/Filtering/GPUImageFilterBase/include/itkGPUCastImageFilter.h -+++ b/Modules/Filtering/GPUImageFilterBase/include/itkGPUCastImageFilter.h -@@ -29,7 +29,7 @@ namespace itk - { - - /** Create a helper GPU Kernel class for GPUCastImageFilter */ --itkGPUKernelClassMacro(GPUCastImageFilterKernel); -+class itkGPUKernelClassMacro(GPUCastImageFilterKernel); - - /** \class GPUCastImageFilter - * \brief GPU version of CastImageFilter. -diff --git a/Modules/Filtering/GPUImageFilterBase/include/itkGPUNeighborhoodOperatorImageFilter.h b/Modules/Filtering/GPUImageFilterBase/include/itkGPUNeighborhoodOperatorImageFilter.h -index c4adc2967..69aeac6db 100644 ---- a/Modules/Filtering/GPUImageFilterBase/include/itkGPUNeighborhoodOperatorImageFilter.h -+++ b/Modules/Filtering/GPUImageFilterBase/include/itkGPUNeighborhoodOperatorImageFilter.h -@@ -41,7 +41,7 @@ namespace itk - */ - - /** Create a helper GPU Kernel class for GPUNeighborhoodOperatorImageFilter */ --itkGPUKernelClassMacro(GPUNeighborhoodOperatorImageFilterKernel); -+class itkGPUKernelClassMacro(GPUNeighborhoodOperatorImageFilterKernel); - - template - class ITK_TEMPLATE_EXPORT GPUMeanImageFilter -diff --git a/Modules/Filtering/GPUThresholding/include/itkGPUBinaryThresholdImageFilter.h b/Modules/Filtering/GPUThresholding/include/itkGPUBinaryThresholdImageFilter.h -index 8d26dcfc5..613bc623f 100644 ---- a/Modules/Filtering/GPUThresholding/include/itkGPUBinaryThresholdImageFilter.h -+++ b/Modules/Filtering/GPUThresholding/include/itkGPUBinaryThresholdImageFilter.h -@@ -85,7 +85,7 @@ private: - } // end of namespace Functor - - /** Create a helper GPU Kernel class for GPUBinaryThresholdImageFilter */ --itkGPUKernelClassMacro(GPUBinaryThresholdImageFilterKernel); -+class itkGPUKernelClassMacro(GPUBinaryThresholdImageFilterKernel); - - /** - * \class GPUBinaryThresholdImageFilter -diff --git a/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.h b/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.h -index 28b21d592..0b46e27b8 100644 ---- a/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.h -+++ b/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.h -@@ -51,7 +51,7 @@ namespace itk - * \ingroup ITKGPUPDEDeformableRegistration - */ - /** Create a helper GPU Kernel class for GPUDemonsRegistrationFunction */ --itkGPUKernelClassMacro(GPUDemonsRegistrationFunctionKernel); -+class itkGPUKernelClassMacro(GPUDemonsRegistrationFunctionKernel); - - template - class ITK_TEMPLATE_EXPORT GPUDemonsRegistrationFunction -diff --git a/Modules/Registration/GPUPDEDeformable/include/itkGPUPDEDeformableRegistrationFilter.h b/Modules/Registration/GPUPDEDeformable/include/itkGPUPDEDeformableRegistrationFilter.h -index 93ab975ec..0afd84871 100644 ---- a/Modules/Registration/GPUPDEDeformable/include/itkGPUPDEDeformableRegistrationFilter.h -+++ b/Modules/Registration/GPUPDEDeformable/include/itkGPUPDEDeformableRegistrationFilter.h -@@ -73,7 +73,7 @@ namespace itk - */ - - /** Create a helper GPU Kernel class for GPUPDEDeformableRegistrationFilter */ --itkGPUKernelClassMacro(GPUPDEDeformableRegistrationFilterKernel); -+class itkGPUKernelClassMacro(GPUPDEDeformableRegistrationFilterKernel); - - template ,zstd::libzstd_shared,zstd::libzstd_static>) + endif() + + diff --git a/external_imported/vcpkg/ports/kf5archive/portfile.cmake b/external_imported/vcpkg/ports/kf5archive/portfile.cmake index ec03f9f04..ec0c2dd98 100644 --- a/external_imported/vcpkg/ports/kf5archive/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5archive/portfile.cmake @@ -5,13 +5,14 @@ vcpkg_from_github( SHA512 e77d5233b6549332f180be3dcf0459688d6565c24e1af409814aab92d415ebb2b8a04ad720dfa9ed6f017f3ab86fab766b909e30a860bb83c5ddd51def7c3e5f HEAD_REF master PATCHES - use_cmake_to_find_zstd.patch # https://invent.kde.org/frameworks/karchive/-/merge_requests/24 + control-dependencies.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - INVERTED_FEATURES - "lzma" CMAKE_DISABLE_FIND_PACKAGE_LibLZMA - "zstd" CMAKE_DISABLE_FIND_PACKAGE_ZSTD + FEATURES + "bzip2" VCPKG_USE_BZIP2 + "lzma" VCPKG_USE_LIBLZMA + "zstd" VCPKG_USE_ZSTD ) # Prevent KDEClangFormat from writing to source effectively blocking parallel configure @@ -20,6 +21,7 @@ file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: fa vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + -DCMAKE_DISABLE_FIND_PACKAGE_PkgConfig=ON -DBUILD_TESTING=OFF ${FEATURE_OPTIONS} ) @@ -35,4 +37,4 @@ 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(INSTALL "${SOURCE_PATH}/LICENSES/LGPL-2.0-or-later.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/kf5archive/use_cmake_to_find_zstd.patch b/external_imported/vcpkg/ports/kf5archive/use_cmake_to_find_zstd.patch deleted file mode 100644 index ee7dfd555..000000000 --- a/external_imported/vcpkg/ports/kf5archive/use_cmake_to_find_zstd.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 82fc20234d4cf8abdec1a2b4fea9823154f1aecc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= -Date: Fri, 27 Aug 2021 01:48:53 +0200 -Subject: [PATCH] Use CMake to find ZSTD - ---- - CMakeLists.txt | 11 +++++------ - KF5ArchiveConfig.cmake.in | 3 +-- - 2 files changed, 6 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8ab85f4..ece1f77 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -44,12 +44,11 @@ set_package_properties(LibLZMA PROPERTIES - PURPOSE "Support for xz compressed files and data streams" - ) - --find_package(PkgConfig) --if (PkgConfig_FOUND) -- pkg_check_modules(LibZstd IMPORTED_TARGET "libzstd") --endif() --add_feature_info(LibZstd LibZstd_FOUND -- "Support for zstd compressed files and data streams" -+find_package(ZSTD) -+set_package_properties(LibZstd PROPERTIES -+ URL "http://www.zstd.net" -+ DESCRIPTION "Support for zstd compressed files and data streams" -+ PURPOSE "Support for zstd compressed files and data streams" - ) - - include(ECMSetupVersion) -diff --git a/KF5ArchiveConfig.cmake.in b/KF5ArchiveConfig.cmake.in -index 0a738c2..d868324 100644 ---- a/KF5ArchiveConfig.cmake.in -+++ b/KF5ArchiveConfig.cmake.in -@@ -23,8 +23,7 @@ if (NOT @BUILD_SHARED_LIBS@) - endif() - - if (@LibZstd_FOUND@) -- find_package(PkgConfig) -- pkg_check_modules(LibZstd IMPORTED_TARGET "libzstd") -+ find_dependency(ZSTD) - endif() - endif() - --- -GitLab - diff --git a/external_imported/vcpkg/ports/kf5archive/vcpkg.json b/external_imported/vcpkg/ports/kf5archive/vcpkg.json index 8caa55f6f..a6a778d87 100644 --- a/external_imported/vcpkg/ports/kf5archive/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5archive/vcpkg.json @@ -1,10 +1,11 @@ { "name": "kf5archive", "version": "5.89.0", + "port-version": 1, "description": "File compression", "homepage": "https://api.kde.org/frameworks/karchive/html/index.html", + "license": "LGPL-2.0-or-later", "dependencies": [ - "bzip2", "ecm", "qt5-base", { @@ -17,7 +18,16 @@ }, "zlib" ], + "default-features": [ + "bzip2" + ], "features": { + "bzip2": { + "description": "Support for bzip2 compressed files and data streams", + "dependencies": [ + "bzip2" + ] + }, "lzma": { "description": "Support for xz compressed files and data streams", "dependencies": [ diff --git a/external_imported/vcpkg/ports/kfr/portfile.cmake b/external_imported/vcpkg/ports/kfr/portfile.cmake index ca8f4a0fd..c632bb1d9 100644 --- a/external_imported/vcpkg/ports/kfr/portfile.cmake +++ b/external_imported/vcpkg/ports/kfr/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "Linux") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/external_imported/vcpkg/ports/kfr/vcpkg.json b/external_imported/vcpkg/ports/kfr/vcpkg.json index ecf2ac02d..913744529 100644 --- a/external_imported/vcpkg/ports/kfr/vcpkg.json +++ b/external_imported/vcpkg/ports/kfr/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kfr", "version-semver": "4.2.1", + "port-version": 1, "description": "Fast, modern C++ DSP framework.", "homepage": "https://www.kfr.dev/", "license": "GPL-2.0", diff --git a/external_imported/vcpkg/ports/kinectsdk1/portfile.cmake b/external_imported/vcpkg/ports/kinectsdk1/portfile.cmake index adcb82a52..305f9d7bb 100644 --- a/external_imported/vcpkg/ports/kinectsdk1/portfile.cmake +++ b/external_imported/vcpkg/ports/kinectsdk1/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm") - set(KINECTSDK10_VERSION "v1.8") vcpkg_download_distfile(KINECTSDK10_INSTALLER URLS "https://download.microsoft.com/download/E/1/D/E1DEC243-0389-4A23-87BF-F47DE869FC1A/KinectSDK-${KINECTSDK10_VERSION}-Setup.exe" @@ -63,4 +61,4 @@ file( ) # Handle copyright -file(INSTALL ${KINECTSDK10_DIR}/SDKEula.rtf DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +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 230677a25..225fe460e 100644 --- a/external_imported/vcpkg/ports/kinectsdk1/vcpkg.json +++ b/external_imported/vcpkg/ports/kinectsdk1/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kinectsdk1", - "version-string": "1.8", - "port-version": 3, + "version": "1.8", + "port-version": 4, "description": "Kinect for Windows SDK for Kinect v1 sensor.", "supports": "!arm" } diff --git a/external_imported/vcpkg/ports/knet/portfile.cmake b/external_imported/vcpkg/ports/knet/portfile.cmake index 73e97179b..d3330ad11 100644 --- a/external_imported/vcpkg/ports/knet/portfile.cmake +++ b/external_imported/vcpkg/ports/knet/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/external_imported/vcpkg/ports/knet/vcpkg.json b/external_imported/vcpkg/ports/knet/vcpkg.json index dfad9b2c1..a5a5c2411 100644 --- a/external_imported/vcpkg/ports/knet/vcpkg.json +++ b/external_imported/vcpkg/ports/knet/vcpkg.json @@ -1,6 +1,7 @@ { "name": "knet", "version": "1.1.0", + "port-version": 1, "description": "A cross platform lock-free and timer-supported C++11 network library.", "homepage": "https://github.com/kibaamor/knet", "license": "MIT", diff --git a/external_imported/vcpkg/ports/krabsetw/portfile.cmake b/external_imported/vcpkg/ports/krabsetw/portfile.cmake index 7dcb2c7fb..ee321fc61 100644 --- a/external_imported/vcpkg/ports/krabsetw/portfile.cmake +++ b/external_imported/vcpkg/ports/krabsetw/portfile.cmake @@ -1,7 +1,3 @@ -# Header-only library - -vcpkg_fail_port_install(ON_TARGET "UWP" "LINUX" "OSX" "FREEBSD" "ANDROID" "MINGW") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/krabsetw diff --git a/external_imported/vcpkg/ports/krabsetw/vcpkg.json b/external_imported/vcpkg/ports/krabsetw/vcpkg.json index 937493786..9027ddacb 100644 --- a/external_imported/vcpkg/ports/krabsetw/vcpkg.json +++ b/external_imported/vcpkg/ports/krabsetw/vcpkg.json @@ -1,6 +1,7 @@ { "name": "krabsetw", - "version-string": "4.1.18", + "version": "4.1.18", + "port-version": 1, "description": "krabsetw is a header-only C++ library that simplifies interacting with ETW.", "homepage": "https://github.com/microsoft/krabsetw", "supports": "windows & !uwp" diff --git a/external_imported/vcpkg/ports/ktx/portfile.cmake b/external_imported/vcpkg/ports/ktx/portfile.cmake index 8731a85b8..ab105302a 100644 --- a/external_imported/vcpkg/ports/ktx/portfile.cmake +++ b/external_imported/vcpkg/ports/ktx/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "x86" "arm64") - set(PORT_VERSION 4.0.0) vcpkg_from_github( @@ -23,8 +21,8 @@ if(VCPKG_TARGET_IS_WINDOWS) "https://repo.msys2.org/msys/x86_64/util-linux-2.35.2-1-x86_64.pkg.tar.zst" ff951c2cd96d0fda87bacb505c93e4aa1f9aeb35f829c52b5a7862d05e167f69605a4927a0e7197b5ee2b2fa5cb56619ad7a6ba293ede4765fdcacedf2ed35da ) - vcpkg_add_to_path(${MSYS_ROOT}/usr/bin) - + vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") + file(REMOVE "${SOURCE_PATH}/other_include/zstd.h" "${SOURCE_PATH}/other_include/zstd_errors.h") @@ -38,19 +36,18 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vulkan KTX_FEATURE_VULKAN ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DKTX_VERSION_FULL=v${PORT_VERSION} -DKTX_FEATURE_TESTS=OFF -DKTX_FEATURE_LOADTEST_APPS=OFF -DKTX_FEATURE_STATIC_LIBRARY=${ENABLE_STATIC} ${FEATURE_OPTIONS} + DISABLE_PARALLEL_CONFIGURE ) -vcpkg_install_cmake() - +vcpkg_cmake_install() vcpkg_copy_pdbs() if(tools IN_LIST FEATURES) @@ -66,12 +63,15 @@ if(tools IN_LIST FEATURES) vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) endif() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ktx) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ktx) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + +if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() configure_file("${SOURCE_PATH}/LICENSE.md" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") -file(COPY ${LICENSE_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSES") \ No newline at end of file +file(COPY ${LICENSE_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSES") diff --git a/external_imported/vcpkg/ports/ktx/vcpkg.json b/external_imported/vcpkg/ports/ktx/vcpkg.json index ae905f55d..c2d458df2 100644 --- a/external_imported/vcpkg/ports/ktx/vcpkg.json +++ b/external_imported/vcpkg/ports/ktx/vcpkg.json @@ -1,10 +1,19 @@ { "name": "ktx", "version": "4.0.0", + "port-version": 2, "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)", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zstd" ], "features": { diff --git a/external_imported/vcpkg/ports/kubernetes/001-fix-destination.patch b/external_imported/vcpkg/ports/kubernetes/001-fix-destination.patch index 00e7919d5..9169ac3ee 100644 --- a/external_imported/vcpkg/ports/kubernetes/001-fix-destination.patch +++ b/external_imported/vcpkg/ports/kubernetes/001-fix-destination.patch @@ -1,11 +1,11 @@ diff --git a/kubernetes/CMakeLists.txt b/kubernetes/CMakeLists.txt ---- a/kubernetes/CMakeLists.txt (revision 6b98698c92c59d8c63815f74ed4183fc36cde37b) -+++ b/kubernetes/CMakeLists.txt (date 1632055519986) -@@ -1563,7 +1563,7 @@ - install(TARGETS ${pkgName} DESTINATION ${CMAKE_INSTALL_PREFIX}) +--- a/kubernetes/CMakeLists.txt (revision 80aff0a1c71c2cb8a1ab4b73e0592f0f88c59376) ++++ b/kubernetes/CMakeLists.txt (date 1642600807646) +@@ -1255,7 +1255,7 @@ + install(TARGETS ${pkgName} DESTINATION lib) else() include(GNUInstallDirs) -- install(TARGETS ${pkgName} DESTINATION ${CMAKE_INSTALL_PREFIX} EXPORT ${pkgName}Targets) +- install(TARGETS ${pkgName} DESTINATION lib EXPORT ${pkgName}Targets) + install(TARGETS ${pkgName} EXPORT ${pkgName}Targets) foreach(HDR_FILE ${HDRS}) diff --git a/external_imported/vcpkg/ports/kubernetes/portfile.cmake b/external_imported/vcpkg/ports/kubernetes/portfile.cmake index 134c11bd7..ff554cf66 100644 --- a/external_imported/vcpkg/ports/kubernetes/portfile.cmake +++ b/external_imported/vcpkg/ports/kubernetes/portfile.cmake @@ -1,10 +1,8 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kubernetes-client/c - REF a019822652b57781647d4d262870fa38ef531ad9 - SHA512 7547bade6878dd6402f760fb49248cb1dd031be11dda31c3758324cf833ca184efb127c637d28cb5c59cc172dcb211a49e5fa60f459c396fea2fcd781c1260a1 + REF 5eab1ef0a855d1707b3ef01adb2c4b545a01f36d + SHA512 a45ff221cfdddd8add0d8a04d75906e369e84b192cb7d0611a22f28ac81e0bb0c29cb71faa2bc352100aadacd7467fc2700c25f074654b7a9d75c80d86b71296 HEAD_REF master PATCHES 001-fix-destination.patch @@ -24,4 +22,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) vcpkg_copy_pdbs() -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/kubernetes/vcpkg.json b/external_imported/vcpkg/ports/kubernetes/vcpkg.json index a2403271f..0a0a186fb 100644 --- a/external_imported/vcpkg/ports/kubernetes/vcpkg.json +++ b/external_imported/vcpkg/ports/kubernetes/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kubernetes", - "version-date": "2021-11-24", + "version-date": "2022-01-19", + "port-version": 1, "description": "Kubernetes C client", "homepage": "https://github.com/kubernetes-client/c/", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/kwsys/portfile.cmake b/external_imported/vcpkg/ports/kwsys/portfile.cmake index b676a4a13..6b8879d89 100644 --- a/external_imported/vcpkg/ports/kwsys/portfile.cmake +++ b/external_imported/vcpkg/ports/kwsys/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_gitlab( GITLAB_URL https://gitlab.kitware.com OUT_SOURCE_PATH SOURCE_PATH diff --git a/external_imported/vcpkg/ports/kwsys/vcpkg.json b/external_imported/vcpkg/ports/kwsys/vcpkg.json index b45350d73..6a6c4c3f8 100644 --- a/external_imported/vcpkg/ports/kwsys/vcpkg.json +++ b/external_imported/vcpkg/ports/kwsys/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kwsys", "version-date": "2021-08-06", + "port-version": 1, "description": "Provides platform-independent APIs to many common system features", "homepage": "https://gitlab.kitware.com/utils/kwsys", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/lager/portfile.cmake b/external_imported/vcpkg/ports/lager/portfile.cmake index 737df91aa..ed2bb6da5 100644 --- a/external_imported/vcpkg/ports/lager/portfile.cmake +++ b/external_imported/vcpkg/ports/lager/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO arximboldi/lager - REF 5924508df1e08752274404818c460c80f0666bb8 - SHA512 ee186b82dd1d729454c61207b48fb80ac8a861511ff501fab499aff5d3ba123ca669f89bdbbd37f120af6dc11a651ba6c163250b5ca94e6290657a35870618d7 + REF c87a4c7fd0368bea346f41191b8bc0b54a3e9d80 + SHA512 788586078fdc07f0bd899148ddb0ad255fc6e18254901de65c2d1e43f9637ed8a8c121e8d0d26f043e86c7764ea1ff6ce323a791ba7d577589b4c80a329619d4 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/lager/vcpkg.json b/external_imported/vcpkg/ports/lager/vcpkg.json index d59ce787c..ee05059aa 100644 --- a/external_imported/vcpkg/ports/lager/vcpkg.json +++ b/external_imported/vcpkg/ports/lager/vcpkg.json @@ -1,7 +1,6 @@ { "name": "lager", - "version-date": "2021-06-17", - "port-version": 1, + "version-date": "2022-02-21", "description": "C++ library for value-oriented design using the unidirectional data-flow architecture", "homepage": "https://sinusoid.es/lager/", "dependencies": [ diff --git a/external_imported/vcpkg/ports/lapack-reference/portfile.cmake b/external_imported/vcpkg/ports/lapack-reference/portfile.cmake index 4fb353fdd..8e7490c8f 100644 --- a/external_imported/vcpkg/ports/lapack-reference/portfile.cmake +++ b/external_imported/vcpkg/ports/lapack-reference/portfile.cmake @@ -11,13 +11,13 @@ endif() include(vcpkg_find_fortran) SET(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) -set(lapack_ver 3.8.0) +set(lapack_ver 3.10.0) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO "Reference-LAPACK/lapack" REF "v${lapack_ver}" - SHA512 17786cb7306fccdc9b4a242de7f64fc261ebe6a10b6ec55f519deb4cb673cb137e8742aa5698fd2dc52f1cd56d3bd116af3f593a01dcf6770c4dcc86c50b2a7f + SHA512 56055000c241bab8f318ebd79249ea012c33be0c4c3eca6a78e247f35ad9e8088f46605a0ba52fd5ad3e7898be3b7bc6c50ceb3af327c4986a266b06fe768cbf HEAD_REF master ) @@ -61,16 +61,15 @@ else() set(USE_OPTIMIZED_BLAS ON) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS "-DUSE_OPTIMIZED_BLAS=${USE_OPTIMIZED_BLAS}" "-DCBLAS=${CBLAS}" ${FORTRAN_CMAKE} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME lapack-${lapack_ver} CONFIG_PATH lib/cmake/lapack-${lapack_ver}) #Should the target path be lapack and not lapack-reference? diff --git a/external_imported/vcpkg/ports/lapack-reference/vcpkg.json b/external_imported/vcpkg/ports/lapack-reference/vcpkg.json index c3f20e032..e52b1ef84 100644 --- a/external_imported/vcpkg/ports/lapack-reference/vcpkg.json +++ b/external_imported/vcpkg/ports/lapack-reference/vcpkg.json @@ -1,10 +1,14 @@ { "name": "lapack-reference", - "version-semver": "3.8.0", - "port-version": 6, - "description": "LAPACK — Linear Algebra PACKage", + "version": "3.10.0", + "description": "LAPACK - Linear Algebra PACKage", "homepage": "http://www.netlib.org/lapack/", + "license": "BSD-3-Clause-Open-MPI", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, { "name": "vcpkg-cmake-config", "host": true diff --git a/external_imported/vcpkg/ports/lapack/vcpkg.json b/external_imported/vcpkg/ports/lapack/vcpkg.json index 49dbcfc22..70a2aabec 100644 --- a/external_imported/vcpkg/ports/lapack/vcpkg.json +++ b/external_imported/vcpkg/ports/lapack/vcpkg.json @@ -1,16 +1,16 @@ { "name": "lapack", - "version-string": "3", - "port-version": 2, + "version-date": "2022-02-22", "description": "Metapackage for packages which provide LAPACK", + "license": null, "dependencies": [ { "name": "clapack", - "platform": "arm & windows" + "platform": "(arm & windows) | uwp" }, { "name": "lapack-reference", - "platform": "!arm | !windows" + "platform": "!((arm & windows) | uwp)" } ] } diff --git a/external_imported/vcpkg/ports/lazy-importer/portfile.cmake b/external_imported/vcpkg/ports/lazy-importer/portfile.cmake index 18aac44cf..808452099 100644 --- a/external_imported/vcpkg/ports/lazy-importer/portfile.cmake +++ b/external_imported/vcpkg/ports/lazy-importer/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO JustasMasiulis/lazy_importer - REF a02a9ed62ea56c614728465b1be9fab812fdf037 - SHA512 d88a7a1df269f2159eb0997f691fb5b71e89d75160b45ce968bd58e0d71e214f03e4c05e44234ace04ba9025b0b7d3ff07cf803753473c51164223a05a61598f + REF edac6afddb9e0df2e3affa8b2d631caafcba69ed + SHA512 45f024c34fa1c8854b8b77706934ce95449b2416a5c1dcab970d0df068c9b5bf0de12994c13ac215e629f8ae21fdab75b4ce6535f56ca7508f490a4c664e5b1a HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/lazy-importer/vcpkg.json b/external_imported/vcpkg/ports/lazy-importer/vcpkg.json index aa9f6c62c..7f3073487 100644 --- a/external_imported/vcpkg/ports/lazy-importer/vcpkg.json +++ b/external_imported/vcpkg/ports/lazy-importer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "lazy-importer", - "version-date": "2021-10-23", + "version-date": "2022-02-09", "description": "Library for importing functions from dlls in a hidden, reverse engineer unfriendly way", "homepage": "https://github.com/JustasMasiulis/lazy_importer" } diff --git a/external_imported/vcpkg/ports/lcms/CMakeLists.txt b/external_imported/vcpkg/ports/lcms/CMakeLists.txt index 4852f8c4e..83a1915ba 100644 --- a/external_imported/vcpkg/ports/lcms/CMakeLists.txt +++ b/external_imported/vcpkg/ports/lcms/CMakeLists.txt @@ -12,7 +12,7 @@ if(BUILD_SHARED_LIBS) endif() target_compile_options(lcms2 PRIVATE -DUNICODE -D_UNICODE) -target_include_directories(lcms2 PUBLIC $) +target_include_directories(lcms2 PUBLIC $ $) set_target_properties(lcms2 PROPERTIES PUBLIC_HEADER "${CMAKE_CURRENT_LIST_DIR}/include/lcms2.h;${CMAKE_CURRENT_LIST_DIR}/include/lcms2_plugin.h") # Generate pkg-config file diff --git a/external_imported/vcpkg/ports/lcms/vcpkg.json b/external_imported/vcpkg/ports/lcms/vcpkg.json index 6dca15372..8a78ac8bb 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": 2, + "port-version": 3, "description": "Little CMS.", "homepage": "https://github.com/mm2/Little-CMS", "dependencies": [ diff --git a/external_imported/vcpkg/ports/leptonica/Modify-include-dir.patch b/external_imported/vcpkg/ports/leptonica/Modify-include-dir.patch deleted file mode 100644 index 59486c6e2..000000000 --- a/external_imported/vcpkg/ports/leptonica/Modify-include-dir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5aed94f..9bfcff9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -212,7 +212,7 @@ include(Configure) - - configure_file(${AUTOCONFIG_SRC} ${AUTOCONFIG} @ONLY) - --set(INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include" "${CMAKE_INSTALL_PREFIX}/include/leptonica") -+set(INCLUDE_DIR "\${CMAKE_CURRENT_LIST_DIR}/../../include" "\${CMAKE_CURRENT_LIST_DIR}/../../include/leptonica") - - ############################################################################### - # diff --git a/external_imported/vcpkg/ports/leptonica/find-dependency.patch b/external_imported/vcpkg/ports/leptonica/find-dependency.patch deleted file mode 100644 index 9bae12609..000000000 --- a/external_imported/vcpkg/ports/leptonica/find-dependency.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/cmake/templates/LeptonicaConfig.cmake.in b/cmake/templates/LeptonicaConfig.cmake.in -index 342c37d..b358b7b 100644 ---- a/cmake/templates/LeptonicaConfig.cmake.in -+++ b/cmake/templates/LeptonicaConfig.cmake.in -@@ -20,6 +20,15 @@ - # - # =================================================================================== - -+include(CMakeFindDependencyMacro) -+find_dependency(JPEG) -+find_dependency(ZLIB) -+find_dependency(PNG) -+find_dependency(TIFF) -+find_dependency(GIF) -+find_dependency(WebP) -+find_dependency(OpenJPEG) -+ - include(${CMAKE_CURRENT_LIST_DIR}/LeptonicaTargets.cmake) - - # ====================================================== diff --git a/external_imported/vcpkg/ports/leptonica/fix-CMakeDependency.patch b/external_imported/vcpkg/ports/leptonica/fix-CMakeDependency.patch new file mode 100644 index 000000000..9234fbfb3 --- /dev/null +++ b/external_imported/vcpkg/ports/leptonica/fix-CMakeDependency.patch @@ -0,0 +1,64 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6d300da..fae4ca7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -66,8 +66,28 @@ if(NOT SW_BUILD) + find_package(PNG) + find_package(TIFF) + find_package(ZLIB) +- find_package(PkgConfig) +- if (PKG_CONFIG_FOUND) ++ find_package(WEBP NAMES WebP REQUIRED) ++ find_package(JP2K NAMES OpenJPEG REQUIRED) ++ ++ set(GIF_LIBRARIES GIF::GIF) ++ set(JPEG_LIBRARIES JPEG::JPEG) ++ set(PNG_LIBRARIES PNG::PNG) ++ set(TIFF_LIBRARIES TIFF::TIFF) ++ set(ZLIB_LIBRARIES ZLIB::ZLIB) ++ ++ set(JP2K "${JP2K_FOUND}") ++ set(JP2K_INCLUDE_DIRS "") ++ set(HAVE_LIBJP2K 1) ++ set(JP2K_LIBRARIES openjp2) # imported target ++ ++ set(WEBP "${WEBP_FOUND}") ++ set(WEBP_INCLUDE_DIRS "") ++ set(WEBPMUX 1) ++ set(HAVE_LIBWEBP_ANIM 1) ++ set(WEBPMUX_FOUND TRUE) ++ set(WEBP_LIBRARIES WebP::libwebpmux WebP::webp) ++ ++ if (0) + pkg_check_modules(WEBP libwebp QUIET) + pkg_check_modules(WEBPMUX libwebpmux>=${MINIMUM_WEBPMUX_VERSION} QUIET) + pkg_check_modules(JP2K libopenjp2>=2.0 QUIET) +diff --git a/cmake/templates/LeptonicaConfig.cmake.in b/cmake/templates/LeptonicaConfig.cmake.in +index 342c37d..506fb2a 100644 +--- a/cmake/templates/LeptonicaConfig.cmake.in ++++ b/cmake/templates/LeptonicaConfig.cmake.in +@@ -19,6 +19,14 @@ + # - Leptonica_VERSION_PATCH : Patch version part of Leptonica_VERSION: "@VERSION_PATCH@" + # + # =================================================================================== ++include(CMakeFindDependencyMacro) ++find_dependency(JPEG) ++find_dependency(ZLIB) ++find_dependency(PNG) ++find_dependency(TIFF) ++find_dependency(GIF) ++find_dependency(WebP) ++find_dependency(OpenJPEG) + + include(${CMAKE_CURRENT_LIST_DIR}/LeptonicaTargets.cmake) + +@@ -36,7 +44,8 @@ SET(Leptonica_VERSION_PATCH @VERSION_PATCH@) + # ====================================================== + + # Provide the include directories to the caller +-set(Leptonica_INCLUDE_DIRS "@INCLUDE_DIR@") ++get_filename_component(Leptonica_INCLUDE_DIRS "${CMAKE_CURRENT_LIST_DIR}/../../include" ABSOLUTE) ++list(APPEND Leptonica_INCLUDE_DIRS "${Leptonica_INCLUDE_DIRS}/leptonica") + + # ==================================================================== + # Link libraries: diff --git a/external_imported/vcpkg/ports/leptonica/fix-cmakelists.patch b/external_imported/vcpkg/ports/leptonica/fix-cmakelists.patch deleted file mode 100644 index 6d1d28169..000000000 --- a/external_imported/vcpkg/ports/leptonica/fix-cmakelists.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index e474463..d2b999d 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -14,7 +14,6 @@ if (MSVC) - set_source_files_properties(${src} PROPERTIES LANGUAGE CXX) - endif() - --string(REPLACE "-O3" "-O2" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}") - - add_library (leptonica ${src} ${hdr}) - set_target_properties (leptonica PROPERTIES VERSION ${VERSION_PLAIN}) diff --git a/external_imported/vcpkg/ports/leptonica/fix-find-libwebp.patch b/external_imported/vcpkg/ports/leptonica/fix-find-libwebp.patch deleted file mode 100644 index 588cf0c54..000000000 --- a/external_imported/vcpkg/ports/leptonica/fix-find-libwebp.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6535632..1740841 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -70,8 +70,7 @@ if(NOT SW_BUILD) - pkg_check_modules(JP2K libopenjp2>=2.0 QUIET) - endif() - if(NOT WEBP) -- find_path(WEBP_INCLUDE_DIR /webp/decode.h) -- find_library(WEBP_LIBRARY NAMES webp) -+ find_package(WebP CONFIG REQUIRED) - if (WEBP_INCLUDE_DIR AND WEBP_LIBRARY) - set(WEBP 1) - set(WEBP_FOUND TRUE) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index d2b999d..019ec7b 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -52,7 +52,7 @@ if (TIFF_LIBRARIES) - endif() - if (WEBP_FOUND) - target_include_directories (leptonica PUBLIC ${WEBP_INCLUDE_DIRS}) -- target_link_libraries (leptonica ${WEBP_LIBRARIES}) -+ target_link_libraries (leptonica WebP::webp WebP::libwebpmux) - endif() - if (ZLIB_LIBRARIES) - target_include_directories (leptonica PUBLIC ${ZLIB_INCLUDE_DIRS}) diff --git a/external_imported/vcpkg/ports/leptonica/portfile.cmake b/external_imported/vcpkg/ports/leptonica/portfile.cmake index 11dfb3967..94b64a6f3 100644 --- a/external_imported/vcpkg/ports/leptonica/portfile.cmake +++ b/external_imported/vcpkg/ports/leptonica/portfile.cmake @@ -1,34 +1,29 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DanBloomberg/leptonica - REF 2ff4313a85427ceb272540c570106b2f893da097 # 1.81.1 - SHA512 0e35538f1407e7220e68d635e5fd4c82219b58fb4b6ca8132d72892f52853e13451a2a160644a122c47598f77d2e87046cfb072be261be9a941342f476dc6376 + REF f4138265b390f1921b9891d6669674d3157887d8 # 1.82.0 + SHA512 cd8c55454fc2cb4d23c2b3f01870e154766fa5a35c07b79d25c2d85dc2675dcb224d9be8a1cdcb7e9a0bd3c17e90141aa4084f67a311a1c327d7ac2439ba196a HEAD_REF master PATCHES - fix-cmakelists.patch - find-dependency.patch - fix-find-libwebp.patch - Modify-include-dir.patch + fix-CMakeDependency.patch ) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATIC) - vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DSW_BUILD=OFF - -DCPPAN_BUILD=OFF - -DSTATIC=${STATIC} - -DCMAKE_REQUIRED_INCLUDES=${CURRENT_INSTALLED_DIR}/include # for check_include_file() - MAYBE_UNUSED_VARIABLES - STATIC + -DCMAKE_REQUIRE_FIND_PACKAGE_GIF=TRUE + -DCMAKE_REQUIRE_FIND_PACKAGE_JPEG=TRUE + -DCMAKE_REQUIRE_FIND_PACKAGE_PNG=TRUE + -DCMAKE_REQUIRE_FIND_PACKAGE_TIFF=TRUE + -DCMAKE_REQUIRE_FIND_PACKAGE_ZLIB=TRUE ) vcpkg_cmake_install() vcpkg_fixup_pkgconfig() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/leptonica) vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/leptonica/vcpkg.json b/external_imported/vcpkg/ports/leptonica/vcpkg.json index b70a8332d..ba9bcaf7e 100644 --- a/external_imported/vcpkg/ports/leptonica/vcpkg.json +++ b/external_imported/vcpkg/ports/leptonica/vcpkg.json @@ -1,8 +1,9 @@ { "name": "leptonica", - "version": "1.81.1", + "version": "1.82.0", "description": "An open source library containing software that is broadly useful for image processing and image analysis applications", "homepage": "https://github.com/DanBloomberg/leptonica", + "license": null, "dependencies": [ "giflib", "libjpeg-turbo", diff --git a/external_imported/vcpkg/ports/leveldb/fix-dependencies.patch b/external_imported/vcpkg/ports/leveldb/fix-dependencies.patch new file mode 100644 index 000000000..a0fe68651 --- /dev/null +++ b/external_imported/vcpkg/ports/leveldb/fix-dependencies.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 98b87dc..76d2e9b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -35,8 +35,14 @@ include(CheckIncludeFile) + check_include_file("unistd.h" HAVE_UNISTD_H) + + include(CheckLibraryExists) +-check_library_exists(crc32c crc32c_value "" HAVE_CRC32C) +-check_library_exists(snappy snappy_compress "" HAVE_SNAPPY) ++if (WITH_CRC32C) ++ find_package(Crc32c CONFIG REQUIRED) ++ set(HAVE_CRC32C 1) ++endif() ++if (WITH_SNAPPY) ++ find_package(Snappy CONFIG REQUIRED) ++ set(HAVE_SNAPPY 1) ++endif() + check_library_exists(tcmalloc malloc "" HAVE_TCMALLOC) + + include(CheckCXXSymbolExists) +@@ -246,10 +252,10 @@ if(HAVE_CLANG_THREAD_SAFETY) + endif(HAVE_CLANG_THREAD_SAFETY) + + if(HAVE_CRC32C) +- target_link_libraries(leveldb crc32c) ++ target_link_libraries(leveldb Crc32c::crc32c) + endif(HAVE_CRC32C) + if(HAVE_SNAPPY) +- target_link_libraries(leveldb snappy) ++ target_link_libraries(leveldb Snappy::snappy) + endif(HAVE_SNAPPY) + if(HAVE_TCMALLOC) + target_link_libraries(leveldb tcmalloc) diff --git a/external_imported/vcpkg/ports/leveldb/leveldbConfig.cmake.in b/external_imported/vcpkg/ports/leveldb/leveldbConfig.cmake.in index 560e743fe..65b9bac51 100644 --- a/external_imported/vcpkg/ports/leveldb/leveldbConfig.cmake.in +++ b/external_imported/vcpkg/ports/leveldb/leveldbConfig.cmake.in @@ -2,5 +2,13 @@ include(CMakeFindDependencyMacro) set_and_check(leveldb_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@") +find_dependency(Threads) + +if (@WITH_CRC32C@) + find_dependency(Crc32c CONFIG) +endif() +if (@WITH_SNAPPY@) + find_dependency(Snappy CONFIG) +endif() include("${CMAKE_CURRENT_LIST_DIR}/leveldbTargets.cmake") diff --git a/external_imported/vcpkg/ports/leveldb/portfile.cmake b/external_imported/vcpkg/ports/leveldb/portfile.cmake index 4f20f837b..85af613ea 100644 --- a/external_imported/vcpkg/ports/leveldb/portfile.cmake +++ b/external_imported/vcpkg/ports/leveldb/portfile.cmake @@ -1,7 +1,3 @@ -if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "leveldb doesn't supports UWP") -endif() - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( @@ -12,22 +8,31 @@ vcpkg_from_github( HEAD_REF master PATCHES fix_config.patch + fix-dependencies.patch ) -file(COPY ${CURRENT_PORT_DIR}/leveldbConfig.cmake.in DESTINATION ${SOURCE_PATH}/cmake) +file(COPY "${CURRENT_PORT_DIR}/leveldbConfig.cmake.in" DESTINATION "${SOURCE_PATH}/cmake") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + crc32c WITH_CRC32C + snappy WITH_SNAPPY +) -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} OPTIONS_DEBUG -DINSTALL_HEADERS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/leveldb) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) -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 DESTINATION ${CURRENT_PACKAGES_DIR}/share/leveldb RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/external_imported/vcpkg/ports/leveldb/vcpkg.json b/external_imported/vcpkg/ports/leveldb/vcpkg.json index 00df32a4f..10d1f8c09 100644 --- a/external_imported/vcpkg/ports/leveldb/vcpkg.json +++ b/external_imported/vcpkg/ports/leveldb/vcpkg.json @@ -1,8 +1,33 @@ { "name": "leveldb", - "version-string": "1.22", - "port-version": 2, + "version": "1.22", + "port-version": 5, "description": "LevelDB is a fast key-value storage library written at Google that provides an ordered mapping from string keys to string values.", - "homepage": "https://github.com/bitcoin-core/leveldb", - "supports": "!uwp" + "homepage": "https://github.com/google/leveldb", + "license": "BSD-3-Clause", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "crc32c": { + "description": "Build with crc32c", + "dependencies": [ + "crc32c" + ] + }, + "snappy": { + "description": "Build with snappy", + "dependencies": [ + "snappy" + ] + } + } } diff --git a/external_imported/vcpkg/ports/levmar/portfile.cmake b/external_imported/vcpkg/ports/levmar/portfile.cmake index 020d42520..1ed0ad75d 100644 --- a/external_imported/vcpkg/ports/levmar/portfile.cmake +++ b/external_imported/vcpkg/ports/levmar/portfile.cmake @@ -1,7 +1,3 @@ -vcpkg_fail_port_install(MESSAGE "levmar currently only checked on Windows" - ON_TARGET "OSX" "Linux" "UWP" -) - vcpkg_download_distfile(ARCHIVE URLS "http://users.ics.forth.gr/~lourakis/levmar/levmar-2.6.tgz" FILENAME "levmar-2.6.tgz" diff --git a/external_imported/vcpkg/ports/levmar/vcpkg.json b/external_imported/vcpkg/ports/levmar/vcpkg.json index 99c22de73..a72eb4b3f 100644 --- a/external_imported/vcpkg/ports/levmar/vcpkg.json +++ b/external_imported/vcpkg/ports/levmar/vcpkg.json @@ -1,7 +1,8 @@ { "name": "levmar", - "version-string": "2.6", + "version": "2.6", + "port-version": 1, "description": "Levenberg-Marquardt nonlinear least squares optimization algorithm", "homepage": "http://users.ics.forth.gr/~lourakis/levmar/", - "supports": "!(uwp | osx | linux)" + "supports": "windows & !uwp" } diff --git a/external_imported/vcpkg/ports/libalkimia/portfile.cmake b/external_imported/vcpkg/ports/libalkimia/portfile.cmake index 4d12566d2..a9ba9230e 100644 --- a/external_imported/vcpkg/ports/libalkimia/portfile.cmake +++ b/external_imported/vcpkg/ports/libalkimia/portfile.cmake @@ -47,4 +47,6 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() +vcpkg_fixup_pkgconfig() + file(INSTALL "${SOURCE_PATH}/COPYING.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/libalkimia/vcpkg.json b/external_imported/vcpkg/ports/libalkimia/vcpkg.json index 4c1e965d8..90cd8e2e0 100644 --- a/external_imported/vcpkg/ports/libalkimia/vcpkg.json +++ b/external_imported/vcpkg/ports/libalkimia/vcpkg.json @@ -1,8 +1,10 @@ { "name": "libalkimia", "version": "8.1.70", + "port-version": 1, "description": "Common functionality for finance applications.", "homepage": "https://community.kde.org/Alkimia/libalkimia", + "license": "LGPL-2.1-or-later", "dependencies": [ "ecm", { diff --git a/external_imported/vcpkg/ports/libao/0001-windows-build-patch.patch b/external_imported/vcpkg/ports/libao/0001-windows-build-patch.patch new file mode 100644 index 000000000..96bea6116 --- /dev/null +++ b/external_imported/vcpkg/ports/libao/0001-windows-build-patch.patch @@ -0,0 +1,127 @@ +From 129f8e155596199191cc005bcc257397d0d981ac Mon Sep 17 00:00:00 2001 +From: xiaoyifang +Date: Wed, 16 Feb 2022 21:58:40 +0800 +Subject: [PATCH] patch windows + +--- + include/ao/ao_private.h | 30 +++++++++++++++--------------- + src/ao_wmm.c | 1 + + src/audio_out.c | 1 - + 3 files changed, 16 insertions(+), 16 deletions(-) + +diff --git a/include/ao/ao_private.h b/include/ao/ao_private.h +index 44fa03e..c3c50aa 100644 +--- a/include/ao/ao_private.h ++++ b/include/ao/ao_private.h +@@ -138,13 +138,13 @@ struct ao_functions { + + void ao_read_config_files (ao_config *config); + +-#define adebug(format, args...) {\ ++#define adebug(format, ...) {\ + if(!device || device->verbose==2){ \ + if(strcmp(format,"\n")){ \ + if(device && device->funcs->driver_info()->short_name){ \ +- fprintf(stderr,"ao_%s debug: " format,device->funcs->driver_info()->short_name,## args); \ ++ fprintf(stderr,"ao_%s debug: " format,device->funcs->driver_info()->short_name,__VA_ARGS__); \ + }else{ \ +- fprintf(stderr,"debug: " format,## args); \ ++ fprintf(stderr,"debug: " format,__VA_ARGS__); \ + } \ + }else{ \ + fprintf(stderr,"\n"); \ +@@ -152,13 +152,13 @@ void ao_read_config_files (ao_config *config); + } \ + } + +-#define averbose(format, args...) {\ ++#define averbose(format, ...) {\ + if(!device || device->verbose>0){ \ + if(strcmp(format,"\n")){ \ + if(device && device->funcs->driver_info()->short_name){ \ +- fprintf(stderr,"ao_%s info: " format,device->funcs->driver_info()->short_name,## args); \ ++ fprintf(stderr,"ao_%s info: " format,device->funcs->driver_info()->short_name,__VA_ARGS__); \ + }else{ \ +- fprintf(stderr,"info: " format,## args); \ ++ fprintf(stderr,"info: " format,__VA_ARGS__); \ + } \ + }else{ \ + fprintf(stderr,"\n"); \ +@@ -166,13 +166,13 @@ void ao_read_config_files (ao_config *config); + } \ + } + +-#define ainfo(format, args...) {\ ++#define ainfo(format, ...) {\ + if(!device || device->verbose>=0){ \ + if(strcmp(format,"\n")){ \ + if(device && device->funcs->driver_info()->short_name){ \ +- fprintf(stderr,"ao_%s info: " format,device->funcs->driver_info()->short_name,## args); \ ++ fprintf(stderr,"ao_%s info: " format,device->funcs->driver_info()->short_name,__VA_ARGS__); \ + }else{ \ +- fprintf(stderr,"info: " format,## args); \ ++ fprintf(stderr,"info: " format,__VA_ARGS__); \ + } \ + }else{ \ + fprintf(stderr,"\n"); \ +@@ -180,13 +180,13 @@ void ao_read_config_files (ao_config *config); + } \ + } + +-#define awarn(format, args...) {\ ++#define awarn(format, ...) {\ + if(!device || device->verbose>=0){ \ + if(strcmp(format,"\n")){ \ + if(device && device->funcs->driver_info()->short_name){ \ +- fprintf(stderr,"ao_%s WARNING: " format,device->funcs->driver_info()->short_name,## args); \ ++ fprintf(stderr,"ao_%s WARNING: " format,device->funcs->driver_info()->short_name,__VA_ARGS__); \ + }else{ \ +- fprintf(stderr,"WARNING: " format,## args); \ ++ fprintf(stderr,"WARNING: " format,__VA_ARGS__); \ + } \ + }else{ \ + fprintf(stderr,"\n"); \ +@@ -194,13 +194,13 @@ void ao_read_config_files (ao_config *config); + } \ + } + +-#define aerror(format, args...) { \ ++#define aerror(format, ...) { \ + if(!device || device->verbose>=0){ \ + if(strcmp(format,"\n")){ \ + if(device && device->funcs->driver_info()->short_name){ \ +- fprintf(stderr,"ao_%s ERROR: " format,device->funcs->driver_info()->short_name,## args); \ ++ fprintf(stderr,"ao_%s ERROR: " format,device->funcs->driver_info()->short_name,__VA_ARGS__); \ + }else{ \ +- fprintf(stderr,"ERROR: " format,## args); \ ++ fprintf(stderr,"ERROR: " format,__VA_ARGS__); \ + } \ + }else{ \ + fprintf(stderr,"\n"); \ +diff --git a/src/ao_wmm.c b/src/ao_wmm.c +index eec6b83..d18d2a4 100644 +--- a/src/ao_wmm.c ++++ b/src/ao_wmm.c +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + #include + + #include +diff --git a/src/audio_out.c b/src/audio_out.c +index bd8f6fc..e3af366 100644 +--- a/src/audio_out.c ++++ b/src/audio_out.c +@@ -49,7 +49,6 @@ static int dlclose(void *handle) { return 0; } + #ifndef _MSC_VER + # include + #endif +-#include + + #include "ao/ao.h" + #include "ao_private.h" +-- +2.30.0.windows.2 + diff --git a/external_imported/vcpkg/ports/libao/portfile.cmake b/external_imported/vcpkg/ports/libao/portfile.cmake new file mode 100644 index 000000000..274beec82 --- /dev/null +++ b/external_imported/vcpkg/ports/libao/portfile.cmake @@ -0,0 +1,34 @@ +set(NO_DLFCN ) +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND PATCHES "0001-windows-build-patch.patch") + set(NO_DLFCN "ac_cv_header_dlfcn_h=no") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO xiph/libao + REF 1.2.2 + SHA512 d2736d25b60862e7d7469611ce31b1df40a4366ab160e2ff1b46919ae91692d1596c8468e4f016303b306fc3ac1bddc7b727f535a362f403c3fe7c6532e9045a + HEAD_REF master + PATCHES ${PATCHES} +) + +if(VCPKG_TARGET_IS_WINDOWS) + set(ENV{LIBS} "-lwinmm -lksuser") +endif() + +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + OPTIONS --disable-binaries + ${NO_DLFCN} +) +vcpkg_install_make() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + + +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/libao/vcpkg.json b/external_imported/vcpkg/ports/libao/vcpkg.json new file mode 100644 index 000000000..18f7a2675 --- /dev/null +++ b/external_imported/vcpkg/ports/libao/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "libao", + "version": "1.2.2", + "port-version": 4, + "description": "libao - A Cross-platform Audio Library", + "homepage": "https://github.com/xiph/libao", + "license": "GPL-2.0", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true, + "platform": "windows" + } + ] +} diff --git a/external_imported/vcpkg/ports/libarchive/fix-dependencies.patch b/external_imported/vcpkg/ports/libarchive/fix-dependencies.patch index 0d3213c67..573361c49 100644 --- a/external_imported/vcpkg/ports/libarchive/fix-dependencies.patch +++ b/external_imported/vcpkg/ports/libarchive/fix-dependencies.patch @@ -11,38 +11,26 @@ index 39b5333..8164d8f 100644 ELSE() SET(BZIP2_FOUND FALSE) # Override cached value ENDIF() -@@ -462,27 +462,15 @@ MARK_AS_ADVANCED(CLEAR BZIP2_LIBRARIES) +@@ -462,7 +462,8 @@ MARK_AS_ADVANCED(CLEAR BZIP2_LIBRARIES) # Find LZMA # IF(ENABLE_LZMA) - FIND_PACKAGE(LibLZMA) -+ FIND_PACKAGE(LibLZMA CONFIG REQUIRED) ++ FIND_PACKAGE(LibLZMA REQUIRED) ++ SET(LIBLZMA_LIBRARIES LibLZMA::LibLZMA) ELSE() SET(LIBLZMA_FOUND FALSE) # Override cached value ENDIF() - --IF(LIBLZMA_FOUND) -+IF(LibLZMA_FOUND) +@@ -470,6 +471,8 @@ ENDIF() + IF(LIBLZMA_FOUND) SET(HAVE_LIBLZMA 1) SET(HAVE_LZMA_H 1) -- CMAKE_PUSH_CHECK_STATE() -- INCLUDE_DIRECTORIES(${LIBLZMA_INCLUDE_DIRS}) -- LIST(APPEND ADDITIONAL_LIBS ${LIBLZMA_LIBRARIES}) -- # Test if a macro is needed for the library. -- TRY_MACRO_FOR_LIBRARY( -- "${LIBLZMA_INCLUDE_DIRS}" "${LIBLZMA_LIBRARIES}" -- COMPILES -- "#include \nint main() {return (int)lzma_version_number(); }" -- "WITHOUT_LZMA_API_STATIC;LZMA_API_STATIC") -- IF(NOT WITHOUT_LZMA_API_STATIC AND LZMA_API_STATIC) -- ADD_DEFINITIONS(-DLZMA_API_STATIC) -- ENDIF(NOT WITHOUT_LZMA_API_STATIC AND LZMA_API_STATIC) -- CMAKE_POP_CHECK_STATE() + LIST(APPEND ADDITIONAL_LIBS LibLZMA::LibLZMA) - ELSE(LIBLZMA_FOUND) - # LZMA not found and will not be used. - ENDIF(LIBLZMA_FOUND) -@@ -555,22 +543,15 @@ IF(ENABLE_LZ4) ++elseif(0) + 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) @@ -138,13 +126,3 @@ index 39b5333..8164d8f 100644 ELSE() SET(LIBXML2_FOUND FALSE) ENDIF() -@@ -1432,8 +1400,7 @@ CHECK_C_SOURCE_COMPILES( - MAJOR_IN_SYSMACROS) - - CMAKE_PUSH_CHECK_STATE() --SET(CMAKE_REQUIRED_INCLUDES ${LIBLZMA_INCLUDE_DIR}) --SET(CMAKE_REQUIRED_LIBRARIES ${LIBLZMA_LIBRARIES}) -+SET(CMAKE_REQUIRED_LIBRARIES LibLZMA::LibLZMA) - IF(ENABLE_LZMA) - CHECK_C_SOURCE_COMPILES( - "#include \n#if LZMA_VERSION < 50020000\n#error unsupported\n#endif\nint main(void){lzma_stream_encoder_mt(0, 0); return 0;}" diff --git a/external_imported/vcpkg/ports/libarchive/pkgconfig-modules.patch b/external_imported/vcpkg/ports/libarchive/pkgconfig-modules.patch index d8e6f4cf7..72ad81394 100644 --- a/external_imported/vcpkg/ports/libarchive/pkgconfig-modules.patch +++ b/external_imported/vcpkg/ports/libarchive/pkgconfig-modules.patch @@ -27,15 +27,15 @@ index 7b6f0ad..18cf15c 100644 # Test if a macro is needed for the library. TRY_MACRO_FOR_LIBRARY( "${BZIP2_INCLUDE_DIR}" "${BZIP2_LIBRARIES}" -@@ -471,6 +475,7 @@ IF(LibLZMA_FOUND) +@@ -471,6 +475,7 @@ IF(LIBLZMA_FOUND) SET(HAVE_LIBLZMA 1) SET(HAVE_LZMA_H 1) LIST(APPEND ADDITIONAL_LIBS LibLZMA::LibLZMA) + STRING(APPEND LIBARCHIVE_REQUIRES_PRIVATE " liblzma") - ELSE(LIBLZMA_FOUND) - # LZMA not found and will not be used. - ENDIF(LIBLZMA_FOUND) -@@ -499,6 +504,7 @@ IF(LZO2_FOUND) + elseif(0) + CMAKE_PUSH_CHECK_STATE() + INCLUDE_DIRECTORIES(${LIBLZMA_INCLUDE_DIRS}) +@@ -514,6 +519,7 @@ IF(LZO2_FOUND) SET(HAVE_LZO_LZO1X_H 1) INCLUDE_DIRECTORIES(${LZO2_INCLUDE_DIR}) LIST(APPEND ADDITIONAL_LIBS ${LZO2_LIBRARY}) diff --git a/external_imported/vcpkg/ports/libarchive/portfile.cmake b/external_imported/vcpkg/ports/libarchive/portfile.cmake index 71cdde237..5685a345b 100644 --- a/external_imported/vcpkg/ports/libarchive/portfile.cmake +++ b/external_imported/vcpkg/ports/libarchive/portfile.cmake @@ -1,12 +1,10 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libarchive/libarchive REF 1b2c437b99b361c7692538fa373e99955e9b93ae #v3.5.2 SHA512 df527dd333b01ed85f07831ba0bd4b1d0b5384fe12cfa53474ad39c04509105a3c8574a2d21a430e3584a931c8f6ae923bca95df83945f0c593c1ffaed3f62da HEAD_REF master - PATCHES + PATCHES disable-warnings.patch fix-buildsystem.patch fix-cpu-set.patch diff --git a/external_imported/vcpkg/ports/libarchive/usage b/external_imported/vcpkg/ports/libarchive/usage index cf8c24304..ff8a1fb0b 100644 --- a/external_imported/vcpkg/ports/libarchive/usage +++ b/external_imported/vcpkg/ports/libarchive/usage @@ -1,5 +1,8 @@ -The package libarchive is compatible with built-in CMake targets: +The package libarchive is compatible with the CMake Find Module: find_package(LibArchive REQUIRED) target_include_directories(main PRIVATE ${LibArchive_INCLUDE_DIRS}) target_link_libraries(main PRIVATE ${LibArchive_LIBRARIES}) + + find_package(LibArchive REQUIRED) + target_link_libraries(main PRIVATE LibArchive::LibArchive) # CMake >= 3.17 diff --git a/external_imported/vcpkg/ports/libarchive/vcpkg-cmake-wrapper.cmake.in b/external_imported/vcpkg/ports/libarchive/vcpkg-cmake-wrapper.cmake.in index 5f00aad95..f3b7cf588 100644 --- a/external_imported/vcpkg/ports/libarchive/vcpkg-cmake-wrapper.cmake.in +++ b/external_imported/vcpkg/ports/libarchive/vcpkg-cmake-wrapper.cmake.in @@ -33,8 +33,8 @@ if(LibArchive_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") endif() if(@ENABLE_LZO@) include(SelectLibraryConfigurations) - find_library(Z_VCPKG_LZO_LIBRARY_DEBUG NAMES lzo2d lzo2 PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH) - find_library(Z_VCPKG_LZO_LIBRARY_RELEASE NAMES lzo2 PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH) + find_library(Z_VCPKG_LZO_LIBRARY_DEBUG NAMES lzo2d lzo2 NAMES_PER_DIR PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH) + find_library(Z_VCPKG_LZO_LIBRARY_RELEASE NAMES lzo2 NAMES_PER_DIR PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH) select_library_configurations(Z_VCPKG_LZO) if(Z_VCPKG_LZO_LIBRARY) list(APPEND z_vcpkg_libarchive_libs ${Z_VCPKG_LZO_LIBRARY}) @@ -57,6 +57,13 @@ if(LibArchive_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") list(APPEND LibArchive_LIBRARIES ${z_vcpkg_libarchive_libs}) if(TARGET LibArchive::LibArchive) + if(Z_VCPKG_LZO_LIBRARY AND Z_VCPKG_LZO_LIBRARY_DEBUG) + list(REMOVE_ITEM z_vcpkg_libarchive_libs ${Z_VCPKG_LZO_LIBRARY}) + list(APPEND z_vcpkg_libarchive_libs + "\$<\$>:${Z_VCPKG_LZO_LIBRARY_RELEASE}>" + "\$<\$:${Z_VCPKG_LZO_LIBRARY_DEBUG}>" + ) + endif() set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${z_vcpkg_libarchive_libs}) endif() unset(z_vcpkg_libarchive_libs) diff --git a/external_imported/vcpkg/ports/libarchive/vcpkg.json b/external_imported/vcpkg/ports/libarchive/vcpkg.json index 0eb93f942..0a0eb02d5 100644 --- a/external_imported/vcpkg/ports/libarchive/vcpkg.json +++ b/external_imported/vcpkg/ports/libarchive/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libarchive", "version-semver": "3.5.2", - "port-version": 2, + "port-version": 5, "description": "Library for reading and writing streaming archives", "homepage": "https://github.com/libarchive/libarchive", + "license": null, "supports": "!uwp", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/libassuan/portfile.cmake b/external_imported/vcpkg/ports/libassuan/portfile.cmake index d2cd25a52..1d0451406 100644 --- a/external_imported/vcpkg/ports/libassuan/portfile.cmake +++ b/external_imported/vcpkg/ports/libassuan/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports unix platform" ON_TARGET "Windows") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gpg/libassuan @@ -21,7 +19,7 @@ vcpkg_configure_make( ) vcpkg_install_make() -vcpkg_fixup_pkgconfig() +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libassuan/bin/libassuan-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") diff --git a/external_imported/vcpkg/ports/libassuan/vcpkg.json b/external_imported/vcpkg/ports/libassuan/vcpkg.json index 9bb9aba21..eb2e6a2d8 100644 --- a/external_imported/vcpkg/ports/libassuan/vcpkg.json +++ b/external_imported/vcpkg/ports/libassuan/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libassuan", "version": "2.5.3", - "port-version": 3, + "port-version": 4, "description": "A library implementing the so-called Assuan protocol", "homepage": "https://gnupg.org/software/libassuan/index.html", "supports": "!windows", diff --git a/external_imported/vcpkg/ports/libb2/portfile.cmake b/external_imported/vcpkg/ports/libb2/portfile.cmake index fe26199ce..452218f28 100644 --- a/external_imported/vcpkg/ports/libb2/portfile.cmake +++ b/external_imported/vcpkg/ports/libb2/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "WINDOWS") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO BLAKE2/libb2 @@ -28,4 +26,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) 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/libb2/vcpkg.json b/external_imported/vcpkg/ports/libb2/vcpkg.json index 6cd8bc6dc..e8ef8ec05 100644 --- a/external_imported/vcpkg/ports/libb2/vcpkg.json +++ b/external_imported/vcpkg/ports/libb2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libb2", "version": "0.98.1", - "port-version": 5, + "port-version": 6, "description": "C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp", "homepage": "https://github.com/BLAKE2/libb2", "supports": "!windows" diff --git a/external_imported/vcpkg/ports/libbacktrace/vcpkg.json b/external_imported/vcpkg/ports/libbacktrace/vcpkg.json index 7b6b32b53..4136d4f6b 100644 --- a/external_imported/vcpkg/ports/libbacktrace/vcpkg.json +++ b/external_imported/vcpkg/ports/libbacktrace/vcpkg.json @@ -1,6 +1,8 @@ { "name": "libbacktrace", "version-date": "2021-03-14", + "port-version": 1, "description": "The libbacktrace library may be linked into a program or library and used to produce symbolic backtraces.", - "homepage": "https://github.com/ianlancetaylor/libbacktrace" + "homepage": "https://github.com/ianlancetaylor/libbacktrace", + "supports": "!windows" } diff --git a/external_imported/vcpkg/ports/libcanberra/portfile.cmake b/external_imported/vcpkg/ports/libcanberra/portfile.cmake index 6fa7f3221..9b862ca23 100644 --- a/external_imported/vcpkg/ports/libcanberra/portfile.cmake +++ b/external_imported/vcpkg/ports/libcanberra/portfile.cmake @@ -1,6 +1,5 @@ -vcpkg_fail_port_install(ON_TARGET "Windows" "UWP") set(VERSION 0.30) -set(PATCHES +set(PATCHES pkgconfig.patch undefined_reference.diff # https://sources.debian.org/patches/libcanberra/0.30-7/ gtk_dont_assume_x11.patch # likewise diff --git a/external_imported/vcpkg/ports/libcanberra/vcpkg.json b/external_imported/vcpkg/ports/libcanberra/vcpkg.json index 7ddde0421..44c64d07b 100644 --- a/external_imported/vcpkg/ports/libcanberra/vcpkg.json +++ b/external_imported/vcpkg/ports/libcanberra/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libcanberra", "version": "0.30", - "port-version": 1, + "port-version": 2, "description": "An implementation of the XDG Sound Theme and Name Specifications, for generating event sounds on free desktops", "homepage": "http://0pointer.de/lennart/projects/libcanberra/", "supports": "!(windows | uwp)", diff --git a/external_imported/vcpkg/ports/libcpplocate/fix-install-paths.patch b/external_imported/vcpkg/ports/libcpplocate/fix-install-paths.patch new file mode 100644 index 000000000..62d4722c2 --- /dev/null +++ b/external_imported/vcpkg/ports/libcpplocate/fix-install-paths.patch @@ -0,0 +1,39 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 854214c..9c4d98a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -124,7 +124,7 @@ if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr" OR "${CMAKE_INSTALL_PREFIX}" STREQU + endif() + + # Installation paths +-if(UNIX AND SYSTEM_DIR_INSTALL) ++if(1) + # Install into the system (/usr/bin or /usr/local/bin) + set(INSTALL_ROOT "share/${project}") # /usr/[local]/share/ + set(INSTALL_CMAKE "share/${project}/cmake") # /usr/[local]/share//cmake +diff --git a/cpplocate-config.cmake b/cpplocate-config.cmake +index 8693fa4..cdb2828 100644 +--- a/cpplocate-config.cmake ++++ b/cpplocate-config.cmake +@@ -26,7 +26,7 @@ macro(find_modules PREFIX) + if(TARGET ${module_name}) + set(MODULE_FOUND TRUE) + else() +- find_module("${CMAKE_CURRENT_LIST_DIR}/${PREFIX}/${module_name}/${module_name}-export.cmake") ++ find_module("${CMAKE_CURRENT_LIST_DIR}/${module_name}-export.cmake") + endif() + endforeach(module_name) + endmacro() +diff --git a/liblocate-config.cmake b/liblocate-config.cmake +index 3bf4823..7245353 100644 +--- a/liblocate-config.cmake ++++ b/liblocate-config.cmake +@@ -25,7 +25,7 @@ macro(find_modules PREFIX) + if(TARGET ${module_name}) + set(MODULE_FOUND TRUE) + else() +- find_module("${CMAKE_CURRENT_LIST_DIR}/${PREFIX}/${module_name}/${module_name}-export.cmake") ++ find_module("${CMAKE_CURRENT_LIST_DIR}/${module_name}-export.cmake") + endif() + endforeach(module_name) + endmacro() diff --git a/external_imported/vcpkg/ports/libcpplocate/portfile.cmake b/external_imported/vcpkg/ports/libcpplocate/portfile.cmake new file mode 100644 index 000000000..963700fcb --- /dev/null +++ b/external_imported/vcpkg/ports/libcpplocate/portfile.cmake @@ -0,0 +1,41 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cginternals/cpplocate + REF v2.3.0 + SHA512 4028d552d0c3c0161d5dd5aea27bb22f0c61297a4b461a067c082cfcf84e3a709c9895453e750d819433529089011c2512293b2064c42bb5ba11f957eebc2206 + HEAD_REF master + PATCHES + fix-install-paths.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DOPTION_BUILD_TESTS=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME cpplocate + CONFIG_PATH share/cpplocate/cmake/cpplocate + DO_NOT_DELETE_PARENT_CONFIG_PATH +) + +vcpkg_cmake_config_fixup( + PACKAGE_NAME liblocate + CONFIG_PATH share/cpplocate/cmake/liblocate +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/cpplocate/cmake") + +# Patched liblocate config file needs moving to the correct directory +file(RENAME + "${CURRENT_PACKAGES_DIR}/share/cpplocate/liblocate-config.cmake" + "${CURRENT_PACKAGES_DIR}/share/liblocate/liblocate-config.cmake" +) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/libcpplocate/vcpkg.json b/external_imported/vcpkg/ports/libcpplocate/vcpkg.json new file mode 100644 index 000000000..3dbe9db2e --- /dev/null +++ b/external_imported/vcpkg/ports/libcpplocate/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "libcpplocate", + "version-semver": "2.3.0", + "description": "Cross-platform C++ library providing tools for applications to locate themselves, their data assets as well as dependent modules.", + "homepage": "https://cpplocate.org/", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/libcrafter/portfile.cmake b/external_imported/vcpkg/ports/libcrafter/portfile.cmake index 71303f600..b72759a15 100644 --- a/external_imported/vcpkg/ports/libcrafter/portfile.cmake +++ b/external_imported/vcpkg/ports/libcrafter/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "windows") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pellegre/libcrafter @@ -25,4 +23,4 @@ vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() # Handle copyright -file(INSTALL "${SOURCE_PATH}/libcrafter/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/libcrafter/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/libcrafter/vcpkg.json b/external_imported/vcpkg/ports/libcrafter/vcpkg.json index 22f83239b..8f8dfd08c 100644 --- a/external_imported/vcpkg/ports/libcrafter/vcpkg.json +++ b/external_imported/vcpkg/ports/libcrafter/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libcrafter", "version": "1.0", - "port-version": 1, + "port-version": 2, "description": "Libcrafter is a high level library for C++ designed to create and decode network packets.", "homepage": "https://github.com/pellegre/libcrafter", "supports": "!windows", diff --git a/external_imported/vcpkg/ports/libcurl-simple-https/portfile.cmake b/external_imported/vcpkg/ports/libcurl-simple-https/portfile.cmake new file mode 100644 index 000000000..4ea56bdd1 --- /dev/null +++ b/external_imported/vcpkg/ports/libcurl-simple-https/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO SamuelMarks/curl-simple-https + REF 5a115053ba4d249fc1af22c3673b4d014e56bcf5 + SHA512 6274bfeec5235d39c627850b1b6ef03c3f1982c74f937b604137cf3cf87e982f971c4681760b42926a3fb15bc8268f2fa48c197919516066d73f53425aa24545 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DBUILD_CLI=OFF" +) +vcpkg_cmake_install() +file(INSTALL "${SOURCE_PATH}/cmake/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/libcurl-simple-https/vcpkg.json b/external_imported/vcpkg/ports/libcurl-simple-https/vcpkg.json new file mode 100644 index 000000000..beac2afdd --- /dev/null +++ b/external_imported/vcpkg/ports/libcurl-simple-https/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "libcurl-simple-https", + "version-date": "2022-02-14", + "description": "Very simple HTTPS interface built atop libcurl", + "license": "Apache-2.0 OR MIT", + "supports": "!uwp", + "dependencies": [ + "curl", + { + "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 3ab79d82a..9c8e45f2f 100644 --- a/external_imported/vcpkg/ports/libdatachannel/0001-fix-for-vcpkg.patch +++ b/external_imported/vcpkg/ports/libdatachannel/0001-fix-for-vcpkg.patch @@ -68,8 +68,8 @@ index c0e59d1..1d71e38 100644 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::juice) -+ target_link_libraries(datachannel-static PRIVATE LibJuice::juice) ++ 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 a999aadd5..b41e17cc5 100644 --- a/external_imported/vcpkg/ports/libdatachannel/portfile.cmake +++ b/external_imported/vcpkg/ports/libdatachannel/portfile.cmake @@ -1,11 +1,17 @@ +set(PATCHES 0001-fix-for-vcpkg.patch) + +if(VCPKG_TARGET_IS_UWP) + list(APPEND PATCHES uwp-warnings.patch) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO paullouisageneau/libdatachannel - REF 6e1222c4def8b959eedc8b9e6da95072afe6ff78 #v0.16.0 - SHA512 bfa21b1f55a18c6bd0473b2c80d6739e9f06d463246004f91b216423739c5fa04651a099ef995b4ab12f392784208cc0c7ab8662e3790ce4be6be36e37a944d7 + REF 127f157fc00abeb6fe5a57ce56a7c4e092721203 #v0.16.4 + SHA512 ef7d1f652af031c13260a4c436c949eb566d40d15dcde5b56ab782e9e9d7b5e287f4a6a61bc4eb3fcdbb835c102637b0368f3c43af6f9fa9c87cd99d15bde454 HEAD_REF master PATCHES - 0001-fix-for-vcpkg.patch + ${PATCHES} ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -40,4 +46,4 @@ ${DATACHANNEL_CONFIG}") 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) \ 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/libdatachannel/uwp-warnings.patch b/external_imported/vcpkg/ports/libdatachannel/uwp-warnings.patch new file mode 100644 index 000000000..023bf888e --- /dev/null +++ b/external_imported/vcpkg/ports/libdatachannel/uwp-warnings.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b79b458..790bf95 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -385,6 +385,9 @@ if(WARNINGS_AS_ERRORS) + endif() + endif() + ++target_compile_options(datachannel PRIVATE /wd4996) ++target_compile_options(datachannel-static PRIVATE /wd4996) ++ + install(TARGETS datachannel EXPORT LibDataChannelTargets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib diff --git a/external_imported/vcpkg/ports/libdatachannel/vcpkg.json b/external_imported/vcpkg/ports/libdatachannel/vcpkg.json index 9098874c6..3f67b93a4 100644 --- a/external_imported/vcpkg/ports/libdatachannel/vcpkg.json +++ b/external_imported/vcpkg/ports/libdatachannel/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libdatachannel", - "version-semver": "0.16.0", + "version-semver": "0.16.4", + "port-version": 1, "description": "libdatachannel is a standalone implementation of WebRTC Data Channels, WebRTC Media Transport, and WebSockets in C++17 with C bindings for POSIX platforms (including GNU/Linux, Android, and Apple macOS) and Microsoft Windows.", "homepage": "https://github.com/paullouisageneau/libdatachannel", "dependencies": [ diff --git a/external_imported/vcpkg/ports/libdatrie/CMakeLists.txt b/external_imported/vcpkg/ports/libdatrie/CMakeLists.txt index bdc1c21ea..57e7cf58e 100644 --- a/external_imported/vcpkg/ports/libdatrie/CMakeLists.txt +++ b/external_imported/vcpkg/ports/libdatrie/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.22) project(libdatrie LANGUAGES C) option(SKIP_HEADERS "Skip headers" OFF) @@ -49,30 +49,23 @@ check_function_exists(malloc HAVE_MALLOC) configure_file(config.h.cmake config.h) +include_directories( + "${CMAKE_CURRENT_SOURCE_DIR}" + "${CMAKE_CURRENT_BINARY_DIR}" +) + add_library(libdatrie ${LIB_SRCS}) -target_include_directories(libdatrie PRIVATE ".") -target_include_directories(libdatrie PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) -set_target_properties(libdatrie PROPERTIES PREFIX "") -set_target_properties(libdatrie PROPERTIES DEBUG_POSTFIX "d") +set_target_properties(libdatrie PROPERTIES OUTPUT_NAME "datrie") if(MSVC) add_definitions(-D_CRT_SECURE_NO_WARNINGS) add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) endif() - if (NOT SKIP_TOOL) add_executable(trietool "tools/trietool.c" ) - target_include_directories(trietool PRIVATE ".") - target_include_directories(trietool PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) - target_link_libraries(trietool libdatrie) - - find_path(ICONV_INCLUDE_DIR iconv.h) - find_library(ICONV_LIBRARY NAMES iconv libiconv) - find_library(CHARSET_LIBRARY NAMES charset libcharset) - target_include_directories(trietool PRIVATE ${ICONV_INCLUDE_DIR}) - target_link_libraries(trietool ${ICONV_LIBRARY} ${CHARSET_LIBRARY}) - + find_package(Iconv REQUIRED) + target_link_libraries(trietool PRIVATE libdatrie Iconv::Iconv) install( TARGETS trietool RUNTIME DESTINATION bin @@ -92,3 +85,13 @@ if (NOT SKIP_HEADERS) DESTINATION "include/datrie" ) endif() + +set(prefix "${CMAKE_INSTALL_PREFIX}") +set(exec_prefix "\${prefix}") +set(libdir "\${prefix}/lib") +set(includedir "\${prefix}/include") +configure_file(datrie-0.2.pc.in datrie-0.2.pc) +install( + FILES "${CMAKE_CURRENT_BINARY_DIR}/datrie-0.2.pc" + DESTINATION "lib/pkgconfig" +) \ No newline at end of file diff --git a/external_imported/vcpkg/ports/libdatrie/fix-trietool.patch b/external_imported/vcpkg/ports/libdatrie/fix-trietool.patch deleted file mode 100644 index bcecee26e..000000000 --- a/external_imported/vcpkg/ports/libdatrie/fix-trietool.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 086a76ad7c17060d504371ea724cf5d651d43eb3 Mon Sep 17 00:00:00 2001 -From: Mikhail Paulyshka -Date: Thu, 28 Dec 2017 16:07:51 +0300 -Subject: [PATCH] fix trietool for MSVC runtime - ---- - tools/trietool.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tools/trietool.c b/tools/trietool.c -index 4cfde2a..7c90905 100644 ---- a/tools/trietool.c -+++ b/tools/trietool.c -@@ -589,12 +589,12 @@ string_trim (char *s) - char *p; - - /* skip leading white spaces */ -- while (*s && isspace (*s)) -+ while (*s && isspace ((unsigned char)*s)) - ++s; - - /* trim trailing white spaces */ - p = s + strlen (s) - 1; -- while (isspace (*p)) -+ while (isspace ((unsigned char)*p)) - --p; - *++p = '\0'; - --- -2.14.1.windows.1 - diff --git a/external_imported/vcpkg/ports/libdatrie/portfile.cmake b/external_imported/vcpkg/ports/libdatrie/portfile.cmake index 452b66a17..76e880460 100644 --- a/external_imported/vcpkg/ports/libdatrie/portfile.cmake +++ b/external_imported/vcpkg/ports/libdatrie/portfile.cmake @@ -1,52 +1,40 @@ -set(LIBDATRIE_VERSION 0.2.10) +set(LIBDATRIE_VERSION 0.2.13) -vcpkg_download_distfile(ARCHIVE - URLS "https://linux.thai.net/pub/ThaiLinux/software/libthai/libdatrie-${LIBDATRIE_VERSION}.tar.xz" - FILENAME "libdatrie-${LIBDATRIE_VERSION}.tar.xz" - SHA512 ee68ded9d6e06c562da462d42e7e56098a82478d7b8547506200c3018b72536c4037a4e518924f779dc77d3ab139d93216bdb29ab4116b9dc9efd1a5d1eb9e31 -) - -vcpkg_extract_source_archive_ex( - ARCHIVE ${ARCHIVE} +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH + REPO tlwg/libdatrie + REF v${LIBDATRIE_VERSION} + SHA512 38f5a3ee1f3ca0f0601a5fcfeec3892cb34857d4b4720b8e018ca1beb6520c4c10af3bd2f0e4d64367cb256e8e2bca4d0a59b1c81fb36782613d2c258b64df59 + HEAD_REF master PATCHES - "${CMAKE_CURRENT_LIST_DIR}/fix-exports.patch" - "${CMAKE_CURRENT_LIST_DIR}/fix-trietool.patch" + fix-exports.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h.cmake DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/config.h.cmake" DESTINATION "${SOURCE_PATH}") -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - set(SKIP_TOOL ON) -else() - set(SKIP_TOOL OFF) -endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + tool SKIP_TOOL +) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DVERSION=${LIBDATRIE_VERSION} - OPTIONS_RELEASE - -DSKIP_TOOL=${SKIP_TOOL} - -DSKIP_HEADERS=OFF + ${FEATURE_OPTIONS} OPTIONS_DEBUG -DSKIP_TOOL=ON -DSKIP_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() -if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT}) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/trietool.exe ${CURRENT_PACKAGES_DIR}/tools/${PORT}/trietool.exe) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) -endif() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +if(NOT SKIP_TOOL) + vcpkg_copy_tools(TOOL_NAMES trietool AUTO_CLEAN) endif() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libdatrie RENAME copyright) +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/libdatrie/usage b/external_imported/vcpkg/ports/libdatrie/usage new file mode 100644 index 000000000..e63cedeed --- /dev/null +++ b/external_imported/vcpkg/ports/libdatrie/usage @@ -0,0 +1,13 @@ +The package libdatrie can be used via CMake: + + find_path(LIBDATRIE_INCLUDE_DIR datrie/trie.h) + find_library(LIBDATRIE_LIBRARY NAMES datrie) + target_include_directories(main PRIVATE "${LIBDATRIE_INCLUDE_DIR}") + target_link_libraries(main PRIVATE "${LIBDATRIE_LIBRARY}") + +The package libdatrie can be imported via CMake FindPkgConfig module: + + find_package(PkgConfig) + pkg_check_modules(LIBDATRIE REQUIRED IMPORTED_TARGET datrie-0.2) + + target_link_libraries(main PRIVATE PkgConfig::LIBDATRIE) diff --git a/external_imported/vcpkg/ports/libdatrie/vcpkg.json b/external_imported/vcpkg/ports/libdatrie/vcpkg.json index b9f1f5457..e143b035f 100644 --- a/external_imported/vcpkg/ports/libdatrie/vcpkg.json +++ b/external_imported/vcpkg/ports/libdatrie/vcpkg.json @@ -1,10 +1,23 @@ { "name": "libdatrie", - "version-string": "0.2.10", - "port-version": 4, - "description": "implementation of double-array structure for representing trie", + "version": "0.2.13", + "port-version": 1, + "description": "Implementation of double-array structure for representing trie", "homepage": "https://linux.thai.net/pub/ThaiLinux/software/libthai", + "license": "LGPL-2.1-or-later", "dependencies": [ - "libiconv" - ] + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "tool": { + "description": "Build the trietool application", + "supports": "!uwp", + "dependencies": [ + "libiconv" + ] + } + } } diff --git a/external_imported/vcpkg/ports/libde265/portfile.cmake b/external_imported/vcpkg/ports/libde265/portfile.cmake index 6fad08dee..87418395b 100644 --- a/external_imported/vcpkg/ports/libde265/portfile.cmake +++ b/external_imported/vcpkg/ports/libde265/portfile.cmake @@ -10,10 +10,16 @@ vcpkg_from_github( fix-libde265-headers.patch ) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + sse DISABLE_SSE +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_SDL=ON + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() @@ -39,6 +45,9 @@ vcpkg_fixup_pkgconfig() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libde265/de265.h" "!defined(LIBDE265_STATIC_BUILD)" "0") +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libde265/de265.h" "!defined(LIBDE265_STATIC_BUILD)" "1") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/external_imported/vcpkg/ports/libde265/vcpkg.json b/external_imported/vcpkg/ports/libde265/vcpkg.json index 5276b3880..49e6569ee 100644 --- a/external_imported/vcpkg/ports/libde265/vcpkg.json +++ b/external_imported/vcpkg/ports/libde265/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libde265", - "version-string": "1.0.8", - "port-version": 3, + "version": "1.0.8", + "port-version": 5, "description": "Open h.265 video codec implementation.", "homepage": "https://www.libde265.org/", + "license": "LGPL-3.0-only", "supports": "!(arm | uwp)", "dependencies": [ { @@ -14,5 +15,10 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "sse": { + "description": "Enable SSE optimizations" + } + } } diff --git a/external_imported/vcpkg/ports/libdshowcapture/portfile.cmake b/external_imported/vcpkg/ports/libdshowcapture/portfile.cmake index 136be4d21..79633e0f7 100644 --- a/external_imported/vcpkg/ports/libdshowcapture/portfile.cmake +++ b/external_imported/vcpkg/ports/libdshowcapture/portfile.cmake @@ -6,21 +6,20 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_build_cmake(TARGET libdshowcapture) +vcpkg_cmake_build(TARGET libdshowcapture) # Copy files -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libdshowcapture RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libdshowcapture" RENAME copyright) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libdshowcapture.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libdshowcapture.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libdshowcapture.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libdshowcapture.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") endif() -file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libdshowcapture.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) -file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libdshowcapture.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -file(INSTALL ${SOURCE_PATH}/dshowcapture.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libdshowcapture.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") +file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libdshowcapture.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") +file(INSTALL "${SOURCE_PATH}/dshowcapture.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include") vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/libdshowcapture/vcpkg.json b/external_imported/vcpkg/ports/libdshowcapture/vcpkg.json index ca807e319..643b10dc8 100644 --- a/external_imported/vcpkg/ports/libdshowcapture/vcpkg.json +++ b/external_imported/vcpkg/ports/libdshowcapture/vcpkg.json @@ -1,6 +1,13 @@ { "name": "libdshowcapture", - "version-string": "0.6.0", - "port-version": 2, - "description": "Free and Open Source C++11 Library for capturing DirectShow video/audio devices on windows." + "version": "0.6.0", + "port-version": 3, + "description": "Free and Open Source C++11 Library for capturing DirectShow video/audio devices on windows.", + "supports": "windows & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/libe57/0001_cmake.patch b/external_imported/vcpkg/ports/libe57/0001_cmake.patch index 47001bbe4..e4963aeb5 100644 --- a/external_imported/vcpkg/ports/libe57/0001_cmake.patch +++ b/external_imported/vcpkg/ports/libe57/0001_cmake.patch @@ -86,3 +86,22 @@ diff -Naur a/CMakeLists.txt b/CMakeLists.txt ) #include (InstallRequiredSystemLibraries) +--- a/src/refimpl/E57RefImplConfig.cmake 2011-10-06 16:01:00.000000000 +0800 ++++ b/src/refimpl/E57RefImplConfig.cmake 2022-03-01 16:48:29.117485600 +0800 +@@ -49,6 +49,8 @@ + # NOTE: You will also need to include the boost and xerces libraries to your + # project. + ++get_filename_component(E57RefImpl_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE) ++ + IF (NOT "${E57RefImpl_DIR}/include" EQUAL "${E57RefImpl_INCLUDE_DIR}") + SET(E57RefImpl_LIBRARY_DEBUG E57RefImpl_LIBRARY_DEBUG-NOTFOUND) + SET(E57RefImpl_LIBRARY_RELEASE E57RefImpl_LIBRARY_RELEASE-NOTFOUND) +@@ -78,6 +80,6 @@ + NAMES libE57RefImpl-d + E57RefImpl-d +- HINTS ${E57RefImpl_DIR}/lib ++ HINTS ${E57RefImpl_DIR}/debug/lib + DOC "E57 debug library" + ) + diff --git a/external_imported/vcpkg/ports/libe57/0002_replace_tr1_with_cpp11.patch b/external_imported/vcpkg/ports/libe57/0002_replace_tr1_with_cpp11.patch index 1b48de7c2..ff23c340b 100644 --- a/external_imported/vcpkg/ports/libe57/0002_replace_tr1_with_cpp11.patch +++ b/external_imported/vcpkg/ports/libe57/0002_replace_tr1_with_cpp11.patch @@ -1,20 +1,20 @@ -diff -Naur a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2021-06-16 22:53:02.033465000 +0800 -+++ b/CMakeLists.txt 2021-06-16 23:01:31.542323600 +0800 -@@ -25,7 +25,9 @@ - # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - # DEALINGS IN THE SOFTWARE. +diff --color -Naur a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2013-04-03 22:24:08.000000000 +0800 ++++ b/CMakeLists.txt 2022-03-01 17:23:01.210728200 +0800 +@@ -36,8 +36,9 @@ + # If you find any errors or have suggestion to improve the build script: + # patches are most welcome! Please send them to the development mailing list. --cmake_minimum_required(VERSION 2.8.2) +cmake_minimum_required(VERSION 3.1) -+ + +-cmake_minimum_required(VERSION 2.8.2) +set(CMAKE_CXX_STANDARD 11) # Override flags to enable prepare for linking to static runtime set(CMAKE_USER_MAKE_RULES_OVERRIDE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/c_flag_overrides.cmake) -diff -Naur a/src/tools/e57fields.cpp b/src/tools/e57fields.cpp +diff --color -Naur a/src/tools/e57fields.cpp b/src/tools/e57fields.cpp --- a/src/tools/e57fields.cpp 2012-04-04 17:19:01.000000000 +0800 -+++ b/src/tools/e57fields.cpp 2021-06-16 22:55:02.789463000 +0800 ++++ b/src/tools/e57fields.cpp 2022-03-01 17:24:17.904911600 +0800 @@ -30,11 +30,7 @@ #include #include @@ -49,10 +49,10 @@ diff -Naur a/src/tools/e57fields.cpp b/src/tools/e57fields.cpp /// The precalculated parts of the element path name. /// The only part that is missing is the record number which goes in between. -diff -Naur a/src/tools/e57unpack.cpp b/src/tools/e57unpack.cpp ---- a/src/tools/e57unpack.cpp 2011-10-06 16:01:00.000000000 +0800 -+++ b/src/tools/e57unpack.cpp 2021-06-16 22:56:57.150323800 +0800 -@@ -41,12 +41,8 @@ +diff --color -Naur a/src/tools/e57unpack.cpp b/src/tools/e57unpack.cpp +--- a/src/tools/e57unpack.cpp 2013-04-03 22:24:08.000000000 +0800 ++++ b/src/tools/e57unpack.cpp 2022-03-01 17:25:15.206260200 +0800 +@@ -45,12 +45,8 @@ #include using std::runtime_error; @@ -67,10 +67,10 @@ diff -Naur a/src/tools/e57unpack.cpp b/src/tools/e57unpack.cpp #include using std::string; -diff -Naur a/src/tools/e57validate.cpp b/src/tools/e57validate.cpp +diff --color -Naur a/src/tools/e57validate.cpp b/src/tools/e57validate.cpp --- a/src/tools/e57validate.cpp 2011-10-06 16:01:00.000000000 +0800 -+++ b/src/tools/e57validate.cpp 2021-06-16 22:58:19.365323700 +0800 -@@ -66,11 +66,8 @@ ++++ b/src/tools/e57validate.cpp 2022-03-01 17:25:46.220771800 +0800 +@@ -66,11 +66,7 @@ ================================================================*/ @@ -79,13 +79,12 @@ diff -Naur a/src/tools/e57validate.cpp b/src/tools/e57validate.cpp -#else -# include -using std::tr1::unordered_map; -+ +-#endif +#include +using std::unordered_map; --#endif #include using std::strlen; -@@ -694,7 +692,7 @@ +@@ -694,7 +691,7 @@ void dump(int indent = 0, std::ostream& os = std::cout); //================ private: diff --git a/external_imported/vcpkg/ports/libe57/portfile.cmake b/external_imported/vcpkg/ports/libe57/portfile.cmake index 1f7bfd9ea..c260430d6 100644 --- a/external_imported/vcpkg/ports/libe57/portfile.cmake +++ b/external_imported/vcpkg/ports/libe57/portfile.cmake @@ -1,11 +1,11 @@ -set(VERSION 1.1.312) +set(VERSION 1.1.332) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/E57RefImpl_src-${VERSION}) vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO e57-3d-imgfmt FILENAME "E57RefImpl_src-${VERSION}.zip" - SHA512 c729cc3094131f115ddf9b8c24a9420c4ab9d16a4343acfefb42f997f4bf25247cd5563126271df2af95f103093b7f6b360dbade52c9e66ec39dd2f06e041eb7 + SHA512 86adb88cff32d72905e923b1205d609a2bce2eabd78995c59a7957395b233766a5ce31481db08977117abc1a70bbed90d2ce0cdb9897704a8c63d992e91a3907 PATCHES "0001_cmake.patch" "0002_replace_tr1_with_cpp11.patch" diff --git a/external_imported/vcpkg/ports/libe57/vcpkg.json b/external_imported/vcpkg/ports/libe57/vcpkg.json index 09984c737..eb35fdaab 100644 --- a/external_imported/vcpkg/ports/libe57/vcpkg.json +++ b/external_imported/vcpkg/ports/libe57/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libe57", - "version-semver": "1.1.312", + "version-semver": "1.1.332", "port-version": 1, "description": "An open source implementation of the ASTM E2807 Standard Specification for 3D Imaging Data Exchange in the C++ language.", "homepage": "http://www.libe57.org/", + "license": "BSL-1.0", "dependencies": [ "boost-crc", "boost-filesystem", diff --git a/external_imported/vcpkg/ports/libe57format/portfile.cmake b/external_imported/vcpkg/ports/libe57format/portfile.cmake new file mode 100644 index 000000000..34ddab5ce --- /dev/null +++ b/external_imported/vcpkg/ports/libe57format/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO asmaloney/libE57Format + REF v2.2.0 + SHA512 7b788efce2efdbfba83d4e3ab5c4884b3d85b5e44c510954f9200db26fb97c92f4e33d04209c0647fc39c3af081fc09d1ee6a79857b1980a0e1e43586f78bd0c + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/E57Format") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/libe57format RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") \ No newline at end of file diff --git a/external_imported/vcpkg/ports/libe57format/vcpkg.json b/external_imported/vcpkg/ports/libe57format/vcpkg.json new file mode 100644 index 000000000..758240454 --- /dev/null +++ b/external_imported/vcpkg/ports/libe57format/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "libe57format", + "version-string": "2.2.0", + "description": "A library to provide read & write support for the E57 file format.", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "xerces-c" + ] +} diff --git a/external_imported/vcpkg/ports/libevent/portfile.cmake b/external_imported/vcpkg/ports/libevent/portfile.cmake index d89df926c..df80d0a09 100644 --- a/external_imported/vcpkg/ports/libevent/portfile.cmake +++ b/external_imported/vcpkg/ports/libevent/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libevent/libevent diff --git a/external_imported/vcpkg/ports/libevent/vcpkg.json b/external_imported/vcpkg/ports/libevent/vcpkg.json index 70e05c8cc..41bcecaf1 100644 --- a/external_imported/vcpkg/ports/libevent/vcpkg.json +++ b/external_imported/vcpkg/ports/libevent/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libevent", "version": "2.1.12", - "port-version": 5, + "port-version": 6, "description": "An event notification library", "homepage": "https://github.com/libevent/libevent", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/libevhtp/portfile.cmake b/external_imported/vcpkg/ports/libevhtp/portfile.cmake index 71c17ee53..07d8ee937 100644 --- a/external_imported/vcpkg/ports/libevhtp/portfile.cmake +++ b/external_imported/vcpkg/ports/libevhtp/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux and Mac platform" ON_TARGET "Windows") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO criticalstack/libevhtp @@ -30,5 +28,5 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) vcpkg_copy_pdbs() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -vcpkg_fixup_pkgconfig() +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_fixup_pkgconfig() diff --git a/external_imported/vcpkg/ports/libevhtp/vcpkg.json b/external_imported/vcpkg/ports/libevhtp/vcpkg.json index 04f8de172..db641b8fc 100644 --- a/external_imported/vcpkg/ports/libevhtp/vcpkg.json +++ b/external_imported/vcpkg/ports/libevhtp/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libevhtp", - "version-string": "1.2.18", - "port-version": 2, + "version": "1.2.18", + "port-version": 3, "description": "Libevhtp was created as a replacement API for Libevent's current HTTP API.", "homepage": "https://github.com/criticalstack/libevhtp", + "supports": "!windows", "dependencies": [ "libevent" ], diff --git a/external_imported/vcpkg/ports/libexif/portfile.cmake b/external_imported/vcpkg/ports/libexif/portfile.cmake index 4869c40b5..a3f2abb37 100644 --- a/external_imported/vcpkg/ports/libexif/portfile.cmake +++ b/external_imported/vcpkg/ports/libexif/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET uwp) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libexif/libexif diff --git a/external_imported/vcpkg/ports/libexif/vcpkg.json b/external_imported/vcpkg/ports/libexif/vcpkg.json index d27752d4b..01b68491c 100644 --- a/external_imported/vcpkg/ports/libexif/vcpkg.json +++ b/external_imported/vcpkg/ports/libexif/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libexif", - "version-string": "0.6.22", - "port-version": 1, + "version": "0.6.22", + "port-version": 2, "description": "a library for parsing, editing, and saving EXIF data", "homepage": "https://libexif.github.io/", "supports": "!uwp" diff --git a/external_imported/vcpkg/ports/libfabric/portfile.cmake b/external_imported/vcpkg/ports/libfabric/portfile.cmake index 563dc483f..03b2ec3fa 100644 --- a/external_imported/vcpkg/ports/libfabric/portfile.cmake +++ b/external_imported/vcpkg/ports/libfabric/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "Linux" "OSX" "UWP" ON_ARCH "x86") - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( diff --git a/external_imported/vcpkg/ports/libfabric/vcpkg.json b/external_imported/vcpkg/ports/libfabric/vcpkg.json index 92b5b54bf..547c77e3c 100644 --- a/external_imported/vcpkg/ports/libfabric/vcpkg.json +++ b/external_imported/vcpkg/ports/libfabric/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libfabric", "version-semver": "1.13.2", + "port-version": 1, "description": "The OpenFabrics Interfaces Working Group (OFIWG) and the Libfabric open-source community are pleased to announce the release of version v1.6.2 of libfabric. See NEWS.md for the list of features and enhancements that have been added since the last release.", "homepage": "https://github.com/ofiwg/libfabric", - "supports": "windows & x64 & !static", + "supports": "windows & !uwp & x64 & !static", "dependencies": [ { "name": "networkdirect-sdk", diff --git a/external_imported/vcpkg/ports/libfido2/fix_cmakelists.patch b/external_imported/vcpkg/ports/libfido2/fix_cmakelists.patch index d5c363706..23bbf6a8f 100644 --- a/external_imported/vcpkg/ports/libfido2/fix_cmakelists.patch +++ b/external_imported/vcpkg/ports/libfido2/fix_cmakelists.patch @@ -1,27 +1,29 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1eb8726..b308597 100644 +index 11a51ac..33b9313 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -161,16 +161,20 @@ if(UNIX) +@@ -156,18 +156,20 @@ if(UNIX) endif() if(MSVC) - if((NOT CBOR_INCLUDE_DIRS) OR (NOT CBOR_LIBRARY_DIRS) OR -- (NOT CRYPTO_INCLUDE_DIRS) OR (NOT CRYPTO_LIBRARY_DIRS) OR -- (NOT ZLIB_INCLUDE_DIRS) OR (NOT ZLIB_LIBRARY_DIRS)) -- message(FATAL_ERROR "please provide definitions for " -- "{CBOR,CRYPTO,ZLIB}_{INCLUDE,LIBRARY}_DIRS when building " -- "under msvc") +- (NOT CBOR_BIN_DIRS) OR (NOT CRYPTO_INCLUDE_DIRS) OR +- (NOT CRYPTO_LIBRARY_DIRS) OR (NOT CRYPTO_BIN_DIRS) OR +- (NOT ZLIB_INCLUDE_DIRS) OR (NOT ZLIB_LIBRARY_DIRS) OR +- (NOT ZLIB_BIN_DIRS)) +- message(FATAL_ERROR "please define " +- "{CBOR,CRYPTO,ZLIB}_{INCLUDE,LIBRARY,BIN}_DIRS when " +- "building under msvc") - endif() - set(CBOR_LIBRARIES cbor) - set(ZLIB_LIBRARIES zlib) -- set(CRYPTO_LIBRARIES crypto-46) -+ include(FindPkgConfig) -+ +- set(CRYPTO_LIBRARIES crypto-47) ++ find_package(PkgConfig) ++ + find_package(LIBCBOR REQUIRED) + find_package(OpenSSL REQUIRED) + find_package(ZLIB REQUIRED) -+ ++ + # Handling of different Packagenames in VCPKG + set(CBOR_INCLUDE_DIRS ${LIBCBOR_INCLUDE_DIR}) + set(CRYPTO_INCLUDE_DIRS ${OPENSSL_INCLUDE_DIRS}) @@ -31,18 +33,15 @@ index 1eb8726..b308597 100644 + set(CRYPTO_LIBRARIES ${OPENSSL_LIBRARIES}) + add_definitions("-D_CRT_SECURE_NO_WARNINGS" "-D_CRT_NONSTDC_NO_DEPRECATE") set(MSVC_DISABLED_WARNINGS_LIST - "C4200" # nonstandard extension used: zero-sized array in - # struct/union; -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 11b0bb5..d820ff3 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -120,7 +120,7 @@ if(BUILD_SHARED_LIBS) - install(TARGETS fido2_shared - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -- RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() + "C4152" # nonstandard extension used: function/data pointer + # conversion in expression; +@@ -403,6 +402,9 @@ message(STATUS "USE_HIDAPI: ${USE_HIDAPI}") + message(STATUS "USE_WINHELLO: ${USE_WINHELLO}") + message(STATUS "NFC_LINUX: ${NFC_LINUX}") - install(FILES fido.h DESTINATION include) ++set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /wd4996") ++set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /wd4996") ++ + subdirs(src) + if(BUILD_EXAMPLES) + subdirs(examples) diff --git a/external_imported/vcpkg/ports/libfido2/portfile.cmake b/external_imported/vcpkg/ports/libfido2/portfile.cmake index 9cc2b4cd2..dcd620840 100644 --- a/external_imported/vcpkg/ports/libfido2/portfile.cmake +++ b/external_imported/vcpkg/ports/libfido2/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Yubico/libfido2 - REF 1.7.0 - SHA512 f40d394883d909e9e3ea3308b32f7ca31a882c709e11b3b143ed5734d16b0c244d4932effe06965d566776b03d152b1fc280e73cdfeeb81b65d8414042af19fe + REF 1.10.0 + SHA512 ba03e25d3f42f11cec74dee48c853ae35d03600f24ca06d2b751840408a132290fe22461372ae42ae31419061a63d9908c20a2c0cf3c0c9c8dbc46c34916784f HEAD_REF master PATCHES "fix_cmakelists.patch" @@ -12,7 +12,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LIBFIDO2_BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LIBFIDO2_BUILD_SHARED) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_EXAMPLES=OFF -DBUILD_MANPAGES=OFF @@ -26,4 +26,4 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -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/libfido2/vcpkg.json b/external_imported/vcpkg/ports/libfido2/vcpkg.json index 5604af16f..a470ecdd5 100644 --- a/external_imported/vcpkg/ports/libfido2/vcpkg.json +++ b/external_imported/vcpkg/ports/libfido2/vcpkg.json @@ -1,8 +1,10 @@ { "name": "libfido2", - "version": "1.7.0", + "version": "1.10.0", + "port-version": 1, "description": "Provides library functionality to communicate with a FIDO device over USB, and to verify attestation and assertion signatures.", "homepage": "https://developers.yubico.com/libfido2/", + "license": "BSD-2-Clause", "supports": "!uwp & (x86 | x64) & windows", "dependencies": [ "libcbor", diff --git a/external_imported/vcpkg/ports/libgeotiff/cmakelists.patch b/external_imported/vcpkg/ports/libgeotiff/cmakelists.patch index 472ab6f7e..d2790e17d 100644 --- a/external_imported/vcpkg/ports/libgeotiff/cmakelists.patch +++ b/external_imported/vcpkg/ports/libgeotiff/cmakelists.patch @@ -1,21 +1,3 @@ -diff --git a/libgeotiff/bin/CMakeLists.txt b/libgeotiff/bin/CMakeLists.txt -index 7b12341..b6b1d0c 100644 ---- a/libgeotiff/bin/CMakeLists.txt -+++ b/libgeotiff/bin/CMakeLists.txt -@@ -22,12 +19,11 @@ MESSAGE(STATUS "Adding GeoTIFF utilities to build") - - FOREACH(utility ${GEOTIFF_UTILITIES}) - ADD_EXECUTABLE(${utility} ${utility}.c ${GETOPT_SOURCE}) -- TARGET_LINK_LIBRARIES(${utility} xtiff ${GEOTIFF_LIBRARY_TARGET}) -+ TARGET_LINK_LIBRARIES(${utility} ${GEOTIFF_LIBRARY_TARGET}) - ENDFOREACH() - - ADD_EXECUTABLE(geotifcp geotifcp.c ${GETOPT_SOURCE}) - TARGET_LINK_LIBRARIES(geotifcp -- xtiff - ${GEOTIFF_LIBRARY_TARGET} - ${JPEG_LIBRARIES} - ${ZLIB_LIBRARIES}) diff --git a/libgeotiff/cmake/CMakeLists.txt b/libgeotiff/cmake/CMakeLists.txt index 47a2b00..3809ba3 100644 --- a/libgeotiff/cmake/CMakeLists.txt diff --git a/external_imported/vcpkg/ports/libgeotiff/fix-staticbuild.patch b/external_imported/vcpkg/ports/libgeotiff/fix-staticbuild.patch deleted file mode 100644 index 5b47a5dab..000000000 --- a/external_imported/vcpkg/ports/libgeotiff/fix-staticbuild.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/libgeotiff/CMakeLists.txt b/libgeotiff/CMakeLists.txt -index b4a3cee..fd9f0a5 100644 ---- a/libgeotiff/CMakeLists.txt -+++ b/libgeotiff/CMakeLists.txt -@@ -80,7 +80,11 @@ SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) - - IF(WIN32) - IF(MSVC) -+ IF(BUILD_SHARED_LIBS) - ADD_DEFINITIONS(-DBUILD_AS_DLL=1) -+ ELSE() -+ ADD_DEFINITIONS(-DBUILD_AS_DLL=0) -+ ENDIF() - ADD_DEFINITIONS(/DW4) - if (NOT (MSVC_VERSION VERSION_LESS 1400)) - ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE) diff --git a/external_imported/vcpkg/ports/libgeotiff/geotiff-config.patch b/external_imported/vcpkg/ports/libgeotiff/geotiff-config.patch deleted file mode 100644 index 59a9b4947..000000000 --- a/external_imported/vcpkg/ports/libgeotiff/geotiff-config.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/libgeotiff/cmake/project-config.cmake.in b/libgeotiff/cmake/project-config.cmake.in -index dc5b999..2ce07fd 100644 ---- a/libgeotiff/cmake/project-config.cmake.in -+++ b/libgeotiff/cmake/project-config.cmake.in -@@ -23,6 +23,9 @@ message (STATUS "Reading ${CMAKE_CURRENT_LIST_FILE}") - message (STATUS - "@PROJECT_NAME@ configuration, version ${@PROJECT_NAME@_VERSION}") - -+include(CMakeFindDependencyMacro) -+find_dependency(PROJ) -+ - # Tell the user project where to find our headers and libraries - get_filename_component (_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) - get_filename_component (_ROOT "${_DIR}/@PROJECT_ROOT_DIR@" ABSOLUTE) diff --git a/external_imported/vcpkg/ports/libgeotiff/portfile.cmake b/external_imported/vcpkg/ports/libgeotiff/portfile.cmake index 4cd525fa3..d6cc3d755 100644 --- a/external_imported/vcpkg/ports/libgeotiff/portfile.cmake +++ b/external_imported/vcpkg/ports/libgeotiff/portfile.cmake @@ -1,13 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/libgeotiff - REF 7da5bacae7814c65ebb78f0b64e1141fbcb3de1e #v1.7.0 - SHA512 36047778fbbb4a533a7b65e7b32ab8c0955f59b95417b68b68e7ddd398191445e730e00271756213bf657cbf7cd5eb028b25d4b0741e5b309c78c207b4ec01c6 + REF 1.7.1 + SHA512 3c71a19f02a46a86d546777e2afe6bd715098779845967a5253ca949e0cacc0117c697cabd099611247e85e15cf1813733ae0ef445b136d7001f34667a4c8dd6 HEAD_REF master PATCHES cmakelists.patch - geotiff-config.patch - fix-staticbuild.patch skip-doc-install.patch ) @@ -21,7 +19,6 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/libgeotiff" OPTIONS -DGEOTIFF_BIN_SUBDIR=bin - -DGEOTIFF_DATA_SUBDIR=share -DWITH_TIFF=1 -DHAVE_TIFFOPEN=1 -DHAVE_TIFFMERGEFIELDINFO=1 diff --git a/external_imported/vcpkg/ports/libgeotiff/skip-doc-install.patch b/external_imported/vcpkg/ports/libgeotiff/skip-doc-install.patch index 9430751f6..bef3fc860 100644 --- a/external_imported/vcpkg/ports/libgeotiff/skip-doc-install.patch +++ b/external_imported/vcpkg/ports/libgeotiff/skip-doc-install.patch @@ -1,16 +1,16 @@ diff --git a/libgeotiff/CMakeLists.txt b/libgeotiff/CMakeLists.txt -index b4a3cee..f838a36 100644 +index 54779a5..30ff29f 100644 --- a/libgeotiff/CMakeLists.txt +++ b/libgeotiff/CMakeLists.txt -@@ -286,6 +286,7 @@ SET(GEOTIFF_LIB_DIR ${GEOTIFF_LIB_SUBDIR}) +@@ -262,6 +262,7 @@ SET(GEOTIFF_BIN_DIR ${GEOTIFF_BIN_SUBDIR}) + SET(GEOTIFF_LIB_DIR ${GEOTIFF_LIB_SUBDIR}) SET(GEOTIFF_INCLUDE_DIR ${GEOTIFF_INCLUDE_SUBDIR}) - SET(GEOTIFF_DATA_DIR ${GEOTIFF_DATA_SUBDIR}) +if(0) # Install doc files INSTALL(FILES AUTHORS ChangeLog COPYING INSTALL LICENSE README README_BIN README.WIN -@@ -294,6 +295,7 @@ INSTALL(FILES +@@ -269,6 +270,7 @@ INSTALL(FILES # Install man pages INSTALL(FILES ${GEOTIFF_MAN_PAGES} DESTINATION share/man/man1) diff --git a/external_imported/vcpkg/ports/libgeotiff/vcpkg.json b/external_imported/vcpkg/ports/libgeotiff/vcpkg.json index ec7a39eb0..fc3ed37f7 100644 --- a/external_imported/vcpkg/ports/libgeotiff/vcpkg.json +++ b/external_imported/vcpkg/ports/libgeotiff/vcpkg.json @@ -1,10 +1,11 @@ { "name": "libgeotiff", - "version": "1.7.0", + "version": "1.7.1", "description": "Libgeotiff is an open source library on top of libtiff for reading and writing GeoTIFF information tags.", "homepage": "https://github.com/OSGeo/libgeotiff", + "license": "MIT", "dependencies": [ - "proj4", + "proj", { "name": "tiff", "default-features": false diff --git a/external_imported/vcpkg/ports/libgit2/fix-configcmake.patch b/external_imported/vcpkg/ports/libgit2/fix-configcmake.patch index 3f860a656..1cc67d897 100644 --- a/external_imported/vcpkg/ports/libgit2/fix-configcmake.patch +++ b/external_imported/vcpkg/ports/libgit2/fix-configcmake.patch @@ -1,32 +1,34 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index fdb3673..da1f972 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -125,7 +125,6 @@ include(SelectHashes) - target_sources(git2internal PRIVATE ${SRC_SHA1}) - +diff --git a/cmake/SelectRegex.cmake b/cmake/SelectRegex.cmake +index 2a3a91b8c..cbb409350 100644 +--- a/cmake/SelectRegex.cmake ++++ b/cmake/SelectRegex.cmake +@@ -1,5 +1,4 @@ # Specify regular expression implementation --FIND_PACKAGE(PCRE) +-find_package(PCRE) - IF(REGEX_BACKEND STREQUAL "") - CHECK_SYMBOL_EXISTS(regcomp_l "regex.h;xlocale.h" HAVE_REGCOMP_L) -@@ -159,8 +158,8 @@ ELSEIF(REGEX_BACKEND STREQUAL "pcre") - ADD_FEATURE_INFO(regex ON "using system PCRE") - SET(GIT_REGEX_PCRE 1) + if(REGEX_BACKEND STREQUAL "") + check_symbol_exists(regcomp_l "regex.h;xlocale.h" HAVE_REGCOMP_L) +@@ -33,8 +32,8 @@ elseif(REGEX_BACKEND STREQUAL "pcre") + add_feature_info(regex ON "using system PCRE") + set(GIT_REGEX_PCRE 1) -- LIST(APPEND LIBGIT2_SYSTEM_INCLUDES ${PCRE_INCLUDE_DIRS}) -- LIST(APPEND LIBGIT2_LIBS ${PCRE_LIBRARIES}) -+ FIND_PACKAGE(unofficial-pcre CONFIG REQUIRED) -+ LIST(APPEND LIBGIT2_LIBS unofficial::pcre::pcre) - LIST(APPEND LIBGIT2_PC_REQUIRES "libpcre") - ELSEIF(REGEX_BACKEND STREQUAL "regcomp") - ADD_FEATURE_INFO(regex ON "using system regcomp") -@@ -424,10 +423,28 @@ IF (MSVC_IDE) - ENDIF () +- list(APPEND LIBGIT2_SYSTEM_INCLUDES ${PCRE_INCLUDE_DIRS}) +- list(APPEND LIBGIT2_SYSTEM_LIBS ${PCRE_LIBRARIES}) ++ find_package(unofficial-pcre CONFIG REQUIRED) ++ list(APPEND LIBGIT2_SYSTEM_LIBS unofficial::pcre::pcre) + list(APPEND LIBGIT2_PC_REQUIRES "libpcre") + elseif(REGEX_BACKEND STREQUAL "regcomp") + add_feature_info(regex ON "using system regcomp") +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index e7b54d036..6b549deef 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -298,10 +298,28 @@ if(MSVC_IDE) + endif() # Install --INSTALL(TARGETS git2 -+INSTALL(TARGETS git2 EXPORT unofficial-git2Targets +-install(TARGETS git2 ++install(TARGETS git2 EXPORT unofficial-git2Targets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} @@ -38,16 +40,16 @@ index fdb3673..da1f972 100644 +) +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-git2-config.cmake.in" +[[include(CMakeFindDependencyMacro) -+IF(@USE_BUNDLED_ZLIB@ STREQUAL "OFF") ++if(@USE_BUNDLED_ZLIB@ STREQUAL "OFF") + find_dependency(ZLIB) -+ENDIF() -+IF(@REGEX_BACKEND@ STREQUAL "pcre") ++endif() ++if(@REGEX_BACKEND@ STREQUAL "pcre") + find_dependency(unofficial-pcre CONFIG) -+ENDIF() ++endif() +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-git2Targets.cmake") +]]) +configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-git2-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-git2-config.cmake" @ONLY) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-git2-config.cmake DESTINATION share/unofficial-git2) + - INSTALL(DIRECTORY ${libgit2_SOURCE_DIR}/include/git2 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - INSTALL(FILES ${libgit2_SOURCE_DIR}/include/git2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/git2 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + install(FILES ${PROJECT_SOURCE_DIR}/include/git2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) diff --git a/external_imported/vcpkg/ports/libgit2/portfile.cmake b/external_imported/vcpkg/ports/libgit2/portfile.cmake index 1f3a9a0d7..867d0b175 100644 --- a/external_imported/vcpkg/ports/libgit2/portfile.cmake +++ b/external_imported/vcpkg/ports/libgit2/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libgit2/libgit2 - REF v1.3.0 - SHA512 842a648a67ff23ba9e6bf14b706ba9081164866e14000ebf3858442b7046925f05e1dbf00a7d740dc4bf32280e260730e23a9492e817094aa90736ae335ee76e - HEAD_REF master + REF v1.4.2 + SHA512 144bec7f8e66d97b20335d87d1eb68d522f5e59064b0c557505c088d3c486d45704f023d701f51de572efa8e2eb111e3136eb5d23c035e29d16698206b5ec277 + HEAD_REF maint/v1.4 PATCHES fix-configcmake.patch ) @@ -67,7 +67,7 @@ vcpkg_check_features( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DBUILD_CLAR=OFF + -DBUILD_TESTS=OFF -DUSE_HTTP_PARSER=system -DUSE_HTTPS=${USE_HTTPS} -DREGEX_BACKEND=${REGEX_BACKEND} diff --git a/external_imported/vcpkg/ports/libgit2/vcpkg.json b/external_imported/vcpkg/ports/libgit2/vcpkg.json index 7ecca211e..1614564db 100644 --- a/external_imported/vcpkg/ports/libgit2/vcpkg.json +++ b/external_imported/vcpkg/ports/libgit2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libgit2", - "version-semver": "1.3.0", - "port-version": 2, + "version-semver": "1.4.2", "description": "Git linkable library", "homepage": "https://github.com/libgit2/libgit2", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/libgnutls/portfile.cmake b/external_imported/vcpkg/ports/libgnutls/portfile.cmake index a6d074f06..aa83cb647 100644 --- a/external_imported/vcpkg/ports/libgnutls/portfile.cmake +++ b/external_imported/vcpkg/ports/libgnutls/portfile.cmake @@ -33,6 +33,7 @@ vcpkg_configure_make( --disable-maintainer-mode --disable-rpath --disable-libdane + --disable-guile --with-included-unistring --without-p11-kit --without-tpm diff --git a/external_imported/vcpkg/ports/libgnutls/vcpkg.json b/external_imported/vcpkg/ports/libgnutls/vcpkg.json index 1d48006be..c09c9244e 100644 --- a/external_imported/vcpkg/ports/libgnutls/vcpkg.json +++ b/external_imported/vcpkg/ports/libgnutls/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libgnutls", "version": "3.6.15", - "port-version": 2, + "port-version": 3, "description": "A secure communications library implementing the SSL, TLS and DTLS protocols", "homepage": "https://www.gnutls.org/", + "license": "LGPL-2.1-or-later", "supports": "!windows", "dependencies": [ "gettext", diff --git a/external_imported/vcpkg/ports/libgo/portfile.cmake b/external_imported/vcpkg/ports/libgo/portfile.cmake index e365ee3a1..e51f060e2 100644 --- a/external_imported/vcpkg/ports/libgo/portfile.cmake +++ b/external_imported/vcpkg/ports/libgo/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/external_imported/vcpkg/ports/libgo/vcpkg.json b/external_imported/vcpkg/ports/libgo/vcpkg.json index 47377a3e8..94c6818d1 100644 --- a/external_imported/vcpkg/ports/libgo/vcpkg.json +++ b/external_imported/vcpkg/ports/libgo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libgo", "version": "3.1", - "port-version": 3, + "port-version": 4, "description": "The best stackful coroutine by c++11.", "homepage": "https://github.com/yyzybb537/libgo", "supports": "!(arm | uwp)", diff --git a/external_imported/vcpkg/ports/libgpiod/portfile.cmake b/external_imported/vcpkg/ports/libgpiod/portfile.cmake new file mode 100644 index 000000000..68ee7eff0 --- /dev/null +++ b/external_imported/vcpkg/ports/libgpiod/portfile.cmake @@ -0,0 +1,42 @@ +vcpkg_from_git( + OUT_SOURCE_PATH SOURCE_PATH + URL git://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git + REF dfc5d361e6748d5f48b706e5c4ac949d133b5470 # v1.6.3 + PATCHES +) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + list(APPEND OPTIONS --enable-shared=yes) + list(APPEND OPTIONS --enable-static=no) +else() + list(APPEND OPTIONS --enable-shared=no) + list(APPEND OPTIONS --enable-static=yes) +endif() + +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 ac_cv_func_malloc_0_nonnull=yes) + list(APPEND OPTIONS ac_cv_func_realloc_0_nonnull=yes) + endif() +endif() + +vcpkg_configure_make( + AUTOCONFIG + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + ${OPTIONS} + --enable-tools=no + --enable-tests=no + --enable-bindings-cxx=no + --enable-bindings-python=no +) + +vcpkg_install_make() +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 diff --git a/external_imported/vcpkg/ports/libgpiod/vcpkg.json b/external_imported/vcpkg/ports/libgpiod/vcpkg.json new file mode 100644 index 000000000..bbbca0c71 --- /dev/null +++ b/external_imported/vcpkg/ports/libgpiod/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "libgpiod", + "version": "1.6.3", + "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)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/libgpod/portfile.cmake b/external_imported/vcpkg/ports/libgpod/portfile.cmake index 397f0e5d1..b5ff21b53 100644 --- a/external_imported/vcpkg/ports/libgpod/portfile.cmake +++ b/external_imported/vcpkg/ports/libgpod/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux platform" ON_TARGET "Windows" "OSX") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fadingred/libgpod @@ -37,4 +35,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright file(COPY ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -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/libgpod/vcpkg.json b/external_imported/vcpkg/ports/libgpod/vcpkg.json index 3915e50b1..550993c57 100644 --- a/external_imported/vcpkg/ports/libgpod/vcpkg.json +++ b/external_imported/vcpkg/ports/libgpod/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libgpod", "version-date": "2019-08-29", - "port-version": 3, + "port-version": 4, "description": "libgpod is a library meant to abstract access to an iPod content.", "homepage": "https://github.com/fadingred/libgpod", + "supports": "!windows & !osx", "dependencies": [ "glib", "libplist", diff --git a/external_imported/vcpkg/ports/libgwenhywfar/portfile.cmake b/external_imported/vcpkg/ports/libgwenhywfar/portfile.cmake index 44967ed78..3ea00a459 100644 --- a/external_imported/vcpkg/ports/libgwenhywfar/portfile.cmake +++ b/external_imported/vcpkg/ports/libgwenhywfar/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports unix platforms" ON_TARGET "Windows") - set(VERSION_MAJOR 5) set(VERSION_MINOR 6) set(VERSION_PATCH 0) @@ -13,7 +11,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE ${ARCHIVE} REF ${VERSION} ) @@ -39,7 +37,7 @@ vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} OPTIONS --disable-silent-rules - --disable-binreloc + --disable-binreloc --with-guis=${GUIS} --with-libgpg-error-prefix=${CURRENT_INSTALLED_DIR}/tools/libgpg-error --with-libgcrypt-prefix=${CURRENT_INSTALLED_DIR}/tools/libgcrypt diff --git a/external_imported/vcpkg/ports/libgwenhywfar/vcpkg.json b/external_imported/vcpkg/ports/libgwenhywfar/vcpkg.json index df3f0bfa3..6c56ae3f8 100644 --- a/external_imported/vcpkg/ports/libgwenhywfar/vcpkg.json +++ b/external_imported/vcpkg/ports/libgwenhywfar/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libgwenhywfar", "version-semver": "5.6.0", - "port-version": 1, + "port-version": 2, "description": "A helper library for networking and security applications and libraries", "homepage": "https://www.aquamaniac.de/rdm/", "supports": "!windows", diff --git a/external_imported/vcpkg/ports/libhdfs3/portfile.cmake b/external_imported/vcpkg/ports/libhdfs3/portfile.cmake index 4bbc7621e..a656d149f 100644 --- a/external_imported/vcpkg/ports/libhdfs3/portfile.cmake +++ b/external_imported/vcpkg/ports/libhdfs3/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP" "Windows") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO erikmuttersbach/libhdfs3 diff --git a/external_imported/vcpkg/ports/libhdfs3/vcpkg.json b/external_imported/vcpkg/ports/libhdfs3/vcpkg.json index aebe7c702..050bcb5ee 100644 --- a/external_imported/vcpkg/ports/libhdfs3/vcpkg.json +++ b/external_imported/vcpkg/ports/libhdfs3/vcpkg.json @@ -1,12 +1,16 @@ { "name": "libhdfs3", - "version-string": "2019-11-05", - "port-version": 1, + "version-date": "2019-11-05", + "port-version": 3, "description": "Native Hadoop RPC protocol and HDFS data transfer protocol implementation", "homepage": "https://github.com/erikmuttersbach/libhdfs3", + "supports": "!windows", "dependencies": [ "boost", - "libuuid", + { + "name": "libuuid", + "platform": "!windows & !osx" + }, "libxml2", "protobuf" ] diff --git a/external_imported/vcpkg/ports/libheif/portfile.cmake b/external_imported/vcpkg/ports/libheif/portfile.cmake index 212d310ec..bde4f5b17 100644 --- a/external_imported/vcpkg/ports/libheif/portfile.cmake +++ b/external_imported/vcpkg/ports/libheif/portfile.cmake @@ -25,6 +25,12 @@ if(NOT VCPKG_BUILD_TYPE) 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") +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libheif/heif.h" "!defined(LIBHEIF_STATIC_BUILD)" "0") +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/libheif/vcpkg.json b/external_imported/vcpkg/ports/libheif/vcpkg.json index 1bdd57d44..957f728f4 100644 --- a/external_imported/vcpkg/ports/libheif/vcpkg.json +++ b/external_imported/vcpkg/ports/libheif/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libheif", "version": "1.12.0", - "port-version": 1, + "port-version": 3, "description": "Open h.265 video codec implementation.", "homepage": "http://www.libheif.org/", + "license": "LGPL-3.0-only", "dependencies": [ { "name": "gdk-pixbuf", diff --git a/external_imported/vcpkg/ports/libhsplasma/portfile.cmake b/external_imported/vcpkg/ports/libhsplasma/portfile.cmake index b37dfa7ae..5393b9ca5 100644 --- a/external_imported/vcpkg/ports/libhsplasma/portfile.cmake +++ b/external_imported/vcpkg/ports/libhsplasma/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO H-uru/libhsplasma @@ -29,4 +27,4 @@ vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -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/libhsplasma/vcpkg.json b/external_imported/vcpkg/ports/libhsplasma/vcpkg.json index 3c6ea3930..92bc718ae 100644 --- a/external_imported/vcpkg/ports/libhsplasma/vcpkg.json +++ b/external_imported/vcpkg/ports/libhsplasma/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libhsplasma", "version-string": "2021.06.08", + "port-version": 1, "description": "Cross-platform Plasma data and network library", "homepage": "https://github.com/H-uru/libhsplasma", "supports": "!(arm | uwp)", diff --git a/external_imported/vcpkg/ports/libhv/fix-find_package.patch b/external_imported/vcpkg/ports/libhv/fix-find_package.patch new file mode 100644 index 000000000..6ec8b7078 --- /dev/null +++ b/external_imported/vcpkg/ports/libhv/fix-find_package.patch @@ -0,0 +1,24 @@ +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/portfile.cmake b/external_imported/vcpkg/ports/libhv/portfile.cmake index cb13974b9..b45624499 100644 --- a/external_imported/vcpkg/ports/libhv/portfile.cmake +++ b/external_imported/vcpkg/ports/libhv/portfile.cmake @@ -1,16 +1,21 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ithewei/libhv - REF v1.2.2 - SHA512 D0CB0BE3901E282E642FE454ADF0CAAF1840DD0CD340B6558E40270CF32608FF0773AAAD0BE1B9EA97BE5BD41B4CEB00FA92CDDA1590B71900A3D8EE4AB2358F + REF v1.2.4 + SHA512 5732800970180294DCEB329F25D22B1A7178739A2A5A2CE32E030F4FD38055A6298797D26E7FF5525AC662059FF0AAEDB8ABC200E0BA9E4EEBEB5846FB53F4D0 HEAD_REF master + PATCHES + fix-find_package.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + ssl WITH_OPENSSL +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE @@ -19,6 +24,7 @@ vcpkg_cmake_configure( -DBUILD_UNITTEST=OFF -DBUILD_STATIC=${BUILD_STATIC} -DBUILD_SHARED=${BUILD_SHARED} + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() diff --git a/external_imported/vcpkg/ports/libhv/vcpkg.json b/external_imported/vcpkg/ports/libhv/vcpkg.json index 6df137e12..f337b9acd 100644 --- a/external_imported/vcpkg/ports/libhv/vcpkg.json +++ b/external_imported/vcpkg/ports/libhv/vcpkg.json @@ -1,13 +1,23 @@ { "name": "libhv", - "version": "1.2.2", + "version": "1.2.4", + "port-version": 1, "description": "Libhv is a C/C++ network library similar to libevent/libuv.", "homepage": "https://github.com/ithewei/libhv", + "license": "BSD-3-Clause", "supports": "!(arm | uwp)", "dependencies": [ { "name": "vcpkg-cmake", "host": true } - ] + ], + "features": { + "ssl": { + "description": "with openssl library", + "dependencies": [ + "openssl" + ] + } + } } diff --git a/external_imported/vcpkg/ports/libiconv/portfile.cmake b/external_imported/vcpkg/ports/libiconv/portfile.cmake index 9d8ff25aa..3cca1b292 100644 --- a/external_imported/vcpkg/ports/libiconv/portfile.cmake +++ b/external_imported/vcpkg/ports/libiconv/portfile.cmake @@ -1,7 +1,7 @@ if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_ANDROID) set(VCPKG_POLICY_EMPTY_PACKAGE enabled) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/iconv) - file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/iconv) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/iconv") + file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/iconv") return() endif() @@ -26,24 +26,28 @@ if (NOT VCPKG_TARGET_IS_ANDROID) list(APPEND OPTIONS --enable-relocatable) endif() -vcpkg_configure_make(SOURCE_PATH ${SOURCE_PATH} - DETERMINE_BUILD_TRIPLET - USE_WRAPPERS - OPTIONS - --enable-extra-encodings - --without-libiconv-prefix - --without-libintl-prefix - ${OPTIONS} - ) +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + DETERMINE_BUILD_TRIPLET + USE_WRAPPERS + OPTIONS + --enable-extra-encodings + --without-libiconv-prefix + --without-libintl-prefix + ${OPTIONS} +) vcpkg_install_make() vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin) - -file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/iconv) +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin") -file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/iconv") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}") # share contains unneeded doc files + +# 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) diff --git a/external_imported/vcpkg/ports/libiconv/usage b/external_imported/vcpkg/ports/libiconv/usage new file mode 100644 index 000000000..db47c33e8 --- /dev/null +++ b/external_imported/vcpkg/ports/libiconv/usage @@ -0,0 +1,4 @@ +The package libiconv provides CMake targets: + + find_package(Iconv) + target_link_libraries(main PRIVATE Iconv::Iconv) diff --git a/external_imported/vcpkg/ports/libiconv/vcpkg.json b/external_imported/vcpkg/ports/libiconv/vcpkg.json index 2cafb0218..b567aee18 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": 11, + "port-version": 13, "description": "GNU Unicode text conversion", "homepage": "https://www.gnu.org/software/libiconv/" } diff --git a/external_imported/vcpkg/ports/libidn2/CMakeLists.txt b/external_imported/vcpkg/ports/libidn2/CMakeLists.txt index f8e0908f4..9920afce2 100644 --- a/external_imported/vcpkg/ports/libidn2/CMakeLists.txt +++ b/external_imported/vcpkg/ports/libidn2/CMakeLists.txt @@ -37,7 +37,7 @@ set(LIB_SRC lib/bidi.c set(UNISTR_SRC unistring/c-ctype.c unistring/c-strcasecmp.c unistring/c-strncasecmp.c - unistring/malloca.c + unistring/free.c unistring/striconveh.c unistring/striconveha.c unistring/uniconv/u8-conv-from-enc.c @@ -45,6 +45,7 @@ set(UNISTR_SRC unistring/c-ctype.c unistring/uniconv/u8-strconv-from-locale.c unistring/uniconv/u8-strconv-to-enc.c unistring/uniconv/u8-strconv-to-locale.c + unistring/unistr/u32-cmp.c unistring/unistr/u32-cpy.c unistring/unistr/u32-cpy-alloc.c unistring/unistr/u32-mbtouc-unsafe.c @@ -86,6 +87,7 @@ set(GL_SRC gl/rawmemchr.c gl/strverscmp.c gl/msvc-inval.c gl/msvc-nothrow.c + gl/malloca.c ) add_library(libidn2 ${LIB_SRC} ${UNISTR_SRC} ${GL_SRC}) @@ -111,7 +113,12 @@ set(prefix "\${pcfiledir}/../..") set(exec_prefix "\${prefix}") set(includedir "\${prefix}/include") set(libdir "\${prefix}/lib") -set(LTLIBICONV "") +set(LTLIBICONV "-liconv -lcharset") set(LTLIBUNISTRING "") -configure_file("libidn2.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libidn2.pc") +configure_file("libidn2.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libidn2.pc" @ONLY) +if(WIN32 AND NOT MINGW) + file(READ "${CMAKE_CURRENT_BINARY_DIR}/libidn2.pc" pc_data) + string(REPLACE " -lidn" " -llibidn" pc_data "${pc_data}") + file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/libidn2.pc" "${pc_data}") +endif() install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libidn2.pc" DESTINATION "lib/pkgconfig") diff --git a/external_imported/vcpkg/ports/libidn2/config.h b/external_imported/vcpkg/ports/libidn2/config.h index 5d5e6efcc..8c8fad230 100644 --- a/external_imported/vcpkg/ports/libidn2/config.h +++ b/external_imported/vcpkg/ports/libidn2/config.h @@ -16,12 +16,8 @@ /* Define to the number of bits in type 'wint_t'. */ /* #undef BITSIZEOF_WINT_T */ -/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP - systems. This function is required for `alloca.c' support on those systems. - */ -/* #undef CRAY_STACKSEG_END */ -/* Define to 1 if using `alloca.c'. */ +/* Define to 1 if using 'alloca.c'. */ /* #undef C_ALLOCA */ /* Define to 1 if // is a file system root distinct from /. */ @@ -31,6 +27,9 @@ language is requested. */ /* #undef ENABLE_NLS */ +/* Define this to 1 if F_DUPFD behavior does not match POSIX */ +/* #undef FCNTL_DUPFD_BUGGY */ + /* Define to a C preprocessor expression that evaluates to 1 or 0, depending whether the gnulib module fscanf shall be considered present. */ #define GNULIB_FSCANF 1 @@ -704,12 +703,19 @@ STACK_DIRECTION = 0 => direction of growth unknown */ /* #undef STACK_DIRECTION */ +/* Define to 1 if the `S_IS*' macros in do not work properly. */ +/* #undef STAT_MACROS_BROKEN */ + /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Define to 1 if strerror_r returns char *. */ /* #undef STRERROR_R_CHAR_P */ +/* Define to 1 if the type of the st_atim member of a struct stat is struct + timespec. */ +/* #undef TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC */ + /* Enable extensions on AIX 3, Interix. */ #ifndef _ALL_SOURCE # define _ALL_SOURCE 1 @@ -718,11 +724,44 @@ #ifndef _DARWIN_C_SOURCE # define _DARWIN_C_SOURCE 1 #endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +/* # undef __EXTENSIONS__ */ +#endif /* Enable GNU extensions on systems that have them. */ #ifndef _GNU_SOURCE # define _GNU_SOURCE 1 #endif -/* Enable threading extensions on Solaris. */ +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +/* # undef _HPUX_ALT_XOPEN_SOCKET_API */ +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +/* # undef _MINIX */ +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +/* # undef _NETBSD_SOURCE */ +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +/* # undef _OPENBSD_SOURCE */ +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +/* # undef _POSIX_SOURCE */ +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +/* # undef _POSIX_1_SOURCE */ +#endif +/* Enable POSIX-compatible threading on Solaris. */ #ifndef _POSIX_PTHREAD_SEMANTICS # define _POSIX_PTHREAD_SEMANTICS 1 #endif @@ -758,16 +797,11 @@ #ifndef _TANDEM_SOURCE # define _TANDEM_SOURCE 1 #endif -/* Enable X/Open extensions if necessary. HP-UX 11.11 defines - mbstate_t only if _XOPEN_SOURCE is defined to 500, regardless of - whether compiling with -Ae or -D_HPUX_SOURCE=1. */ +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ #ifndef _XOPEN_SOURCE /* # undef _XOPEN_SOURCE */ #endif -/* Enable general extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# define __EXTENSIONS__ 1 -#endif /* Version number of package */ @@ -781,19 +815,48 @@ 'wint_t'. */ /* #undef WINT_T_SUFFIX */ -/* Define to 1 if on MINIX. */ -/* #undef _MINIX */ +/* Number of bits in a file offset, on hosts where this is settable. */ +/* #undef _FILE_OFFSET_BITS */ -/* Define to 1 to make NetBSD features available. MINIX 3 needs this. */ -/* #undef _NETBSD_SOURCE */ +/* True if the compiler says it groks GNU C version MAJOR.MINOR. */ +#if defined __GNUC__ && defined __GNUC_MINOR__ +# define _GL_GNUC_PREREQ(major, minor) \ + ((major) < __GNUC__ + ((minor) <= __GNUC_MINOR__)) +#else +# define _GL_GNUC_PREREQ(major, minor) 0 +#endif + + +/* Define to enable the declarations of ISO C 11 types and functions. */ +/* #undef _ISOC11_SOURCE */ + +/* Define for large files, on AIX-style hosts. */ +/* #undef _LARGE_FILES */ /* The _Noreturn keyword of C11. */ -#if ! (defined _Noreturn \ - || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__)) -# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \ - || 0x5110 <= __SUNPRO_C) +#ifndef _Noreturn +# if (defined __cplusplus \ + && ((201103 <= __cplusplus && !(__GNUC__ == 4 && __GNUC_MINOR__ == 7)) \ + || (defined _MSC_VER && 1900 <= _MSC_VER)) \ + && 0) + /* [[noreturn]] is not practically usable, because with it the syntax + extern _Noreturn void func (...); + would not be valid; such a declaration would only be valid with 'extern' + and '_Noreturn' swapped, or without the 'extern' keyword. However, some + AIX system header files and several gnulib header files use precisely + this syntax with 'extern'. */ +# define _Noreturn [[noreturn]] +# elif ((!defined __cplusplus || defined __clang__) \ + && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \ + || (!defined __STRICT_ANSI__ \ + && (_GL_GNUC_PREREQ (4, 7) \ + || (defined __apple_build_version__ \ + ? 6000000 <= __apple_build_version__ \ + : 3 < __clang_major__ + (5 <= __clang_minor__)))))) + /* _Noreturn works as-is. */ +# elif _GL_GNUC_PREREQ (2, 8) || defined __clang__ || 0x5110 <= __SUNPRO_C # define _Noreturn __attribute__ ((__noreturn__)) -# elif defined _MSC_VER && 1200 <= _MSC_VER +# elif 1200 <= (defined _MSC_VER ? _MSC_VER : 0) # define _Noreturn __declspec (noreturn) # else # define _Noreturn @@ -801,26 +864,262 @@ #endif -/* Define to 2 if the system does not provide POSIX.1 features except with - this defined. */ -/* #undef _POSIX_1_SOURCE */ - -/* Define to 1 if you need to in order for 'stat' and other things to work. */ -/* #undef _POSIX_SOURCE */ - /* For standard stat data types on VMS. */ #define _USE_STD_STAT 1 +/* Define to rpl_ if the getopt replacement functions and variables should be + used. */ +/* #undef __GETOPT_PREFIX */ + /* Define to 1 if the system predates C++11. */ /* #undef __STDC_CONSTANT_MACROS */ /* Define to 1 if the system predates C++11. */ /* #undef __STDC_LIMIT_MACROS */ +/* The _GL_ASYNC_SAFE marker should be attached to functions that are + signal handlers (for signals other than SIGABRT, SIGPIPE) or can be + invoked from such signal handlers. Such functions have some restrictions: + * All functions that it calls should be marked _GL_ASYNC_SAFE as well, + or should be listed as async-signal-safe in POSIX + + section 2.4.3. Note that malloc(), sprintf(), and fwrite(), in + particular, are NOT async-signal-safe. + * All memory locations (variables and struct fields) that these functions + access must be marked 'volatile'. This holds for both read and write + accesses. Otherwise the compiler might optimize away stores to and + reads from such locations that occur in the program, depending on its + data flow analysis. For example, when the program contains a loop + that is intended to inspect a variable set from within a signal handler + while (!signal_occurred) + ; + the compiler is allowed to transform this into an endless loop if the + variable 'signal_occurred' is not declared 'volatile'. + Additionally, recall that: + * A signal handler should not modify errno (except if it is a handler + for a fatal signal and ends by raising the same signal again, thus + provoking the termination of the process). If it invokes a function + that may clobber errno, it needs to save and restore the value of + errno. */ +#define _GL_ASYNC_SAFE + + +/* Attributes. */ +#if (defined __has_attribute \ + && (!defined __clang_minor__ \ + || 3 < __clang_major__ + (5 <= __clang_minor__))) +# define _GL_HAS_ATTRIBUTE(attr) __has_attribute (__##attr##__) +#else +# define _GL_HAS_ATTRIBUTE(attr) _GL_ATTR_##attr +# define _GL_ATTR_alloc_size _GL_GNUC_PREREQ (4, 3) +# define _GL_ATTR_always_inline _GL_GNUC_PREREQ (3, 2) +# define _GL_ATTR_artificial _GL_GNUC_PREREQ (4, 3) +# define _GL_ATTR_cold _GL_GNUC_PREREQ (4, 3) +# define _GL_ATTR_const _GL_GNUC_PREREQ (2, 95) +# define _GL_ATTR_deprecated _GL_GNUC_PREREQ (3, 1) +# define _GL_ATTR_diagnose_if 0 +# define _GL_ATTR_error _GL_GNUC_PREREQ (4, 3) +# define _GL_ATTR_externally_visible _GL_GNUC_PREREQ (4, 1) +# define _GL_ATTR_fallthrough _GL_GNUC_PREREQ (7, 0) +# define _GL_ATTR_format _GL_GNUC_PREREQ (2, 7) +# define _GL_ATTR_leaf _GL_GNUC_PREREQ (4, 6) +# ifdef _ICC +# define _GL_ATTR_may_alias 0 +# else +# define _GL_ATTR_may_alias _GL_GNUC_PREREQ (3, 3) +# endif +# define _GL_ATTR_malloc _GL_GNUC_PREREQ (3, 0) +# define _GL_ATTR_noinline _GL_GNUC_PREREQ (3, 1) +# define _GL_ATTR_nonnull _GL_GNUC_PREREQ (3, 3) +# define _GL_ATTR_nonstring _GL_GNUC_PREREQ (8, 0) +# define _GL_ATTR_nothrow _GL_GNUC_PREREQ (3, 3) +# define _GL_ATTR_packed _GL_GNUC_PREREQ (2, 7) +# define _GL_ATTR_pure _GL_GNUC_PREREQ (2, 96) +# define _GL_ATTR_returns_nonnull _GL_GNUC_PREREQ (4, 9) +# define _GL_ATTR_sentinel _GL_GNUC_PREREQ (4, 0) +# define _GL_ATTR_unused _GL_GNUC_PREREQ (2, 7) +# define _GL_ATTR_warn_unused_result _GL_GNUC_PREREQ (3, 4) +#endif + + +#if _GL_HAS_ATTRIBUTE (alloc_size) +# define _GL_ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args)) +#else +# define _GL_ATTRIBUTE_ALLOC_SIZE(args) +#endif + +#if _GL_HAS_ATTRIBUTE (always_inline) +# define _GL_ATTRIBUTE_ALWAYS_INLINE __attribute__ ((__always_inline__)) +#else +# define _GL_ATTRIBUTE_ALWAYS_INLINE +#endif + +#if _GL_HAS_ATTRIBUTE (artificial) +# define _GL_ATTRIBUTE_ARTIFICIAL __attribute__ ((__artificial__)) +#else +# define _GL_ATTRIBUTE_ARTIFICIAL +#endif + +/* Avoid __attribute__ ((cold)) on MinGW; see thread starting at + . + Also, Oracle Studio 12.6 requires 'cold' not '__cold__'. */ +#if _GL_HAS_ATTRIBUTE (cold) && !defined __MINGW32__ +# ifndef __SUNPRO_C +# define _GL_ATTRIBUTE_COLD __attribute__ ((__cold__)) +# else +# define _GL_ATTRIBUTE_COLD __attribute__ ((cold)) +# endif +#else +# define _GL_ATTRIBUTE_COLD +#endif + +#if _GL_HAS_ATTRIBUTE (const) +# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__)) +#else +# define _GL_ATTRIBUTE_CONST +#endif + +#if 201710L < __STDC_VERSION__ +# define _GL_ATTRIBUTE_DEPRECATED [[__deprecated__]] +#elif _GL_HAS_ATTRIBUTE (deprecated) +# define _GL_ATTRIBUTE_DEPRECATED __attribute__ ((__deprecated__)) +#else +# define _GL_ATTRIBUTE_DEPRECATED +#endif + +#if _GL_HAS_ATTRIBUTE (error) +# define _GL_ATTRIBUTE_ERROR(msg) __attribute__ ((__error__ (msg))) +# define _GL_ATTRIBUTE_WARNING(msg) __attribute__ ((__warning__ (msg))) +#elif _GL_HAS_ATTRIBUTE (diagnose_if) +# define _GL_ATTRIBUTE_ERROR(msg) __attribute__ ((__diagnose_if__ (1, msg, "error"))) +# define _GL_ATTRIBUTE_WARNING(msg) __attribute__ ((__diagnose_if__ (1, msg, "warning"))) +#else +# define _GL_ATTRIBUTE_ERROR(msg) +# define _GL_ATTRIBUTE_WARNING(msg) +#endif + +#if _GL_HAS_ATTRIBUTE (externally_visible) +# define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE __attribute__ ((externally_visible)) +#else +# define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE +#endif + +/* FALLTHROUGH is special, because it always expands to something. */ +#if 201710L < __STDC_VERSION__ +# define _GL_ATTRIBUTE_FALLTHROUGH [[__fallthrough__]] +#elif _GL_HAS_ATTRIBUTE (fallthrough) +# define _GL_ATTRIBUTE_FALLTHROUGH __attribute__ ((__fallthrough__)) +#else +# define _GL_ATTRIBUTE_FALLTHROUGH ((void) 0) +#endif + +#if _GL_HAS_ATTRIBUTE (format) +# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) +#else +# define _GL_ATTRIBUTE_FORMAT(spec) +#endif + +#if _GL_HAS_ATTRIBUTE (leaf) +# define _GL_ATTRIBUTE_LEAF __attribute__ ((__leaf__)) +#else +# define _GL_ATTRIBUTE_LEAF +#endif + +/* Oracle Studio 12.6 mishandles may_alias despite __has_attribute OK. */ +#if _GL_HAS_ATTRIBUTE (may_alias) && !defined __SUNPRO_C +# define _GL_ATTRIBUTE_MAY_ALIAS __attribute__ ((__may_alias__)) +#else +# define _GL_ATTRIBUTE_MAY_ALIAS +#endif + +#if 201710L < __STDC_VERSION__ +# define _GL_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]] +#elif _GL_HAS_ATTRIBUTE (unused) +# define _GL_ATTRIBUTE_MAYBE_UNUSED __attribute__ ((__unused__)) +#else +# define _GL_ATTRIBUTE_MAYBE_UNUSED +#endif +/* Earlier spellings of this macro. */ +#define _GL_UNUSED _GL_ATTRIBUTE_MAYBE_UNUSED +#define _UNUSED_PARAMETER_ _GL_ATTRIBUTE_MAYBE_UNUSED + +#if _GL_HAS_ATTRIBUTE (malloc) +# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) +#else +# define _GL_ATTRIBUTE_MALLOC +#endif + +#if 201710L < __STDC_VERSION__ +# define _GL_ATTRIBUTE_NODISCARD [[__nodiscard__]] +#elif _GL_HAS_ATTRIBUTE (warn_unused_result) +# define _GL_ATTRIBUTE_NODISCARD __attribute__ ((__warn_unused_result__)) +#else +# define _GL_ATTRIBUTE_NODISCARD +#endif + +#if _GL_HAS_ATTRIBUTE (noinline) +# define _GL_ATTRIBUTE_NOINLINE __attribute__ ((__noinline__)) +#else +# define _GL_ATTRIBUTE_NOINLINE +#endif + +#if _GL_HAS_ATTRIBUTE (nonnull) +# define _GL_ATTRIBUTE_NONNULL(args) __attribute__ ((__nonnull__ args)) +#else +# define _GL_ATTRIBUTE_NONNULL(args) +#endif + +#if _GL_HAS_ATTRIBUTE (nonstring) +# define _GL_ATTRIBUTE_NONSTRING __attribute__ ((__nonstring__)) +#else +# define _GL_ATTRIBUTE_NONSTRING +#endif + +/* There is no _GL_ATTRIBUTE_NORETURN; use _Noreturn instead. */ + +#if _GL_HAS_ATTRIBUTE (nothrow) && !defined __cplusplus +# define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__)) +#else +# define _GL_ATTRIBUTE_NOTHROW +#endif + +#if _GL_HAS_ATTRIBUTE (packed) +# define _GL_ATTRIBUTE_PACKED __attribute__ ((__packed__)) +#else +# define _GL_ATTRIBUTE_PACKED +#endif + +#if _GL_HAS_ATTRIBUTE (pure) +# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) +#else +# define _GL_ATTRIBUTE_PURE +#endif + +#if _GL_HAS_ATTRIBUTE (returns_nonnull) +# define _GL_ATTRIBUTE_RETURNS_NONNULL __attribute__ ((__returns_nonnull__)) +#else +# define _GL_ATTRIBUTE_RETURNS_NONNULL +#endif + +#if _GL_HAS_ATTRIBUTE (sentinel) +# define _GL_ATTRIBUTE_SENTINEL(pos) __attribute__ ((__sentinel__ pos)) +#else +# define _GL_ATTRIBUTE_SENTINEL(pos) +#endif + + +/* To support C++ as well as C, use _GL_UNUSED_LABEL with trailing ';'. */ +#if !defined __cplusplus || _GL_GNUC_PREREQ (4, 5) +# define _GL_UNUSED_LABEL _GL_ATTRIBUTE_MAYBE_UNUSED +#else +# define _GL_UNUSED_LABEL +#endif + + /* Please see the Gnulib manual for how to use these macros. Suppress extern inline with HP-UX cc, as it appears to be broken; see - . + . Suppress extern inline with Sun C in standards-conformance mode, as it mishandles inline functions that call each other. E.g., for 'inline void f @@ -834,20 +1133,32 @@ if isdigit is mistakenly implemented via a static inline function, a program containing an extern inline function that calls isdigit may not work since the C standard prohibits extern inline functions - from calling static functions. This bug is known to occur on: + from calling static functions (ISO C 99 section 6.7.4.(3). + This bug is known to occur on: OS X 10.8 and earlier; see: - http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html + https://lists.gnu.org/r/bug-gnulib/2012-12/msg00023.html DragonFly; see - http://muscles.dragonflybsd.org/bulk/bleeding-edge-potential/latest-per-pkg/ah-tty-0.3.12.log + http://muscles.dragonflybsd.org/bulk/clang-master-potential/20141111_102002/logs/ah-tty-0.3.12.log FreeBSD; see: - http://lists.gnu.org/archive/html/bug-gnulib/2014-07/msg00104.html + https://lists.gnu.org/r/bug-gnulib/2014-07/msg00104.html OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and - for clang but remains for g++; see . - Assume DragonFly and FreeBSD will be similar. */ + for clang but remains for g++; see . + Assume DragonFly and FreeBSD will be similar. + + GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99 + inline semantics, unless -fgnu89-inline is used. It defines a macro + __GNUC_STDC_INLINE__ to indicate this situation or a macro + __GNUC_GNU_INLINE__ to indicate the opposite situation. + GCC 4.2 with -std=c99 or -std=gnu99 implements the GNU C inline + semantics but warns, unless -fgnu89-inline is used: + warning: C99 inline functions are not supported; using GNU89 + warning: to disable this warning use -fgnu89-inline or the gnu_inline function attribute + It defines a macro __GNUC_GNU_INLINE__ to indicate this situation. + */ #if (((defined __APPLE__ && defined __MACH__) \ || defined __DragonFly__ || defined __FreeBSD__) \ && (defined __header_inline \ @@ -928,22 +1239,42 @@ # define __GNUC_STDC_INLINE__ 1 #endif +/* _GL_CMP (n1, n2) performs a three-valued comparison on n1 vs. n2, where + n1 and n2 are expressions without side effects, that evaluate to real + numbers (excluding NaN). + It returns + 1 if n1 > n2 + 0 if n1 == n2 + -1 if n1 < n2 + The naïve code (n1 > n2 ? 1 : n1 < n2 ? -1 : 0) produces a conditional + jump with nearly all GCC versions up to GCC 10. + This variant (n1 < n2 ? -1 : n1 > n2) produces a conditional with many + GCC versions up to GCC 9. + The better code (n1 > n2) - (n1 < n2) from Hacker's Delight § 2-9 + avoids conditional jumps in all GCC versions >= 3.4. */ +#define _GL_CMP(n1, n2) (((n1) > (n2)) - ((n1) < (n2))) + + /* Define to `int' if does not define. */ /* #undef mode_t */ -/* Define to `int' if does not define. */ +/* Define to the type of st_nlink in struct stat, or a supertype. */ +/* #undef nlink_t */ + +/* Define as a signed integer type capable of holding a process identifier. */ /* #undef pid_t */ /* Define to the equivalent of the C99 'restrict' keyword, or to nothing if this is not supported. Do not define if restrict is - supported directly. */ + supported only directly. */ #define restrict __restrict -/* Work around a bug in Sun C++: it does not support _Restrict or - __restrict__, even though the corresponding Sun C compiler ends up with - "#define restrict _Restrict" or "#define restrict __restrict__" in the - previous line. Perhaps some future version of Sun C++ will work with - restrict; if so, hopefully it defines __RESTRICT like Sun C does. */ -#if defined __SUNPRO_CC && !defined __RESTRICT +/* Work around a bug in older versions of Sun C++, which did not + #define __restrict__ or support _Restrict or __restrict__ + even though the corresponding Sun C compiler ended up with + "#define restrict _Restrict" or "#define restrict __restrict__" + in the previous line. This workaround can be removed once + we assume Oracle Developer Studio 12.5 (2016) or later. */ +#if defined __SUNPRO_CC && !defined __RESTRICT && !defined __restrict__ # define _Restrict # define __restrict__ #endif @@ -954,42 +1285,5 @@ /* Define as a signed type of the same size as size_t. */ #define ssize_t intptr_t -/* Define as a marker that can be attached to declarations that might not - be used. This helps to reduce warnings, such as from - GCC -Wunused-parameter. */ -#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) -# define _GL_UNUSED __attribute__ ((__unused__)) -#else -# define _GL_UNUSED -#endif -/* The name _UNUSED_PARAMETER_ is an earlier spelling, although the name - is a misnomer outside of parameter lists. */ -#define _UNUSED_PARAMETER_ _GL_UNUSED - -/* gcc supports the "unused" attribute on possibly unused labels, and - g++ has since version 4.5. Note to support C++ as well as C, - _GL_UNUSED_LABEL should be used with a trailing ; */ -#if !defined __cplusplus || __GNUC__ > 4 \ - || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) -# define _GL_UNUSED_LABEL _GL_UNUSED -#else -# define _GL_UNUSED_LABEL -#endif - -/* The __pure__ attribute was added in gcc 2.96. */ -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) -# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) -#else -# define _GL_ATTRIBUTE_PURE /* empty */ -#endif - -/* The __const__ attribute was added in gcc 2.95. */ -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) -# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__)) -#else -# define _GL_ATTRIBUTE_CONST /* empty */ -#endif - - /* Define as a macro for copying va_list variables. */ /* #undef va_copy */ diff --git a/external_imported/vcpkg/ports/libidn2/portfile.cmake b/external_imported/vcpkg/ports/libidn2/portfile.cmake index f9ffcae78..07ef29cbb 100644 --- a/external_imported/vcpkg/ports/libidn2/portfile.cmake +++ b/external_imported/vcpkg/ports/libidn2/portfile.cmake @@ -1,10 +1,10 @@ -set(IDN2_VERSION 2.3.0) +set(IDN2_VERSION 2.3.1) set(IDN2_FILENAME libidn2-${IDN2_VERSION}.tar.gz) vcpkg_download_distfile(ARCHIVE URLS "https://ftp.gnu.org/gnu/libidn/${IDN2_FILENAME}" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/libidn/${IDN2_FILENAME}" FILENAME "${IDN2_FILENAME}" - SHA512 a2bf6d2249948bce14fbbc802f8af1c9b427fc9bf64203a2f3d7239d8e6061d0a8e7970a23e8e5889110a654a321e0504c7a6d049bb501e7f6a23d42b50b6187 + SHA512 4d77a4a79e08a05e46fc14827f987b9e7645ebf5d0c0869eb96f9902c2f6b73ea69fd6f9f97b80a9f07cce84f7aa299834df91485d4e7c16500d31a4b9865fe4 ) vcpkg_extract_source_archive_ex( @@ -20,10 +20,11 @@ if (VCPKG_TARGET_IS_WINDOWS) set(HAVE_ALLOCA_H 0) configure_file("${CMAKE_CURRENT_LIST_DIR}/config.h" "${SOURCE_PATH}") + configure_file("${SOURCE_PATH}/gl/alloca.in.h" "${SOURCE_PATH}/gl/alloca.h") function(simple_copy_template_header FILE_PATH BASE_NAME) if(NOT EXISTS "${FILE_PATH}/${BASE_NAME}.h" AND EXISTS "${FILE_PATH}/${BASE_NAME}.in.h") - configure_file("${FILE_PATH}/${BASE_NAME}.in.h" "${FILE_PATH}/${BASE_NAME}.h") + configure_file("${FILE_PATH}/${BASE_NAME}.in.h" "${FILE_PATH}/${BASE_NAME}.h" @ONLY) endif() endfunction() diff --git a/external_imported/vcpkg/ports/libidn2/vcpkg.json b/external_imported/vcpkg/ports/libidn2/vcpkg.json index 9c00c1b15..767619f16 100644 --- a/external_imported/vcpkg/ports/libidn2/vcpkg.json +++ b/external_imported/vcpkg/ports/libidn2/vcpkg.json @@ -1,19 +1,18 @@ { "name": "libidn2", - "version": "2.3.0", - "port-version": 4, + "version": "2.3.1", "description": "GNU Libidn is an implementation of the Stringprep, Punycode and IDNA 2003 specifications. Libidn's purpose is to encode and decode internationalized domain names.", "homepage": "https://www.gnu.org/software/libidn/", "dependencies": [ "libiconv", { "name": "libunistring", - "platform": "!(windows | mingw)" + "platform": "!windows" }, { "name": "vcpkg-cmake", "host": true, - "platform": "windows | mingw" + "platform": "windows" } ] } diff --git a/external_imported/vcpkg/ports/libigl/portfile.cmake b/external_imported/vcpkg/ports/libigl/portfile.cmake index 5917425ce..345aa4cc7 100644 --- a/external_imported/vcpkg/ports/libigl/portfile.cmake +++ b/external_imported/vcpkg/ports/libigl/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libigl/libigl @@ -50,4 +48,4 @@ vcpkg_copy_pdbs() # libigl is a header-only library. file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL "${SOURCE_PATH}/LICENSE.GPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE.GPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/libigl/vcpkg.json b/external_imported/vcpkg/ports/libigl/vcpkg.json index 22f523168..c74ff015f 100644 --- a/external_imported/vcpkg/ports/libigl/vcpkg.json +++ b/external_imported/vcpkg/ports/libigl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libigl", "version": "2.3.0", + "port-version": 1, "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", "supports": "!(arm | uwp)", diff --git a/external_imported/vcpkg/ports/libjpeg-turbo/portfile.cmake b/external_imported/vcpkg/ports/libjpeg-turbo/portfile.cmake index 8a4ab2655..091af45bc 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 ecf021bc0d6f435daacff7c35ccaeef0145df1b9 # 2.1.2 - SHA512 74ca399599f785e8c8c271f57f73c17acf6eadbd27c0c62aa1f95bbcb51542fd92aa19b4beee811c73902085fbcd365236dcc579726372c09fa9b12c2599d0f5 + REF c5f269eb9665435271c05fbcaf8721fa58e9eafa # 2.1.3 + SHA512 5d1c3cbbc7628339cfedc0f81a65ceb972aba2b8ffcc72d001f87526d0ff468f83665c78165051aa95c39200d9aaa6aee76e01266a4ea9cddb678dc6ef17ec27 HEAD_REF master PATCHES add-options-for-exes-docs-headers.patch @@ -54,6 +54,10 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libjpeg-turbo) # Rename libraries for static builds if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -64,14 +68,24 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg-static.lib") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg.lib") + endif() + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + if (EXISTS "${CURRENT_PACKAGES_DIR}/share/${PORT}/libjpeg-turboTargets-debug.cmake") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/libjpeg-turboTargets-debug.cmake" + "jpeg-static${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "jpeg${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/libjpeg-turboTargets-debug.cmake" + "turbojpeg-static${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "turbojpeg${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") + endif() + if (EXISTS "${CURRENT_PACKAGES_DIR}/share/${PORT}/libjpeg-turboTargets-release.cmake") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/libjpeg-turboTargets-release.cmake" + "jpeg-static${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "jpeg${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/libjpeg-turboTargets-release.cmake" + "turbojpeg-static${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "turbojpeg${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") endif() endif() -vcpkg_fixup_pkgconfig() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libjpeg-turbo) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/include" @@ -81,5 +95,3 @@ file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR} file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/jpeg") file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake index 0c1a883c0..d63c58b0a 100644 --- a/external_imported/vcpkg/ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake +++ b/external_imported/vcpkg/ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake @@ -1,10 +1,11 @@ +cmake_policy(PUSH) +cmake_policy(SET CMP0012 NEW) +cmake_policy(SET CMP0054 NEW) find_path(JPEG_INCLUDE_DIR NAMES jpeglib.h PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" NO_DEFAULT_PATH) find_library(JPEG_LIBRARY_RELEASE NAMES jpeg PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH) find_library(JPEG_LIBRARY_DEBUG NAMES jpeg PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH) -if(CMAKE_VERSION VERSION_LESS 3.12) - include(SelectLibraryConfigurations) - select_library_configurations(JPEG) - unset(JPEG_FOUND) +if(CMAKE_VERSION VERSION_LESS 3.12 AND CMAKE_BUILD_TYPE STREQUAL "Debug") + set(JPEG_LIBRARY "${JPEG_LIBRARY_DEBUG}" CACHE FILEPATH "") endif() _find_package(${ARGS}) if(JPEG_FOUND AND NOT TARGET JPEG::JPEG) @@ -34,3 +35,4 @@ if(JPEG_FOUND AND NOT TARGET JPEG::JPEG) IMPORTED_LOCATION_DEBUG "${JPEG_LIBRARY_DEBUG}") endif() endif() +cmake_policy(POP) diff --git a/external_imported/vcpkg/ports/libjpeg-turbo/vcpkg.json b/external_imported/vcpkg/ports/libjpeg-turbo/vcpkg.json index c5ee4936c..5365b8421 100644 --- a/external_imported/vcpkg/ports/libjpeg-turbo/vcpkg.json +++ b/external_imported/vcpkg/ports/libjpeg-turbo/vcpkg.json @@ -1,8 +1,10 @@ { "name": "libjpeg-turbo", - "version": "2.1.2", + "version": "2.1.3", + "port-version": 2, "description": "libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX, SSE2, NEON, AltiVec) to accelerate baseline JPEG compression and decompression on x86, x86-64, ARM, and PowerPC systems.", "homepage": "https://github.com/libjpeg-turbo/libjpeg-turbo", + "license": "BSD-3-Clause", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/libjuice/portfile.cmake b/external_imported/vcpkg/ports/libjuice/portfile.cmake index f6e383a5d..b29ef11c3 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 026b3dd68db33143db8a5a9b16af3923733a8b61 #v0.9.1 - SHA512 050e92df2e3f24da465ffd4e57d35ffc7a4e13042dc0b829627a09c3f8c7898c7b066f3e386004b579e7416adf4885f5f7a8da46f34c76e9bc63747616f34f9d + REF e2bb4df9c9a2d3a296312925f313bf6f26854010 #v0.9.8 + SHA512 98fa9cf8a1f22c0f43ef7b2dd438bdd299483384b8d81f1196d8a0fe7fa41c63df7d7acfb94b9af3b8edfe569aeb73b33569bea2557ed2d0a554ba3a81603c2f 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 d3a226ba9..2e87efc9e 100644 --- a/external_imported/vcpkg/ports/libjuice/vcpkg.json +++ b/external_imported/vcpkg/ports/libjuice/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libjuice", - "version": "0.9.1", + "version": "0.9.8", "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", "dependencies": [ diff --git a/external_imported/vcpkg/ports/liblinear/portfile.cmake b/external_imported/vcpkg/ports/liblinear/portfile.cmake index fab41c039..245e35e25 100644 --- a/external_imported/vcpkg/ports/liblinear/portfile.cmake +++ b/external_imported/vcpkg/ports/liblinear/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cjlin1/liblinear diff --git a/external_imported/vcpkg/ports/liblinear/vcpkg.json b/external_imported/vcpkg/ports/liblinear/vcpkg.json index a65229aa0..a7eff708c 100644 --- a/external_imported/vcpkg/ports/liblinear/vcpkg.json +++ b/external_imported/vcpkg/ports/liblinear/vcpkg.json @@ -1,6 +1,7 @@ { "name": "liblinear", - "version-string": "243", + "version": "243", + "port-version": 1, "description": "A Library for Large Linear Classification", "homepage": "https://github.com/cjlin1/liblinear", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/liblsl/portfile.cmake b/external_imported/vcpkg/ports/liblsl/portfile.cmake index a8d56b0bd..f41ac7318 100644 --- a/external_imported/vcpkg/ports/liblsl/portfile.cmake +++ b/external_imported/vcpkg/ports/liblsl/portfile.cmake @@ -1,29 +1,29 @@ -# static builds are currently not supported since liblsl always also builds shared binaries -# which need to be deleted for vcpkg but then the CMake target can no longer be imported because it still references them -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sccn/liblsl - REF v1.14.0 # NOTE: when updating version, also change it in the parameter to vcpkg_configure_cmake - SHA512 b4ec379339d174c457c8c1ec69f9e51ea78a738e72ecc96b9193f07b5273acb296b5b1f90c9dfe16591ecab0eef9aae9add640c1936d3769cae0bd96617205ec + REF v1.16.0 # NOTE: when updating version, also change it in the parameter to vcpkg_cmake_configure + SHA512 bfd54c6cca944ed33622da74dc1417ab75b542002c02c83bb86c917fd5968936c4b56ec734bd6d757e9fa67364f9dc85fd15ed28697ed410305df4928cf6790b HEAD_REF master + PATCHES + use-find-package-asio.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LSL_BUILD_STATIC) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DLSL_BUILD_STATIC=OFF + -DLSL_BUILD_STATIC=${LSL_BUILD_STATIC} + -DLSL_BUNDLED_BOOST=OFF # we use the boost vcpkg packages instead -DLSL_BUNDLED_PUGIXML=OFF # we use the pugixml vcpkg package instead - -Dlslgitrevision=v1.14.0 + -Dlslgitrevision=v1.16.0 -Dlslgitbranch=master ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() - vcpkg_copy_tools(TOOL_NAMES lslver AUTO_CLEAN) +vcpkg_cmake_config_fixup(PACKAGE_NAME LSL CONFIG_PATH lib/cmake/LSL) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/external_imported/vcpkg/ports/liblsl/use-find-package-asio.patch b/external_imported/vcpkg/ports/liblsl/use-find-package-asio.patch new file mode 100644 index 000000000..be837c674 --- /dev/null +++ b/external_imported/vcpkg/ports/liblsl/use-find-package-asio.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b47cb7f8..bd12f519 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -203,8 +203,9 @@ target_include_directories(lslobj + target_include_directories(lslobj + SYSTEM PUBLIC + $ +- $ + ) ++find_package(asio CONFIG REQUIRED) ++target_link_libraries(lslobj PUBLIC asio::asio) + target_compile_definitions(lslobj PRIVATE + LIBLSL_EXPORTS + LOGURU_DEBUG_LOGGING=$ diff --git a/external_imported/vcpkg/ports/liblsl/vcpkg.json b/external_imported/vcpkg/ports/liblsl/vcpkg.json index dfacb5398..4b91b069d 100644 --- a/external_imported/vcpkg/ports/liblsl/vcpkg.json +++ b/external_imported/vcpkg/ports/liblsl/vcpkg.json @@ -1,11 +1,32 @@ { "name": "liblsl", - "version-string": "1.14.0", - "port-version": 2, + "version": "1.16.0", "description": "C++ lsl library for multi-modal time-synched data transmission over the local network", "homepage": "https://github.com/sccn/liblsl", - "supports": "!staticcrt", + "license": "MIT", "dependencies": [ - "pugixml" + "asio", + "boost-atomic", + "boost-bind", + "boost-chrono", + "boost-config", + "boost-endian", + "boost-functional", + "boost-integer", + "boost-lexical-cast", + "boost-math", + "boost-serialization", + "boost-smart-ptr", + "boost-thread", + "boost-uuid", + "pugixml", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/liblzma/portfile.cmake b/external_imported/vcpkg/ports/liblzma/portfile.cmake index b7d081794..7c1ce3b6e 100644 --- a/external_imported/vcpkg/ports/liblzma/portfile.cmake +++ b/external_imported/vcpkg/ports/liblzma/portfile.cmake @@ -13,8 +13,6 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS_DEBUG - "-DCMAKE_DEBUG_POSTFIX=d" # This was in the old vcpkg CMakeLists.txt and I don't intend to fix it all over vcpkg ) vcpkg_cmake_install() vcpkg_copy_pdbs() @@ -27,91 +25,27 @@ set(PACKAGE_VERSION 5.2.5) if(NOT VCPKG_TARGET_IS_WINDOWS) set(PTHREAD_CFLAGS -pthread) endif() -if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - set(prefix "${CURRENT_INSTALLED_DIR}") - configure_file("${SOURCE_PATH}/src/liblzma/liblzma.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/liblzma.pc" @ONLY) -endif() -if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") +set(prefix "${CURRENT_INSTALLED_DIR}") +configure_file("${SOURCE_PATH}/src/liblzma/liblzma.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/liblzma.pc" @ONLY) +if (NOT VCPKG_BUILD_TYPE) set(prefix "${CURRENT_INSTALLED_DIR}/debug") configure_file("${SOURCE_PATH}/src/liblzma/liblzma.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/liblzma.pc" @ONLY) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/liblzma.pc" "-llzma" "-llzmad") endif() vcpkg_fixup_pkgconfig() - vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/liblzma) -file(WRITE "${CURRENT_PACKAGES_DIR}/share/liblzma/liblzma-config.cmake" "include(\"\${CMAKE_CURRENT_LIST_DIR}/liblzmaConfig.cmake\")") -file(APPEND "${CURRENT_PACKAGES_DIR}/share/liblzma/liblzmaConfig.cmake" -" -include(\${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake) -find_path(LibLZMA_INCLUDE_DIR NAMES lzma.h PATHS \"\${_IMPORT_PREFIX}/include\" NO_DEFAULT_PATH REQUIRED) -if(NOT LibLZMA_LIBRARY) - find_library(LibLZMA_LIBRARY_RELEASE NAMES lzma PATHS \"\${_IMPORT_PREFIX}/lib\" NO_DEFAULT_PATH) - find_library(LibLZMA_LIBRARY_DEBUG NAMES lzmad PATHS \"\${_IMPORT_PREFIX}/debug/lib\" NO_DEFAULT_PATH) - select_library_configurations(LibLZMA) -endif() -set(LibLZMA_INCLUDE_DIRS \${LibLZMA_INCLUDE_DIR} CACHE PATH \"\") -set(LibLZMA_LIBRARIES \${LibLZMA_LIBRARY} CACHE STRING \"\") -set(LZMA_INCLUDE_DIR \${LibLZMA_INCLUDE_DIR} CACHE PATH \"\") -set(LZMA_LIBRARY \${LibLZMA_LIBRARY} CACHE STRING \"\") -set(LZMA_INCLUDE_DIRS \${LibLZMA_INCLUDE_DIR} CACHE PATH \"\") -set(LZMA_LIBRARIES \${LibLZMA_LIBRARY} CACHE STRING \"\") -set(LIBLZMA_INCLUDE_DIRS \${LibLZMA_INCLUDE_DIR} CACHE PATH \"\") -set(LIBLZMA_LIBRARIES \${LibLZMA_LIBRARY} CACHE STRING \"\") -set(LIBLZMA_INCLUDE_DIR \${LibLZMA_INCLUDE_DIR} CACHE PATH \"\") -set(LIBLZMA_LIBRARY \${LibLZMA_LIBRARY} CACHE STRING \"\") - -if(LIBLZMA_INCLUDE_DIR AND EXISTS \"\${LIBLZMA_INCLUDE_DIR}/lzma/version.h\") - file(STRINGS \"\${LIBLZMA_INCLUDE_DIR}/lzma/version.h\" LIBLZMA_HEADER_CONTENTS REGEX \"#define LZMA_VERSION_[A-Z]+ [0-9]+\") - - string(REGEX REPLACE \".*#define LZMA_VERSION_MAJOR ([0-9]+).*\" \"\\\\1\" LIBLZMA_VERSION_MAJOR \"\${LIBLZMA_HEADER_CONTENTS}\") - string(REGEX REPLACE \".*#define LZMA_VERSION_MINOR ([0-9]+).*\" \"\\\\1\" LIBLZMA_VERSION_MINOR \"\${LIBLZMA_HEADER_CONTENTS}\") - string(REGEX REPLACE \".*#define LZMA_VERSION_PATCH ([0-9]+).*\" \"\\\\1\" LIBLZMA_VERSION_PATCH \"\${LIBLZMA_HEADER_CONTENTS}\") - - set(LIBLZMA_VERSION_STRING \"\${LIBLZMA_VERSION_MAJOR}.\${LIBLZMA_VERSION_MINOR}.\${LIBLZMA_VERSION_PATCH}\") - unset(LIBLZMA_HEADER_CONTENTS) -endif() - -## We're using new code known now as XZ, even library still been called LZMA -## it can be found in http://tukaani.org/xz/ -## Avoid using old codebase -#if (LIBLZMA_LIBRARY) -# include(\${CMAKE_ROOT}/Modules/CheckLibraryExists.cmake) -# CHECK_LIBRARY_EXISTS(\${LibLZMA_LIBRARY_RELEASE} lzma_auto_decoder \"\" LIBLZMA_HAS_AUTO_DECODER) -# CHECK_LIBRARY_EXISTS(\${LibLZMA_LIBRARY_RELEASE} lzma_easy_encoder \"\" LIBLZMA_HAS_EASY_ENCODER) -# CHECK_LIBRARY_EXISTS(\${LibLZMA_LIBRARY_RELEASE} lzma_lzma_preset \"\" LIBLZMA_HAS_LZMA_PRESET) -#endif () - -set(LibLZMA_FOUND TRUE CACHE BOOL \"\") -set(LZMA_FOUND TRUE CACHE BOOL \"\") -set(LIBLZMA_FOUND TRUE CACHE BOOL \"\") -") - -file(READ ${CURRENT_PACKAGES_DIR}/include/lzma.h _contents) -if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") - string(REPLACE "defined(LZMA_API_STATIC)" "1" _contents "${_contents}") -else() - string(REPLACE "defined(LZMA_API_STATIC)" "0" _contents "${_contents}") -endif() -file(WRITE ${CURRENT_PACKAGES_DIR}/include/lzma.h "${_contents}") - -if (VCPKG_BUILD_TYPE STREQUAL debug) - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/include") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/lzma.h" "defined(LZMA_API_STATIC)" "1") else() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/lzma.h" "defined(LZMA_API_STATIC)" "0") endif() -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - vcpkg_replace_string( - "${CURRENT_PACKAGES_DIR}/include/lzma.h" - "if !defined(LZMA_API_STATIC)" - "if 0" - ) -endif() - -file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/share/man" +) set(TOOLS xz xzdec) foreach(_tool IN LISTS TOOLS) @@ -127,5 +61,6 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +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) -file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") \ No newline at end of file diff --git a/external_imported/vcpkg/ports/liblzma/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/liblzma/vcpkg-cmake-wrapper.cmake index cf22af021..32ea80155 100644 --- a/external_imported/vcpkg/ports/liblzma/vcpkg-cmake-wrapper.cmake +++ b/external_imported/vcpkg/ports/liblzma/vcpkg-cmake-wrapper.cmake @@ -1,8 +1,64 @@ -list(REMOVE_ITEM ARGS "NO_MODULE") -list(REMOVE_ITEM ARGS "CONFIG") -list(REMOVE_ITEM ARGS "MODULE") # Always call CONFIG. -_find_package(${ARGS} CONFIG) -if(NOT TARGET LibLZMA::LibLZMA AND TARGET liblzma::liblzma) - add_library(LibLZMA::LibLZMA INTERFACE IMPORTED) # Too lazy to fix wrong target usage all over vcpkg. - set_target_properties(LibLZMA::LibLZMA PROPERTIES INTERFACE_LINK_LIBRARIES liblzma::liblzma) +cmake_policy(PUSH) +cmake_policy(SET CMP0012 NEW) +cmake_policy(SET CMP0057 NEW) +set(z_vcpkg_liblzma_fixup_needed 0) +if(NOT "CONFIG" IN_LIST ARGS AND NOT "NO_MODULE" IN_LIST ARGS AND NOT CMAKE_DISABLE_FIND_PACKAGE_LibLZMA) + get_filename_component(z_vcpkg_liblzma_prefix "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY) + get_filename_component(z_vcpkg_liblzma_prefix "${z_vcpkg_liblzma_prefix}" DIRECTORY) + find_path(LIBLZMA_INCLUDE_DIR NAMES lzma.h PATHS "${z_vcpkg_liblzma_prefix}/include" NO_DEFAULT_PATH) + # liblzma doesn't use a debug postfix, but FindLibLZMA.cmake expects it + find_library(LIBLZMA_LIBRARY_RELEASE NAMES lzma PATHS "${z_vcpkg_liblzma_prefix}/lib" NO_DEFAULT_PATH) + find_library(LIBLZMA_LIBRARY_DEBUG NAMES lzma PATHS "${z_vcpkg_liblzma_prefix}/debug/lib" NO_DEFAULT_PATH) + unset(z_vcpkg_liblzma_prefix) + 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}") + elseif(NOT TARGET LibLZMA::LibLZMA) + set(z_vcpkg_liblzma_fixup_needed 1) + endif() + # Known values, and required. Skip expensive tests. + set(LIBLZMA_HAS_AUTO_DECODER 1 CACHE INTERNAL "") + set(LIBLZMA_HAS_EASY_ENCODER 1 CACHE INTERNAL "") + set(LIBLZMA_HAS_LZMA_PRESET 1 CACHE INTERNAL "") endif() + +_find_package(${ARGS}) + +if(z_vcpkg_liblzma_fixup_needed) + include(SelectLibraryConfigurations) + select_library_configurations(LIBLZMA) + if(NOT TARGET LibLZMA::LibLZMA) + # Backfill LibLZMA::LibLZMA to versions of cmake before 3.14 + add_library(LibLZMA::LibLZMA UNKNOWN IMPORTED) + if(DEFINED LIBLZMA_INCLUDE_DIRS) + set_target_properties(LibLZMA::LibLZMA PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${LIBLZMA_INCLUDE_DIRS}") + endif() + set_property(TARGET LibLZMA::LibLZMA APPEND PROPERTY + IMPORTED_CONFIGURATIONS RELEASE) + set_target_properties(LibLZMA::LibLZMA PROPERTIES + IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C" + IMPORTED_LOCATION_RELEASE "${LIBLZMA_LIBRARY_RELEASE}") + if(EXISTS "${LIBLZMA_LIBRARY}") + set_target_properties(LibLZMA::LibLZMA PROPERTIES + IMPORTED_LINK_INTERFACE_LANGUAGES "C" + IMPORTED_LOCATION "${LIBLZMA_LIBRARY}") + endif() + endif() + if(LIBLZMA_LIBRARY_DEBUG) + # Backfill debug variant to versions of cmake before 3.16 + set_property(TARGET LibLZMA::LibLZMA APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) + set_target_properties(LibLZMA::LibLZMA PROPERTIES IMPORTED_LOCATION_DEBUG "${LIBLZMA_LIBRARY_DEBUG}") + endif() +endif() +if(LIBLZMA_LIBRARIES AND NOT "Threads::Threads" IN_LIST LIBLZMA_LIBRARIES) + set(THREADS_PREFER_PTHREAD_FLAG TRUE) + find_package(Threads) + list(APPEND LIBLZMA_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) + if(TARGET LibLZMA::LibLZMA) + set_property(TARGET LibLZMA::LibLZMA APPEND PROPERTY INTERFACE_LINK_LIBRARIES Threads::Threads) + endif() +endif() +unset(z_vcpkg_liblzma_fixup_needed) +cmake_policy(POP) diff --git a/external_imported/vcpkg/ports/liblzma/vcpkg.json b/external_imported/vcpkg/ports/liblzma/vcpkg.json index 5c1874023..c2c5a5a84 100644 --- a/external_imported/vcpkg/ports/liblzma/vcpkg.json +++ b/external_imported/vcpkg/ports/liblzma/vcpkg.json @@ -1,9 +1,10 @@ { "name": "liblzma", "version-semver": "5.2.5", - "port-version": 4, + "port-version": 5, "description": "Compression library with an API similar to that of zlib.", - "homepage": "hhttps://github.com/xz-mirror/xz", + "homepage": "https://github.com/xz-mirror/xz", + "license": null, "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/liblzma/win_output_name.patch b/external_imported/vcpkg/ports/liblzma/win_output_name.patch index e1da52a46..e3ce250a0 100644 --- a/external_imported/vcpkg/ports/liblzma/win_output_name.patch +++ b/external_imported/vcpkg/ports/liblzma/win_output_name.patch @@ -1,13 +1,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index e80b524..1ecf908 100644 +index e80b524..cddbccb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -429,7 +429,7 @@ set_target_properties(liblzma PROPERTIES +@@ -429,8 +429,11 @@ set_target_properties(liblzma PROPERTIES # It's liblzma.so or liblzma.dll, not libliblzma.so or lzma.dll. # Avoid the name lzma.dll because it would conflict with LZMA SDK. - PREFIX "" + OUTPUT_NAME lzma ) ++if(WIN32 AND NOT MINGW) ++ set_target_properties(liblzma PROPERTIES RUNTIME_OUTPUT_NAME liblzma) ++endif() # Create liblzmaConfigVersion.cmake. + # diff --git a/external_imported/vcpkg/ports/libmesh/portfile.cmake b/external_imported/vcpkg/ports/libmesh/portfile.cmake index 9a16dbf98..c4810b560 100644 --- a/external_imported/vcpkg/ports/libmesh/portfile.cmake +++ b/external_imported/vcpkg/ports/libmesh/portfile.cmake @@ -18,27 +18,23 @@ endif() vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} OPTIONS ${OPTIONS} + OPTIONS_DEBUG --with-methods=dbg + OPTIONS_RELEASE --with-methods=opt ) vcpkg_install_make() if (EXISTS ${CURRENT_PACKAGES_DIR}/contrib/bin/libtool) - file(COPY ${CURRENT_PACKAGES_DIR}/contrib/bin/libtool DESTINATION ${CURRENT_PACKAGES_DIR}/tools) + file(COPY ${CURRENT_PACKAGES_DIR}/contrib/bin/libtool DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) file(REMOVE ${CURRENT_PACKAGES_DIR}/contrib/bin/libtool) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/contrib ${CURRENT_PACKAGES_DIR}/debug/contrib) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/contrib) -file(GLOB ${CURRENT_PACKAGES_DIR}/bin LIBMESH_TOOLS) -foreach (LIBMESH_TOOL ${LIBMESH_TOOLS}) - file(COPY ${LIBMESH_TOOL} DESTINATION ${CURRENT_PACKAGES_DIR}/tools) - file(REMOVE ${LIBMESH_TOOL}) -endforeach() - -file(GLOB LIBMESH_TOOLS ${CURRENT_PACKAGES_DIR}/examples/*) -foreach (LIBMESH_TOOL ${LIBMESH_TOOLS}) - file(COPY ${LIBMESH_TOOL} DESTINATION ${CURRENT_PACKAGES_DIR}/tools) - file(REMOVE ${LIBMESH_TOOL}) +file(GLOB LIBMESH_EXAMPLES ${CURRENT_PACKAGES_DIR}/examples/*) +foreach (LIBMESH_EXAMPLE ${LIBMESH_EXAMPLES}) + file(COPY ${LIBMESH_EXAMPLE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) endforeach() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/examples) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) @@ -47,10 +43,11 @@ endif() # Remove tools and debug include directories file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/contrib ${CURRENT_PACKAGES_DIR}/debug/etc ${CURRENT_PACKAGES_DIR}/debug/examples ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share + ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/tools/libmesh/debug ${CURRENT_PACKAGES_DIR}/Make.common ${CURRENT_PACKAGES_DIR}/debug/Make.common) vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() file(INSTALL ${CURRENT_PORT_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/external_imported/vcpkg/ports/libmesh/vcpkg.json b/external_imported/vcpkg/ports/libmesh/vcpkg.json index 7c4b273f1..d7240de55 100644 --- a/external_imported/vcpkg/ports/libmesh/vcpkg.json +++ b/external_imported/vcpkg/ports/libmesh/vcpkg.json @@ -1,7 +1,8 @@ { "name": "libmesh", - "version-string": "1.5.0", - "port-version": 2, + "version": "1.5.0", + "port-version": 4, "description": "The libMesh library provides a framework for the numerical simulation of partial differential equations using arbitrary unstructured discretizations on serial and parallel platforms. A major goal of the library is to provide support for adaptive mesh refinement (AMR) computations in parallel while allowing a research scientist to focus on the physics they are modeling.", - "homepage": "https://github.com/libMesh/libmesh" + "homepage": "https://github.com/libMesh/libmesh", + "license": "LGPL-2.1-only" } diff --git a/external_imported/vcpkg/ports/libmicrohttpd/fix-msvc-project.patch b/external_imported/vcpkg/ports/libmicrohttpd/fix-msvc-project.patch deleted file mode 100644 index 29071a2be..000000000 --- a/external_imported/vcpkg/ports/libmicrohttpd/fix-msvc-project.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/w32/common/libmicrohttpd-files.vcxproj b/w32/common/libmicrohttpd-files.vcxproj -index 6f1e03b..c0ddea8 100644 ---- a/w32/common/libmicrohttpd-files.vcxproj -+++ b/w32/common/libmicrohttpd-files.vcxproj -@@ -3,6 +3,7 @@ - - - -+ - - - diff --git a/external_imported/vcpkg/ports/libmicrohttpd/portfile.cmake b/external_imported/vcpkg/ports/libmicrohttpd/portfile.cmake index 74cde2f8f..4fcca42aa 100644 --- a/external_imported/vcpkg/ports/libmicrohttpd/portfile.cmake +++ b/external_imported/vcpkg/ports/libmicrohttpd/portfile.cmake @@ -1,19 +1,16 @@ -vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "arm") - -set(MICROHTTPD_VERSION 0.9.63) +set(MICROHTTPD_VERSION 0.9.75) vcpkg_download_distfile(ARCHIVE URLS "https://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-${MICROHTTPD_VERSION}.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-${MICROHTTPD_VERSION}.tar.gz" FILENAME "libmicrohttpd-${MICROHTTPD_VERSION}.tar.gz" - SHA512 cb99e7af84fb6d7c0fd3894a9dc0fbff14959b35347506bd3211a65bbfad36455007b9e67493e97c9d8394834408df10eeabdc7758573e6aae0ba6f5f87afe17 + SHA512 4dc62ed191342a61cc2767171bb1ff4050f390db14ef7100299888237b52ea0b04b939c843878fe7f5daec2b35a47b3c1b7e7c11fb32d458184fe6b19986a37c ) vcpkg_extract_source_archive_ex( ARCHIVE "${ARCHIVE}" OUT_SOURCE_PATH SOURCE_PATH - PATCHES fix-msvc-project.patch ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) diff --git a/external_imported/vcpkg/ports/libmicrohttpd/vcpkg.json b/external_imported/vcpkg/ports/libmicrohttpd/vcpkg.json index 368fd2a65..1418a7ff4 100644 --- a/external_imported/vcpkg/ports/libmicrohttpd/vcpkg.json +++ b/external_imported/vcpkg/ports/libmicrohttpd/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libmicrohttpd", - "version": "0.9.63", - "port-version": 7, + "version": "0.9.75", "description": "GNU libmicrohttpd is a small C library that is supposed to make it easy to run an HTTP server as part of another application", "homepage": "https://www.gnu.org/software/libmicrohttpd/", "supports": "!(arm | uwp)", diff --git a/external_imported/vcpkg/ports/libmodbus/portfile.cmake b/external_imported/vcpkg/ports/libmodbus/portfile.cmake index a607f5a9e..24b6bdfa1 100644 --- a/external_imported/vcpkg/ports/libmodbus/portfile.cmake +++ b/external_imported/vcpkg/ports/libmodbus/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stephane/libmodbus @@ -29,4 +27,4 @@ endif() # Handle copyright file(INSTALL ${SOURCE_PATH}/COPYING.LESSER DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -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/libmodbus/vcpkg.json b/external_imported/vcpkg/ports/libmodbus/vcpkg.json index cea788931..08d6a1cda 100644 --- a/external_imported/vcpkg/ports/libmodbus/vcpkg.json +++ b/external_imported/vcpkg/ports/libmodbus/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmodbus", - "version-string": "3.1.6", - "port-version": 1, + "version": "3.1.6", + "port-version": 2, "description": "libmodbus is a free software library to send/receive data with a device which respects the Modbus protocol", "homepage": "https://github.com/stephane/libmodbus", "supports": "!uwp" diff --git a/external_imported/vcpkg/ports/libmpeg2/portfile.cmake b/external_imported/vcpkg/ports/libmpeg2/portfile.cmake index 3813e0d6e..181ff2d5e 100644 --- a/external_imported/vcpkg/ports/libmpeg2/portfile.cmake +++ b/external_imported/vcpkg/ports/libmpeg2/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Windows Desktop platform." ON_TARGET "Linux" "OSX" "uwp") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) # There is archived version of releases available at https://github.com/janisozaur/libmpeg2 diff --git a/external_imported/vcpkg/ports/libmpeg2/vcpkg.json b/external_imported/vcpkg/ports/libmpeg2/vcpkg.json index 4936a91db..7942b3427 100644 --- a/external_imported/vcpkg/ports/libmpeg2/vcpkg.json +++ b/external_imported/vcpkg/ports/libmpeg2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmpeg2", - "version-string": "0.5.1", - "port-version": 1, + "version": "0.5.1", + "port-version": 2, "description": "a free MPEG-2 video stream decoder", "homepage": "http://libmpeg2.sourceforge.net/", "supports": "!(linux | osx | uwp)", diff --git a/external_imported/vcpkg/ports/libmt32emu/portfile.cmake b/external_imported/vcpkg/ports/libmt32emu/portfile.cmake index 706307693..9eea719a5 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 libmt32emu_2_5_3 - SHA512 c801e22e861898281316109533ca6264f5a9cf778d4f0bb14b49bb6d04d53b7e60cd8320d5b29a63534f6c470b4feb67c881e86c49b7860a98639ce01b99debf + REF 004800c20b1edaab921e08f69133fc2a4bd3b8e8 #vlibmt32emu_2_6_2 + SHA512 3a47c269d285f3930eefda4cae6f1c7e157fc4e88d7d64ad029542586b6592b32d5f9bf0e22344e27a21869aea2191051505f3727e52dff268cf2be4d52f15c3 HEAD_REF master ) @@ -15,6 +15,11 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME MT32Emu CONFIG_PATH lib/cmake/MT32Emu) + +vcpkg_fixup_pkgconfig() + vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") @@ -23,5 +28,3 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") file(INSTALL "${SOURCE_PATH}/mt32emu/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -vcpkg_fixup_pkgconfig() diff --git a/external_imported/vcpkg/ports/libmt32emu/vcpkg.json b/external_imported/vcpkg/ports/libmt32emu/vcpkg.json index 79ead6f26..115c3206e 100644 --- a/external_imported/vcpkg/ports/libmt32emu/vcpkg.json +++ b/external_imported/vcpkg/ports/libmt32emu/vcpkg.json @@ -1,9 +1,9 @@ { "name": "libmt32emu", - "version": "2.5.3", - "port-version": 1, + "version": "2.6.2", "description": "A MT-32 emulator", "homepage": "https://github.com/munt/munt/tree/master/mt32emu", + "license": "GPL-2.0-or-later", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/libmupdf/portfile.cmake b/external_imported/vcpkg/ports/libmupdf/portfile.cmake index 88e7b7e37..3ef0146ba 100644 --- a/external_imported/vcpkg/ports/libmupdf/portfile.cmake +++ b/external_imported/vcpkg/ports/libmupdf/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "osx") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/external_imported/vcpkg/ports/libmupdf/vcpkg.json b/external_imported/vcpkg/ports/libmupdf/vcpkg.json index af307e1df..d6c2cd491 100644 --- a/external_imported/vcpkg/ports/libmupdf/vcpkg.json +++ b/external_imported/vcpkg/ports/libmupdf/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libmupdf", - "version-string": "1.19.0-rc2", + "version": "1.19.0-rc2", + "port-version": 1, "description": "a lightweight PDF, XPS, and E-book library", "homepage": "https://github.com/ArtifexSoftware/mupdf", "supports": "!osx", diff --git a/external_imported/vcpkg/ports/libmysql/openssl.patch b/external_imported/vcpkg/ports/libmysql/openssl.patch new file mode 100644 index 000000000..3abbcf98f --- /dev/null +++ b/external_imported/vcpkg/ports/libmysql/openssl.patch @@ -0,0 +1,125 @@ +diff --git a/mysys/my_md5.cc b/mysys/my_md5.cc +index dea997b252c..81484f0652b 100644 +--- a/mysys/my_md5.cc ++++ b/mysys/my_md5.cc +@@ -35,6 +35,10 @@ + #include + #include + ++#if OPENSSL_VERSION_NUMBER >= 0x30000000L ++#include ++#endif ++ + static void my_md5_hash(unsigned char *digest, unsigned const char *buf, + int len) { + MD5_CTX ctx; +@@ -56,7 +60,11 @@ static void my_md5_hash(unsigned char *digest, unsigned const char *buf, + int compute_md5_hash(char *digest, const char *buf, int len) { + int retval = 0; + int fips_mode = 0; ++ #if OPENSSL_VERSION_NUMBER < 0x30000000L + fips_mode = FIPS_mode(); ++ #else ++ fips_mode = EVP_default_properties_is_fips_enabled(NULL); ++ #endif + /* If fips mode is ON/STRICT restricted method calls will result into abort, + * skipping call. */ + if (fips_mode == 0) { +diff --git a/plugin/x/client/xconnection_impl.cc b/plugin/x/client/xconnection_impl.cc +index 13bc6794ea5..8752bcea9bf 100644 +--- a/plugin/x/client/xconnection_impl.cc ++++ b/plugin/x/client/xconnection_impl.cc +@@ -51,6 +51,10 @@ + #include "plugin/x/src/config/config.h" + #include "sql-common/net_ns.h" + ++#if OPENSSL_VERSION_NUMBER >= 0x30000000L ++#include ++#endif ++ + #ifndef WIN32 + #include + #include +@@ -524,12 +528,20 @@ int set_fips_mode(const uint32_t fips_mode, + if (fips_mode > 2) { + goto EXIT; + } ++ #if OPENSSL_VERSION_NUMBER < 0x30000000L + fips_mode_old = FIPS_mode(); ++ #else ++ fips_mode_old = EVP_default_properties_is_fips_enabled(NULL); ++ #endif + if (fips_mode_old == fips_mode) { + rc = 1; + goto EXIT; + } ++ #if OPENSSL_VERSION_NUMBER < 0x30000000L + if (!(rc = FIPS_mode_set(fips_mode))) { ++ #else ++ if (!(rc = EVP_default_properties_enable_fips(fips_mode))) { ++ #endif + err_library = ERR_get_error(); + ERR_error_string_n(err_library, err_string, OPENSSL_ERROR_LENGTH - 1); + err_string[OPENSSL_ERROR_LENGTH - 1] = '\0'; +diff --git a/vio/viosslfactories.cc b/vio/viosslfactories.cc +index 6c04029ccb0..164b727e3dc 100644 +--- a/vio/viosslfactories.cc ++++ b/vio/viosslfactories.cc +@@ -40,6 +40,10 @@ + + #include + ++#if OPENSSL_VERSION_NUMBER >= 0x30000000L ++#include ++#endif ++ + #if OPENSSL_VERSION_NUMBER < 0x10002000L + #include + #endif /* OPENSSL_VERSION_NUMBER < 0x10002000L */ +@@ -498,12 +502,20 @@ int set_fips_mode(const uint fips_mode, char err_string[OPENSSL_ERROR_LENGTH]) { + if (fips_mode > 2) { + goto EXIT; + } ++ #if OPENSSL_VERSION_NUMBER < 0x30000000L + fips_mode_old = FIPS_mode(); ++ #else ++ fips_mode_old = EVP_default_properties_is_fips_enabled(NULL); ++ #endif + if (fips_mode_old == fips_mode) { + rc = 1; + goto EXIT; + } ++ #if OPENSSL_VERSION_NUMBER < 0x30000000L + if (!(rc = FIPS_mode_set(fips_mode))) { ++ #else ++ if (!(rc = EVP_default_properties_enable_fips(NULL, fips_mode))) { ++ #endif + /* + If OS doesn't have FIPS enabled openssl library and user sets FIPS mode + ON, It fails with proper error. But in the same time it doesn't allow to +@@ -511,7 +523,11 @@ int set_fips_mode(const uint fips_mode, char err_string[OPENSSL_ERROR_LENGTH]) { + error, setting old working FIPS mode value in the OpenSSL library. It will + allow successful cryptographic operation and will not abort the server. + */ ++ #if OPENSSL_VERSION_NUMBER < 0x30000000L + FIPS_mode_set(fips_mode_old); ++ #else ++ EVP_default_properties_enable_fips(NULL, fips_mode_old); ++ #endif + err_library = ERR_get_error(); + ERR_error_string_n(err_library, err_string, OPENSSL_ERROR_LENGTH - 1); + err_string[OPENSSL_ERROR_LENGTH - 1] = '\0'; +@@ -525,7 +541,13 @@ EXIT: + + @returns openssl current fips mode + */ ++#if OPENSSL_VERSION_NUMBER < 0x30000000L + uint get_fips_mode() { return FIPS_mode(); } ++#else ++uint get_fips_mode() { ++ return EVP_default_properties_is_fips_enabled(NULL); ++} ++#endif + + long process_tls_version(const char *tls_version) { + const char *separator = ","; diff --git a/external_imported/vcpkg/ports/libmysql/portfile.cmake b/external_imported/vcpkg/ports/libmysql/portfile.cmake index 525a995ee..5e3311131 100644 --- a/external_imported/vcpkg/ports/libmysql/portfile.cmake +++ b/external_imported/vcpkg/ports/libmysql/portfile.cmake @@ -18,6 +18,7 @@ vcpkg_from_github( rename-version.patch export-cmake-targets.patch 004-added-limits-include.patch + openssl.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/include/boost_1_70_0") diff --git a/external_imported/vcpkg/ports/libmysql/vcpkg.json b/external_imported/vcpkg/ports/libmysql/vcpkg.json index 91fc043d1..56880427e 100644 --- a/external_imported/vcpkg/ports/libmysql/vcpkg.json +++ b/external_imported/vcpkg/ports/libmysql/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmysql", "version": "8.0.20", - "port-version": 5, + "port-version": 6, "description": "A MySQL client library for C development", "homepage": "https://github.com/mysql/mysql-server", "supports": "!(windows & x86) & !uwp", diff --git a/external_imported/vcpkg/ports/libnice/CMakeLists.txt b/external_imported/vcpkg/ports/libnice/CMakeLists.txt deleted file mode 100644 index 0ca7cdafa..000000000 --- a/external_imported/vcpkg/ports/libnice/CMakeLists.txt +++ /dev/null @@ -1,159 +0,0 @@ -cmake_minimum_required(VERSION 3.19) -project(libnice - LANGUAGES C - VERSION 0.1.15) -SET (this_target libnice) - -if (WIN32) - add_definitions( - -D_CRT_SECURE_NO_WARNINGS - -D_SCL_SECURE_NO_WARNINGS - -DHAVE_OPENSSL - -DPACKAGE_STRING="${PROJECT_VERSION}") -else() - add_definitions( - -DHAVE_OPENSSL - -DPACKAGE_STRING="${PROJECT_VERSION}" - -DHAVE_NETDB_H=1) -endif() - -configure_file(${CMAKE_SOURCE_DIR}/win32/vs9/config.h ${CMAKE_SOURCE_DIR}/config.h COPYONLY) -configure_file(${CMAKE_SOURCE_DIR}/win32/vs9/libnice.def ${CMAKE_SOURCE_DIR}/libnice.def COPYONLY) - -find_package(PkgConfig REQUIRED) -pkg_check_modules(GLIB2 glib-2.0 gobject-2.0 gmodule-2.0 gio-2.0 IMPORTED_TARGET) -find_library(IPHLPAPI_LIBRARY iphlpapi) -find_library(WS2_32_LIB ws2_32) -find_library(ADVAPI32_LIB advapi32) -find_package(OpenSSL REQUIRED) -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/agent - ${CMAKE_CURRENT_SOURCE_DIR}/random - ${CMAKE_CURRENT_SOURCE_DIR}/socket - ${CMAKE_CURRENT_SOURCE_DIR}/stun - ${GLIB2_INCLUDE_DIRS}) - - -SET (SRCS - ./agent/address.c - ./agent/agent-enum-types.c - ./agent/agent.c - ./agent/candidate.c - ./agent/component.c - ./agent/conncheck.c - ./agent/debug.c - ./agent/discovery.c - ./agent/inputstream.c - ./agent/interfaces.c - ./agent/iostream.c - ./agent/outputstream.c - ./agent/pseudotcp.c - ./agent/stream.c - ./random/random-glib.c - ./random/random.c - ./random/test.c - ./socket/http.c - ./socket/pseudossl.c - ./socket/socket.c - ./socket/socks5.c - ./socket/tcp-active.c - ./socket/tcp-bsd.c - ./socket/tcp-passive.c - ./socket/udp-bsd.c - ./socket/udp-turn-over-tcp.c - ./socket/udp-turn.c - ./stun/debug.c - ./stun/rand.c - ./stun/stun5389.c - ./stun/stunagent.c - ./stun/stuncrc32.c - ./stun/stunhmac.c - ./stun/stunmessage.c - ./stun/usages/bind.c - ./stun/usages/ice.c - ./stun/usages/timer.c - ./stun/usages/turn.c - ./stun/utils.c - ./libnice.def - ) -SET(HEADERS - ./agent/address.h - ./agent/agent-enum-types.h - ./agent/agent-priv.h - ./agent/agent.h - ./agent/candidate.h - ./agent/component.h - ./agent/conncheck.h - ./agent/debug.h - ./agent/discovery.h - ./agent/inputstream.h - ./agent/interfaces.h - ./agent/iostream.h - ./agent/outputstream.h - ./agent/pseudotcp.h - ./agent/stream.h - ./config.h - ./nice/nice.h - ./random/random-glib.h - ./random/random.h - ./socket/http.h - ./socket/pseudossl.h - ./socket/socket-priv.h - ./socket/socket.h - ./socket/socks5.h - ./socket/tcp-active.h - ./socket/tcp-bsd.h - ./socket/tcp-passive.h - ./socket/udp-bsd.h - ./socket/udp-turn-over-tcp.h - ./socket/udp-turn.h - ./stun/constants.h - ./stun/debug.h - ./stun/rand.h - ./stun/stun5389.h - ./stun/stunagent.h - ./stun/stuncrc32.h - ./stun/stunhmac.h - ./stun/stunmessage.h - ./stun/tools/stund.h - ./stun/usages/bind.h - ./stun/usages/ice.h - ./stun/usages/timer.h - ./stun/usages/turn.h - ./stun/utils.h - ./stun/win32_common.h - ./win32/vs9/config.h - ) -add_library(libnice ${SRCS} ${HEADERS}) -if (MSVC) - set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/wd4244 /wd4005 /wd4391 /wd4142 /wd4267") -endif() -if (WIN32) - target_link_libraries(libnice ${IPHLPAPI_LIBRARY} ${WS2_32_LIB} ${ADVAPI32_LIB} PkgConfig::GLIB2 OpenSSL::SSL) -else() - target_link_libraries(libnice PkgConfig::GLIB2 OpenSSL::SSL) -endif() -install(TARGETS libnice -RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib) - -if (CMAKE_BUILD_TYPE STREQUAL "Release") -install(FILES agent/address.h DESTINATION include/nice) -install(FILES agent/agent.h DESTINATION include/nice) -install(FILES agent/candidate.h DESTINATION include/nice) -install(FILES agent/debug.h DESTINATION include/nice) -install(FILES agent/interfaces.h DESTINATION include/nice) -install(FILES nice/nice.h DESTINATION include/nice) -install(FILES agent/pseudotcp.h DESTINATION include/nice) -install(FILES stun/constants.h DESTINATION include/stun) -install(FILES stun/debug.h DESTINATION include/stun) -install(FILES stun/stunagent.h DESTINATION include/stun) -install(FILES stun/stunmessage.h DESTINATION include/stun) -install(FILES stun/usages/bind.h DESTINATION include/stun/usages) -install(FILES stun/usages/ice.h DESTINATION include/stun/usages) -install(FILES stun/usages/timer.h DESTINATION include/stun/usages) -install(FILES stun/usages/turn.h DESTINATION include/stun/usages) -install(FILES stun/win32_common.h DESTINATION include/stun) -endif() diff --git a/external_imported/vcpkg/ports/libnice/portfile.cmake b/external_imported/vcpkg/ports/libnice/portfile.cmake index 038b21ebb..1f8596647 100644 --- a/external_imported/vcpkg/ports/libnice/portfile.cmake +++ b/external_imported/vcpkg/ports/libnice/portfile.cmake @@ -1,30 +1,40 @@ -vcpkg_download_distfile( - ARCHIVE - URLS "https://nice.freedesktop.org/releases/libnice-0.1.15.tar.gz" - FILENAME "libnice-0.1.15.tar.gz" - SHA512 60a8bcca06c0ab300dfabbf13e45aeac2085d553c420c5cc4d2fdeb46b449b2b9c9aee8015b0662c16bd1cecf5a49824b7e24951a8a0b66a87074cb00a619c0c -) -vcpkg_extract_source_archive_ex( - ARCHIVE ${ARCHIVE} +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org OUT_SOURCE_PATH SOURCE_PATH - ) + REPO libnice/libnice + REF 55b71d47f2b427b3baa8812818ed3f059acc748d # 0.1.18 + SHA512 78575c487d74734d2dff1c04103fd55c76cf5e78edde03ffd68050348881a3efc985513cfd30553bfce0568c8edfcd61be7dea8991731efc749ee4fee2f503d6 + HEAD_REF master +) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -vcpkg_find_acquire_program(PKGCONFIG) -vcpkg_configure_cmake( +vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - DISABLE_PARALLEL_CONFIGURE OPTIONS - -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} - OPTIONS_RELEASE -DOPTIMIZE=1 - OPTIONS_DEBUG -DDEBUGGABLE=1 + -Dgtk_doc=disabled #Enable generating the API reference (depends on GTK-Doc) + -Dintrospection=disabled #Enable GObject Introspection (depends on GObject)' + -Dtests=disabled + -Dexamples=disabled + -Dgstreamer=disabled + -Dcrypto-library=openssl + ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' + ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' ) -vcpkg_install_cmake() +# Could be features: +# option('gupnp', type: 'feature', value: 'auto', + # description: 'Enable or disable GUPnP IGD support') +# option('ignored-network-interface-prefix', type: 'array', value: ['docker', 'veth', 'virbr', 'vnet'], + # description: 'Ignore network interfaces whose name starts with a string from this list in the ICE connection check algorithm. For example, "virbr" to ignore virtual bridge interfaces added by virtd, which do not help in finding connectivity.') +# option('crypto-library', type: 'combo', choices : ['auto', 'gnutls', 'openssl'], value : 'auto') + +vcpkg_install_meson() 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) +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) diff --git a/external_imported/vcpkg/ports/libnice/vcpkg.json b/external_imported/vcpkg/ports/libnice/vcpkg.json index 16802d092..59acb444c 100644 --- a/external_imported/vcpkg/ports/libnice/vcpkg.json +++ b/external_imported/vcpkg/ports/libnice/vcpkg.json @@ -1,11 +1,16 @@ { "name": "libnice", - "version": "0.1.15", - "port-version": 7, + "version": "0.1.18", "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", "dependencies": [ "glib", + { + "name": "glib", + "host": true, + "default-features": false + }, "openssl" ] } diff --git a/external_imported/vcpkg/ports/libnoise/fix-build.patch b/external_imported/vcpkg/ports/libnoise/fix-build.patch index c0b7d7ce5..e4b07413d 100644 --- a/external_imported/vcpkg/ports/libnoise/fix-build.patch +++ b/external_imported/vcpkg/ports/libnoise/fix-build.patch @@ -1,14 +1,18 @@ diff --git a/noiseutils/CMakeLists.txt b/noiseutils/CMakeLists.txt -index 07747de..08c0bda 100644 +index 07747de..68db2a2 100644 --- a/noiseutils/CMakeLists.txt +++ b/noiseutils/CMakeLists.txt -@@ -22,8 +22,11 @@ if(BUILD_SHARED_LIBS) - target_include_directories(${TARGET_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/src) +@@ -19,11 +19,14 @@ if(BUILD_SHARED_LIBS) + + set_target_properties(${TARGET_NAME} PROPERTIES VERSION ${LIBNOISE_VERSION}) + target_link_libraries(${TARGET_NAME} noise) +- target_include_directories(${TARGET_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/src) ++ target_include_directories(${TARGET_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/src PUBLIC $ $) # install dynamic libraries (.dll or .so) into /bin - install(TARGETS ${TARGET_NAME} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") -endif() -+ install(TARGETS ${TARGET_NAME} ++ install(TARGETS ${TARGET_NAME} EXPORT unofficial-noiseutilsTargets + RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" + LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" + ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}/lib") @@ -16,27 +20,49 @@ index 07747de..08c0bda 100644 #---------------------------------------- # build static lib (it's good practice to include a lib file for the dll) -@@ -35,7 +38,7 @@ target_include_directories(${TARGET_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/src) +@@ -31,11 +34,22 @@ set(TARGET_NAME "${LIB_NAME}-static") + add_library(${TARGET_NAME} STATIC ${libSrcs}) + set_target_properties(${TARGET_NAME} PROPERTIES VERSION ${LIBNOISE_VERSION}) + target_link_libraries(${TARGET_NAME} noise-static) +-target_include_directories(${TARGET_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/src) ++target_include_directories(${TARGET_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/src PUBLIC $ $) # install static libraries (.lib) into /lib - install(TARGETS ${TARGET_NAME} DESTINATION "${CMAKE_INSTALL_PREFIX}/lib") +-install(TARGETS ${TARGET_NAME} DESTINATION "${CMAKE_INSTALL_PREFIX}/lib") ++install(TARGETS ${TARGET_NAME} EXPORT unofficial-noiseutilsTargets DESTINATION "${CMAKE_INSTALL_PREFIX}/lib") #---------------------------------------- - +endif() # install include files into /include install( FILES "${PROJECT_SOURCE_DIR}/noiseutils/noiseutils.h" - DESTINATION "${CMAKE_INSTALL_PREFIX}/include/noise" ) +- DESTINATION "${CMAKE_INSTALL_PREFIX}/include/noise" ) +\ No newline at end of file ++ DESTINATION "${CMAKE_INSTALL_PREFIX}/include/noise" ) ++ ++install(EXPORT unofficial-noiseutilsTargets ++ NAMESPACE unofficial::noiseutils:: ++ DESTINATION share/unofficial-noiseutils ++) ++ ++file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-noiseutils-config.cmake.in" ++[[include("${CMAKE_CURRENT_LIST_DIR}/unofficial-noiseutilsTargets.cmake")]]) ++configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-noiseutils-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-noiseutils-config.cmake" @ONLY) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-noiseutils-config.cmake DESTINATION share/unofficial-noiseutils) ++ \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 2757f30..7a135c2 100644 +index 2757f30..47dcc51 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -62,8 +62,11 @@ if(BUILD_SHARED_LIBS) +@@ -60,10 +60,13 @@ if(BUILD_SHARED_LIBS) + add_library(${TARGET_NAME} SHARED ${libSrcs}) + endif() set_target_properties(${TARGET_NAME} PROPERTIES VERSION ${LIBNOISE_VERSION}) - target_include_directories(${TARGET_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/src) +- target_include_directories(${TARGET_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/src) ++ target_include_directories(${TARGET_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/src PUBLIC $ $) target_compile_definitions(${TARGET_NAME} PRIVATE NOISE_BUILD_DLL) - install(TARGETS ${TARGET_NAME} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") -endif() -+ install(TARGETS ${TARGET_NAME} ++ install(TARGETS ${TARGET_NAME} EXPORT unofficial-noiseTargets + RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" + LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" + ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}/lib") @@ -44,13 +70,31 @@ index 2757f30..7a135c2 100644 #---------------------------------------- # build static lib (it's good practice to include a lib file for the dll) -@@ -76,7 +79,7 @@ target_compile_definitions(${TARGET_NAME} PUBLIC NOISE_STATIC) +@@ -71,12 +74,22 @@ set(TARGET_NAME "${LIB_NAME}-static") + message(STATUS "build ${TARGET_NAME}") + add_library(${TARGET_NAME} STATIC ${libSrcs}) + set_target_properties(${TARGET_NAME} PROPERTIES VERSION ${LIBNOISE_VERSION}) +-target_include_directories(${TARGET_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/src) ++target_include_directories(${TARGET_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/src PUBLIC $ $) + target_compile_definitions(${TARGET_NAME} PUBLIC NOISE_STATIC) # install static libraries (.lib) into /lib - install(TARGETS ${TARGET_NAME} DESTINATION "${CMAKE_INSTALL_PREFIX}/lib") +-install(TARGETS ${TARGET_NAME} DESTINATION "${CMAKE_INSTALL_PREFIX}/lib") ++install(TARGETS ${TARGET_NAME} EXPORT unofficial-noiseTargets DESTINATION "${CMAKE_INSTALL_PREFIX}/lib") #---------------------------------------- - +endif() # install include files into /include install( DIRECTORY "${PROJECT_SOURCE_DIR}/src/noise" - DESTINATION "${CMAKE_INSTALL_PREFIX}/include" ) +- DESTINATION "${CMAKE_INSTALL_PREFIX}/include" ) \ No newline at end of file ++ DESTINATION "${CMAKE_INSTALL_PREFIX}/include" ) ++ ++install(EXPORT unofficial-noiseTargets ++ NAMESPACE unofficial::noise:: ++ DESTINATION share/unofficial-noise ++) ++ ++file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-noise-config.cmake.in" ++[[include("${CMAKE_CURRENT_LIST_DIR}/unofficial-noiseTargets.cmake")]]) ++configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-noise-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-noise-config.cmake" @ONLY) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-noise-config.cmake DESTINATION share/unofficial-noise) diff --git a/external_imported/vcpkg/ports/libnoise/portfile.cmake b/external_imported/vcpkg/ports/libnoise/portfile.cmake index 5c14ae663..a929f37c6 100644 --- a/external_imported/vcpkg/ports/libnoise/portfile.cmake +++ b/external_imported/vcpkg/ports/libnoise/portfile.cmake @@ -10,9 +10,8 @@ vcpkg_from_github( PATCHES fix-build.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_WALL=ON -DBUILD_SPEED_OPTIMIZED=ON @@ -21,15 +20,15 @@ vcpkg_configure_cmake( -DBUILD_LIBNOISE_EXAMPLES=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-noise CONFIG_PATH share/unofficial-noise) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-noiseutils CONFIG_PATH share/unofficial-noiseutils) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/noise/module/modulebase.h "if NOISE_STATIC" "if 1" ) endif() -file(INSTALL ${SOURCE_PATH}/cmake/Modules/FindLibNoise.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) - -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/external_imported/vcpkg/ports/libnoise/vcpkg.json b/external_imported/vcpkg/ports/libnoise/vcpkg.json index d82097ee5..640e503be 100644 --- a/external_imported/vcpkg/ports/libnoise/vcpkg.json +++ b/external_imported/vcpkg/ports/libnoise/vcpkg.json @@ -1,7 +1,18 @@ { "name": "libnoise", - "version-string": "1.0.0", - "port-version": 2, + "version": "1.0.0", + "port-version": 3, "description": "A general-purpose library that generates three-dimensional coherent noise. Useful for terrain generation and procedural texture generation. Uses a broad number of techniques (Perlin noise, ridged multifractal, etc.) and combinations of those techniques.", - "homepage": "https://github.com/RobertHue/libnoise" + "homepage": "https://github.com/RobertHue/libnoise", + "license": "LGPL-2.1", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/libosip2/portfile.cmake b/external_imported/vcpkg/ports/libosip2/portfile.cmake index c46102a65..e289d493b 100644 --- a/external_imported/vcpkg/ports/libosip2/portfile.cmake +++ b/external_imported/vcpkg/ports/libosip2/portfile.cmake @@ -18,8 +18,6 @@ vcpkg_extract_source_archive_ex( ) if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_fail_port_install(ON_ARCH "arm" "arm64") - # Use /Z7 rather than /Zi to avoid "fatal error C1090: PDB API call failed, error code '23': (0x00000006)" foreach(VCXPROJ IN ITEMS "${SOURCE_PATH}/platform/vsnet/osip2.vcxproj" diff --git a/external_imported/vcpkg/ports/libosip2/vcpkg.json b/external_imported/vcpkg/ports/libosip2/vcpkg.json index 8b3d9ecc8..a524d3460 100644 --- a/external_imported/vcpkg/ports/libosip2/vcpkg.json +++ b/external_imported/vcpkg/ports/libosip2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libosip2", "version": "5.2.0", - "port-version": 1, + "port-version": 2, "description": "oSIP is an LGPL implementation of SIP. It's stable, portable, flexible and compliant! -may be more-! It is used mostly with eXosip2 stack (GPL) which provides simpler API for User-Agent implementation.", "homepage": "https://www.gnu.org/software/osip/", "supports": "!(windows & arm)", diff --git a/external_imported/vcpkg/ports/libosmium/vcpkg.json b/external_imported/vcpkg/ports/libosmium/vcpkg.json index 904c1e22a..ffd7c5861 100644 --- a/external_imported/vcpkg/ports/libosmium/vcpkg.json +++ b/external_imported/vcpkg/ports/libosmium/vcpkg.json @@ -1,13 +1,15 @@ { "name": "libosmium", "version-semver": "2.17.1", + "port-version": 1, "description": "A fast and flexible C++ library for working with OpenStreetMap data", "homepage": "https://osmcode.org/libosmium/", + "license": "BSL-1.0", "dependencies": [ "boost", "bzip2", "expat", - "proj4", + "proj", "protozero", "utfcpp", { diff --git a/external_imported/vcpkg/ports/libp7client/portfile.cmake b/external_imported/vcpkg/ports/libp7client/portfile.cmake index 66a878834..95809babf 100644 --- a/external_imported/vcpkg/ports/libp7client/portfile.cmake +++ b/external_imported/vcpkg/ports/libp7client/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp" "osx") - vcpkg_download_distfile(ARCHIVE URLS http://baical.net/files/libP7Client_v5.6.zip FILENAME libP7Client_v5.6.zip diff --git a/external_imported/vcpkg/ports/libp7client/vcpkg.json b/external_imported/vcpkg/ports/libp7client/vcpkg.json index dda660ebc..d5a77d32f 100644 --- a/external_imported/vcpkg/ports/libp7client/vcpkg.json +++ b/external_imported/vcpkg/ports/libp7client/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libp7client", "version-string": "5.6", - "port-version": 1, + "port-version": 2, "description": "Open source, cross-platform, fastest library for sending logs, telemetry & trace data from your application.", "homepage": "https://baical.net/", "supports": "!(arm | uwp | osx)" diff --git a/external_imported/vcpkg/ports/libpff/CMakeLists.txt b/external_imported/vcpkg/ports/libpff/CMakeLists.txt index 276db5d80..44317432d 100644 --- a/external_imported/vcpkg/ports/libpff/CMakeLists.txt +++ b/external_imported/vcpkg/ports/libpff/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.12) project(libpff C) -find_package(zlib REQUIRED) +find_package(ZLIB REQUIRED) if(MSVC) add_compile_definitions(_CRT_SECURE_NO_DEPRECATE) diff --git a/external_imported/vcpkg/ports/libpff/portfile.cmake b/external_imported/vcpkg/ports/libpff/portfile.cmake index 5a3e81388..00be14f66 100644 --- a/external_imported/vcpkg/ports/libpff/portfile.cmake +++ b/external_imported/vcpkg/ports/libpff/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_download_distfile(ARCHIVE SHA512 7207ba87607ea2fd4609a081c2f4b061344a783e188605e88df99fd473f2a8da1269b065e57b054f4622888d40aa8f2b8272dc4748334ddfe358b28d443d6ad1 ) - vcpkg_extract_source_archive_ex( +vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} REF ${LIB_VERSION} @@ -20,18 +20,16 @@ vcpkg_download_distfile(ARCHIVE file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") file(COPY "${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libpff TARGET_PATH share/unofficial-libpff) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libpff PACKAGE_NAME unofficial-libpff) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_copy_pdbs() -# License and man -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libpff" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_copy_pdbs() +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/libpff/vcpkg.json b/external_imported/vcpkg/ports/libpff/vcpkg.json index 5480dbdaa..b8eaba407 100644 --- a/external_imported/vcpkg/ports/libpff/vcpkg.json +++ b/external_imported/vcpkg/ports/libpff/vcpkg.json @@ -1,9 +1,20 @@ { "name": "libpff", - "version-string": "2018-07-14", - "port-version": 2, + "version-date": "2018-07-14", + "port-version": 3, "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", + "supports": "windows & !(static & windows) & !uwp", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/external_imported/vcpkg/ports/libpq/config.pl b/external_imported/vcpkg/ports/libpq/config.pl index cbe605ef0..5538aae22 100644 --- a/external_imported/vcpkg/ports/libpq/config.pl +++ b/external_imported/vcpkg/ports/libpq/config.pl @@ -11,6 +11,7 @@ extraver => undef, # --with-extra-version= gss => undef, # --with-gssapi= icu => undef, # --with-icu= + lz4 => undef, # --with-lz4= nls => undef, # --enable-nls= tap_tests => undef, # --enable-tap-tests tcl => undef, # --with-tcl= diff --git a/external_imported/vcpkg/ports/libpq/patches/fix-configure.patch b/external_imported/vcpkg/ports/libpq/patches/fix-configure.patch new file mode 100644 index 000000000..aa1dd2b9f --- /dev/null +++ b/external_imported/vcpkg/ports/libpq/patches/fix-configure.patch @@ -0,0 +1,64 @@ +diff --git a/configure.ac b/configure.ac +index fba79ee36..4563fa9f7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -18,15 +18,14 @@ dnl + m4_pattern_forbid(^PGAC_)dnl to catch undefined macros + + 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]) + + [PG_MAJORVERSION=`expr "$PACKAGE_VERSION" : '\([0-9][0-9]*\)'`] +@@ -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])], + [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 + 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])]) + 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 + 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])]) + 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])]) + 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])]) + 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 index 84ebcbd21..cd4b30cf8 100644 --- a/external_imported/vcpkg/ports/libpq/patches/linux/configure.patch +++ b/external_imported/vcpkg/ports/libpq/patches/linux/configure.patch @@ -2,7 +2,7 @@ diff --git a/configure b/configure index 54c852aca..96e2c89ba 100644 --- a/configure +++ b/configure -@@ -11923,7 +11923,7 @@ if ${ac_cv_lib_crypto_CRYPTO_new_ex_data+:} false; then : +@@ -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 @@ -11,7 +11,7 @@ index 54c852aca..96e2c89ba 100644 cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -11958,7 +11958,7 @@ if test "x$ac_cv_lib_crypto_CRYPTO_new_ex_data" = xyes; then : +@@ -12487,7 +12487,7 @@ if test "x$ac_cv_lib_crypto_CRYPTO_new_ex_data" = xyes; then : #define HAVE_LIBCRYPTO 1 _ACEOF diff --git a/external_imported/vcpkg/ports/libpq/patches/mingw/additional-zlib-names.patch b/external_imported/vcpkg/ports/libpq/patches/mingw/additional-zlib-names.patch deleted file mode 100644 index e8ab7b065..000000000 --- a/external_imported/vcpkg/ports/libpq/patches/mingw/additional-zlib-names.patch +++ /dev/null @@ -1,186 +0,0 @@ -diff --git a/configure b/configure -index c22d3de..75210f0 100755 ---- a/configure -+++ b/configure -@@ -11777,13 +11789,13 @@ Use --without-readline to disable readline support." "$LINENO" 5 - fi - - if test "$with_zlib" = yes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflate in -lz" >&5 --$as_echo_n "checking for inflate in -lz... " >&6; } --if ${ac_cv_lib_z_inflate+:} false; then : -+ if test "$enable_debug" = yes; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inflate" >&5 -+$as_echo_n "checking for library containing inflate... " >&6; } -+if ${ac_cv_search_inflate+:} false; then : - $as_echo_n "(cached) " >&6 - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lz $LIBS" -+ ac_func_search_save_LIBS=$LIBS - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -11802,23 +11814,101 @@ return inflate (); - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_z_inflate=yes --else -- ac_cv_lib_z_inflate=no -+for ac_lib in '' zd zlibd zlib1d z zlib zlib1; 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_inflate=$ac_res - fi - rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS -+ conftest$ac_exeext -+ if ${ac_cv_search_inflate+:} false; then : -+ break - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflate" >&5 --$as_echo "$ac_cv_lib_z_inflate" >&6; } --if test "x$ac_cv_lib_z_inflate" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_LIBZ 1 -+done -+if ${ac_cv_search_inflate+:} false; then : -+ -+else -+ ac_cv_search_inflate=no -+fi -+rm conftest.$ac_ext -+LIBS=$ac_func_search_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inflate" >&5 -+$as_echo "$ac_cv_search_inflate" >&6; } -+ac_res=$ac_cv_search_inflate -+if test "$ac_res" != no; then : -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -+ -+$as_echo "#define HAVE_LIBZ 1" >>confdefs.h -+ -+else -+ as_fn_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. -+Use --without-zlib to disable zlib support." "$LINENO" 5 -+fi -+ -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inflate" >&5 -+$as_echo_n "checking for library containing inflate... " >&6; } -+if ${ac_cv_search_inflate+:} 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 inflate (); -+int -+main () -+{ -+return inflate (); -+ ; -+ return 0; -+} - _ACEOF -+for ac_lib in '' z zlib zlib1; 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_inflate=$ac_res -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext -+ if ${ac_cv_search_inflate+:} false; then : -+ break -+fi -+done -+if ${ac_cv_search_inflate+:} false; then : - -- LIBS="-lz $LIBS" -+else -+ ac_cv_search_inflate=no -+fi -+rm conftest.$ac_ext -+LIBS=$ac_func_search_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inflate" >&5 -+$as_echo "$ac_cv_search_inflate" >&6; } -+ac_res=$ac_cv_search_inflate -+if test "$ac_res" != no; then : -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -+ -+$as_echo "#define HAVE_LIBZ 1" >>confdefs.h - - else - as_fn_error $? "zlib library not found -@@ -11827,6 +11917,7 @@ failure. It is possible the compiler isn't looking in the proper directory. - Use --without-zlib to disable zlib support." "$LINENO" 5 - fi - -+ fi - fi - - if test "$enable_spinlocks" = yes; then -diff --git a/configure.in b/configure.in -index 976f90d..e3cd80b 100644 ---- a/configure.in -+++ b/configure.in -@@ -1170,11 +1170,21 @@ Use --without-readline to disable readline support.]) - fi - - if test "$with_zlib" = yes; then -- AC_CHECK_LIB(z, inflate, [], -- [AC_MSG_ERROR([zlib library not found -+ if test "$enable_debug" = yes; then -+ AC_SEARCH_LIBS(inflate, [zd zlibd zlib1d z zlib zlib1], -+ [AC_DEFINE([HAVE_LIBZ], [1], [Define to 1 if you have the `z' library.])], -+ [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. - Use --without-zlib to disable zlib support.])]) -+ else -+ AC_SEARCH_LIBS(inflate, [z zlib zlib1], -+ [AC_DEFINE([HAVE_LIBZ], [1], [Define to 1 if you have the `z' library.])], -+ [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. -+Use --without-zlib to disable zlib support.])]) -+ fi - fi - - if test "$enable_spinlocks" = yes; then -diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in -index 244886a..29dd35b 100644 ---- a/src/include/pg_config.h.in -+++ b/src/include/pg_config.h.in -@@ -374,7 +374,7 @@ - /* Define to 1 if you have the `xslt' library (-lxslt). */ - #undef HAVE_LIBXSLT - --/* Define to 1 if you have the `z' library (-lz). */ -+/* Define to 1 if you have the `z' library. */ - #undef HAVE_LIBZ - - /* Define to 1 if the system has the type `locale_t'. */ diff --git a/external_imported/vcpkg/ports/libpq/patches/windows/MSBuildProject-static-lib.patch b/external_imported/vcpkg/ports/libpq/patches/windows/MSBuildProject-static-lib.patch index ba72a82bf..70cd22d60 100644 --- a/external_imported/vcpkg/ports/libpq/patches/windows/MSBuildProject-static-lib.patch +++ b/external_imported/vcpkg/ports/libpq/patches/windows/MSBuildProject-static-lib.patch @@ -2,7 +2,7 @@ diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm index 823357c02..e1dc59aa7 100644 --- a/src/tools/msvc/MSBuildProject.pm +++ b/src/tools/msvc/MSBuildProject.pm -@@ -262,7 +262,7 @@ sub WriteConfigurationPropertyGroup +@@ -265,7 +265,7 @@ sub WriteConfigurationPropertyGroup my $cfgtype = ($self->{type} eq "exe") ? 'Application' diff --git a/external_imported/vcpkg/ports/libpq/patches/windows/MSBuildProject_fix_gendef_perl.patch b/external_imported/vcpkg/ports/libpq/patches/windows/MSBuildProject_fix_gendef_perl.patch index 6c52713a9..10955c3f9 100644 --- a/external_imported/vcpkg/ports/libpq/patches/windows/MSBuildProject_fix_gendef_perl.patch +++ b/external_imported/vcpkg/ports/libpq/patches/windows/MSBuildProject_fix_gendef_perl.patch @@ -2,7 +2,7 @@ diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm index 823357c02..b93992f22 100644 --- a/src/tools/msvc/MSBuildProject.pm +++ b/src/tools/msvc/MSBuildProject.pm -@@ -381,7 +381,7 @@ EOF +@@ -384,7 +384,7 @@ EOF print $f < Generate DEF file diff --git a/external_imported/vcpkg/ports/libpq/patches/windows/Mkvcbuild-static-lib.patch b/external_imported/vcpkg/ports/libpq/patches/windows/Mkvcbuild-static-lib.patch index 818134f5c..554d8527a 100644 --- a/external_imported/vcpkg/ports/libpq/patches/windows/Mkvcbuild-static-lib.patch +++ b/external_imported/vcpkg/ports/libpq/patches/windows/Mkvcbuild-static-lib.patch @@ -2,7 +2,7 @@ diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm index 99f39caa5..4f51c12f2 100644 --- a/src/tools/msvc/Mkvcbuild.pm +++ b/src/tools/msvc/Mkvcbuild.pm -@@ -182,7 +182,7 @@ sub mkvcbuild +@@ -199,7 +199,7 @@ sub mkvcbuild 'syncrep_gram.y'); $postgres->AddFiles('src/backend/utils/adt', 'jsonpath_scan.l', 'jsonpath_gram.y'); diff --git a/external_imported/vcpkg/ports/libpq/patches/windows/Solution.patch b/external_imported/vcpkg/ports/libpq/patches/windows/Solution.patch index 2259e3e8a..4647fe104 100644 --- a/external_imported/vcpkg/ports/libpq/patches/windows/Solution.patch +++ b/external_imported/vcpkg/ports/libpq/patches/windows/Solution.patch @@ -2,25 +2,31 @@ diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index 51711c2bf..d33fdc3b0 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm -@@ -69,9 +69,15 @@ sub DeterminePlatform - my $self = shift; +@@ -63,17 +63,21 @@ sub DeterminePlatform + my $self = shift; - # Examine CL help output to determine if we are in 32 or 64-bit mode. -- my $output = `cl /? 2>&1`; -+ my $output = `cl 2>&1`; - $? >> 8 == 0 or die "cl command not found"; -- $self->{platform} = ($output =~ /^\/favor:<.+AMD64/m) ? 'x64' : 'Win32'; -+ if ($output =~ m/x64\n/) { $self->{platform} = 'x64'; -+ } elsif ($output =~ m/x86\n/) { $self->{platform} = 'Win32'; -+ } elsif ($output =~ m/ARM64\n/) { $self->{platform} = 'ARM64'; -+ } elsif ($output =~ m/ARM\n/) { $self->{platform} = 'ARM'; -+ } else { $self->{platform} = 'Unknown' -+ } -+ print "cl output $output."; - print "Detected hardware platform: $self->{platform}\n"; - return; + if ($^O eq "MSWin32") + { + # Examine CL help output to determine if we are in 32 or 64-bit mode. + my $output = `cl /help 2>&1`; + $? >> 8 == 0 or die "cl command not found"; +- $self->{platform} = +- ($output =~ /^\/favor:<.+AMD64/m) ? 'x64' : 'Win32'; ++ if ($output =~ m/x64\n/) { $self->{platform} = 'x64'; ++ } elsif ($output =~ m/x86\n/) { $self->{platform} = 'Win32'; ++ } elsif ($output =~ m/ARM64\n/) { $self->{platform} = 'ARM64'; ++ } elsif ($output =~ m/ARM\n/) { $self->{platform} = 'ARM'; ++ } else { $self->{platform} = 'Unknown' ++ } + } + else + { + $self->{platform} = 'FAKE'; + } + print "Detected hardware platform: $self->{platform}\n"; + return; } -@@ -526,14 +526,14 @@ EOF +@@ -757,14 +757,14 @@ EOF || confess "Could not open pg_config_paths.h"; print $o <{options}->{zlib}) { $proj->AddIncludeDir($self->{options}->{zlib} . '\include'); @@ -11,43 +11,36 @@ index 51711c2bf..d33fdc3b0 100644 } if ($self->{options}->{openssl}) { -@@ -698,8 +698,8 @@ sub AddProject +@@ -989,8 +989,11 @@ sub AddProject # On both Win32 and Win64 the same library # names are used without a debugging context. $dbgsuffix = 0; - $libsslpath = '\lib\libssl.lib'; - $libcryptopath = '\lib\libcrypto.lib'; -+ $libsslpath = '\debug\lib\libssl.lib'; -+ $libcryptopath = '\debug\lib\libcrypto.lib'; ++ $libsslpath = '\debug\lib\libssl.lib'; # ++ $libcryptopath = '\debug\lib\libcrypto.lib'; # ++ $proj->AddLibrary('crypt32.lib'); ++ $proj->AddLibrary('ws2_32.lib'); ++ $proj->AddLibrary('secur32.lib'); } $proj->AddLibrary($self->{options}->{openssl} . $libsslpath, -@@ -715,16 +715,16 @@ sub AddProject - # to be here, so don't ask for it in last - # parameter. - $proj->AddLibrary( -- $self->{options}->{openssl} . '\lib\ssleay32.lib', 0); -+ $self->{options}->{openssl} . '\debug\lib\ssleay32.lib', 0); - $proj->AddLibrary( -- $self->{options}->{openssl} . '\lib\libeay32.lib', 0); -+ $self->{options}->{openssl} . '\debug\lib\libeay32.lib', 0); - } - } - } +@@ -1024,7 +1024,7 @@ sub AddProject if ($self->{options}->{nls}) { $proj->AddIncludeDir($self->{options}->{nls} . '\include'); - $proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib'); -+ $proj->AddLibrary($self->{options}->{nls} . '\debug\lib\intl.lib'); ++ $proj->AddLibrary($self->{options}->{nls} . '\debug\lib\intl.lib'); # } if ($self->{options}->{gss}) { -@@ -752,39 +752,39 @@ sub AddProject +@@ -1051,21 +1051,21 @@ sub AddProject + } if ($self->{options}->{iconv}) { $proj->AddIncludeDir($self->{options}->{iconv} . '\include'); - $proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib'); -+ $proj->AddLibrary($self->{options}->{iconv} . '\debug\lib\iconv.lib'); ++ $proj->AddLibrary($self->{options}->{iconv} . '\debug\lib\iconv.lib'); # } if ($self->{options}->{icu}) { @@ -57,38 +50,43 @@ index 51711c2bf..d33fdc3b0 100644 - $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); - $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); - $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); -+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuind.lib'); -+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuucd.lib'); -+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icudtd.lib'); ++ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuind.lib'); # ++ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuucd.lib'); # ++ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icudtd.lib'); # } else { - $proj->AddLibrary($self->{options}->{icu} . '\lib64\icuin.lib'); - $proj->AddLibrary($self->{options}->{icu} . '\lib64\icuuc.lib'); - $proj->AddLibrary($self->{options}->{icu} . '\lib64\icudt.lib'); -+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuind.lib'); -+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuucd.lib'); -+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icudtd.lib'); ++ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuind.lib'); # ++ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuucd.lib'); # ++ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icudtd.lib'); # } - } - if ($self->{options}->{xml}) +@@ -1074,22 +1074,22 @@ sub AddProject { $proj->AddIncludeDir($self->{options}->{xml} . '\include'); $proj->AddIncludeDir($self->{options}->{xml} . '\include\libxml2'); - $proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib'); -+ $proj->AddLibrary($self->{options}->{xml} . '\debug\lib\libxml2.lib'); ++ $proj->AddLibrary($self->{options}->{xml} . '\debug\lib\libxml2.lib'); # } if ($self->{options}->{xslt}) { $proj->AddIncludeDir($self->{options}->{xslt} . '\include'); - $proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib'); -+ $proj->AddLibrary($self->{options}->{xslt} . '\debug\lib\libxslt.lib'); ++ $proj->AddLibrary($self->{options}->{xslt} . '\debug\lib\libxslt.lib'); # + } + if ($self->{options}->{lz4}) + { + $proj->AddIncludeDir($self->{options}->{lz4} . '\include'); +- $proj->AddLibrary($self->{options}->{lz4} . '\lib\liblz4.lib'); ++ $proj->AddLibrary($self->{options}->{lz4} . '\debug\lib\lz4d.lib'); # } if ($self->{options}->{uuid}) { $proj->AddIncludeDir($self->{options}->{uuid} . '\include'); - $proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib'); -+ $proj->AddLibrary($self->{options}->{uuid} . '\debug\lib\uuid.lib'); ++ $proj->AddLibrary($self->{options}->{uuid} . '\debug\lib\uuid.lib'); # } return $proj; } diff --git a/external_imported/vcpkg/ports/libpq/patches/windows/Solution_RELEASE.patch b/external_imported/vcpkg/ports/libpq/patches/windows/Solution_RELEASE.patch index b690c1871..8270645ef 100644 --- a/external_imported/vcpkg/ports/libpq/patches/windows/Solution_RELEASE.patch +++ b/external_imported/vcpkg/ports/libpq/patches/windows/Solution_RELEASE.patch @@ -1,8 +1,8 @@ diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm -index 51711c2bf..d33fdc3b0 100644 ---- a/src/tools/msvc/Solution.pm +index 2820ace22..7fddbf0fb 100644 +--- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm -@@ -658,7 +658,7 @@ sub AddProject +@@ -948,7 +948,7 @@ sub AddProject if ($self->{options}->{zlib}) { $proj->AddIncludeDir($self->{options}->{zlib} . '\include'); @@ -11,25 +11,82 @@ index 51711c2bf..d33fdc3b0 100644 } if ($self->{options}->{openssl}) { -@@ -724,7 +724,7 @@ sub AddProject +@@ -989,8 +989,11 @@ sub AddProject + # On both Win32 and Win64 the same library + # names are used without a debugging context. + $dbgsuffix = 0; +- $libsslpath = '\lib\libssl.lib'; +- $libcryptopath = '\lib\libcrypto.lib'; ++ $libsslpath = '\lib\libssl.lib'; # ++ $libcryptopath = '\lib\libcrypto.lib'; # ++ $proj->AddLibrary('crypt32.lib'); ++ $proj->AddLibrary('ws2_32.lib'); ++ $proj->AddLibrary('secur32.lib'); + } + + $proj->AddLibrary($self->{options}->{openssl} . $libsslpath, +@@ -1024,7 +1024,7 @@ sub AddProject if ($self->{options}->{nls}) { $proj->AddIncludeDir($self->{options}->{nls} . '\include'); - $proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib'); -+ $proj->AddLibrary($self->{options}->{nls} . '\lib\intl.lib'); ++ $proj->AddLibrary($self->{options}->{nls} . '\lib\intl.lib'); # } if ($self->{options}->{gss}) { -@@ -765,9 +765,9 @@ sub AddProject +@@ -1051,21 +1051,21 @@ sub AddProject + } + if ($self->{options}->{iconv}) + { + $proj->AddIncludeDir($self->{options}->{iconv} . '\include'); +- $proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib'); ++ $proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib'); # + } + if ($self->{options}->{icu}) + { + $proj->AddIncludeDir($self->{options}->{icu} . '\include'); + if ($self->{platform} eq 'Win32') + { +- $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); +- $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); +- $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); ++ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); # ++ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); # ++ $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); # } else { - $proj->AddLibrary($self->{options}->{icu} . '\lib64\icuin.lib'); - $proj->AddLibrary($self->{options}->{icu} . '\lib64\icuuc.lib'); - $proj->AddLibrary($self->{options}->{icu} . '\lib64\icudt.lib'); -+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); -+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); -+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); ++ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); # ++ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); # ++ $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); # } +@@ -1074,22 +1074,22 @@ sub AddProject + { + $proj->AddIncludeDir($self->{options}->{xml} . '\include'); + $proj->AddIncludeDir($self->{options}->{xml} . '\include\libxml2'); +- $proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib'); ++ $proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib'); # + } + if ($self->{options}->{xslt}) + { + $proj->AddIncludeDir($self->{options}->{xslt} . '\include'); +- $proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib'); ++ $proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib'); # + } + if ($self->{options}->{lz4}) + { + $proj->AddIncludeDir($self->{options}->{lz4} . '\include'); +- $proj->AddLibrary($self->{options}->{lz4} . '\lib\liblz4.lib'); ++ $proj->AddLibrary($self->{options}->{lz4} . '\lib\lz4.lib'); # + } + if ($self->{options}->{uuid}) + { + $proj->AddIncludeDir($self->{options}->{uuid} . '\include'); +- $proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib'); ++ $proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib'); # } - if ($self->{options}->{xml}) + return $proj; + } diff --git a/external_imported/vcpkg/ports/libpq/patches/windows/fix-compile-flag-Zi.patch b/external_imported/vcpkg/ports/libpq/patches/windows/fix-compile-flag-Zi.patch index 04d86811e..b5e3b6cdb 100644 --- a/external_imported/vcpkg/ports/libpq/patches/windows/fix-compile-flag-Zi.patch +++ b/external_imported/vcpkg/ports/libpq/patches/windows/fix-compile-flag-Zi.patch @@ -2,7 +2,7 @@ diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm index b93992f..2397511 100644 --- a/src/tools/msvc/MSBuildProject.pm +++ b/src/tools/msvc/MSBuildProject.pm -@@ -333,7 +333,7 @@ sub WriteItemDefinitionGroup +@@ -336,7 +336,7 @@ sub WriteItemDefinitionGroup false Level3 true @@ -15,7 +15,7 @@ diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm index e0c9a88..98f9e67 100644 --- a/src/tools/msvc/Install.pm +++ b/src/tools/msvc/Install.pm -@@ -341,9 +341,12 @@ sub CopySolutionOutput +@@ -352,9 +352,12 @@ sub CopySolutionOutput || croak "Could not copy $pf.$ext\n"; } } diff --git a/external_imported/vcpkg/ports/libpq/patches/windows/install.patch b/external_imported/vcpkg/ports/libpq/patches/windows/install.patch index ecc14ac7b..0d7a6d69a 100644 --- a/external_imported/vcpkg/ports/libpq/patches/windows/install.patch +++ b/external_imported/vcpkg/ports/libpq/patches/windows/install.patch @@ -2,7 +2,7 @@ diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm index d109b2c90..75c7446e6 100644 --- a/src/tools/msvc/Install.pm +++ b/src/tools/msvc/Install.pm -@@ -86,10 +86,10 @@ sub Install +@@ -89,10 +89,10 @@ sub Install my $majorver = DetermineMajorVersion(); print "Installing version $majorver for $conf in $target\n"; @@ -16,7 +16,7 @@ index d109b2c90..75c7446e6 100644 if ($insttype eq "client") { EnsureDirectories($target, @client_dirs); -@@ -114,7 +114,7 @@ sub Install +@@ -117,7 +117,7 @@ sub Install } }, @top_dir); @@ -25,7 +25,7 @@ index d109b2c90..75c7446e6 100644 CopyFiles( 'Import libraries', $target . '/lib/', -@@ -128,35 +128,35 @@ sub Install +@@ -131,35 +131,35 @@ sub Install CopySetOfFiles( 'timezone names', [ glob('src\timezone\tznames\*.txt') ], @@ -69,7 +69,7 @@ index d109b2c90..75c7446e6 100644 my $pl_extension_files = []; my @pldirs = ('src/pl/plpgsql/src'); -@@ -175,7 +175,7 @@ sub Install +@@ -178,7 +178,7 @@ sub Install }, @pldirs); CopySetOfFiles('PL Extension files', @@ -78,7 +78,7 @@ index d109b2c90..75c7446e6 100644 } GenerateNLSFiles($target, $config->{nls}, $majorver) if ($config->{nls}); -@@ -290,23 +290,26 @@ sub CopySolutionOutput +@@ -293,23 +293,26 @@ sub CopySolutionOutput { if ($1 == 1) { @@ -109,7 +109,7 @@ index d109b2c90..75c7446e6 100644 } } elsif ($vcproj eq 'vcxproj' -@@ -317,11 +317,11 @@ sub CopySolutionOutput +@@ -320,11 +320,11 @@ sub CopySolutionOutput { if ($1 eq 'Application') { @@ -123,7 +123,7 @@ index d109b2c90..75c7446e6 100644 if ($is_sharedlib) { push(@{ $install_list{'bin'} }, "dll"); -@@ -327,10 +330,9 @@ sub CopySolutionOutput +@@ -333,10 +333,9 @@ sub CopySolutionOutput } else # 'StaticLibrary' { @@ -135,7 +135,7 @@ index d109b2c90..75c7446e6 100644 } } else -@@ -349,7 +349,7 @@ sub CopySolutionOutput +@@ -352,7 +352,7 @@ sub CopySolutionOutput || croak "Could not copy $pf.$ext\n"; } } @@ -144,16 +144,14 @@ index d109b2c90..75c7446e6 100644 || croak "Could not copy $pf.pdb\n"; print "."; } -@@ -366,7 +366,7 @@ sub GenerateTimezoneFiles +@@ -374,5 +374,5 @@ sub GenerateTimezoneFiles print "Generating timezone files..."; - my @args = -- ("$conf/zic/zic", '-d', "$target/share/timezone", -+ ("$conf/zic/zic", '-d', "$target/share/libpq/timezone", - '-p', "$posixrules", '-b', 'fat'); +- my @args = ("$conf/zic/zic", '-d', "$target/share/timezone"); ++ my @args = ("$conf/zic/zic", '-d', "$target/share/libpq/timezone"); foreach (@tzfiles) { -@@ -391,7 +391,7 @@ sub GenerateTsearchFiles +@@ -398,7 +398,7 @@ sub GenerateTsearchFiles $mf =~ /^LANGUAGES\s*=\s*(.*)$/m || die "Could not find LANGUAGES line in snowball Makefile\n"; my @pieces = split /\s+/, $1; @@ -162,7 +160,7 @@ index d109b2c90..75c7446e6 100644 || die "Could not write snowball_create.sql"; print $F read_file('src/backend/snowball/snowball_func.sql.in'); -@@ -476,7 +476,7 @@ sub CopySubdirFiles +@@ -483,7 +483,7 @@ sub CopySubdirFiles foreach my $f (split /\s+/, $flist) { lcopy("$subdir/$module/$f.control", @@ -171,7 +169,7 @@ index d109b2c90..75c7446e6 100644 || croak("Could not copy file $f.control in contrib $module"); print '.'; } -@@ -494,7 +494,7 @@ sub CopySubdirFiles +@@ -501,7 +501,7 @@ sub CopySubdirFiles foreach my $f (split /\s+/, $flist) { lcopy("$subdir/$module/$f", @@ -180,7 +178,7 @@ index d109b2c90..75c7446e6 100644 || croak("Could not copy file $f in contrib $module"); print '.'; } -@@ -509,7 +509,7 @@ sub CopySubdirFiles +@@ -516,7 +516,7 @@ sub CopySubdirFiles foreach my $f (split /\s+/, $flist) { lcopy("$subdir/$module/$f", @@ -189,7 +187,7 @@ index d109b2c90..75c7446e6 100644 || croak("Could not copy file $f in $subdir $module"); print '.'; } -@@ -572,7 +572,7 @@ sub CopySubdirFiles +@@ -579,7 +579,7 @@ sub CopySubdirFiles if ($module eq 'spi'); foreach my $f (split /\s+/, $flist) { @@ -198,7 +196,7 @@ index d109b2c90..75c7446e6 100644 || croak("Could not copy file $f in contrib $module"); print '.'; } -@@ -701,7 +701,7 @@ sub GenerateNLSFiles +@@ -708,7 +708,7 @@ sub GenerateNLSFiles my $majorver = shift; print "Installing NLS files..."; @@ -207,7 +205,7 @@ index d109b2c90..75c7446e6 100644 my @flist; File::Find::find( { -@@ -723,12 +723,12 @@ sub GenerateNLSFiles +@@ -730,12 +730,12 @@ sub GenerateNLSFiles next unless /([^\/]+)\.po/; $lang = $1; diff --git a/external_imported/vcpkg/ports/libpq/patches/windows/minimize_install.patch b/external_imported/vcpkg/ports/libpq/patches/windows/minimize_install.patch index 1d1eb2b57..1a57c275f 100644 --- a/external_imported/vcpkg/ports/libpq/patches/windows/minimize_install.patch +++ b/external_imported/vcpkg/ports/libpq/patches/windows/minimize_install.patch @@ -2,28 +2,28 @@ diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm index d109b2c90..75c7446e6 100644 --- a/src/tools/msvc/Install.pm +++ b/src/tools/msvc/Install.pm -@@ -19,13 +19,13 @@ our (@ISA, @EXPORT_OK); +@@ -22,13 +22,13 @@ our (@ISA, @EXPORT_OK); my $insttype; my @client_contribs = ('oid2name', 'pgbench', 'vacuumlo'); -my @client_program_files = ( -- 'clusterdb', 'createdb', 'createuser', 'dropdb', -- 'dropuser', 'ecpg', 'libecpg', 'libecpg_compat', -- 'libpgtypes', 'libpq', 'pg_basebackup', 'pg_config', -- 'pg_dump', 'pg_dumpall', 'pg_isready', 'pg_receivewal', -- 'pg_recvlogical', 'pg_restore', 'psql', 'reindexdb', -- 'vacuumdb', @client_contribs); +- 'clusterdb', 'createdb', 'createuser', 'dropdb', +- 'dropuser', 'ecpg', 'libecpg', 'libecpg_compat', +- 'libpgtypes', 'libpq', 'pg_amcheck', 'pg_basebackup', +- 'pg_config', 'pg_dump', 'pg_dumpall', 'pg_isready', +- 'pg_receivewal', 'pg_recvlogical', 'pg_restore', 'psql', +- 'reindexdb', 'vacuumdb', @client_contribs); +my @client_program_files = ( 'libecpg','libecpg_compat', 'libpgtypes', 'libpq' ); -+ # 'clusterdb', 'createdb', 'createuser', 'dropdb', -+ # 'dropuser', 'ecpg', 'libecpg', 'libecpg_compat', -+ #'libpgtypes', 'libpq', 'pg_basebackup', 'pg_config', -+ #'pg_dump', 'pg_dumpall', 'pg_isready', 'pg_receivewal', -+ #'pg_recvlogical', 'pg_restore', 'psql', 'reindexdb', -+ #'vacuumdb', @client_contribs); ++ #'clusterdb', 'createdb', 'createuser', 'dropdb', ++ #'dropuser', 'ecpg', 'libecpg', 'libecpg_compat', ++ #'libpgtypes', 'libpq', 'pg_amcheck', 'pg_basebackup', ++ #'pg_config', 'pg_dump', 'pg_dumpall', 'pg_isready', ++ #'pg_receivewal', 'pg_recvlogical', 'pg_restore', 'psql', ++ #'reindexdb', 'vacuumdb', @client_contribs); sub lcopy { -@@ -110,7 +110,7 @@ sub Install +@@ -121,7 +121,7 @@ sub Install CopyFiles( 'Import libraries', $target . '/lib/', diff --git a/external_imported/vcpkg/ports/libpq/patches/windows/msgfmt.patch b/external_imported/vcpkg/ports/libpq/patches/windows/msgfmt.patch index 352daed87..98be285bc 100644 --- a/external_imported/vcpkg/ports/libpq/patches/windows/msgfmt.patch +++ b/external_imported/vcpkg/ports/libpq/patches/windows/msgfmt.patch @@ -2,12 +2,12 @@ diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm index 66c0c3483..2154c6cf6 100644 --- a/src/tools/msvc/Install.pm +++ b/src/tools/msvc/Install.pm -@@ -728,7 +728,7 @@ sub GenerateNLSFiles - EnsureDirectories($target, "share/libpq/locale/$lang", - "share/libpq/locale/$lang/LC_MESSAGES"); - my @args = ( -- "$nlspath\\bin\\msgfmt", -+ "msgfmt.exe", - '-o', - "$target\\share\\libpq\\locale\\$lang\\LC_MESSAGES\\$prgm-$majorver.mo", - $_); +@@ -733,7 +733,7 @@ sub GenerateNLSFiles + EnsureDirectories($target, "share/libpq/locale/$lang", + "share/libpq/locale/$lang/LC_MESSAGES"); + my @args = ( +- "$nlspath\\bin\\msgfmt", ++ "msgfmt.exe", + '-o', + "$target\\share\\libpq\\locale\\$lang\\LC_MESSAGES\\$prgm-$majorver.mo", + $_); diff --git a/external_imported/vcpkg/ports/libpq/patches/windows/openssl_exe_path.patch b/external_imported/vcpkg/ports/libpq/patches/windows/openssl_exe_path.patch index 533f1c4fd..813ea58b1 100644 --- a/external_imported/vcpkg/ports/libpq/patches/windows/openssl_exe_path.patch +++ b/external_imported/vcpkg/ports/libpq/patches/windows/openssl_exe_path.patch @@ -2,7 +2,7 @@ diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index 51711c2bf..d33fdc3b0 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm -@@ -133,7 +133,7 @@ sub GetOpenSSLVersion +@@ -129,7 +129,7 @@ sub GetOpenSSLVersion # openssl.exe is in the specified directory. # Quote the .exe name in case it has spaces my $opensslcmd = diff --git a/external_imported/vcpkg/ports/libpq/patches/windows/python3_build_DEBUG.patch b/external_imported/vcpkg/ports/libpq/patches/windows/python3_build_DEBUG.patch index 0a2610386..f6124d8ec 100644 --- a/external_imported/vcpkg/ports/libpq/patches/windows/python3_build_DEBUG.patch +++ b/external_imported/vcpkg/ports/libpq/patches/windows/python3_build_DEBUG.patch @@ -22,7 +22,7 @@ index 99f39caa5..21b5559d6 100644 + #die "Could not query for python version!\n" if $?; + #my ($pyprefix, $pyver) = split(/\r?\n/, $pyout); + my $pyprefix = $solution->{options}->{python}; -+ my $pyver = 39; ++ my $pyver = 310; # Sometimes (always?) if python is not present, the execution # appears to work, but gives no data... die "Failed to query python for version information\n" @@ -32,7 +32,7 @@ index 99f39caa5..21b5559d6 100644 'dll', 'PLs', 'src/pl/plpython'); - $plpython->AddIncludeDir($pyprefix . '/include'); - $plpython->AddLibrary($pyprefix . "/Libs/python$pyver.lib"); -+ $plpython->AddIncludeDir($pyprefix . '/include/python3.9'); ++ $plpython->AddIncludeDir($pyprefix . '/include/python3.10'); + $plpython->AddDefine('_DEBUG'); # required for python autolink linking correctly! + $plpython->AddLibrary($pyprefix . "/debug/lib/python$pyver" . "_d.lib"); $plpython->AddReference($postgres); diff --git a/external_imported/vcpkg/ports/libpq/patches/windows/python3_build_RELEASE.patch b/external_imported/vcpkg/ports/libpq/patches/windows/python3_build_RELEASE.patch index 5631d55e0..f559e9af4 100644 --- a/external_imported/vcpkg/ports/libpq/patches/windows/python3_build_RELEASE.patch +++ b/external_imported/vcpkg/ports/libpq/patches/windows/python3_build_RELEASE.patch @@ -22,7 +22,7 @@ index 99f39caa5..21b5559d6 100644 + #die "Could not query for python version!\n" if $?; + #my ($pyprefix, $pyver) = split(/\r?\n/, $pyout); + my $pyprefix = $solution->{options}->{python}; -+ my $pyver = 39; ++ my $pyver = 310; # Sometimes (always?) if python is not present, the execution # appears to work, but gives no data... die "Failed to query python for version information\n" @@ -32,7 +32,7 @@ index 99f39caa5..21b5559d6 100644 'dll', 'PLs', 'src/pl/plpython'); - $plpython->AddIncludeDir($pyprefix . '/include'); - $plpython->AddLibrary($pyprefix . "/Libs/python$pyver.lib"); -+ $plpython->AddIncludeDir($pyprefix . '/include/python3.9'); ++ $plpython->AddIncludeDir($pyprefix . '/include/python3.10'); + $plpython->AddLibrary($pyprefix . "/lib/python$pyver.lib"); $plpython->AddReference($postgres); diff --git a/external_imported/vcpkg/ports/libpq/patches/windows/python_lib.patch b/external_imported/vcpkg/ports/libpq/patches/windows/python_lib.patch index 8b52e26c7..cd012329f 100644 --- a/external_imported/vcpkg/ports/libpq/patches/windows/python_lib.patch +++ b/external_imported/vcpkg/ports/libpq/patches/windows/python_lib.patch @@ -2,7 +2,7 @@ diff --git a/src/pl/plpython/plpython.h b/src/pl/plpython/plpython.h index 3a1f0d56d..6a8a09a20 100644 --- a/src/pl/plpython/plpython.h +++ b/src/pl/plpython/plpython.h -@@ -46,12 +46,10 @@ +@@ -45,12 +45,10 @@ #if defined(_MSC_VER) && defined(_DEBUG) /* Python uses #pragma to bring in a non-default libpython on VC++ if * _DEBUG is defined */ diff --git a/external_imported/vcpkg/ports/libpq/patches/windows/tcl_version.patch b/external_imported/vcpkg/ports/libpq/patches/windows/tcl_version.patch new file mode 100644 index 000000000..5518949a3 --- /dev/null +++ b/external_imported/vcpkg/ports/libpq/patches/windows/tcl_version.patch @@ -0,0 +1,13 @@ +diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm +index e2fbe95..8c4f279 100644 +--- a/src/tools/msvc/Mkvcbuild.pm ++++ b/src/tools/msvc/Mkvcbuild.pm +@@ -226,7 +226,7 @@ sub mkvcbuild + $pltcl->AddIncludeDir($solution->{options}->{tcl} . '/include'); + $pltcl->AddReference($postgres); + +- for my $tclver (qw(86t 86 85 84)) ++ for my $tclver (qw(90 90g 90s 90sg)) + { + my $tcllib = $solution->{options}->{tcl} . "/lib/tcl$tclver.lib"; + if (-e $tcllib) diff --git a/external_imported/vcpkg/ports/libpq/patches/windows/win_bison_flex.patch b/external_imported/vcpkg/ports/libpq/patches/windows/win_bison_flex.patch index fecf0bd36..645d53af2 100644 --- a/external_imported/vcpkg/ports/libpq/patches/windows/win_bison_flex.patch +++ b/external_imported/vcpkg/ports/libpq/patches/windows/win_bison_flex.patch @@ -2,7 +2,7 @@ diff --git a/src/tools/msvc/pgflex.pl b/src/tools/msvc/pgflex.pl index aceed5ffd..f6ed215e8 100644 --- a/src/tools/msvc/pgflex.pl +++ b/src/tools/msvc/pgflex.pl -@@ -12,7 +12,7 @@ $ENV{CYGWIN} = 'nodosfilewarning'; +@@ -16,7 +16,7 @@ $ENV{CYGWIN} = 'nodosfilewarning'; do './src/tools/msvc/buildenv.pl' if -e 'src/tools/msvc/buildenv.pl'; @@ -11,7 +11,7 @@ index aceed5ffd..f6ed215e8 100644 $flexver = (split(/\s+/, $flexver))[1]; $flexver =~ s/[^0-9.]//g; my @verparts = split(/\./, $flexver); -@@ -48,7 +48,7 @@ close($mf); +@@ -52,7 +52,7 @@ close($mf); my $basetarg = basename($output); my $flexflags = ($make =~ /^$basetarg:\s*FLEXFLAGS\s*=\s*(\S.*)/m ? $1 : ''); @@ -24,7 +24,7 @@ diff --git a/src/tools/msvc/pgbison.pl b/src/tools/msvc/pgbison.pl index 895e398c0..f5b524a5d 100644 --- a/src/tools/msvc/pgbison.pl +++ b/src/tools/msvc/pgbison.pl -@@ -9,7 +9,7 @@ use File::Basename; +@@ -13,7 +13,7 @@ use File::Basename; do './src/tools/msvc/buildenv.pl' if -e 'src/tools/msvc/buildenv.pl'; @@ -33,7 +33,7 @@ index 895e398c0..f5b524a5d 100644 $bisonver = (split(/\s+/, $bisonver))[3]; # grab version number unless ($bisonver eq '1.875' || $bisonver ge '2.2') -@@ -45,5 +45,5 @@ close($mf); +@@ -51,5 +51,5 @@ close($mf); my $nodep = $bisonver ge '3.0' ? "-Wno-deprecated" : ""; diff --git a/external_imported/vcpkg/ports/libpq/portfile.cmake b/external_imported/vcpkg/ports/libpq/portfile.cmake index 8d44094ee..02d7e5a97 100644 --- a/external_imported/vcpkg/ports/libpq/portfile.cmake +++ b/external_imported/vcpkg/ports/libpq/portfile.cmake @@ -1,4 +1,4 @@ -set(PORT_VERSION 12.9) +set(PORT_VERSION 14.1) # NOTE: the python patches must be regenerated on version update macro(feature_unsupported) @@ -22,6 +22,9 @@ if(VCPKG_TARGET_IS_WINDOWS) # 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() @@ -32,7 +35,7 @@ endif() 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 11697d8283f5df5a9c74c2406e94d1b6da6df8358ad48f3b773825aab98e8395f9fd4e3fc8b1e6ebad3743c3dadbda8b795d4fe84a447d7913223e136cf2b88f + SHA512 4a0bec157d5464bb9e5f5c0eb0efdede55526e03f6f4d660b87d161a47705eb152fa0878960b1581bce42a5ed28a1f457825ea54e8d22e34b5b8eb36473ceefd ) set(PATCHES @@ -43,20 +46,22 @@ set(PATCHES patches/windows/MSBuildProject_fix_gendef_perl.patch patches/windows/msgfmt.patch patches/windows/python_lib.patch - patches/windows/fix-compile-flag-Zi.patch) + patches/windows/fix-compile-flag-Zi.patch + patches/windows/tcl_version.patch + patches/fix-configure.patch + ) if(VCPKG_TARGET_IS_MINGW) - list(APPEND PATCHES patches/mingw/additional-zlib-names.patch) 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) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") list(APPEND PATCHES patches/windows/MSBuildProject-static-lib.patch) list(APPEND PATCHES patches/windows/Mkvcbuild-static-lib.patch) endif() -if(VCPKG_CRT_LINKAGE STREQUAL static) +if(VCPKG_CRT_LINKAGE STREQUAL "static") list(APPEND PATCHES patches/windows/MSBuildProject-static-crt.patch) endif() if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm") @@ -70,7 +75,7 @@ else() endif() vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" PATCHES ${PATCHES} ) unset(buildenv_contents) @@ -106,12 +111,12 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE MATCHES "[Dd][Ee][Bb][Uu][Gg set(INSTALL_PATH_SUFFIX_${_buildtype} "/debug") set(BUILDPATH_${_buildtype} "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${_short}") file(REMOVE_RECURSE "${BUILDPATH_${_buildtype}}") #Clean old builds - set(PACKAGE_DIR_${_buildtype} ${CURRENT_PACKAGES_DIR}${INSTALL_PATH_SUFFIX_${_buildtype}}) + set(PACKAGE_DIR_${_buildtype} "${CURRENT_PACKAGES_DIR}${INSTALL_PATH_SUFFIX_${_buildtype}}") unset(_short) unset(_buildtype) endif() -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}") ## Do the build if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) @@ -184,14 +189,15 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) string(REPLACE "xml => undef" "xml => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") string(REPLACE "iconv => undef" "iconv => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") endif() - if("${FEATURES}" MATCHES "xslt") string(REPLACE "xslt => undef" "xslt => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") endif() - if("${FEATURES}" MATCHES "zlib") string(REPLACE "zlib => undef" "zlib => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") endif() + if("${FEATURES}" MATCHES "lz4") + string(REPLACE "lz4 => undef" "lz4 => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") + endif() file(WRITE "${CONFIG_FILE}" "${_contents}") file(WRITE "${BUILDPATH_${_buildtype}}/src/tools/msvc/buildenv.pl" "${buildenv_contents}") @@ -212,8 +218,8 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) message(STATUS "Building libpq ${TARGET_TRIPLET}-${_buildtype}...") vcpkg_execute_required_process( COMMAND ${PERL} build.pl ${_buildtype} - WORKING_DIRECTORY ${BUILDPATH_${_buildtype}}/src/tools/msvc - LOGNAME build-${TARGET_TRIPLET}-${_buildtype} + WORKING_DIRECTORY "${BUILDPATH_${_buildtype}}/src/tools/msvc" + LOGNAME "build-${TARGET_TRIPLET}-${_buildtype}" ) message(STATUS "Building libpq ${TARGET_TRIPLET}-${_buildtype}... done") else() @@ -222,8 +228,8 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) message(STATUS "Building ${build_lib} ${TARGET_TRIPLET}-${_buildtype}...") vcpkg_execute_required_process( COMMAND ${PERL} build.pl ${_buildtype} ${build_lib} - WORKING_DIRECTORY ${BUILDPATH_${_buildtype}}/src/tools/msvc - LOGNAME build-${build_lib}-${TARGET_TRIPLET}-${_buildtype} + WORKING_DIRECTORY "${BUILDPATH_${_buildtype}}/src/tools/msvc" + LOGNAME "build-${build_lib}-${TARGET_TRIPLET}-${_buildtype}" ) message(STATUS "Building ${build_lib} ${TARGET_TRIPLET}-${_buildtype}... done") endforeach() @@ -231,9 +237,9 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) message(STATUS "Installing libpq ${TARGET_TRIPLET}-${_buildtype}...") vcpkg_execute_required_process( - COMMAND ${PERL} install.pl ${CURRENT_PACKAGES_DIR}${INSTALL_PATH_SUFFIX_${_buildtype}} client - WORKING_DIRECTORY ${BUILDPATH_${_buildtype}}/src/tools/msvc - LOGNAME install-${TARGET_TRIPLET}-${_buildtype} + COMMAND ${PERL} install.pl "${CURRENT_PACKAGES_DIR}${INSTALL_PATH_SUFFIX_${_buildtype}}" client + WORKING_DIRECTORY "${BUILDPATH_${_buildtype}}/src/tools/msvc" + LOGNAME "install-${TARGET_TRIPLET}-${_buildtype}" ) message(STATUS "Installing libpq ${TARGET_TRIPLET}-${_buildtype}... done") endforeach() @@ -241,28 +247,34 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) message(STATUS "Cleanup libpq ${TARGET_TRIPLET}...") #Cleanup - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/doc) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/tools) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/symbols) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/symbols) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/doc") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/symbols") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/symbols") 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() if(NOT HAS_TOOLS) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools") else() - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") endif() message(STATUS "Cleanup libpq ${TARGET_TRIPLET}... - done") set(USE_DL OFF) else() - file(COPY ${CMAKE_CURRENT_LIST_DIR}/Makefile DESTINATION ${SOURCE_PATH}) - + file(COPY "${CMAKE_CURRENT_LIST_DIR}/Makefile" DESTINATION "${SOURCE_PATH}") + + if("nls" IN_LIST FEATURES) + list(APPEND BUILD_OPTS --enable-nls) + set(ENV{MSGFMT} "${CURRENT_HOST_INSTALLED_DIR}/tools/gettext/bin/msgfmt${VCPKG_HOST_EXECUTABLE_SUFFIX}") + else() + list(APPEND BUILD_OPTS --disable-nls) + endif() if("openssl" IN_LIST FEATURES) list(APPEND BUILD_OPTS --with-openssl) else() @@ -273,11 +285,36 @@ else() else() list(APPEND BUILD_OPTS --without-zlib) endif() + if("icu" IN_LIST FEATURES) + list(APPEND BUILD_OPTS --with-icu) + else() + list(APPEND BUILD_OPTS --without-icu) + endif() + if("lz4" IN_LIST FEATURES) + list(APPEND BUILD_OPTS --with-lz4) + else() + list(APPEND BUILD_OPTS --without-lz4) + endif() if("readline" IN_LIST FEATURES) list(APPEND BUILD_OPTS --with-readline) else() list(APPEND BUILD_OPTS --without-readline) endif() + if("xml" IN_LIST FEATURES) + list(APPEND BUILD_OPTS --with-libxml) + else() + list(APPEND BUILD_OPTS --without-libxml) + endif() + if("xslt" IN_LIST FEATURES) + list(APPEND BUILD_OPTS --with-libxslt) + else() + list(APPEND BUILD_OPTS --without-libxslt) + endif() + if("python" IN_LIST FEATURES) + list(APPEND BUILD_OPTS --with-python) + else() + list(APPEND BUILD_OPTS --without-python) + endif() if(VCPKG_TARGET_IS_ANDROID) # AND CMAKE_SYSTEM_VERSION LESS 26) list(APPEND BUILD_OPTS ac_cv_header_langinfo_h=no) endif() @@ -285,7 +322,8 @@ else() list(APPEND BUILD_OPTS "PG_SYSROOT=${VCPKG_OSX_SYSROOT}") endif() vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + SOURCE_PATH "${SOURCE_PATH}" COPY_SOURCE DETERMINE_BUILD_TRIPLET OPTIONS @@ -304,25 +342,25 @@ else() endif() vcpkg_install_make() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") if(NOT HAS_TOOLS) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") else() - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug) + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug") endif() if(VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libpq.a ${CURRENT_PACKAGES_DIR}/lib/libpq.dll.a) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libpq.dll ${CURRENT_PACKAGES_DIR}/bin/libpq.dll) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libpq.a" "${CURRENT_PACKAGES_DIR}/lib/libpq.dll.a") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libpq.dll" "${CURRENT_PACKAGES_DIR}/bin/libpq.dll") endif() if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libpq.a ${CURRENT_PACKAGES_DIR}/debug/lib/libpq.dll.a) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libpq.dll ${CURRENT_PACKAGES_DIR}/debug/bin/libpq.dll) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libpq.a" "${CURRENT_PACKAGES_DIR}/debug/lib/libpq.dll.a") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libpq.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/libpq.dll") endif() endif() if(VCPKG_TARGET_IS_MINGW) @@ -330,6 +368,9 @@ else() else() set(USE_DL ON) endif() + + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/postgresql/server/pg_config.h" "#define CONFIGURE_ARGS" "// #define CONFIGURE_ARGS") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/pg_config.h" "#define CONFIGURE_ARGS" "// #define CONFIGURE_ARGS") endif() configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/postgresql/vcpkg-cmake-wrapper.cmake" @ONLY) diff --git a/external_imported/vcpkg/ports/libpq/vcpkg.json b/external_imported/vcpkg/ports/libpq/vcpkg.json index dc7adc983..210c6e1d7 100644 --- a/external_imported/vcpkg/ports/libpq/vcpkg.json +++ b/external_imported/vcpkg/ports/libpq/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libpq", - "version": "12.9", + "version": "14.1", "port-version": 1, "description": "The official database access API of postgresql", "homepage": "https://www.postgresql.org/", + "license": "PostgreSQL", "supports": "!uwp", "dependencies": [ { @@ -16,6 +17,7 @@ } ], "default-features": [ + "lz4", "openssl", "zlib" ], @@ -24,7 +26,7 @@ "description": "Build with Bonjour support (--with-bonjour)" }, "client": { - "description": "Build all client tools and libraries." + "description": "Build all client tools and libraries (dynamic only?)" }, "icu": { "description": "Build with support for the ICU library (--with-icu)", @@ -44,10 +46,23 @@ "llvm" ] }, + "lz4": { + "description": "Use lz4 (else --without-lz4)", + "dependencies": [ + "lz4" + ] + }, "nls": { "description": "Native Language Support (--enable-nls[=LANGUAGES])", "dependencies": [ - "gettext" + "gettext", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + } ] }, "openssl": { @@ -103,6 +118,13 @@ "xslt": { "description": "Build with libxslt (--with-libxslt)", "dependencies": [ + { + "name": "libpq", + "default-features": false, + "features": [ + "xml" + ] + }, "libxslt" ] }, 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 new file mode 100644 index 000000000..9b9a26e94 --- /dev/null +++ b/external_imported/vcpkg/ports/libpqxx/fix_build_with_apple_clang_13.patch @@ -0,0 +1,15 @@ +# 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/portfile.cmake b/external_imported/vcpkg/ports/libpqxx/portfile.cmake index 53d7eea4d..86d1813fd 100644 --- a/external_imported/vcpkg/ports/libpqxx/portfile.cmake +++ b/external_imported/vcpkg/ports/libpqxx/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( 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 880ccb197..a0fe57f9b 100644 --- a/external_imported/vcpkg/ports/libpqxx/vcpkg.json +++ b/external_imported/vcpkg/ports/libpqxx/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libpqxx", "version-semver": "7.6.0", - "port-version": 2, + "port-version": 3, "description": "The official C++ client API for PostgreSQL", "homepage": "https://www.postgresql.org/", "dependencies": [ diff --git a/external_imported/vcpkg/ports/libproxy/portfile.cmake b/external_imported/vcpkg/ports/libproxy/portfile.cmake index 26842e797..594e4d09f 100644 --- a/external_imported/vcpkg/ports/libproxy/portfile.cmake +++ b/external_imported/vcpkg/ports/libproxy/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - # Enable static build in UNIX if (VCPKG_TARGET_IS_WINDOWS) vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) diff --git a/external_imported/vcpkg/ports/libproxy/vcpkg.json b/external_imported/vcpkg/ports/libproxy/vcpkg.json index fb855d40c..f993e04dc 100644 --- a/external_imported/vcpkg/ports/libproxy/vcpkg.json +++ b/external_imported/vcpkg/ports/libproxy/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libproxy", "version": "0.4.17", - "port-version": 1, + "port-version": 2, "description": "libproxy is a library that provides automatic proxy configuration management.", "homepage": "https://github.com/libproxy/libproxy", + "supports": "!uwp", "dependencies": [ "libmodman", { diff --git a/external_imported/vcpkg/ports/libqcow/portfile.cmake b/external_imported/vcpkg/ports/libqcow/portfile.cmake index 043c72f40..f43d28890 100644 --- a/external_imported/vcpkg/ports/libqcow/portfile.cmake +++ b/external_imported/vcpkg/ports/libqcow/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) set(LIB_VERSION 20210419) diff --git a/external_imported/vcpkg/ports/libqcow/vcpkg.json b/external_imported/vcpkg/ports/libqcow/vcpkg.json index 5f8992d0b..2436924ce 100644 --- a/external_imported/vcpkg/ports/libqcow/vcpkg.json +++ b/external_imported/vcpkg/ports/libqcow/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libqcow", "version-string": "20210419", - "port-version": 1, + "port-version": 2, "description": "Library and tools to access the QEMU Copy-On-Write (QCOW) image format.", "homepage": "https://github.com/libyal/libqcow", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/librabbitmq/fix-uwpwarning.patch b/external_imported/vcpkg/ports/librabbitmq/fix-uwpwarning.patch index 896145970..97b1a3de4 100644 --- a/external_imported/vcpkg/ports/librabbitmq/fix-uwpwarning.patch +++ b/external_imported/vcpkg/ports/librabbitmq/fix-uwpwarning.patch @@ -1,8 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b353be6..419e983 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -150,6 +150,10 @@ else() + endif() + endif() + ++if(MSVC) ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996") ++endif() ++ + option(REGENERATE_AMQP_FRAMING "Regenerate amqp_framing.h/amqp_framing.c sources (for developer use)" OFF) + mark_as_advanced(REGENERATE_AMQP_FRAMING) + diff --git a/librabbitmq/CMakeLists.txt b/librabbitmq/CMakeLists.txt -index bd5369a..f6d703f 100644 +index d8dcd26..671840b 100644 --- a/librabbitmq/CMakeLists.txt +++ b/librabbitmq/CMakeLists.txt -@@ -113,7 +113,7 @@ set(RABBITMQ_SOURCES +@@ -108,7 +108,7 @@ set(RABBITMQ_SOURCES ${AMQP_SSL_SRCS} ) diff --git a/external_imported/vcpkg/ports/librabbitmq/portfile.cmake b/external_imported/vcpkg/ports/librabbitmq/portfile.cmake index 7957cfbfd..ac8e6f5cb 100644 --- a/external_imported/vcpkg/ports/librabbitmq/portfile.cmake +++ b/external_imported/vcpkg/ports/librabbitmq/portfile.cmake @@ -1,30 +1,32 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO alanxz/rabbitmq-c - REF d416b8b16d196085106cfe137a0ff6919a9f6752 - SHA512 3fc137893fc18509a3e583cc8d40a8e91f219063237b9fd018a65cf14da188914ddba3a031c4bc033a886fed19fc6291d1b28b55458b9163eb6d20425b0474dc + REF v0.11.0 + SHA512 0c3dbb6e2b862e9f25e3f76df798ea272bbd81de2865950b95adf1f1e5791eb20d7c9d5a76cb7d2fda54bad5f12bdf69cbfa7e9fd1afdede6f9ec729ca2287de HEAD_REF master PATCHES - fix-uwpwarning.patch + fix-uwpwarning.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/rabbitmq-c TARGET_PATH share/rabbitmq-c) +vcpkg_cmake_config_fixup(PACKAGE_NAME rabbitmq-c CONFIG_PATH lib/cmake/rabbitmq-c) + +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) -file(INSTALL ${SOURCE_PATH}/LICENSE-MIT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE-MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/librabbitmq/vcpkg.json b/external_imported/vcpkg/ports/librabbitmq/vcpkg.json index f79a890ba..9e8a33321 100644 --- a/external_imported/vcpkg/ports/librabbitmq/vcpkg.json +++ b/external_imported/vcpkg/ports/librabbitmq/vcpkg.json @@ -1,10 +1,18 @@ { "name": "librabbitmq", - "version-string": "2020-06-03", + "version": "0.11.0", "port-version": 1, "description": "A C-language AMQP client library for use with v2.0+ of the RabbitMQ broker.", "homepage": "https://github.com/alanxz/rabbitmq-c", "dependencies": [ - "openssl" + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/libraqm/portfile.cmake b/external_imported/vcpkg/ports/libraqm/portfile.cmake index ad32f08c7..f871328e0 100644 --- a/external_imported/vcpkg/ports/libraqm/portfile.cmake +++ b/external_imported/vcpkg/ports/libraqm/portfile.cmake @@ -1,23 +1,22 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) set(RAQM_VERSION_MAJOR 0) -set(RAQM_VERSION_MINOR 7) +set(RAQM_VERSION_MINOR 9) set(RAQM_VERSION_MICRO 0) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO HOST-Oman/libraqm REF v${RAQM_VERSION_MAJOR}.${RAQM_VERSION_MINOR}.${RAQM_VERSION_MICRO} - SHA512 fe2f5e5707334d72518e720adff4379666ba5c4c045531e92588c5f843d4f56111e7b66ea4e7a061621320fa98f13229624994a950a789a477674d3a359cb58c + SHA512 a45c442a087c806143e5a96878e1d84a31afb7b682d71931fcb014c8d56b974d5a0d6186b163067d44a15952b3c549763f84354ed799f20473795f15d719f060 HEAD_REF master ) file(COPY ${CURRENT_PORT_DIR}/FindFribidi.cmake DESTINATION ${SOURCE_PATH}) file(COPY ${CURRENT_PORT_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DCURRENT_PACKAGES_DIR=${CURRENT_PACKAGES_DIR} -DRAQM_VERSION_MAJOR=${RAQM_VERSION_MAJOR} @@ -25,7 +24,7 @@ vcpkg_configure_cmake( -DRAQM_VERSION_MICRO=${RAQM_VERSION_MICRO} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/libraqm/vcpkg.json b/external_imported/vcpkg/ports/libraqm/vcpkg.json index 7e124e863..34fd9966b 100644 --- a/external_imported/vcpkg/ports/libraqm/vcpkg.json +++ b/external_imported/vcpkg/ports/libraqm/vcpkg.json @@ -1,11 +1,11 @@ { "name": "libraqm", - "version-string": "0.7.0", - "port-version": 3, + "version-string": "0.9.0", "description": "A library for complex text layout", "dependencies": [ "freetype", "fribidi", - "harfbuzz" + "harfbuzz", + "vcpkg-cmake" ] } diff --git a/external_imported/vcpkg/ports/librdkafka/lz4.patch b/external_imported/vcpkg/ports/librdkafka/lz4.patch new file mode 100644 index 000000000..a4cd7a93d --- /dev/null +++ b/external_imported/vcpkg/ports/librdkafka/lz4.patch @@ -0,0 +1,28 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -152,7 +152,7 @@ # LZ4 { + option(ENABLE_LZ4_EXT "Enable external LZ4 library support" ON) + set(WITH_LZ4_EXT OFF) +-if(ENABLE_LZ4_EXT) +- find_package(LZ4) +- if(LZ4_FOUND) ++if(1) ++ find_package(lz4 CONFIG REQUIRED) ++ if(1) + set(WITH_LZ4_EXT ON) + list(APPEND BUILT_WITH "LZ4_EXT") +@@ -248,4 +248,4 @@ # LZ4 { + install( +- FILES "${project_config}" "${project_version}" "packaging/cmake/Modules/FindLZ4.cmake" ++ FILES "${project_config}" "${project_version}" + DESTINATION "${config_install_dir}" + ) + +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -241,4 +241,3 @@ + if(WITH_LZ4_EXT) +- target_include_directories(rdkafka PRIVATE ${LZ4_INCLUDE_DIRS}) +- target_link_libraries(rdkafka PUBLIC LZ4::LZ4) ++ target_link_libraries(rdkafka PUBLIC lz4::lz4) + endif() diff --git a/external_imported/vcpkg/ports/librdkafka/portfile.cmake b/external_imported/vcpkg/ports/librdkafka/portfile.cmake index a8c181ec5..27dee9a27 100644 --- a/external_imported/vcpkg/ports/librdkafka/portfile.cmake +++ b/external_imported/vcpkg/ports/librdkafka/portfile.cmake @@ -4,13 +4,13 @@ vcpkg_from_github( REF v1.8.2 SHA512 8c8ae291129b78e3b8367307ad1b1715af1438cd76d7160d64d13a58adf84c7c9f51efeba4656f55e101c25e4cb744db0d8bb5c01a2decb229e4567d16bdcb22 HEAD_REF master + PATCHES lz4.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" RDKAFKA_BUILD_STATIC) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - lz4 ENABLE_LZ4_EXT ssl WITH_SSL zlib WITH_ZLIB zstd WITH_ZSTD @@ -28,7 +28,7 @@ vcpkg_cmake_configure( OPTIONS_DEBUG -DENABLE_SHAREDPTR_DEBUG=ON -DENABLE_DEVEL=ON - -DENABLE_REFCNT_DEBUG=ON + -DENABLE_REFCNT_DEBUG=OFF -DENABLE_SHAREDPTR_DEBUG=ON -DWITHOUT_OPTIMIZATION=ON OPTIONS_RELEASE @@ -48,23 +48,15 @@ vcpkg_cmake_config_fixup( CONFIG_PATH lib/cmake/RdKafka ) -if("lz4" IN_LIST FEATURES) - vcpkg_replace_string( - ${CURRENT_PACKAGES_DIR}/share/rdkafka/RdKafkaConfig.cmake - "find_dependency(LZ4)" - "include(\"\${CMAKE_CURRENT_LIST_DIR}/FindLZ4.cmake\")\n find_dependency(LZ4)" - ) -endif() - file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" ) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) foreach(hdr rdkafka.h rdkafkacpp.h) vcpkg_replace_string( - ${CURRENT_PACKAGES_DIR}/include/librdkafka/${hdr} + "${CURRENT_PACKAGES_DIR}/include/librdkafka/${hdr}" "#ifdef LIBRDKAFKA_STATICLIB" "#if 1 // #ifdef LIBRDKAFKA_STATICLIB" ) @@ -72,9 +64,9 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) endif() # Handle copyright -configure_file(${SOURCE_PATH}/LICENSES.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSES.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) # Install 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) vcpkg_fixup_pkgconfig() diff --git a/external_imported/vcpkg/ports/librdkafka/vcpkg.json b/external_imported/vcpkg/ports/librdkafka/vcpkg.json index 75038f4f2..8ab425445 100644 --- a/external_imported/vcpkg/ports/librdkafka/vcpkg.json +++ b/external_imported/vcpkg/ports/librdkafka/vcpkg.json @@ -1,10 +1,13 @@ { "name": "librdkafka", "version": "1.8.2", + "port-version": 2, "description": "The Apache Kafka C/C++ library", "homepage": "https://github.com/edenhill/librdkafka", + "license": null, "supports": "!uwp", "dependencies": [ + "lz4", { "name": "vcpkg-cmake", "host": true @@ -15,12 +18,6 @@ } ], "features": { - "lz4": { - "description": "Enable external LZ4 library support", - "dependencies": [ - "lz4" - ] - }, "snappy": { "description": "Build with snappy" }, diff --git a/external_imported/vcpkg/ports/libressl/portfile.cmake b/external_imported/vcpkg/ports/libressl/portfile.cmake index 32ca4d767..b8604ebfd 100644 --- a/external_imported/vcpkg/ports/libressl/portfile.cmake +++ b/external_imported/vcpkg/ports/libressl/portfile.cmake @@ -4,22 +4,20 @@ if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openssl/ssl.h") return() endif() -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") - -set(LIBRESSL_VERSION 3.3.4) -set(LIBRESSL_HASH 11defdde8169d3653c24e149e698ffc5a8ead5ac0808111d1986cb11ef72e9912c463d4891d4635877021e73a8a045dbdbe5e83ec785a59150f170d2ca2031de) +set(LIBRESSL_VERSION 3.4.2) +set(LIBRESSL_HASH ae91a840b29330681dc2a4f55a9bd760e6fe1bdfb3399017aae3a16bd21b413e97cbb8ba504400f0a1f42757f6128b3fa763d06bae4fc9f2b9dbeea867a57ad2) vcpkg_download_distfile( LIBRESSL_SOURCE_ARCHIVE - URLS https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${PORT}-${LIBRESSL_VERSION}.tar.gz https://ftp.fau.de/openbsd/LibreSSL/${PORT}-${LIBRESSL_VERSION}.tar.gz - FILENAME ${PORT}-${LIBRESSL_VERSION}.tar.gz - SHA512 ${LIBRESSL_HASH} + URLS "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${PORT}-${LIBRESSL_VERSION}.tar.gz" "https://ftp.fau.de/openbsd/LibreSSL/${PORT}-${LIBRESSL_VERSION}.tar.gz" + FILENAME "${PORT}-${LIBRESSL_VERSION}.tar.gz" + SHA512 "${LIBRESSL_HASH}" ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE "${LIBRESSL_SOURCE_ARCHIVE}" - REF ${LIBRESSL_VERSION} + REF "${LIBRESSL_VERSION}" PATCHES 0001-enable-ocspcheck-on-msvc.patch 0002-suppress-msvc-warnings.patch @@ -67,6 +65,6 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) file(GLOB_RECURSE LIBS "${CURRENT_PACKAGES_DIR}/*.lib") foreach(LIB ${LIBS}) string(REGEX REPLACE "(.+)-[0-9]+\\.lib" "\\1.lib" LINK "${LIB}") - execute_process(COMMAND "${CMAKE_COMMAND}" -E create_symlink "${LIB}" "${LINK}") + file(CREATE_LINK "${LIB}" "${LINK}") endforeach() endif() diff --git a/external_imported/vcpkg/ports/libressl/vcpkg.json b/external_imported/vcpkg/ports/libressl/vcpkg.json index ff08a3b58..3b784e025 100644 --- a/external_imported/vcpkg/ports/libressl/vcpkg.json +++ b/external_imported/vcpkg/ports/libressl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libressl", - "version": "3.3.4", + "version": "3.4.2", "description": "LibreSSL is a version of the TLS/crypto stack forked from OpenSSL in 2014, with goals of modernizing the codebase, improving security, and applying best practice development processes.", "supports": "!(uwp | arm)", "dependencies": [ diff --git a/external_imported/vcpkg/ports/librsync/portfile.cmake b/external_imported/vcpkg/ports/librsync/portfile.cmake index e9bb64ab9..a0a07bad3 100644 --- a/external_imported/vcpkg/ports/librsync/portfile.cmake +++ b/external_imported/vcpkg/ports/librsync/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( @@ -12,8 +10,8 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_RDIFF:BOOL=OFF + OPTIONS + -DBUILD_RDIFF:BOOL=OFF -DENABLE_COMPRESSION:BOOL=OFF -DENABLE_TRACE:BOOL=OFF ) diff --git a/external_imported/vcpkg/ports/librsync/vcpkg.json b/external_imported/vcpkg/ports/librsync/vcpkg.json index 34aafdb9b..7fda0a64d 100644 --- a/external_imported/vcpkg/ports/librsync/vcpkg.json +++ b/external_imported/vcpkg/ports/librsync/vcpkg.json @@ -1,6 +1,7 @@ { "name": "librsync", "version-semver": "2.3.2", + "port-version": 1, "description": "librsync is a library for calculating and applying network deltas, with an interface designed to ease integration into diverse network applications.", "homepage": "http://librsync.sourcefrog.net/", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/librtmp/CMakeLists.txt b/external_imported/vcpkg/ports/librtmp/CMakeLists.txt index 9751f3d73..c9f77f16b 100644 --- a/external_imported/vcpkg/ports/librtmp/CMakeLists.txt +++ b/external_imported/vcpkg/ports/librtmp/CMakeLists.txt @@ -40,6 +40,7 @@ set(SRCS librtmp/amf.c if(MSVC) set(SRCS_MSVC "librtmp/librtmp.def") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996") endif() add_library(librtmp ${SRCS} ${HEADERS} ${SRCS_MSVC}) diff --git a/external_imported/vcpkg/ports/librtmp/vcpkg.json b/external_imported/vcpkg/ports/librtmp/vcpkg.json index f91704206..90a297315 100644 --- a/external_imported/vcpkg/ports/librtmp/vcpkg.json +++ b/external_imported/vcpkg/ports/librtmp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "librtmp", "version-date": "2019-11-11", - "port-version": 2, + "port-version": 3, "description": "RTMPDump Real-Time Messaging Protocol API", "homepage": "https://rtmpdump.mplayerhq.hu", "dependencies": [ diff --git a/external_imported/vcpkg/ports/libsass/portfile.cmake b/external_imported/vcpkg/ports/libsass/portfile.cmake index 9195b4562..6428e9c07 100644 --- a/external_imported/vcpkg/ports/libsass/portfile.cmake +++ b/external_imported/vcpkg/ports/libsass/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sass/libsass diff --git a/external_imported/vcpkg/ports/libsass/vcpkg.json b/external_imported/vcpkg/ports/libsass/vcpkg.json index 1b7f9e1ce..3d2fa450c 100644 --- a/external_imported/vcpkg/ports/libsass/vcpkg.json +++ b/external_imported/vcpkg/ports/libsass/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libsass", "version": "3.6.5", + "port-version": 1, "description": "LibSass - Sass compiler written in C++", "homepage": "https://github.com/sass/libsass", "supports": "!uwp" diff --git a/external_imported/vcpkg/ports/libsbml/portfile.cmake b/external_imported/vcpkg/ports/libsbml/portfile.cmake index 9b88b13b0..e4961abb2 100644 --- a/external_imported/vcpkg/ports/libsbml/portfile.cmake +++ b/external_imported/vcpkg/ports/libsbml/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sbmlteam/libsbml @@ -86,5 +84,5 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/README.md") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/README.md") endif() -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -vcpkg_fixup_pkgconfig() +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_fixup_pkgconfig() diff --git a/external_imported/vcpkg/ports/libsbml/vcpkg.json b/external_imported/vcpkg/ports/libsbml/vcpkg.json index cc2cc2156..4d6373023 100644 --- a/external_imported/vcpkg/ports/libsbml/vcpkg.json +++ b/external_imported/vcpkg/ports/libsbml/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libsbml", "version": "5.19.0", - "port-version": 1, + "port-version": 2, "description": "A library for reading / writing SBML files", "supports": "!uwp", "dependencies": [ diff --git a/external_imported/vcpkg/ports/libslirp/portfile.cmake b/external_imported/vcpkg/ports/libslirp/portfile.cmake new file mode 100644 index 000000000..8862f1b30 --- /dev/null +++ b/external_imported/vcpkg/ports/libslirp/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/ + OUT_SOURCE_PATH SOURCE_PATH + REPO slirp/libslirp + REF v4.6.1 + SHA512 04a9dd88cd58c849a24b9cff405d951952760d99ea2bef0b070463dff088d79f44557a13c9427ba0043f58d4b9e06b68ff64a4f23a7b0d66df594e32e1521cae + HEAD_REF master +) + +if(VCPKG_HOST_IS_WINDOWS) + vcpkg_acquire_msys(MSYS_ROOT) + vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") +endif() + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${OPTIONS} +) + +vcpkg_install_meson(ADD_BIN_TO_PATH) + +vcpkg_fixup_pkgconfig() + +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libslirp" RENAME copyright) diff --git a/external_imported/vcpkg/ports/libslirp/vcpkg.json b/external_imported/vcpkg/ports/libslirp/vcpkg.json new file mode 100644 index 000000000..470194d07 --- /dev/null +++ b/external_imported/vcpkg/ports/libslirp/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "libslirp", + "version-semver": "4.6.1", + "port-version": 1, + "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", + "supports": "!windows | mingw", + "dependencies": [ + "glib", + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/libsmb2/portfile.cmake b/external_imported/vcpkg/ports/libsmb2/portfile.cmake index 4558f3e01..bce687a71 100644 --- a/external_imported/vcpkg/ports/libsmb2/portfile.cmake +++ b/external_imported/vcpkg/ports/libsmb2/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "osx") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( @@ -23,5 +22,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") #the debug/share folder is generated empty by the provided cmake system 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/libsmb2/vcpkg.json b/external_imported/vcpkg/ports/libsmb2/vcpkg.json index 4b5b2b9a9..8bed89ce6 100644 --- a/external_imported/vcpkg/ports/libsmb2/vcpkg.json +++ b/external_imported/vcpkg/ports/libsmb2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libsmb2", "version-date": "2021-04-29", + "port-version": 1, "description": "SMB2/3 Userspace Client", "homepage": "https://github.com/sahlberg/libsmb2", "supports": "!osx", diff --git a/external_imported/vcpkg/ports/libsndfile/fix-mp3lame.patch b/external_imported/vcpkg/ports/libsndfile/fix-mp3lame.patch new file mode 100644 index 000000000..9b7d2162e --- /dev/null +++ b/external_imported/vcpkg/ports/libsndfile/fix-mp3lame.patch @@ -0,0 +1,73 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b1b49e9..ae8ebec 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -174,7 +174,7 @@ set_package_properties (FLAC PROPERTIES + DESCRIPTION "Free Lossless Audio Codec Library" + PURPOSE "Enables FLAC support" + ) +-set_package_properties (Lame PROPERTIES ++set_package_properties (mp3lame PROPERTIES + TYPE RECOMMENDED + URL "https://lame.sourceforge.io/" + DESCRIPTION "High quality MPEG Audio Layer III (MP3) encoder" +@@ -237,20 +237,7 @@ if (INSTALL_PKGCONFIG_MODULE) + endif () + if (ENABLE_MPEG) + set (EXTERNAL_MPEG_REQUIRE "libmpg123") +- get_filename_component(LAME_WE ${LAME_LIBRARY} NAME_WE) +- if (LAME_HIP_LIBRARY) +- get_filename_component(LAME_HIP_WE ${LAME_HIP_LIBRARY} NAME_WE) +- endif () +- if (CMAKE_IMPORT_LIBRARY_PREFIX) +- string (REGEX REPLACE "^${CMAKE_IMPORT_LIBRARY_PREFIX}" "" LAME_WE_NO_PREFIX ${LAME_WE}) +- if (LAME_HIP_LIBRARY) +- string (REGEX REPLACE "^${CMAKE_IMPORT_LIBRARY_PREFIX}" "" LAME_HIP_WE_NO_PREFIX ${LAME_HIP_WE}) +- endif () +- endif () +- set (EXTERNAL_MPEG_LIBS "-l${LAME_WE_NO_PREFIX}") +- if (LAME_HIP_LIBRARY) +- set (EXTERNAL_MPEG_LIBS "${MPEG_LIBS} -l${LAME_HIP_WE}") +- endif () ++ set (EXTERNAL_MPEG_LIBS "-lmp3lame") + endif () + + configure_file (sndfile.pc.in sndfile.pc @ONLY) +@@ -411,7 +398,7 @@ target_link_libraries (sndfile + $<$,$,$>:Speex::Speex> + $<$:Opus::opus> + $<$:MPG123::libmpg123> +- $<$:Lame::Lame> ++ $<$:mp3lame::mp3lame> + ) + set_target_properties (sndfile PROPERTIES + PUBLIC_HEADER "${sndfile_HDRS}" +diff --git a/cmake/SndFileChecks.cmake b/cmake/SndFileChecks.cmake +index f5d5994..2e09ba6 100644 +--- a/cmake/SndFileChecks.cmake ++++ b/cmake/SndFileChecks.cmake +@@ -56,9 +56,9 @@ else () + set (HAVE_EXTERNAL_XIPH_LIBS 0) + endif () + +-find_package (Lame) ++find_package (mp3lame) + find_package (Mpg123 1.25.10) +-if (LAME_FOUND AND (TARGET MPG123::libmpg123)) ++if (TARGET mp3lame::mp3lame AND (TARGET MPG123::libmpg123)) + set (HAVE_MPEG_LIBS 1) + else () + set (HAVE_MPEG_LIBS 0) +diff --git a/cmake/SndFileConfig.cmake.in b/cmake/SndFileConfig.cmake.in +index 1d5463a..0c98e7e 100644 +--- a/cmake/SndFileConfig.cmake.in ++++ b/cmake/SndFileConfig.cmake.in +@@ -18,7 +18,7 @@ if (SndFile_WITH_EXTERNAL_LIBS AND NOT @BUILD_SHARED_LIBS@) + endif () + + if (SndFile_WITH_MPEG AND NOT @BUILD_SHARED_LIBS@) +- find_dependency (Lame) ++ find_dependency (mp3lame) + find_dependency (MPG123) + endif () + diff --git a/external_imported/vcpkg/ports/libsndfile/fix-uwp.patch b/external_imported/vcpkg/ports/libsndfile/fix-uwp.patch new file mode 100644 index 000000000..92f0a3037 --- /dev/null +++ b/external_imported/vcpkg/ports/libsndfile/fix-uwp.patch @@ -0,0 +1,14 @@ +diff --git a/src/file_io.c b/src/file_io.c +index 334ba2a..90c9608 100644 +--- a/src/file_io.c ++++ b/src/file_io.c +@@ -827,9 +827,6 @@ psf_open_handle (PSF_FILE * pfile) + } ; + + #if defined (WINAPI_FAMILY_PARTITION) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM) +- if (!pfile->use_wchar) +- return INVALID_HANDLE_VALUE ; +- + CREATEFILE2_EXTENDED_PARAMETERS cfParams = { 0 } ; + cfParams.dwSize = sizeof (CREATEFILE2_EXTENDED_PARAMETERS) ; + cfParams.dwFileAttributes = FILE_ATTRIBUTE_NORMAL ; diff --git a/external_imported/vcpkg/ports/libsndfile/portfile.cmake b/external_imported/vcpkg/ports/libsndfile/portfile.cmake index ad84e3315..7c31e3468 100644 --- a/external_imported/vcpkg/ports/libsndfile/portfile.cmake +++ b/external_imported/vcpkg/ports/libsndfile/portfile.cmake @@ -1,9 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libsndfile/libsndfile - REF 1.0.31 - SHA512 5767ced306f2d300aa2014d383c22f3ee9a4fe1ffb2c463405bc26209ede09a9cfb95e1c08256db36e986d2b30151c38dbe635a3cae0b7138d7de485e2084891 + REF 1.1.0 + SHA512 5e530c33165a2d2be1c22d3a4bd96f0f1817dded3a45d24bad0e3f2c7908ccc1f19327a91d5040c3ea4d591845876019180747a125bf2a6f8bd49a6f67eadacd HEAD_REF master + PATCHES + fix-mp3lame.patch + fix-uwp.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) @@ -11,24 +14,31 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES external-libs ENABLE_EXTERNAL_LIBS + FEATURES + external-libs ENABLE_EXTERNAL_LIBS + mpeg ENABLE_MPEG + regtest BUILD_REGTEST ) -vcpkg_configure_cmake( +if(VCPKG_TARGET_IS_UWP) + set(VCPKG_C_FLAGS "/sdl- ${VCPKG_C_FLAGS}") + set(VCPKG_CXX_FLAGS "/sdl- ${VCPKG_CXX_FLAGS}") +endif() + +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DBUILD_EXAMPLES=OFF - -DBUILD_REGTEST=OFF -DBUILD_TESTING=OFF -DENABLE_BOW_DOCS=OFF -DBUILD_PROGRAMS=OFF + -DBUILD_REGTEST=OFF -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON -DPYTHON_EXECUTABLE=${PYTHON3} ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() if(WIN32 AND (NOT MINGW) AND (NOT CYGWIN)) set(CONFIG_PATH cmake) @@ -36,7 +46,7 @@ else() set(CONFIG_PATH lib/cmake/SndFile) endif() -vcpkg_fixup_cmake_targets(CONFIG_PATH ${CONFIG_PATH} TARGET_PATH share/SndFile) +vcpkg_cmake_config_fixup(PACKAGE_NAME SndFile CONFIG_PATH ${CONFIG_PATH}) vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES m) vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/libsndfile/vcpkg.json b/external_imported/vcpkg/ports/libsndfile/vcpkg.json index e0d0acc68..20c29ae2a 100644 --- a/external_imported/vcpkg/ports/libsndfile/vcpkg.json +++ b/external_imported/vcpkg/ports/libsndfile/vcpkg.json @@ -1,20 +1,50 @@ { "name": "libsndfile", - "version-string": "1.0.31", - "description": "Library to read, write and manipulate many soundfile types. Authored by Eric de Castro Lopo", + "version-semver": "1.1.0", + "description": "A library for reading and writing audio files", "homepage": "https://github.com/erikd/libsndfile", "license": "LGPL-2.1", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "default-features": [ - "external-libs" + "external-libs", + "mpeg" ], "features": { + "experimental": { + "description": "Enable experimental code", + "dependencies": [ + "speex" + ] + }, "external-libs": { - "description": "Default feature. Enables Ogg Vorbis, FLAC and Ogg Opus formats support.", + "description": "Enable FLAC, Vorbis, and Opus codecs", "dependencies": [ "libflac", "libvorbis", "opus" ] + }, + "mpeg": { + "description": "Enable MPEG codecs", + "dependencies": [ + "mp3lame", + "mpg123" + ] + }, + "regtest": { + "description": "Build regtest", + "dependencies": [ + "sqlite3" + ] } } } diff --git a/external_imported/vcpkg/ports/libsnoretoast/portfile.cmake b/external_imported/vcpkg/ports/libsnoretoast/portfile.cmake index e97d5f637..295eb96ea 100644 --- a/external_imported/vcpkg/ports/libsnoretoast/portfile.cmake +++ b/external_imported/vcpkg/ports/libsnoretoast/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "osx" "linux" "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/snoretoast @@ -12,7 +10,7 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS + OPTIONS -DBUILD_EXAMPLES=OFF -DBUILD_STATIC_RUNTIME=OFF ) diff --git a/external_imported/vcpkg/ports/libsnoretoast/vcpkg.json b/external_imported/vcpkg/ports/libsnoretoast/vcpkg.json index eb0c3838b..d9263bbd8 100644 --- a/external_imported/vcpkg/ports/libsnoretoast/vcpkg.json +++ b/external_imported/vcpkg/ports/libsnoretoast/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libsnoretoast", "version": "0.8.0", - "port-version": 1, + "port-version": 2, "description": "A tool to create Windows Toast notifications and parse them on Windows 8 or later.", "homepage": "https://invent.kde.org/libraries/snoretoast", "supports": "windows & !uwp", diff --git a/external_imported/vcpkg/ports/libsoundio/fix_cmakelists.patch b/external_imported/vcpkg/ports/libsoundio/fix_cmakelists.patch index ffe00adff..b25f58824 100644 --- a/external_imported/vcpkg/ports/libsoundio/fix_cmakelists.patch +++ b/external_imported/vcpkg/ports/libsoundio/fix_cmakelists.patch @@ -19,7 +19,16 @@ index 6541f1b..e81bdce 100644 endif() if(BUILD_STATIC_LIBS) -@@ -243,9 +245,26 @@ if(BUILD_STATIC_LIBS) +@@ -204,8 +206,7 @@ if(MSVC) + set(EXAMPLE_CFLAGS "/W4") + set(TEST_CFLAGS "${LIB_CFLAGS}") + set(TEST_LDFLAGS " ") + set(LIBM " ") + else() +- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror -pedantic") + set(LIB_CFLAGS "-std=c11 -fvisibility=hidden -Wall -Werror=strict-prototypes -Werror=old-style-definition -Werror=missing-prototypes -D_REENTRANT -D_POSIX_C_SOURCE=200809L -Wno-missing-braces") + set(EXAMPLE_CFLAGS "-std=c99 -Wall") +@@ -243,9 +244,26 @@ if(BUILD_STATIC_LIBS) COMPILE_FLAGS ${LIB_CFLAGS} LINKER_LANGUAGE C ) diff --git a/external_imported/vcpkg/ports/libsoundio/portfile.cmake b/external_imported/vcpkg/ports/libsoundio/portfile.cmake index 3b5081cf9..1e5946189 100644 --- a/external_imported/vcpkg/ports/libsoundio/portfile.cmake +++ b/external_imported/vcpkg/ports/libsoundio/portfile.cmake @@ -1,6 +1,3 @@ - -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO andrewrk/libsoundio diff --git a/external_imported/vcpkg/ports/libsoundio/vcpkg.json b/external_imported/vcpkg/ports/libsoundio/vcpkg.json index 6dc71724b..52ca059cd 100644 --- a/external_imported/vcpkg/ports/libsoundio/vcpkg.json +++ b/external_imported/vcpkg/ports/libsoundio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libsoundio", "version": "2.0.0", - "port-version": 4, + "port-version": 6, "description": "libsoundio is C library providing cross-platform audio input and output.", "homepage": "http://libsound.io/", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/libspatialite/portfile.cmake b/external_imported/vcpkg/ports/libspatialite/portfile.cmake index cd0d9ee49..db8d8bcda 100644 --- a/external_imported/vcpkg/ports/libspatialite/portfile.cmake +++ b/external_imported/vcpkg/ports/libspatialite/portfile.cmake @@ -49,7 +49,11 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) PREFIX PKGCONFIG MODULES --msvc-syntax ${pkg_config_modules} LIBS + CFLAGS ) + + set(CL_FLAGS_RELEASE "${CL_FLAGS} ${PKGCONFIG_CFLAGS_RELEASE}") + set(CL_FLAGS_DEBUG "${CL_FLAGS} ${PKGCONFIG_CFLAGS_DEBUG}") # vcpkg_build_nmake doesn't supply cmake's implicit link libraries if(PKGCONFIG_LIBS_DEBUG MATCHES "libcrypto") @@ -77,12 +81,12 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) endif() vcpkg_install_nmake( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - "CL_FLAGS=${CL_FLAGS}" OPTIONS_RELEASE + "CL_FLAGS=${CL_FLAGS_RELEASE}" "INST_DIR=${INST_DIR}" "LIBS_ALL=${LIBS_ALL_RELEASE}" OPTIONS_DEBUG + "CL_FLAGS=${CL_FLAGS_DEBUG}" "INST_DIR=${INST_DIR}\\debug" "LIBS_ALL=${LIBS_ALL_DEBUG}" "LINK_FLAGS=/debug" diff --git a/external_imported/vcpkg/ports/libspatialite/vcpkg.json b/external_imported/vcpkg/ports/libspatialite/vcpkg.json index 1acbf7cdd..521ba1523 100644 --- a/external_imported/vcpkg/ports/libspatialite/vcpkg.json +++ b/external_imported/vcpkg/ports/libspatialite/vcpkg.json @@ -1,15 +1,22 @@ { "name": "libspatialite", "version": "5.0.1", - "port-version": 2, + "port-version": 4, "description": "SpatiaLite is an open source library intended to extend the SQLite core to support fully fledged Spatial SQL capabilities.", "homepage": "https://www.gaia-gis.it/gaia-sins/libspatialite-sources", + "license": "MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later", "dependencies": [ "geos", "libiconv", "libxml2", - "proj4", - "sqlite3", + "proj", + { + "name": "sqlite3", + "default-features": false, + "features": [ + "rtree" + ] + }, "vcpkg-pkgconfig-get-modules", "zlib" ], diff --git a/external_imported/vcpkg/ports/libspnav/portfile.cmake b/external_imported/vcpkg/ports/libspnav/portfile.cmake index 35d012519..89bf76c44 100644 --- a/external_imported/vcpkg/ports/libspnav/portfile.cmake +++ b/external_imported/vcpkg/ports/libspnav/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "windows" "uwp" "osx") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO FreeSpacenav/libspnav diff --git a/external_imported/vcpkg/ports/libspnav/vcpkg.json b/external_imported/vcpkg/ports/libspnav/vcpkg.json index f3bb1f791..1c9557d3e 100644 --- a/external_imported/vcpkg/ports/libspnav/vcpkg.json +++ b/external_imported/vcpkg/ports/libspnav/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libspnav", - "version-string": "0.2.3", - "port-version": 1, + "version": "0.2.3", + "port-version": 2, "description": "Library for communicating with spacenavd or 3dxsrv to get input from 6-dof devices.", "homepage": "https://github.com/FreeSpacenav/libspnav", "supports": "linux" diff --git a/external_imported/vcpkg/ports/libsquish/portfile.cmake b/external_imported/vcpkg/ports/libsquish/portfile.cmake index 80c4ef54b..e9cb26e3f 100644 --- a/external_imported/vcpkg/ports/libsquish/portfile.cmake +++ b/external_imported/vcpkg/ports/libsquish/portfile.cmake @@ -9,9 +9,15 @@ vcpkg_from_sourceforge( export-target.patch ) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + sse2 BUILD_SQUISH_WITH_SSE2 +) + vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE + OPTIONS ${FEATURE_OPTIONS} ) vcpkg_cmake_install() diff --git a/external_imported/vcpkg/ports/libsquish/vcpkg.json b/external_imported/vcpkg/ports/libsquish/vcpkg.json index 3d247cb93..3af7e3b13 100644 --- a/external_imported/vcpkg/ports/libsquish/vcpkg.json +++ b/external_imported/vcpkg/ports/libsquish/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libsquish", - "version-string": "1.15", - "port-version": 9, + "version": "1.15", + "port-version": 10, "description": "Open source DXT compression library.", "homepage": "https://sourceforge.net/projects/libsquish", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", @@ -13,5 +14,11 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "sse2": { + "description": "Build with SSE2", + "supports": "osx" + } + } } diff --git a/external_imported/vcpkg/ports/libsrt/portfile.cmake b/external_imported/vcpkg/ports/libsrt/portfile.cmake index 23ae59ccd..35ebd0654 100644 --- a/external_imported/vcpkg/ports/libsrt/portfile.cmake +++ b/external_imported/vcpkg/ports/libsrt/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Haivision/srt @@ -38,4 +36,4 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ 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/libsrt/vcpkg.json b/external_imported/vcpkg/ports/libsrt/vcpkg.json index 5de788840..02de23beb 100644 --- a/external_imported/vcpkg/ports/libsrt/vcpkg.json +++ b/external_imported/vcpkg/ports/libsrt/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libsrt", "version": "1.4.4", - "port-version": 1, + "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", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/libsrtp/portfile.cmake b/external_imported/vcpkg/ports/libsrtp/portfile.cmake index 2a1b5bea6..d4074da0e 100644 --- a/external_imported/vcpkg/ports/libsrtp/portfile.cmake +++ b/external_imported/vcpkg/ports/libsrtp/portfile.cmake @@ -1,8 +1,15 @@ +vcpkg_download_distfile(CMAKE_PR_PATCH + URLS https://patch-diff.githubusercontent.com/raw/cisco/libsrtp/pull/573.diff + FILENAME libsrtp-pr-573.patch + SHA512 58c07977ccbd3dce114f59583a5e10813bbee907af5ef23ec1961b4cfd0791c14326845a376470430978e878c78fb1f598851898a9e9031225628739fb248176 +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cisco/libsrtp REF v2.4.2 SHA512 6E4805E6D34B2050A6F68F629B0B42356B1D27F2CBAA6CC6166E56957609C3D9AA6B723DCC674E5C74180D122D27BADD2F9496639CCB1E0C210B9E1F7949D0E2 + PATCHES ${CMAKE_PR_PATCH} ) if (VCPKG_TARGET_IS_WINDOWS) @@ -10,12 +17,16 @@ if (VCPKG_TARGET_IS_WINDOWS) set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} /wd4703") endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA ) -vcpkg_install_cmake() +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup( + CONFIG_PATH lib/cmake/libSRTP +) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/external_imported/vcpkg/ports/libsrtp/vcpkg.json b/external_imported/vcpkg/ports/libsrtp/vcpkg.json index 234d7faf1..5ca1f1352 100644 --- a/external_imported/vcpkg/ports/libsrtp/vcpkg.json +++ b/external_imported/vcpkg/ports/libsrtp/vcpkg.json @@ -1,5 +1,16 @@ { "name": "libsrtp", "version": "2.4.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." + "port-version": 1, + "description": "This package provides an implementation of the Secure Real-time Transport Protocol (SRTP), the Universal Security Transform (UST), and a supporting cryptographic kernel.", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/libssh/portfile.cmake b/external_imported/vcpkg/ports/libssh/portfile.cmake index 4354177c1..77724f1db 100644 --- a/external_imported/vcpkg/ports/libssh/portfile.cmake +++ b/external_imported/vcpkg/ports/libssh/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL https://git.libssh.org/projects/libssh.git @@ -50,10 +48,10 @@ vcpkg_fixup_pkgconfig() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") vcpkg_replace_string( - "${CURRENT_PACKAGES_DIR}/include/libssh/libssh.h" + "${CURRENT_PACKAGES_DIR}/include/libssh/libssh.h" "#ifdef LIBSSH_STATIC" "#if 1" - ) + ) endif() if(VCPKG_TARGET_IS_WINDOWS) diff --git a/external_imported/vcpkg/ports/libssh/vcpkg.json b/external_imported/vcpkg/ports/libssh/vcpkg.json index 9bcc032da..d1f22ec07 100644 --- a/external_imported/vcpkg/ports/libssh/vcpkg.json +++ b/external_imported/vcpkg/ports/libssh/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libssh", "version": "0.9.6", - "port-version": 1, + "port-version": 2, "description": "libssh is a multiplatform C library implementing the SSHv2 protocol on client and server side", "homepage": "https://www.libssh.org/", "supports": "!(uwp | arm)", diff --git a/external_imported/vcpkg/ports/libssh2/0002-fix-macros.patch b/external_imported/vcpkg/ports/libssh2/0002-fix-macros.patch new file mode 100644 index 000000000..dc0f71933 --- /dev/null +++ b/external_imported/vcpkg/ports/libssh2/0002-fix-macros.patch @@ -0,0 +1,19 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 2539607..eceb5a0 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -355,9 +355,12 @@ target_include_directories(libssh2 PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) + # Daniel's note: this should not be necessary and we need to work to + # get this removed. + if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows" OR ${CMAKE_SYSTEM_NAME} STREQUAL "WindowsStore") +- target_compile_definitions(libssh2 PRIVATE LIBSSH2_WIN32) ++ target_compile_definitions(libssh2 PUBLIC LIBSSH2_WIN32) ++ if (BUILD_SHARED_LIBS) ++ target_compile_definitions(libssh2 PUBLIC _WINDLL PRIVATE LIBSSH2_LIBRARY) ++ endif() + elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") +- target_compile_definitions(libssh2 PRIVATE LIBSSH2_DARWIN) ++ target_compile_definitions(libssh2 PUBLIC LIBSSH2_DARWIN) + endif() + + if(MSVC) diff --git a/external_imported/vcpkg/ports/libssh2/0003-fix-openssl3.patch b/external_imported/vcpkg/ports/libssh2/0003-fix-openssl3.patch new file mode 100644 index 000000000..71aa61827 --- /dev/null +++ b/external_imported/vcpkg/ports/libssh2/0003-fix-openssl3.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/max_warnings.cmake b/cmake/max_warnings.cmake +index b176d30..e986461 100644 +--- a/cmake/max_warnings.cmake ++++ b/cmake/max_warnings.cmake +@@ -13,6 +13,8 @@ if(MSVC) + + # Disable broken warnings + add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996") + elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) + if(NOT CMAKE_CXX_FLAGS MATCHES "-Wall") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") diff --git a/external_imported/vcpkg/ports/libssh2/LICENSE b/external_imported/vcpkg/ports/libssh2/LICENSE deleted file mode 100644 index d629fbd3f..000000000 --- a/external_imported/vcpkg/ports/libssh2/LICENSE +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright (c) 2004-2007 Sara Golemon - * Copyright (c) 2005,2006 Mikhail Gusarov - * Copyright (c) 2006-2007 The Written Word, Inc. - * Copyright (c) 2007 Eli Fant - * Copyright (c) 2009-2014 Daniel Stenberg - * Copyright (C) 2008, 2009 Simon Josefsson - * All rights reserved. - * - * Redistribution and use in source and binary forms, - * with or without modification, are permitted provided - * that the following conditions are met: - * - * Redistributions of source code must retain the above - * copyright notice, this list of conditions and the - * following disclaimer. - * - * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * Neither the name of the copyright holder nor the names - * of any other contributors may be used to endorse or - * promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - */ \ No newline at end of file diff --git a/external_imported/vcpkg/ports/libssh2/portfile.cmake b/external_imported/vcpkg/ports/libssh2/portfile.cmake index 7949dc64e..d81f25812 100644 --- a/external_imported/vcpkg/ports/libssh2/portfile.cmake +++ b/external_imported/vcpkg/ports/libssh2/portfile.cmake @@ -4,29 +4,47 @@ vcpkg_from_github( REF libssh2-1.10.0 SHA512 615E28880695911F5700CC7AC3DDA6B894384C0B1D8B02B53C2EB58F1839F47211934A292F490AD7DDEF7E63F332E0EBF44F8E6334F64BE8D143C72032356C1F HEAD_REF master - PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-Fix-UWP.patch" + PATCHES + 0001-Fix-UWP.patch + 0002-fix-macros.patch + 0003-fix-openssl3.patch ) -vcpkg_configure_cmake( +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + zlib ENABLE_ZLIB_COMPRESSION +) + +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF - -DENABLE_ZLIB_COMPRESSION=ON + ${FEATURE_OPTIONS} OPTIONS_DEBUG -DENABLE_DEBUG_LOGGING=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libssh2) + +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libssh2.h" "ifdef LIBSSH2_WIN32" "if 1") + if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libssh2.h" "ifdef _WINDLL" "if 1") + else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libssh2.h" "ifdef _WINDLL" "if 0") + endif() +endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share") - -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libssh2) +# Do not delete the entire share directory as it contains the *-config.cmake files +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/man") -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libssh2" RENAME copyright) +vcpkg_fixup_pkgconfig() -vcpkg_copy_pdbs() +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/libssh2/vcpkg.json b/external_imported/vcpkg/ports/libssh2/vcpkg.json index 9dc048318..157bf7243 100644 --- a/external_imported/vcpkg/ports/libssh2/vcpkg.json +++ b/external_imported/vcpkg/ports/libssh2/vcpkg.json @@ -1,10 +1,30 @@ { "name": "libssh2", "version": "1.10.0", + "port-version": 4, "description": "libssh2 is a client-side C library implementing the SSH2 protocol.", "homepage": "https://www.libssh2.org", + "license": "BSD-3-Clause", "dependencies": [ "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ "zlib" - ] + ], + "features": { + "zlib": { + "description": "Use compressing via zlib", + "dependencies": [ + "zlib" + ] + } + } } diff --git a/external_imported/vcpkg/ports/libtcod/portfile.cmake b/external_imported/vcpkg/ports/libtcod/portfile.cmake index e28639eef..155042f52 100644 --- a/external_imported/vcpkg/ports/libtcod/portfile.cmake +++ b/external_imported/vcpkg/ports/libtcod/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libtcod/libtcod - REF 1.19.0 - SHA512 462c3deadaeaaf3adb44427d41c4e8c1acc2c37ef90677d8d60e8194f9c190bc7e02b0cf2b285e248171354f8d73f1dd28144cfe8a98a469e1071448bce9e68b + REF 1.20.1 + SHA512 bef3751dd1b190769163ff7c188479fe100d425fa98d3f0f97a3a81045fe0f0c24690b64bcde29f7af1eb7fd34915371223146598b1f0cab173e69a78c1dfc76 HEAD_REF develop ) diff --git a/external_imported/vcpkg/ports/libtcod/vcpkg.json b/external_imported/vcpkg/ports/libtcod/vcpkg.json index 2f3f2db95..8af4572e9 100644 --- a/external_imported/vcpkg/ports/libtcod/vcpkg.json +++ b/external_imported/vcpkg/ports/libtcod/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libtcod", - "version-semver": "1.19.0", + "version": "1.20.1", "maintainers": "Kyle Benesch <4b796c65+github@gmail.com>", "description": "Common algorithms and tools for roguelikes.", "homepage": "https://github.com/libtcod/libtcod", diff --git a/external_imported/vcpkg/ports/libtins/portfile.cmake b/external_imported/vcpkg/ports/libtins/portfile.cmake index 5c1d6781b..62cbde451 100644 --- a/external_imported/vcpkg/ports/libtins/portfile.cmake +++ b/external_imported/vcpkg/ports/libtins/portfile.cmake @@ -34,6 +34,14 @@ get_filename_component(LIBTINS_CMAKE_DIR "${LIBTINS_CMAKE_DIR}" PATH) set(LIBTINS_INCLUDE_DIRS "${LIBTINS_CMAKE_DIR}/include") ]]) +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/libtins/libtinsConfig.cmake" "\${LIBTINS_CMAKE_DIR}/libtinsTargets.cmake" "\${CMAKE_CURRENT_LIST_DIR}/libtinsTargets.cmake") + +if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/tins/macros.h" "!defined(TINS_STATIC)" "1") +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/tins/macros.h" "!defined(TINS_STATIC)" "0") +endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright diff --git a/external_imported/vcpkg/ports/libtins/vcpkg.json b/external_imported/vcpkg/ports/libtins/vcpkg.json index d7871cb21..c9a7daa96 100644 --- a/external_imported/vcpkg/ports/libtins/vcpkg.json +++ b/external_imported/vcpkg/ports/libtins/vcpkg.json @@ -1,8 +1,9 @@ { "name": "libtins", "version": "4.3", - "port-version": 4, + "port-version": 6, "description": "High-level, multiplatform C++ network packet sniffing and crafting library", + "license": "BSD-2-Clause", "supports": "!uwp", "dependencies": [ "boost-any", diff --git a/external_imported/vcpkg/ports/libtorrent/portfile.cmake b/external_imported/vcpkg/ports/libtorrent/portfile.cmake index 0c11403fc..d80fa99f7 100644 --- a/external_imported/vcpkg/ports/libtorrent/portfile.cmake +++ b/external_imported/vcpkg/ports/libtorrent/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - if(VCPKG_TARGET_IS_WINDOWS) # Building python bindings is currently broken on Windows if("python" IN_LIST FEATURES) @@ -21,42 +19,72 @@ vcpkg_check_features( tools build_tools ) -# Note: the python feature currently requires `python3-dev` and `python3-setuptools` installed on the system if("python" IN_LIST FEATURES) vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_PATH ${PYTHON3} DIRECTORY) vcpkg_add_to_path(${PYTHON3_PATH}) - file(GLOB BOOST_PYTHON_LIB "${CURRENT_INSTALLED_DIR}/lib/*boost_python*") string(REGEX REPLACE ".*(python)([0-9])([0-9]+).*" "\\1\\2\\3" _boost-python-module-name "${BOOST_PYTHON_LIB}") endif() vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO arvidn/libtorrent - REF 33a10d5a723a6c27d9baee7d9bf2028eb81c88ed # v1.2.14 - SHA512 7be169625c9ab1319047aa025abb36579cf6c749faeee7788b5c0ca24ca32d0a4bfd898415159b9133302da4d26230edcb5585c12137edcab8f5b3548c67a268 - HEAD_REF RC_1_2 + OUT_SOURCE_PATH SOURCE_PATH + REPO arvidn/libtorrent + REF 44e285c30f06772e48f515580f961998e1037b7e # v2.0.5 + SHA512 c7ce747930ab8c1852d0efdc6268d9faa39643abd6b6560b4b5e0b06a12ab207ec61ac301a0bcc7622521a8ae490cc02cbe0b6e43208bc216c08bf472b40cb85 + HEAD_REF RC_2_0 +) + +vcpkg_from_github( + OUT_SOURCE_PATH TRYSIGNAL_SOURCE_PATH + REPO arvidn/try_signal + REF 334fd139e2bb387017b42d36753a03935e3bca75 + SHA512 a25d439b2d979e975f9dd125a34072f70bfc7a08fab950e3829130742c05c584ae88d9f58fc0f1b4fa0b51df2c0e32c5b24c5828d53b121b4bc183a4c68d6a5a + HEAD_REF master +) + +vcpkg_from_github( + OUT_SOURCE_PATH ASIO_GNUTLS_SOURCE_PATH + REPO paullouisageneau/boost-asio-gnutls + REF a57d4d36923c5fafa9698e14be16b8bc2913700a + SHA512 1e093dd4e999cce9c6d74f1d4c2d20f73512258b83505c307c7d53b8c7ed15626a8e90c8e6a6280827aafa069bc233c0c6f4c9276f1c332e4b141c7c350c47c0 + HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_from_github( + OUT_SOURCE_PATH LIB_SIMULATOR_SOURCE_PATH + REPO arvidn/libsimulator + REF 64fb5b4fde1879abc09c018604d57e485a12e999 + SHA512 20b57eb436127028339528f34a9db7e7149d2c5d86149114444205370482d3f5284e76493f2fbc1c6904175e6482671bfcaeb98d0bee7d399e546abef02f32f3 + HEAD_REF master +) + +file(COPY ${TRYSIGNAL_SOURCE_PATH}/ DESTINATION ${SOURCE_PATH}/deps/try_signal) +file(COPY ${ASIO_GNUTLS_SOURCE_PATH}/ DESTINATION ${SOURCE_PATH}/deps/asio-gnutls) +file(COPY ${LIB_SIMULATOR_SOURCE_PATH}/ DESTINATION ${SOURCE_PATH}/simulation/libsimulator) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - ${FEATURE_OPTIONS} - -Dboost-python-module-name=${_boost-python-module-name} - -Dstatic_runtime=${_static_runtime} - -DPython3_USE_STATIC_LIBS=ON + ${FEATURE_OPTIONS} + -Dboost-python-module-name=${_boost-python-module-name} + -Dstatic_runtime=${_static_runtime} + -DPython3_USE_STATIC_LIBS=ON ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/LibtorrentRasterbar TARGET_PATH share/LibtorrentRasterbar) +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME LibtorrentRasterbar CONFIG_PATH lib/cmake/LibtorrentRasterbar) # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) # Do not duplicate include files -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/share/cmake) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/share/cmake") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() -vcpkg_fixup_pkgconfig() +vcpkg_fixup_pkgconfig() \ No newline at end of file diff --git a/external_imported/vcpkg/ports/libtorrent/vcpkg.json b/external_imported/vcpkg/ports/libtorrent/vcpkg.json index 7e0de91dd..4b9eac634 100644 --- a/external_imported/vcpkg/ports/libtorrent/vcpkg.json +++ b/external_imported/vcpkg/ports/libtorrent/vcpkg.json @@ -1,11 +1,11 @@ { "name": "libtorrent", - "version": "1.2.14", - "port-version": 1, + "version": "2.0.5", "maintainers": "Arvid Norberg ", "description": "An efficient feature complete C++ BitTorrent implementation", "homepage": "https://libtorrent.org", "documentation": "https://libtorrent.org/reference.html", + "license": "BSD-2-Clause", "supports": "!uwp & !(windows & arm)", "dependencies": [ "boost-asio", @@ -14,13 +14,23 @@ "boost-crc", "boost-date-time", "boost-iterator", + "boost-logic", + "boost-multi-index", "boost-multiprecision", "boost-pool", "boost-random", "boost-scope-exit", "boost-system", "boost-variant", - "openssl" + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "default-features": [ "iconv" diff --git a/external_imported/vcpkg/ports/libu2f-server/CMakeLists.txt b/external_imported/vcpkg/ports/libu2f-server/CMakeLists.txt index 5e1f50e52..8bff87243 100644 --- a/external_imported/vcpkg/ports/libu2f-server/CMakeLists.txt +++ b/external_imported/vcpkg/ports/libu2f-server/CMakeLists.txt @@ -9,6 +9,7 @@ add_library(libu2f-server ${LIBU2F_SERVER_SOURCE}) target_include_directories(libu2f-server PUBLIC $ $) target_compile_definitions(libu2f-server PRIVATE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_DEPRECATE) +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996") find_package(json-c CONFIG REQUIRED) find_package(OpenSSL REQUIRED) diff --git a/external_imported/vcpkg/ports/libu2f-server/vcpkg.json b/external_imported/vcpkg/ports/libu2f-server/vcpkg.json index b66f13cee..aade166cb 100644 --- a/external_imported/vcpkg/ports/libu2f-server/vcpkg.json +++ b/external_imported/vcpkg/ports/libu2f-server/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libu2f-server", - "version-string": "1.1.0", - "port-version": 3, + "version": "1.1.0", + "port-version": 4, "description": "Yubico Universal 2nd Factor (U2F) Server C Library", "homepage": "https://developers.yubico.com/libu2f-server/", "supports": "(x86 | x64) & windows", diff --git a/external_imported/vcpkg/ports/libudis86/CMakeLists.txt b/external_imported/vcpkg/ports/libudis86/CMakeLists.txt index 8f412cf90..fb47dd7f9 100644 --- a/external_imported/vcpkg/ports/libudis86/CMakeLists.txt +++ b/external_imported/vcpkg/ports/libudis86/CMakeLists.txt @@ -2,6 +2,9 @@ cmake_minimum_required (VERSION 3.9) project (udis86) +if (MSVC) + add_definitions(-D_CRT_SECURE_NO_WARNINGS) +endif() set( lib_sources diff --git a/external_imported/vcpkg/ports/libudis86/fix-macbuild.patch b/external_imported/vcpkg/ports/libudis86/fix-macbuild.patch new file mode 100644 index 000000000..c9bf1a932 --- /dev/null +++ b/external_imported/vcpkg/ports/libudis86/fix-macbuild.patch @@ -0,0 +1,37 @@ +diff --git a/libudis86/udis86.c b/libudis86/udis86.c +index e039c4e..8459012 100644 +--- a/libudis86/udis86.c ++++ b/libudis86/udis86.c +@@ -34,6 +34,10 @@ + # endif + #endif /* !__UD_STANDALONE__ */ + ++#if defined(__APPLE__) ++# include ++#endif ++ + static void ud_inp_init(struct ud *u); + + /* ============================================================================= +diff --git a/udcli/udcli.c b/udcli/udcli.c +index 9b044ca..ad1e4ab 100644 +--- a/udcli/udcli.c ++++ b/udcli/udcli.c +@@ -27,13 +27,11 @@ + #include + #include + #include +-#ifdef _MSC_VER +-#include "..\udis86.h" +-#define PACKAGE_STRING "udis86 pre-1.8" +-#else + #include +-#include +-#endif ++#define PACKAGE_STRING "udis86 pre-1.8" ++#ifdef HAVE_CONFIG_H ++# include ++#endif /* HAVE_CONFIG_H */ + + #if defined(__APPLE__) + # define FMT64 "ll" diff --git a/external_imported/vcpkg/ports/libudis86/portfile.cmake b/external_imported/vcpkg/ports/libudis86/portfile.cmake index 42d99d38a..991b8039c 100644 --- a/external_imported/vcpkg/ports/libudis86/portfile.cmake +++ b/external_imported/vcpkg/ports/libudis86/portfile.cmake @@ -4,9 +4,10 @@ vcpkg_from_github( REF 56ff6c87c11de0ffa725b14339004820556e343d SHA512 7a98333f9310f5f0466294bd980f03f9269c118a7557832015c59a7b6349a0eeab5642e0e6598d0be76d71f5d2d566d8b8af0ec75c26bdcff45646d60ff18e3a HEAD_REF master + PATCHES fix-macbuild.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") vcpkg_find_acquire_program(PYTHON2) @@ -16,16 +17,15 @@ vcpkg_execute_required_process( LOGNAME python-${TARGET_TRIPLET}-generate-sources ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -DDISABLE_INSTALL_TOOLS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/libudis86) +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) -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/libudis86/vcpkg.json b/external_imported/vcpkg/ports/libudis86/vcpkg.json index a687a4104..c642dfaf4 100644 --- a/external_imported/vcpkg/ports/libudis86/vcpkg.json +++ b/external_imported/vcpkg/ports/libudis86/vcpkg.json @@ -1,7 +1,13 @@ { "name": "libudis86", "version-string": "2018-01-28-56ff6c87", - "port-version": 1, + "port-version": 2, "description": "Disassembler Library for x86 and x86-64", - "homepage": "https://github.com/vmt/udis86" + "homepage": "https://github.com/vmt/udis86", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/libunistring/portfile.cmake b/external_imported/vcpkg/ports/libunistring/portfile.cmake index e9eef0641..e16d0a5ba 100644 --- a/external_imported/vcpkg/ports/libunistring/portfile.cmake +++ b/external_imported/vcpkg/ports/libunistring/portfile.cmake @@ -1,10 +1,6 @@ set(LIBUNISTRING_VERSION 0.9.10) set(LIBUNISTRING_FILENAME libunistring-${LIBUNISTRING_VERSION}.tar.gz) -if(NOT VCPKG_TARGET_IS_MINGW) - vcpkg_fail_port_install(ON_TARGET "Windows" "UWP") -endif() - vcpkg_download_distfile(ARCHIVE URLS "https://ftp.gnu.org/gnu/libunistring/${LIBUNISTRING_FILENAME}" diff --git a/external_imported/vcpkg/ports/libunistring/vcpkg.json b/external_imported/vcpkg/ports/libunistring/vcpkg.json index 585ddca79..c2aa59fc2 100644 --- a/external_imported/vcpkg/ports/libunistring/vcpkg.json +++ b/external_imported/vcpkg/ports/libunistring/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libunistring", "version": "0.9.10", - "port-version": 1, + "port-version": 2, "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", diff --git a/external_imported/vcpkg/ports/liburing/portfile.cmake b/external_imported/vcpkg/ports/liburing/portfile.cmake index 304bef5ec..276f68fb4 100644 --- a/external_imported/vcpkg/ports/liburing/portfile.cmake +++ b/external_imported/vcpkg/ports/liburing/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "windows" "uwp" "osx" "ios" "android") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO axboe/liburing @@ -15,14 +13,13 @@ vcpkg_from_github( vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} COPY_SOURCE - NO_DEBUG ) vcpkg_install_make() vcpkg_fixup_pkgconfig() -file(INSTALL ${SOURCE_PATH}/LICENSE +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${CURRENT_PORT_DIR}/usage +file(INSTALL ${CURRENT_PORT_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) # note: {SOURCE_PATH}/src/Makefile makes liburing.so from liburing.a. diff --git a/external_imported/vcpkg/ports/liburing/usage b/external_imported/vcpkg/ports/liburing/usage index 36a718895..bbfbaafbf 100644 --- a/external_imported/vcpkg/ports/liburing/usage +++ b/external_imported/vcpkg/ports/liburing/usage @@ -1,6 +1,6 @@ The package liburing can be imported via CMake FindPkgConfig module: - include(FindPkgConfig) + find_package(PkgConfig) pkg_check_modules(liburing REQUIRED IMPORTED_TARGET GLOBAL liburing>=2.0) target_link_libraries(main PRIVATE PkgConfig::liburing) diff --git a/external_imported/vcpkg/ports/liburing/vcpkg.json b/external_imported/vcpkg/ports/liburing/vcpkg.json index e2bb1b53e..37403d70c 100644 --- a/external_imported/vcpkg/ports/liburing/vcpkg.json +++ b/external_imported/vcpkg/ports/liburing/vcpkg.json @@ -1,6 +1,7 @@ { "name": "liburing", "version": "2.0", + "port-version": 3, "description": "Linux-native io_uring I/O access library", "homepage": "https://github.com/axboe/liburing", "supports": "linux" diff --git a/external_imported/vcpkg/ports/libusb-win32/portfile.cmake b/external_imported/vcpkg/ports/libusb-win32/portfile.cmake index 1cca3bedb..cbfe2b1eb 100644 --- a/external_imported/vcpkg/ports/libusb-win32/portfile.cmake +++ b/external_imported/vcpkg/ports/libusb-win32/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "Linux" "OSX") - set(LIBUSB_VERSION 1.2.6.0) set(LIBUSB_HASH 972438b7465a22882bc91a1238291240ee3cdb09f374454a027d003b150656d4c262553104f74418bb49b4a7ca2f1a4f72d20e689fa3a7728881bafc876267f4) diff --git a/external_imported/vcpkg/ports/libusb-win32/vcpkg.json b/external_imported/vcpkg/ports/libusb-win32/vcpkg.json index 462fd2322..9cbe7bc35 100644 --- a/external_imported/vcpkg/ports/libusb-win32/vcpkg.json +++ b/external_imported/vcpkg/ports/libusb-win32/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libusb-win32", "version-string": "1.2.6.0", - "port-version": 7, + "port-version": 8, "description": "Allows user space applications to access many USB device on Windows.", "homepage": "https://sourceforge.net/projects/libusb-win32", "supports": "windows" diff --git a/external_imported/vcpkg/ports/libusbmuxd/portfile.cmake b/external_imported/vcpkg/ports/libusbmuxd/portfile.cmake index 5ad0cb01f..92a82472d 100644 --- a/external_imported/vcpkg/ports/libusbmuxd/portfile.cmake +++ b/external_imported/vcpkg/ports/libusbmuxd/portfile.cmake @@ -1,9 +1,7 @@ -vcpkg_fail_port_install( ON_TARGET "uwp" "linux" "osx") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libimobiledevice-win32/libusbmuxd - REF ac86b23f57879b8b702f3712ba66729008d059a3 # v1.2.219 + REF ac86b23f57879b8b702f3712ba66729008d059a3 # v1.2.219 SHA512 ced85088bc6ebb416ccb635d6b4e79662fb34f427d869b64b61847e5fde7b4ae094cebb1f7916d9387c314aeb84106a618fbd7497dc4b36151b236dcb55bd0e4 HEAD_REF msvc-master PATCHES fix-win-build.patch diff --git a/external_imported/vcpkg/ports/libusbmuxd/vcpkg.json b/external_imported/vcpkg/ports/libusbmuxd/vcpkg.json index f9bfb7f9f..894b846af 100644 --- a/external_imported/vcpkg/ports/libusbmuxd/vcpkg.json +++ b/external_imported/vcpkg/ports/libusbmuxd/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libusbmuxd", - "version-string": "1.2.219", - "port-version": 1, + "version": "1.2.219", + "port-version": 2, "description": "A client library to multiplex connections from and to iOS devices", "supports": "!(uwp | linux | osx)", "dependencies": [ diff --git a/external_imported/vcpkg/ports/libuuid/portfile.cmake b/external_imported/vcpkg/ports/libuuid/portfile.cmake index e989ce53f..7ed5400c2 100644 --- a/external_imported/vcpkg/ports/libuuid/portfile.cmake +++ b/external_imported/vcpkg/ports/libuuid/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports unix platform" ON_TARGET "Windows") - set(LIBUUID_VERSION 1.0.3) vcpkg_from_sourceforge( diff --git a/external_imported/vcpkg/ports/libuuid/vcpkg.json b/external_imported/vcpkg/ports/libuuid/vcpkg.json index ef05a235e..0abea1e93 100644 --- a/external_imported/vcpkg/ports/libuuid/vcpkg.json +++ b/external_imported/vcpkg/ports/libuuid/vcpkg.json @@ -1,8 +1,8 @@ { "name": "libuuid", "version": "1.0.3", - "port-version": 9, + "port-version": 11, "description": "Universally unique id library", "homepage": "https://sourceforge.net/projects/libuuid", - "supports": "linux | osx" + "supports": "!osx & !windows" } diff --git a/external_imported/vcpkg/ports/libuv/portfile.cmake b/external_imported/vcpkg/ports/libuv/portfile.cmake index 6c2c384bb..8b927ae80 100644 --- a/external_imported/vcpkg/ports/libuv/portfile.cmake +++ b/external_imported/vcpkg/ports/libuv/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libuv/libuv - REF 6ce14710da7079eb248868171f6343bc409ea3a4 # v1.42.0 - SHA512 305b0e8beb9372d22b767f1f792c6351d4b2d747b31cda95a4657cfca101806a17dd0bfab2039d22e29387c9d5ee376fe1b22d63aba1baf0d88817cbcacd97b8 + REF v1.43.0 + SHA512 66ee11f8f6fc1313c432858572789cf67acd6364b29a06c73323ab20626e2d6e3d3dcea748cf5d9d4368b40ad7fe0d5fd35e9369c22e531db523703f005248d3 HEAD_REF v1.x ) diff --git a/external_imported/vcpkg/ports/libuv/vcpkg.json b/external_imported/vcpkg/ports/libuv/vcpkg.json index c1ebc4f1a..5b11cc1fd 100644 --- a/external_imported/vcpkg/ports/libuv/vcpkg.json +++ b/external_imported/vcpkg/ports/libuv/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libuv", - "version-semver": "1.42.0", - "port-version": 2, + "version-semver": "1.43.0", "description": "libuv is a multi-platform support library with a focus on asynchronous I/O.", "homepage": "https://github.com/libuv/libuv", "dependencies": [ diff --git a/external_imported/vcpkg/ports/libvmdk/portfile.cmake b/external_imported/vcpkg/ports/libvmdk/portfile.cmake index 505d5e68c..1aac7f717 100644 --- a/external_imported/vcpkg/ports/libvmdk/portfile.cmake +++ b/external_imported/vcpkg/ports/libvmdk/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - set(LIB_VERSION 20200926) set(LIB_FILENAME libvmdk-alpha-${LIB_VERSION}.tar.gz) diff --git a/external_imported/vcpkg/ports/libvmdk/vcpkg.json b/external_imported/vcpkg/ports/libvmdk/vcpkg.json index e8211d6c6..9a9f7f705 100644 --- a/external_imported/vcpkg/ports/libvmdk/vcpkg.json +++ b/external_imported/vcpkg/ports/libvmdk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libvmdk", "version-string": "20200926", - "port-version": 1, + "port-version": 2, "description": "Library and tools to access the VMware Virtual Disk (VMDK) format", "homepage": "https://github.com/libyal/libvmdk", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/libvorbis/0003-def-mingw-compat.patch b/external_imported/vcpkg/ports/libvorbis/0003-def-mingw-compat.patch new file mode 100644 index 000000000..f1622d982 --- /dev/null +++ b/external_imported/vcpkg/ports/libvorbis/0003-def-mingw-compat.patch @@ -0,0 +1,33 @@ +diff --git a/win32/vorbis.def b/win32/vorbis.def +index 1310b6c..de14385 100644 +--- a/win32/vorbis.def ++++ b/win32/vorbis.def +@@ -1,6 +1,5 @@ + ; vorbis.def + ; +-LIBRARY + EXPORTS + _floor_P + _mapping_P +diff --git a/win32/vorbisenc.def b/win32/vorbisenc.def +index 79af064..40a3e39 100644 +--- a/win32/vorbisenc.def ++++ b/win32/vorbisenc.def +@@ -1,6 +1,5 @@ + ; vorbisenc.def + ; +-LIBRARY + + EXPORTS + vorbis_encode_init +diff --git a/win32/vorbisfile.def b/win32/vorbisfile.def +index 4dc5549..243795d 100644 +--- a/win32/vorbisfile.def ++++ b/win32/vorbisfile.def +@@ -1,6 +1,5 @@ + ; vorbisfile.def + ; +-LIBRARY + EXPORTS + ov_clear + ov_open diff --git a/external_imported/vcpkg/ports/libvorbis/portfile.cmake b/external_imported/vcpkg/ports/libvorbis/portfile.cmake index a015e0e8c..95f2825b7 100644 --- a/external_imported/vcpkg/ports/libvorbis/portfile.cmake +++ b/external_imported/vcpkg/ports/libvorbis/portfile.cmake @@ -7,24 +7,19 @@ vcpkg_from_github( PATCHES 0001-Dont-export-vorbisenc-functions.patch 0002-Fixup-pkgconfig-libs.patch + 0003-def-mingw-compat.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/Vorbis - TARGET_PATH share/Vorbis -) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -# Handle copyright -configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) - +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME Vorbis CONFIG_PATH "lib/cmake/Vorbis") +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/libvorbis/usage b/external_imported/vcpkg/ports/libvorbis/usage new file mode 100644 index 000000000..c20766a90 --- /dev/null +++ b/external_imported/vcpkg/ports/libvorbis/usage @@ -0,0 +1,13 @@ +The package libvorbis provides CMake targets: + + # Vorbis reference encoder and decoder, low-level API + find_package(Vorbis CONFIG REQUIRED) + target_link_libraries(main PRIVATE Vorbis::vorbis) + + # Audio stream decoding and basic manipulation, high-level API + find_package(Vorbis CONFIG REQUIRED) + target_link_libraries(main PRIVATE Vorbis::vorbisfile) + + # Convenience API for setting up an encoding environment + find_package(Vorbis CONFIG REQUIRED) + target_link_libraries(main PRIVATE Vorbis::vorbisenc) diff --git a/external_imported/vcpkg/ports/libvorbis/vcpkg.json b/external_imported/vcpkg/ports/libvorbis/vcpkg.json index af19c1851..65c5edd85 100644 --- a/external_imported/vcpkg/ports/libvorbis/vcpkg.json +++ b/external_imported/vcpkg/ports/libvorbis/vcpkg.json @@ -1,11 +1,19 @@ { "name": "libvorbis", - "version-string": "1.3.7", - "port-version": 1, + "version": "1.3.7", + "port-version": 2, "description": "Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free, general-purpose compressed audio format", "homepage": "https://github.com/xiph/vorbis", "license": "BSD-3-Clause", "dependencies": [ - "libogg" + "libogg", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/libwandio/configure.lib.patch b/external_imported/vcpkg/ports/libwandio/configure.lib.patch index 3898836b7..7c0d1651b 100644 --- a/external_imported/vcpkg/ports/libwandio/configure.lib.patch +++ b/external_imported/vcpkg/ports/libwandio/configure.lib.patch @@ -56,7 +56,7 @@ index 4579fbb3d..f6be008c8 100644 [ - AC_CHECK_HEADER(lzma.h, have_lzma=yes, have_lzma=no) + # AC_CHECK_HEADER(lzma.h, have_lzma=yes, have_lzma=no) -+ AC_SEARCH_LIBS(lzma_free, [lzma lzmad], have_lzma=yes, have_lzma=no) ++ AC_SEARCH_LIBS(lzma_free, [lzma], have_lzma=yes, have_lzma=no) ], [have_lzma=no]) AS_IF([test "x$have_lzma" = "xyes"], [ @@ -67,23 +67,6 @@ index 4579fbb3d..f6be008c8 100644 fi AC_DEFINE(HAVE_LIBLZMA, 1, "Compiled with lzma support") with_lzma=yes], -@@ -215,12 +219,13 @@ AC_ARG_WITH([zstd], - - AS_IF([test "x$with_zstd" != "xno"], - [ -- AC_CHECK_LIB(zstd, ZSTD_createDStream, have_zstd=yes, have_zstd=no) -+ AC_SEARCH_LIBS(ZSTD_createDStream, [zstd zstdd], have_zstd=yes, have_zstd=no) -+ # AC_CHECK_LIB(zstd, ZSTD_createDStream, have_zstd=yes, have_zstd=no) - ], [have_zstd=no]) - - AS_IF([test "x$have_zstd" = "xyes"], [ -- if test "$ac_cv_lib_zstd_code" != "none required"; then -- LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lzstd" -+ if test "$ac_cv_search_ZSTD_createDStream" != "none required"; then -+ LIBWANDIO_LIBS="$LIBWANDIO_LIBS $ac_cv_search_ZSTD_createDStream" - fi - AC_DEFINE(HAVE_LIBZSTD, 1, "Compiled with zstd support") - with_zstd=yes], @@ -259,25 +264,28 @@ AC_ARG_WITH([lz4], AS_IF([test "x$with_lz4" != "xno"], diff --git a/external_imported/vcpkg/ports/libwandio/vcpkg.json b/external_imported/vcpkg/ports/libwandio/vcpkg.json index 94c493eca..6c682a7c3 100644 --- a/external_imported/vcpkg/ports/libwandio/vcpkg.json +++ b/external_imported/vcpkg/ports/libwandio/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libwandio", - "version-string": "4.2.1", - "port-version": 4, + "version": "4.2.1", + "port-version": 6, "description": "C library for simple and efficient file IO.", "homepage": "https://github.com/wanduow/wandio", + "license": "LGPL-3.0-only", "supports": "!windows", "dependencies": [ "bzip2", diff --git a/external_imported/vcpkg/ports/libwebsockets/fix-build-error.patch b/external_imported/vcpkg/ports/libwebsockets/fix-build-error.patch index 0bab319af..b8590d212 100644 --- a/external_imported/vcpkg/ports/libwebsockets/fix-build-error.patch +++ b/external_imported/vcpkg/ports/libwebsockets/fix-build-error.patch @@ -19,7 +19,7 @@ index 1e737e5..75534c1 100644 add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE) # Fail the build if any warnings - add_compile_options(/W3 /WX) -+ add_compile_options(/W3 /WX /wd4142 /wd4267) ++ add_compile_options(/W3 /WX /wd4142 /wd4267 /wd4996) endif(MSVC) if (MINGW) diff --git a/external_imported/vcpkg/ports/libwebsockets/fix-find-openssl.patch b/external_imported/vcpkg/ports/libwebsockets/fix-find-openssl.patch new file mode 100644 index 000000000..4bd45af3b --- /dev/null +++ b/external_imported/vcpkg/ports/libwebsockets/fix-find-openssl.patch @@ -0,0 +1,11 @@ +diff --git a/lib/tls/CMakeLists.txt b/lib/tls/CMakeLists.txt +--- a/lib/tls/CMakeLists.txt (revision a5aae049b2a386712e1be3b417915c0d44c7e675) ++++ b/lib/tls/CMakeLists.txt (date 1642427956730) +@@ -257,7 +257,6 @@ + find_package(PkgConfig QUIET) + pkg_check_modules(PC_OPENSSL openssl QUIET) + find_package(OpenSSL REQUIRED) +- list(APPEND OPENSSL_LIBRARIES ${PC_OPENSSL_LIBRARIES}) + set(OPENSSL_LIBRARIES ${OPENSSL_LIBRARIES} PARENT_SCOPE) + endif() + set(OPENSSL_INCLUDE_DIRS "${OPENSSL_INCLUDE_DIR}") diff --git a/external_imported/vcpkg/ports/libwebsockets/portfile.cmake b/external_imported/vcpkg/ports/libwebsockets/portfile.cmake index 1e16e87a8..6307aa306 100644 --- a/external_imported/vcpkg/ports/libwebsockets/portfile.cmake +++ b/external_imported/vcpkg/ports/libwebsockets/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO warmcat/libwebsockets @@ -10,6 +8,7 @@ vcpkg_from_github( fix-dependency-libuv.patch fix-build-error.patch export-include-path.patch + fix-find-openssl.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LWS_WITH_STATIC) @@ -132,9 +131,15 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LWS_WITH_SHARED) # option(LWS_WITH_LWS_DSH "Support lws_dsh_t Disordered Shared Heap" OFF) ## +set(EXTRA_ARGS) +if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32") + set(EXTRA_ARGS "-DLWS_WITH_LIBUV=ON") +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + ${EXTRA_ARGS} -DLWS_WITH_STATIC=${LWS_WITH_STATIC} -DLWS_WITH_SHARED=${LWS_WITH_SHARED} -DLWS_WITH_GENCRYPTO=ON @@ -144,7 +149,6 @@ vcpkg_cmake_configure( -DLWS_IPV6=ON -DLWS_WITH_HTTP2=ON -DLWS_WITH_HTTP_STREAM_COMPRESSION=ON # Since zlib is already a dependency - -DLWS_WITH_LIBUV=ON -DLWS_WITH_EXTERNAL_POLL=ON # OPTIONS_RELEASE -DOPTIMIZE=1 # OPTIONS_DEBUG -DDEBUGGABLE=1 diff --git a/external_imported/vcpkg/ports/libwebsockets/vcpkg.json b/external_imported/vcpkg/ports/libwebsockets/vcpkg.json index 611844fee..2e4b95825 100644 --- a/external_imported/vcpkg/ports/libwebsockets/vcpkg.json +++ b/external_imported/vcpkg/ports/libwebsockets/vcpkg.json @@ -1,11 +1,15 @@ { "name": "libwebsockets", "version-semver": "4.3.0", + "port-version": 3, "description": "Libwebsockets is a lightweight pure C library built to use minimal CPU and memory resources, and provide fast throughput in both directions as client or server.", "homepage": "https://github.com/warmcat/libwebsockets", "supports": "!uwp", "dependencies": [ - "libuv", + { + "name": "libuv", + "platform": "!emscripten" + }, "openssl", "pthreads", { diff --git a/external_imported/vcpkg/ports/libxdiff/portfile.cmake b/external_imported/vcpkg/ports/libxdiff/portfile.cmake index 05b7ade35..e0813a120 100644 --- a/external_imported/vcpkg/ports/libxdiff/portfile.cmake +++ b/external_imported/vcpkg/ports/libxdiff/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports being built for desktop" ON_TARGET "UWP") - set(LIBXDIFF_REF 77e30f3190685efd87cce2c9c5d688cbaa1b0134) set(LIBXDIFF_SHA512 c559b575e6d6f06f3b3064f3e077a15d8f57422340199215a4cbd7beab527bc250347c8779a8d6f8c4e41799a032431e83c7336f86569527ab754444455b8c87) @@ -31,7 +29,7 @@ if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) endif() -if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release) +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release) if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/xdiff.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/xdiff.dll") diff --git a/external_imported/vcpkg/ports/libxdiff/vcpkg.json b/external_imported/vcpkg/ports/libxdiff/vcpkg.json index ab48b66ba..40e9f6d3e 100644 --- a/external_imported/vcpkg/ports/libxdiff/vcpkg.json +++ b/external_imported/vcpkg/ports/libxdiff/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libxdiff", - "version-string": "0.23", - "port-version": 1, + "version": "0.23", + "port-version": 2, "description": "The LibXDiff library implements basic and yet complete functionalities to create file differences/patches to both binary and text files. The library uses memory files as file abstraction to achieve both performance and portability.", "homepage": "https://github.com/Drako/libxdiff", "supports": "!uwp" diff --git a/external_imported/vcpkg/ports/libxml2/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/libxml2/vcpkg-cmake-wrapper.cmake index f80be639a..dede4c831 100644 --- a/external_imported/vcpkg/ports/libxml2/vcpkg-cmake-wrapper.cmake +++ b/external_imported/vcpkg/ports/libxml2/vcpkg-cmake-wrapper.cmake @@ -40,7 +40,7 @@ if(LibXml2_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT ${ARGV0 endif() endif() if(TARGET LibXml2::LibXml2) - set_property(TARGET LibXml2::LibXml2 APPEND PROPERTY INTERFACE_LINK_LIBRARIES "liblzma::liblzma" "ZLIB::ZLIB") + 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() diff --git a/external_imported/vcpkg/ports/libxml2/vcpkg.json b/external_imported/vcpkg/ports/libxml2/vcpkg.json index 68cb1e3eb..b28e844f3 100644 --- a/external_imported/vcpkg/ports/libxml2/vcpkg.json +++ b/external_imported/vcpkg/ports/libxml2/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libxml2", "version-semver": "2.9.12", - "port-version": 4, + "port-version": 5, "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", "dependencies": [ "libiconv", "liblzma", diff --git a/external_imported/vcpkg/ports/libxmp-lite/portfile.cmake b/external_imported/vcpkg/ports/libxmp-lite/portfile.cmake index 4f3ce6339..abcad6008 100644 --- a/external_imported/vcpkg/ports/libxmp-lite/portfile.cmake +++ b/external_imported/vcpkg/ports/libxmp-lite/portfile.cmake @@ -10,14 +10,13 @@ vcpkg_from_sourceforge( 0001-msvc-buildfix.patch 0002-fix-symbols.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -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) diff --git a/external_imported/vcpkg/ports/libxmp-lite/vcpkg.json b/external_imported/vcpkg/ports/libxmp-lite/vcpkg.json index ec4ffce78..3e0d85044 100644 --- a/external_imported/vcpkg/ports/libxmp-lite/vcpkg.json +++ b/external_imported/vcpkg/ports/libxmp-lite/vcpkg.json @@ -1,7 +1,14 @@ { "name": "libxmp-lite", - "version-string": "4.4.1", - "port-version": 7, + "version": "4.4.1", + "port-version": 8, "description": "Lightweight version of libxmp that supports MOD, S3M, XM and IT modules.", - "homepage": "https://sourceforge.net/projects/xmp/" + "homepage": "https://sourceforge.net/projects/xmp/", + "supports": "windows", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/libxslt/0001-Fix-makefile.patch b/external_imported/vcpkg/ports/libxslt/0001-Fix-makefile.patch index db638886b..65433e0d7 100644 --- a/external_imported/vcpkg/ports/libxslt/0001-Fix-makefile.patch +++ b/external_imported/vcpkg/ports/libxslt/0001-Fix-makefile.patch @@ -8,11 +8,11 @@ index 2e4742bb..8bfe7d83 100644 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 ++LIBS = iconv.lib charset.lib ws2_32.lib lzma.lib +!if "$(DEBUG)" == "1" -+LIBS = $(LIBS) zlibd.lib lzmad.lib ++LIBS = $(LIBS) zlibd.lib +!else -+LIBS = $(LIBS) zlib.lib lzma.lib ++LIBS = $(LIBS) zlib.lib +!endif # The archiver and its options. diff --git a/external_imported/vcpkg/ports/libxslt/vcpkg.json b/external_imported/vcpkg/ports/libxslt/vcpkg.json index 99ea78fa8..03e3bc74b 100644 --- a/external_imported/vcpkg/ports/libxslt/vcpkg.json +++ b/external_imported/vcpkg/ports/libxslt/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libxslt", "version": "1.1.34", - "port-version": 3, + "port-version": 4, "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", diff --git a/external_imported/vcpkg/ports/licensepp/portfile.cmake b/external_imported/vcpkg/ports/licensepp/portfile.cmake index aa4d00969..c7e3fe3da 100644 --- a/external_imported/vcpkg/ports/licensepp/portfile.cmake +++ b/external_imported/vcpkg/ports/licensepp/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/external_imported/vcpkg/ports/licensepp/vcpkg.json b/external_imported/vcpkg/ports/licensepp/vcpkg.json index 04de78675..6365f1567 100644 --- a/external_imported/vcpkg/ports/licensepp/vcpkg.json +++ b/external_imported/vcpkg/ports/licensepp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "licensepp", - "version-string": "2020-05-19", - "port-version": 2, + "version-date": "2020-05-19", + "port-version": 3, "description": "Cross platform software licensing library", "homepage": "https://github.com/zuhd-org/licensepp", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/lilv/portfile.cmake b/external_imported/vcpkg/ports/lilv/portfile.cmake index 858c6c3bf..2bb18d898 100644 --- a/external_imported/vcpkg/ports/lilv/portfile.cmake +++ b/external_imported/vcpkg/ports/lilv/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_gitlab( GITLAB_URL https://gitlab.com OUT_SOURCE_PATH SOURCE_PATH diff --git a/external_imported/vcpkg/ports/lilv/vcpkg.json b/external_imported/vcpkg/ports/lilv/vcpkg.json index bcebc1eca..aab088cc0 100644 --- a/external_imported/vcpkg/ports/lilv/vcpkg.json +++ b/external_imported/vcpkg/ports/lilv/vcpkg.json @@ -1,6 +1,7 @@ { "name": "lilv", - "version-string": "0.24.10", + "version": "0.24.10", + "port-version": 1, "description": "Lilv is a C library for simple use of LV2 plugins in applications.", "homepage": "https://drobilla.net/software/lilv", "license": "ISC", diff --git a/external_imported/vcpkg/ports/lionkor-commandline/add-install.patch b/external_imported/vcpkg/ports/lionkor-commandline/add-install.patch new file mode 100644 index 000000000..5b7947373 --- /dev/null +++ b/external_imported/vcpkg/ports/lionkor-commandline/add-install.patch @@ -0,0 +1,10 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b4db57c..7ace55c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -22,3 +22,5 @@ if(BUILD_EXAMPLES) + target_link_libraries(test commandline) + endif() + ++set_target_properties(commandline PROPERTIES PUBLIC_HEADER "commandline.h") ++install(TARGETS commandline RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib PUBLIC_HEADER DESTINATION include) diff --git a/external_imported/vcpkg/ports/lionkor-commandline/portfile.cmake b/external_imported/vcpkg/ports/lionkor-commandline/portfile.cmake new file mode 100644 index 000000000..51232f1b4 --- /dev/null +++ b/external_imported/vcpkg/ports/lionkor-commandline/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO lionkor/commandline + REF 01434c11aaf82d37a126dc70f5aa02cc523dbbb4 + SHA512 fb9554c07d13aa4c5d84f8288ad39e67ab302da4b286172e0f8fbc22b351234a83fb60f1c085a238d10477a379fded32302338cbddbe7ee0fdda54c6c4a75593 + HEAD_REF master + PATCHES + add-install.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_EXAMPLES=OFF +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/lionkor-commandline/vcpkg.json b/external_imported/vcpkg/ports/lionkor-commandline/vcpkg.json new file mode 100644 index 000000000..f9256896c --- /dev/null +++ b/external_imported/vcpkg/ports/lionkor-commandline/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "lionkor-commandline", + "version-semver": "2.0.0", + "description": "A C++ commandline for use in servers and chat software. Provides very simple asynchronous input/output.", + "homepage": "https://github.com/lionkor/commandline/", + "license": "MIT", + "supports": "!osx & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/llfio/issue-83-fix-backport.patch b/external_imported/vcpkg/ports/llfio/issue-83-fix-backport.patch new file mode 100644 index 000000000..dbf4c53a9 --- /dev/null +++ b/external_imported/vcpkg/ports/llfio/issue-83-fix-backport.patch @@ -0,0 +1,35 @@ +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 ae182ea9e..f896ba239 100644 --- a/external_imported/vcpkg/ports/llfio/portfile.cmake +++ b/external_imported/vcpkg/ports/llfio/portfile.cmake @@ -1,25 +1,29 @@ -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. -]=]) +if (NOT "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. + ]=]) +endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ned14/llfio - REF fba45d6bacbdc7710e257a0b3d229fe3ef3a1f5d - SHA512 d80e132a5b46859bf64d3808bfdc35331e6efd0668c297b7daf8c1453df00c5b8749103ad558456cfd71e9b5bd5b3bf7a1934871e64695bd97f90f2e04cd5621 + REF 4a117d683b82a2e3e456c2ecc47a99c8406280fa + SHA512 7880356dbff10664a146a09558ba15f95cf6883ebe8e0af3d392fbd6f86f3455b9b5c8b6c5c1281c8fca93c358fcafd3468ab575eee0b483ec5b136ca59eef04 HEAD_REF develop + PATCHES + # https://github.com/ned14/llfio/issues/83 + # To be removed on next update + issue-83-fix-backport.patch ) -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_from_github( - OUT_SOURCE_PATH NTKEC_SOURCE_PATH - REPO ned14/ntkernel-error-category - REF bbd44623594142155d49bd3ce8820d3cf9da1e1e - SHA512 589d3bc7bca98ca8d05ce9f5cf009dd98b8884bdf3739582f2f6cbf5a324ce95007ea041450ed935baa4a401b4a0242c181fb6d2dcf7ad91587d75f05491f50e - HEAD_REF master - ) -endif() +vcpkg_from_github( + OUT_SOURCE_PATH NTKEC_SOURCE_PATH + REPO ned14/ntkernel-error-category + REF bbd44623594142155d49bd3ce8820d3cf9da1e1e + SHA512 589d3bc7bca98ca8d05ce9f5cf009dd98b8884bdf3739582f2f6cbf5a324ce95007ea041450ed935baa4a401b4a0242c181fb6d2dcf7ad91587d75f05491f50e + HEAD_REF master +) vcpkg_check_features( OUT_FEATURE_OPTIONS LLFIO_FEATURE_OPTIONS @@ -27,61 +31,57 @@ vcpkg_check_features( status-code LLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE ) -# LLFIO 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/" -) - # LLFIO expects ntkernel-error-category to live inside its include directory file(REMOVE_RECURSE "${SOURCE_PATH}/include/llfio/ntkernel-error-category") -if(VCPKG_TARGET_IS_WINDOWS) - file(RENAME "${NTKEC_SOURCE_PATH}" "${SOURCE_PATH}/include/llfio/ntkernel-error-category") -endif() - -# Already installed dependencies don't appear on the include path, which LLFIO assumes. -string(APPEND VCPKG_CXX_FLAGS " \"-I${CURRENT_INSTALLED_DIR}/include\"") -string(APPEND VCPKG_C_FLAGS " \"-I${CURRENT_INSTALLED_DIR}/include\"") +file(RENAME "${NTKEC_SOURCE_PATH}" "${SOURCE_PATH}/include/llfio/ntkernel-error-category") set(extra_config) # cmake does not correctly set CMAKE_SYSTEM_PROCESSOR when targeting ARM on Windows if(VCPKG_TARGET_IS_WINDOWS AND (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")) list(APPEND extra_config -DLLFIO_ASSUME_CROSS_COMPILING=On) endif() +# setting CMAKE_CXX_STANDARD here to prevent llfio from messing with compiler flags +# the cmake package config requires said C++ standard target transitively via quickcpplib +if ("cxx20" IN_LIST FEATURES) + list(APPEND extra_config -DCMAKE_CXX_STANDARD=20) +elseif("cxx17" IN_LIST FEATURES) + list(APPEND extra_config -DCMAKE_CXX_STANDARD=17) +endif() + +# quickcpplib parses CMAKE_MSVC_RUNTIME_LIBRARY and cannot support the default crt linkage generator expression from vcpkg +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") + list(APPEND extra_config -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded$$<$$:Debug>DLL) + else() + list(APPEND extra_config -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded$$<$$:Debug>) + endif() +endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS -DPROJECT_IS_DEPENDENCY=On - -Dquickcpplib_FOUND=1 - -Doutcome_FOUND=1 + -Dquickcpplib_DIR=${CURRENT_INSTALLED_DIR}/share/quickcpplib ${LLFIO_FEATURE_OPTIONS} -DLLFIO_ENABLE_DEPENDENCY_SMOKE_TEST=ON # Leave this always on to test everything compiles -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON ${extra_config} ) -# LLFIO install assumes that the static library is always built -vcpkg_build_cmake(TARGET _sl) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - vcpkg_build_cmake(TARGET _dl) + vcpkg_cmake_build(TARGET install.dl) +else(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_cmake_build(TARGET install.sl) endif() if("run-tests" IN_LIST FEATURES) - vcpkg_build_cmake(TARGET test) + vcpkg_cmake_build(TARGET test) endif() -vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/llfio) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/llfio) 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() if("status-code" IN_LIST FEATURES) file(INSTALL "${CURRENT_PORT_DIR}/usage-status-code-${VCPKG_LIBRARY_LINKAGE}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/external_imported/vcpkg/ports/llfio/vcpkg.json b/external_imported/vcpkg/ports/llfio/vcpkg.json index 9606cbe88..d35443deb 100644 --- a/external_imported/vcpkg/ports/llfio/vcpkg.json +++ b/external_imported/vcpkg/ports/llfio/vcpkg.json @@ -1,13 +1,52 @@ { "name": "llfio", - "version-string": "2.0-20211208", + "version-string": "2.0-20220112", "description": "P1031 low level file i/o and filesystem library for the C++ standard", "homepage": "https://github.com/ned14/llfio", - "supports": "!(uwp | static)", + "supports": "!uwp", "dependencies": [ - "outcome" + "outcome", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { + "cxx17": { + "description": "Do not polyfill C++17 entities", + "dependencies": [ + { + "name": "ned14-internal-quickcpplib", + "default-features": false, + "features": [ + "cxx17" + ] + } + ] + }, + "cxx20": { + "description": "Do not polyfill C++20 entities", + "dependencies": [ + { + "name": "llfio", + "default-features": false, + "features": [ + "cxx17" + ] + }, + { + "name": "ned14-internal-quickcpplib", + "default-features": false, + "features": [ + "cxx20" + ] + } + ] + }, "run-tests": { "description": "Build and run the dependency validation tests" }, diff --git a/external_imported/vcpkg/ports/llvm/portfile.cmake b/external_imported/vcpkg/ports/llvm/portfile.cmake index 7df4d4761..205d25039 100644 --- a/external_imported/vcpkg/ports/llvm/portfile.cmake +++ b/external_imported/vcpkg/ports/llvm/portfile.cmake @@ -26,6 +26,7 @@ vcpkg_check_features( tools LLVM_INCLUDE_TOOLS utils LLVM_BUILD_UTILS utils LLVM_INCLUDE_UTILS + utils LLVM_INSTALL_UTILS enable-rtti LLVM_ENABLE_RTTI enable-ffi LLVM_ENABLE_FFI enable-terminfo LLVM_ENABLE_TERMINFO diff --git a/external_imported/vcpkg/ports/llvm/vcpkg.json b/external_imported/vcpkg/ports/llvm/vcpkg.json index fc1ed5ba6..29be0e7bb 100644 --- a/external_imported/vcpkg/ports/llvm/vcpkg.json +++ b/external_imported/vcpkg/ports/llvm/vcpkg.json @@ -1,9 +1,10 @@ { "name": "llvm", "version": "13.0.0", - "port-version": 1, + "port-version": 3, "description": "The LLVM Compiler Infrastructure.", "homepage": "https://llvm.org", + "license": "Apache-2.0", "supports": "!uwp & !(arm & windows)", "dependencies": [ { @@ -336,7 +337,16 @@ "description": "Build with XCore backend." }, "tools": { - "description": "Build LLVM tools." + "description": "Build LLVM tools.", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "enable-threads" + ] + } + ] }, "utils": { "description": "Build LLVM utils." diff --git a/external_imported/vcpkg/ports/lmdb/cmake/CMakeLists.txt b/external_imported/vcpkg/ports/lmdb/cmake/CMakeLists.txt index dfa61785f..b7ef12450 100644 --- a/external_imported/vcpkg/ports/lmdb/cmake/CMakeLists.txt +++ b/external_imported/vcpkg/ports/lmdb/cmake/CMakeLists.txt @@ -20,8 +20,7 @@ set(LMDB_LIBRARY_INSTALL_DIR lib CACHE PATH "Install directory for library") set(LMDB_RUNTIME_INSTALL_DIR bin CACHE PATH "Install directory for binaries/dlls") set(LMDB_CONFIG_INSTALL_DIR share/lmdb CACHE PATH "Install directory for cmake config files") - -if(BUILD_SHARED_LIBS) +if(MSVC AND BUILD_SHARED_LIBS) set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /DEF:\"${CMAKE_CURRENT_SOURCE_DIR}/lmdbd.def\"") set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /DEF:\"${CMAKE_CURRENT_SOURCE_DIR}/lmdb.def\"") endif() diff --git a/external_imported/vcpkg/ports/lmdb/portfile.cmake b/external_imported/vcpkg/ports/lmdb/portfile.cmake index 632d7a59e..263966bbd 100644 --- a/external_imported/vcpkg/ports/lmdb/portfile.cmake +++ b/external_imported/vcpkg/ports/lmdb/portfile.cmake @@ -1,23 +1,23 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO LMDB/lmdb - REF 0c357cc88a00bda03aa4a982fc227a5872707df2 # LMDB_0.9.24 - SHA512 a4d4ff96078eaf608eff08014d56561903f113a32617d3c9327dcdedfb7b261e03a80bf705f9d7159bb065eb1ab3c95af49d42525b75de0c2953223377042dec + REF 8ad7be2510414b9506ec9f9e24f24d04d9b04a1a # LMDB_0.9.29 + SHA512 a18b6217761bdfcc5964d9817addd2d0c6c735d02a823717eb7ae1561a48110da0708a3290e21297d481e4d8eeb5d92a4a6860ff44888bf2da665cd9f167513c HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/cmake/ DESTINATION ${SOURCE_PATH}/libraries/liblmdb) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/cmake/" DESTINATION "${SOURCE_PATH}/libraries/liblmdb") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/libraries/liblmdb - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/libraries/liblmdb" OPTIONS_DEBUG -DLMDB_INSTALL_HEADERS=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_install() -file(INSTALL ${SOURCE_PATH}/libraries/liblmdb/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/lmdb RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/libraries/liblmdb/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/lmdb" RENAME copyright) vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/lmdb/vcpkg.json b/external_imported/vcpkg/ports/lmdb/vcpkg.json index 011be1311..1a15ee7a4 100644 --- a/external_imported/vcpkg/ports/lmdb/vcpkg.json +++ b/external_imported/vcpkg/ports/lmdb/vcpkg.json @@ -1,7 +1,17 @@ { "name": "lmdb", - "version-string": "0.9.24", - "port-version": 1, + "version": "0.9.29", "description": "LMDB is an extraordinarily fast, memory-efficient database", - "homepage": "https://github.com/LMDB/lmdb" + "homepage": "https://github.com/LMDB/lmdb", + "license": null, + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/log4cplus/vcpkg.json b/external_imported/vcpkg/ports/log4cplus/vcpkg.json index 9ba37aec9..a70adf299 100644 --- a/external_imported/vcpkg/ports/log4cplus/vcpkg.json +++ b/external_imported/vcpkg/ports/log4cplus/vcpkg.json @@ -1,10 +1,10 @@ { "name": "log4cplus", "version": "2.0.7", + "port-version": 1, "description": "A simple to use C++ logging API providing thread--safe, flexible, and arbitrarily granular control over log management and configuration", "homepage": "https://github.com/log4cplus/log4cplus", "dependencies": [ - "catch", { "name": "vcpkg-cmake", "host": true diff --git a/external_imported/vcpkg/ports/log4cpp/portfile.cmake b/external_imported/vcpkg/ports/log4cpp/portfile.cmake index e36923d62..2548807f7 100644 --- a/external_imported/vcpkg/ports/log4cpp/portfile.cmake +++ b/external_imported/vcpkg/ports/log4cpp/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO orocos-toolchain/log4cpp diff --git a/external_imported/vcpkg/ports/log4cpp/vcpkg.json b/external_imported/vcpkg/ports/log4cpp/vcpkg.json index e2e166805..a7729f41e 100644 --- a/external_imported/vcpkg/ports/log4cpp/vcpkg.json +++ b/external_imported/vcpkg/ports/log4cpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "log4cpp", - "version-string": "2.9.1", - "port-version": 6, + "version": "2.9.1", + "port-version": 7, "description": "Log4cpp is library of C++ classes for flexible logging to files, syslog, IDSA and other destinations. It is modeled after the Log4j Java library, staying as close to their API as is reasonable.", "homepage": "https://github.com/orocos-toolchain/log4cpp", "supports": "!uwp" diff --git a/external_imported/vcpkg/ports/loguru/CMakeLists.txt b/external_imported/vcpkg/ports/loguru/CMakeLists.txt index 3688e1121..473392aa8 100644 --- a/external_imported/vcpkg/ports/loguru/CMakeLists.txt +++ b/external_imported/vcpkg/ports/loguru/CMakeLists.txt @@ -4,6 +4,7 @@ project(loguru CXX) set(CMAKE_CXX_STANDARD 11) option(INSTALL_HEADERS "Install header files" ON) +option(BUILD_WITH_FMT "Build with fmt support" OFF) set(loguru_headers loguru.hpp @@ -17,6 +18,12 @@ target_include_directories(loguru PUBLIC $ $) +if(BUILD_WITH_FMT) + target_compile_definitions(loguru PRIVATE LOGURU_USE_FMTLIB=1) + find_package(fmt CONFIG REQUIRED) + target_link_libraries(loguru PUBLIC fmt::fmt) +endif() + if(UNIX) set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) diff --git a/external_imported/vcpkg/ports/loguru/portfile.cmake b/external_imported/vcpkg/ports/loguru/portfile.cmake index 236c4deb2..a581eab88 100644 --- a/external_imported/vcpkg/ports/loguru/portfile.cmake +++ b/external_imported/vcpkg/ports/loguru/portfile.cmake @@ -15,15 +15,22 @@ if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) configure_file(${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY) configure_file(${CMAKE_CURRENT_LIST_DIR}/loguruConfig.cmake.in ${SOURCE_PATH}/loguruConfig.cmake.in COPYONLY) - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + fmt BUILD_WITH_FMT + ) + + vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DINSTALL_HEADERS=OFF + OPTIONS + ${FEATURE_OPTIONS} ) - vcpkg_install_cmake() - vcpkg_fixup_cmake_targets() + vcpkg_cmake_install() + vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() endif() diff --git a/external_imported/vcpkg/ports/loguru/vcpkg.json b/external_imported/vcpkg/ports/loguru/vcpkg.json index b29fb65c8..d6705d6fa 100644 --- a/external_imported/vcpkg/ports/loguru/vcpkg.json +++ b/external_imported/vcpkg/ports/loguru/vcpkg.json @@ -1,7 +1,25 @@ { "name": "loguru", - "version-string": "2.1.0", - "port-version": 2, + "version": "2.1.0", + "port-version": 3, "description": "A lightweight and flexible C++ logging library", - "homepage": "https://github.com/emilk/loguru" + "homepage": "https://github.com/emilk/loguru", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "fmt": { + "description": "Build with fmt support in non-header-only mode", + "dependencies": [ + "fmt" + ] + } + } } diff --git a/external_imported/vcpkg/ports/lua/portfile.cmake b/external_imported/vcpkg/ports/lua/portfile.cmake index 1a7fac53c..0a034611a 100644 --- a/external_imported/vcpkg/ports/lua/portfile.cmake +++ b/external_imported/vcpkg/ports/lua/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_download_distfile(ARCHIVE - URLS "https://www.lua.org/ftp/lua-5.4.3.tar.gz" - FILENAME "lua-5.4.3.tar.gz" - SHA512 3a1a3ee8694b72b4ec9d3ce76705fe179328294353604ca950c53f41b41161b449877d43318ef4501fee44ecbd6c83314ce7468d7425ba9b2903c9c32a28bbc0 + URLS "https://www.lua.org/ftp/lua-5.4.4.tar.gz" + FILENAME "lua-5.4.4.tar.gz" + SHA512 af0c35d5ba00fecbb2dd617bd7b825edf7418a16a73076e04f2a0df58cdbf098dc3ff4402e974afd789eb5d86d2e12ec6df9c84b99b23656ea694a85f83bcd21 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH @@ -11,7 +11,7 @@ vcpkg_extract_source_archive_ex( fix-ios-system.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") # Used in cmake wrapper set(ENABLE_LUA_CPP 0) @@ -31,22 +31,21 @@ if(VCPKG_TARGET_IS_IOS AND "tools" IN_LIST FEATURES) message(FATAL_ERROR "lua[tools] is not supported for iOS platform build") endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} OPTIONS_DEBUG -DSKIP_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-lua TARGET_PATH share/unofficial-lua) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-lua CONFIG_PATH share/unofficial-lua) if("cpp" IN_LIST FEATURES) - vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-lua-cpp TARGET_PATH share/unofficial-lua-cpp) + vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-lua-cpp CONFIG_PATH "share/unofficial-lua-cpp") endif() if ("tools" IN_LIST FEATURES) @@ -55,15 +54,13 @@ endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) if(VCPKG_TARGET_IS_WINDOWS) - file(READ ${CURRENT_PACKAGES_DIR}/include/luaconf.h LUA_CONF_H) - string(REPLACE "defined(LUA_BUILD_AS_DLL)" "1" LUA_CONF_H "${LUA_CONF_H}") - file(WRITE ${CURRENT_PACKAGES_DIR}/include/luaconf.h "${LUA_CONF_H}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/luaconf.h" "defined(LUA_BUILD_AS_DLL)" "1") endif() endif() # Suitable for old version -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}) +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) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/lua/vcpkg.json b/external_imported/vcpkg/ports/lua/vcpkg.json index e381a077e..2017af765 100644 --- a/external_imported/vcpkg/ports/lua/vcpkg.json +++ b/external_imported/vcpkg/ports/lua/vcpkg.json @@ -1,9 +1,19 @@ { "name": "lua", - "version-semver": "5.4.3", - "port-version": 3, + "version": "5.4.4", + "port-version": 1, "description": "A powerful, fast, lightweight, embeddable scripting language", "homepage": "https://www.lua.org", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "cpp": { "description": "Builds Lua for C++ linkage" diff --git a/external_imported/vcpkg/ports/luajit/portfile.cmake b/external_imported/vcpkg/ports/luajit/portfile.cmake index 262f7ec09..e8a39ff25 100644 --- a/external_imported/vcpkg/ports/luajit/portfile.cmake +++ b/external_imported/vcpkg/ports/luajit/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports being built for desktop" ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO LuaJIT/LuaJIT @@ -21,17 +19,17 @@ 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) @@ -44,17 +42,17 @@ 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) @@ -70,4 +68,4 @@ file(INSTALL ${SOURCE_PATH}/src/lauxlib.h DESTINATION ${CURRENT_PACKAGES_D 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}) \ No newline at end of file +file(COPY ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/external_imported/vcpkg/ports/luajit/vcpkg.json b/external_imported/vcpkg/ports/luajit/vcpkg.json index e4cd839f4..22c50d268 100644 --- a/external_imported/vcpkg/ports/luajit/vcpkg.json +++ b/external_imported/vcpkg/ports/luajit/vcpkg.json @@ -1,7 +1,7 @@ { "name": "luajit", - "version-string": "2.0.5", - "port-version": 4, + "version": "2.0.5", + "port-version": 5, "description": "LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language.", "homepage": "https://github.com/LuaJIT/LuaJIT", "supports": "!uwp" diff --git a/external_imported/vcpkg/ports/luasec/vcpkg.json b/external_imported/vcpkg/ports/luasec/vcpkg.json index 4880e8bfa..76d24caaa 100644 --- a/external_imported/vcpkg/ports/luasec/vcpkg.json +++ b/external_imported/vcpkg/ports/luasec/vcpkg.json @@ -1,9 +1,11 @@ { "name": "luasec", "version": "1.0.1", + "port-version": 1, "maintainers": "Stephen Baker ", "description": "LuaSec depends on OpenSSL, and integrates with LuaSocket to make it easy to add secure connections to any Lua applications or scripts.", "homepage": "https://github.com/brunoos/luasec", + "supports": "!(windows & static)", "dependencies": [ "lua", "luasocket", diff --git a/external_imported/vcpkg/ports/luasocket/portfile.cmake b/external_imported/vcpkg/ports/luasocket/portfile.cmake index 5b4bc3400..b48185c8d 100644 --- a/external_imported/vcpkg/ports/luasocket/portfile.cmake +++ b/external_imported/vcpkg/ports/luasocket/portfile.cmake @@ -5,34 +5,33 @@ vcpkg_from_github( SHA512 bdf7086a0504b0072b9cfd1266fc4ae89504053801722859a426f567fca00ed76f4c295c2a3a968e93f0036d9b792cf97561e9baa82c09ea23999cfd473227eb 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() # Remove debug share -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/luasocket) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/luasocket/LICENSE ${CURRENT_PACKAGES_DIR}/share/luasocket/copyright) +file(COPY "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/luasocket") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/luasocket/LICENSE" "${CURRENT_PACKAGES_DIR}/share/luasocket/copyright") 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) - 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) + 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") + 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") # 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) - 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) + 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") + 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") endif() # Allow empty include directory diff --git a/external_imported/vcpkg/ports/luasocket/vcpkg.json b/external_imported/vcpkg/ports/luasocket/vcpkg.json index 064972699..0fe9652f2 100644 --- a/external_imported/vcpkg/ports/luasocket/vcpkg.json +++ b/external_imported/vcpkg/ports/luasocket/vcpkg.json @@ -1,10 +1,15 @@ { "name": "luasocket", - "version-string": "2020-09-14", - "port-version": 1, + "version-date": "2020-09-14", + "port-version": 2, "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", + "supports": "windows", "dependencies": [ - "lua" + "lua", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/lunasvg/fix-install.patch b/external_imported/vcpkg/ports/lunasvg/fix-install.patch new file mode 100644 index 000000000..73b634875 --- /dev/null +++ b/external_imported/vcpkg/ports/lunasvg/fix-install.patch @@ -0,0 +1,26 @@ + CMakeLists.txt | 15 ++------------- + 1 file changed, 2 insertions(+), 13 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9916c67..159f3a6 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -24,16 +24,5 @@ if(LUNASVG_BUILD_EXAMPLES) + add_subdirectory(example) + endif() + +-set(LUNASVG_LIBDIR ${CMAKE_INSTALL_PREFIX}/lib) +-set(LUNASVG_INCDIR ${CMAKE_INSTALL_PREFIX}/include) +- +-install(FILES +- include/lunasvg.h +- DESTINATION ${LUNASVG_INCDIR} +-) +- +-install(TARGETS lunasvg +- LIBRARY DESTINATION ${LUNASVG_LIBDIR} +- ARCHIVE DESTINATION ${LUNASVG_LIBDIR} +- INCLUDES DESTINATION ${LUNASVG_INCDIR} +-) ++set_target_properties(lunasvg PROPERTIES PUBLIC_HEADER "include/lunasvg.h") ++install(TARGETS lunasvg RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib PUBLIC_HEADER DESTINATION include) diff --git a/external_imported/vcpkg/ports/lunasvg/portfile.cmake b/external_imported/vcpkg/ports/lunasvg/portfile.cmake new file mode 100644 index 000000000..9b40c5842 --- /dev/null +++ b/external_imported/vcpkg/ports/lunasvg/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sammycage/lunasvg + REF e612abda858b53160041381a23422cd2b4f42fbd #2.3.1 + SHA512 44f5d013d918cb5af90114a12857bdd2c204caff761516ef98b12b08d8b6215e91f6d963c281500c386f287b9d0ecd5b3d986d4c8c33423c0c34d539d744e09d + HEAD_REF master + PATCHES + fix-install.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DLUNASVG_BUILD_EXAMPLES=OFF + -DBUILD_SHARED_LIBS=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/lunasvg/vcpkg.json b/external_imported/vcpkg/ports/lunasvg/vcpkg.json new file mode 100644 index 000000000..df3d8aaa0 --- /dev/null +++ b/external_imported/vcpkg/ports/lunasvg/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "lunasvg", + "version": "2.3.1", + "description": "lunasvg is a standalone SVG rendering library in C++", + "homepage": "https://github.com/sammycage/lunasvg", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/mailio/portfile.cmake b/external_imported/vcpkg/ports/mailio/portfile.cmake index 2c3dfb932..9171b35ea 100644 --- a/external_imported/vcpkg/ports/mailio/portfile.cmake +++ b/external_imported/vcpkg/ports/mailio/portfile.cmake @@ -1,22 +1,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO karastojko/mailio - REF 1872f29d88a52f06cd96b611673b2e46c6b9832b # version_0-20-0 - SHA512 1686e49ed2c7163c33f88c820633e772986ecfea5696b78a44b370f44051190b14a1ddcd055bce2a9104324c80e8045cf0441c085eb6f272261da7e80bc4fdb5 + REF cc887a7808d9c55e07c8a7503c7ae2e2d7485120 # version_0-21-0 + SHA512 7125bfe4274e1e126e335b2e4b5743ef54d5dc0b6fd83f0c10e7578b57924d3e398af6b3865fdee3de587e2e2d7c33d95dbe017b1966649e68cf52f2dd268ee5 HEAD_REF master ) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) - vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DMAILIO_BUILD_SHARED_LIBRARY=${BUILD_SHARED} -DMAILIO_BUILD_DOCUMENTATION=OFF -DMAILIO_BUILD_EXAMPLES=OFF ) vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + CONFIG_PATH share/mailio/cmake +) vcpkg_fixup_pkgconfig() diff --git a/external_imported/vcpkg/ports/mailio/vcpkg.json b/external_imported/vcpkg/ports/mailio/vcpkg.json index f3c01cd5a..c2f639f9e 100644 --- a/external_imported/vcpkg/ports/mailio/vcpkg.json +++ b/external_imported/vcpkg/ports/mailio/vcpkg.json @@ -1,11 +1,11 @@ { "name": "mailio", - "version": "0.20.0", - "port-version": 1, + "version": "0.21.0", + "port-version": 2, "maintainers": "Tomislav Karastojković ", "description": "mailio is a cross platform C++ library for MIME format and SMTP, POP3 and IMAP protocols. It is based on the standard C++ 17 and Boost library.", "homepage": "https://github.com/karastojko/mailio", - "license": "BSD-2-clause", + "license": "BSD-2-Clause", "supports": "!uwp", "dependencies": [ "boost-asio", @@ -16,6 +16,10 @@ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/external_imported/vcpkg/ports/mapnik/portfile.cmake b/external_imported/vcpkg/ports/mapnik/portfile.cmake index a093014a9..7140f07f6 100644 --- a/external_imported/vcpkg/ports/mapnik/portfile.cmake +++ b/external_imported/vcpkg/ports/mapnik/portfile.cmake @@ -4,11 +4,9 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mapnik/mapnik - REF 14f913d6ab3b0903dd36a1cb2d22f7d5493b8bb8 - SHA512 f90762594d46946ddc512bb19b21c4d6a2f1ce81b7500a326ad512fae3a3f77e49ef3eb727ff8f98a31596e4132528212e0fa146e2eee0a9965a16551cfd0386 + REF d7b83c0f7d11397aff5b5d8e0bb294ef6ea4354d + SHA512 62b47cb753e9698e55fe88593009016676b6c0c0a90c3f29be6f44a45f9f783ec5beca6916e549f9adbdc750e2e0334a9e927fc0dcb6a88431e40c2e920ff962 HEAD_REF master - PATCHES - proj-find-fix.patch # Quiet search with version range somehow fails for proj8+ ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/external_imported/vcpkg/ports/mapnik/proj-find-fix.patch b/external_imported/vcpkg/ports/mapnik/proj-find-fix.patch deleted file mode 100644 index 4fb353761..000000000 --- a/external_imported/vcpkg/ports/mapnik/proj-find-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 47bbaa1..43f384d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -304,7 +304,7 @@ if(USE_WEBP) - - if(USE_PROJ) - #https://proj.org/development/cmake.html -- mapnik_find_package(PROJ ${PROJ_MIN_VERSION} QUIET) -+ mapnik_find_package(PROJ REQUIRED) - # currently the cmake files are not installed, when installing proj via apt-get. So search via pkg-config - if(NOT PROJ_FOUND) - message(STATUS "PROJ not found via FindPROJ. Searching via pkg-config...") diff --git a/external_imported/vcpkg/ports/mapnik/vcpkg.json b/external_imported/vcpkg/ports/mapnik/vcpkg.json index 64f53ec58..c1dc491ae 100644 --- a/external_imported/vcpkg/ports/mapnik/vcpkg.json +++ b/external_imported/vcpkg/ports/mapnik/vcpkg.json @@ -1,9 +1,10 @@ { "name": "mapnik", - "version-date": "2021-11-15", + "version-date": "2022-01-28", "port-version": 1, "description": "Mapnik is an open source toolkit for developing mapping applications.", "homepage": "https://github.com/mapnik/mapnik", + "license": "LGPL-2.1-only", "supports": "!(static & windows)", "dependencies": [ "boost-assign", @@ -157,7 +158,7 @@ "proj": { "description": "PROJ Functionalities", "dependencies": [ - "proj4" + "proj" ] }, "svg-renderer": { diff --git a/external_imported/vcpkg/ports/marl/portfile.cmake b/external_imported/vcpkg/ports/marl/portfile.cmake index 53e13ef79..53cb52f85 100644 --- a/external_imported/vcpkg/ports/marl/portfile.cmake +++ b/external_imported/vcpkg/ports/marl/portfile.cmake @@ -1,24 +1,21 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/marl - REF 4c1b662da7d7a35f0fba9156a08cb49d129f5189 #2021-04-25 - SHA512 a3f8f65ef870075fac96dc67e8efbbe62596787a623aab02509c34f80a7cae523412d4bf94450c400a4637a0fffee6ef0cbf8f38286707e9d001e628cc11177f + REF 9929747c9ba6354691dbacaf14f9b35433871e5b #2022-03-02 + SHA512 454399485d292526333417474a312302aaff90cf63bc06a95c2e8b87cb92eaea547457ba3c06413e079ca29f9ea64990b9da467aeaec6ec2aa3233efddab2407 HEAD_REF main ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" MARL_BUILD_SHARED) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DMARL_BUILD_SHARED=${MARL_BUILD_SHARED} -DMARL_INSTALL=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() if(MARL_BUILD_SHARED) vcpkg_replace_string( @@ -28,10 +25,10 @@ if(MARL_BUILD_SHARED) ) endif() -vcpkg_fixup_cmake_targets(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/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/marl/vcpkg.json b/external_imported/vcpkg/ports/marl/vcpkg.json index 30c2aa240..c641ba3e6 100644 --- a/external_imported/vcpkg/ports/marl/vcpkg.json +++ b/external_imported/vcpkg/ports/marl/vcpkg.json @@ -1,8 +1,18 @@ { "name": "marl", - "version-date": "2021-04-25", + "version-date": "2022-03-02", "description": "A hybrid thread/fiber task scheduler written in modern C++", "homepage": "https://github.com/google/marl", "license": "Apache-2.0", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/mbedtls/portfile.cmake b/external_imported/vcpkg/ports/mbedtls/portfile.cmake index 3bd961fbc..1f65fff5b 100644 --- a/external_imported/vcpkg/ports/mbedtls/portfile.cmake +++ b/external_imported/vcpkg/ports/mbedtls/portfile.cmake @@ -1,13 +1,11 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - set(VCPKG_LIBRARY_LINKAGE static) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ARMmbed/mbedtls - REF 523f0554b6cdc7ace5d360885c3f5bbcc73ec0e8 # mbedtls-2.24.0 - SHA512 1ce78f34e8d87c2ce0454e0a08f4c6e5b3129d4b24cfa44162af21c2e8b5dc7feabf849e4fa547ce3781b5ce11aaf675cfed47412bae40091fbdd87bbcdbee07 - HEAD_REF master + REF 8b3f26a5ac38d4fdccbc5c5366229f3e01dafcc0 # mbedtls-2.28.0 + SHA512 a5d2694ae87347be7ebf5c32b86d7bb809cc696b549947efb3d12d41d5f726d4f7caed3cc6ee3f3c9b9e46b3c42c4ce8a5f9741b1b0a3c644b6ae615d2f4c55a + HEAD_REF mbedtls-2.28 PATCHES enable-pthread.patch ) @@ -15,12 +13,11 @@ vcpkg_from_github( vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - pthreads ENABLE_PTHREAD + pthreads ENABLE_PTHREAD ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} -DENABLE_TESTING=OFF @@ -28,7 +25,7 @@ vcpkg_configure_cmake( -DMBEDTLS_FATAL_WARNINGS=FALSE ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) @@ -38,4 +35,4 @@ if (VCPKG_TARGET_IS_WINDOWS AND pthreads IN_LIST FEATURES) file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) endif () -vcpkg_copy_pdbs() \ No newline at end of file +vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/mbedtls/vcpkg.json b/external_imported/vcpkg/ports/mbedtls/vcpkg.json index ec036a05f..93c0e9b22 100644 --- a/external_imported/vcpkg/ports/mbedtls/vcpkg.json +++ b/external_imported/vcpkg/ports/mbedtls/vcpkg.json @@ -1,10 +1,20 @@ { "name": "mbedtls", - "version-string": "2.24.0", - "port-version": 3, + "version": "2.28.0", "description": "An open source, portable, easy to use, readable and flexible SSL library", "homepage": "https://github.com/ARMmbed/mbedtls", + "license": "Apache-2.0", "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "pthreads": { "description": "Multi-threading support", diff --git a/external_imported/vcpkg/ports/mdnsresponder/portfile.cmake b/external_imported/vcpkg/ports/mdnsresponder/portfile.cmake index 99dbbdd2d..5a391a45a 100644 --- a/external_imported/vcpkg/ports/mdnsresponder/portfile.cmake +++ b/external_imported/vcpkg/ports/mdnsresponder/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm") - vcpkg_download_distfile(ARCHIVE URLS https://opensource.apple.com/tarballs/mDNSResponder/mDNSResponder-878.270.2.tar.gz FILENAME mDNSResponder-878.270.2.tar.gz diff --git a/external_imported/vcpkg/ports/mdnsresponder/vcpkg.json b/external_imported/vcpkg/ports/mdnsresponder/vcpkg.json index 86839bd05..920ce4c4a 100644 --- a/external_imported/vcpkg/ports/mdnsresponder/vcpkg.json +++ b/external_imported/vcpkg/ports/mdnsresponder/vcpkg.json @@ -1,7 +1,8 @@ { "name": "mdnsresponder", "version": "878.270.2", + "port-version": 1, "description": "The mDNSResponder project is a component of Bonjour, Apple's ease-of-use IP networking initiative.", "homepage": "https://developer.apple.com/bonjour/", - "supports": "!arm" + "supports": "windows & !uwp & !arm" } diff --git a/external_imported/vcpkg/ports/mesa/portfile.cmake b/external_imported/vcpkg/ports/mesa/portfile.cmake index 6f00ba815..5fa919888 100644 --- a/external_imported/vcpkg/ports/mesa/portfile.cmake +++ b/external_imported/vcpkg/ports/mesa/portfile.cmake @@ -25,7 +25,8 @@ vcpkg_from_gitlab( OUT_SOURCE_PATH SOURCE_PATH REPO mesa/mesa REF mesa-21.2.5 - SHA512 24387ce5ea0f200b39f930a842fc56fa120dd5cc6a94d175374ce788356dc7ac73e6390a7ffa6a1f2b0eb212cc00f556c7204548118ececb69d3555f0a259bc0 + SHA512 a9ead27f08e862738938cf728928b7937ff37e4c26967f2e46e40a3c8419159397f75b2f4ce43f9b453b35bb3716df581087fb7ba8434fafdfab9488c3db6f92 + FILE_DISAMBIGUATOR 1 HEAD_REF master PATCHES ${PATCHES} ) @@ -35,59 +36,7 @@ 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("${_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() - -vcpkg_get_python_package(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES setuptools mako) +x_vcpkg_get_python_packages(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES setuptools mako) vcpkg_find_acquire_program(FLEX) get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY ) @@ -169,8 +118,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() endif() - + vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -182,14 +135,14 @@ vcpkg_configure_meson( vcpkg_install_meson() vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") #installed by egl-registry -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/KHR) -file(REMOVE ${CURRENT_PACKAGES_DIR}/include/EGL/egl.h) -file(REMOVE ${CURRENT_PACKAGES_DIR}/include/EGL/eglext.h) -file(REMOVE ${CURRENT_PACKAGES_DIR}/include/EGL/eglplatform.h) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/KHR") +file(REMOVE "${CURRENT_PACKAGES_DIR}/include/EGL/egl.h") +file(REMOVE "${CURRENT_PACKAGES_DIR}/include/EGL/eglext.h") +file(REMOVE "${CURRENT_PACKAGES_DIR}/include/EGL/eglplatform.h") #installed by opengl-registry set(_double_files include/GL/glcorearb.h include/GL/glext.h include/GL/glxext.h include/GLES/egl.h include/GLES/gl.h include/GLES/glext.h include/GLES/glplatform.h @@ -198,8 +151,8 @@ set(_double_files include/GL/glcorearb.h include/GL/glext.h include/GL/glxext.h list(TRANSFORM _double_files PREPEND "${CURRENT_PACKAGES_DIR}/") file(REMOVE ${_double_files}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/GLES) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/GLES2) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/GLES") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/GLES2") # Handle copyright file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(TOUCH "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/external_imported/vcpkg/ports/mesa/vcpkg.json b/external_imported/vcpkg/ports/mesa/vcpkg.json index add7ffe48..8643b1e88 100644 --- a/external_imported/vcpkg/ports/mesa/vcpkg.json +++ b/external_imported/vcpkg/ports/mesa/vcpkg.json @@ -1,10 +1,16 @@ { "name": "mesa", "version": "21.2.5", + "port-version": 3, "description": "Mesa - The 3D Graphics Library", "homepage": "https://www.mesa3d.org/", + "license": "MIT AND BSL-1.0 AND SGI-B-2.0", "supports": "!(windows & arm)", "dependencies": [ + { + "name": "vcpkg-get-python-packages", + "host": true + }, { "name": "vcpkg-tool-meson", "host": true diff --git a/external_imported/vcpkg/ports/mhook/portfile.cmake b/external_imported/vcpkg/ports/mhook/portfile.cmake index 51b47c316..f89536f73 100644 --- a/external_imported/vcpkg/ports/mhook/portfile.cmake +++ b/external_imported/vcpkg/ports/mhook/portfile.cmake @@ -7,14 +7,13 @@ vcpkg_from_github( PATCHES fix-windows-packing-mismatch.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/mhook RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/mhook" RENAME copyright) -vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/external_imported/vcpkg/ports/mhook/vcpkg.json b/external_imported/vcpkg/ports/mhook/vcpkg.json index 8c55068ce..13dc895dd 100644 --- a/external_imported/vcpkg/ports/mhook/vcpkg.json +++ b/external_imported/vcpkg/ports/mhook/vcpkg.json @@ -1,6 +1,13 @@ { "name": "mhook", - "version-string": "2.5.1", - "port-version": 2, - "description": "A Windows API hooking library." + "version": "2.5.1", + "port-version": 3, + "description": "A Windows API hooking library.", + "supports": "windows & !uwp & !arm", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/milerius-sfml-imgui/cpp11.patch b/external_imported/vcpkg/ports/milerius-sfml-imgui/cpp11.patch new file mode 100644 index 000000000..61dd830d5 --- /dev/null +++ b/external_imported/vcpkg/ports/milerius-sfml-imgui/cpp11.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 27b8bd8..ac65300 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -14,6 +14,7 @@ find_package(OpenGL REQUIRED) + ##! Library + add_library(${PROJECT_NAME} SHARED sfml-imgui/imgui-SFML.cpp) + target_link_libraries(${PROJECT_NAME} PUBLIC imgui::imgui sfml-graphics OpenGL::GL) ++target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_11) + + target_include_directories(${PROJECT_NAME} PUBLIC + $ diff --git a/external_imported/vcpkg/ports/milerius-sfml-imgui/portfile.cmake b/external_imported/vcpkg/ports/milerius-sfml-imgui/portfile.cmake index 63ce4e7c5..011993885 100644 --- a/external_imported/vcpkg/ports/milerius-sfml-imgui/portfile.cmake +++ b/external_imported/vcpkg/ports/milerius-sfml-imgui/portfile.cmake @@ -6,18 +6,18 @@ vcpkg_from_github( REF 1.1 SHA512 191184f7b302f643bd7c241b69d9f9edc0d03c6f5a0b3a49f57ac84f3828202f8065291fb17993073a2c07f1237ba491de677c47e2f8160dc70ea77f20eb1946 HEAD_REF master - PATCHES FixFindPackageIssue.patch + PATCHES + FixFindPackageIssue.patch + cpp11.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/milerius-sfml-imgui) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/milerius-sfml-imgui) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/milerius-sfml-imgui) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/milerius-sfml-imgui/LICENSE ${CURRENT_PACKAGES_DIR}/share/milerius-sfml-imgui/copyright) \ No newline at end of file +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/milerius-sfml-imgui/vcpkg.json b/external_imported/vcpkg/ports/milerius-sfml-imgui/vcpkg.json index e208a73f3..62abc101b 100644 --- a/external_imported/vcpkg/ports/milerius-sfml-imgui/vcpkg.json +++ b/external_imported/vcpkg/ports/milerius-sfml-imgui/vcpkg.json @@ -1,10 +1,18 @@ { "name": "milerius-sfml-imgui", - "version-string": "1.1", - "port-version": 3, + "version": "1.1", + "port-version": 4, "description": "imgui dll for sfml usage", "dependencies": [ "imgui", - "sfml" + "sfml", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/mimalloc/fix-cmake.patch b/external_imported/vcpkg/ports/mimalloc/fix-cmake.patch index e3ada035d..dc8740a0a 100644 --- a/external_imported/vcpkg/ports/mimalloc/fix-cmake.patch +++ b/external_imported/vcpkg/ports/mimalloc/fix-cmake.patch @@ -1,39 +1,16 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b56953c..d7ad3e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -303,10 +303,13 @@ if(MI_BUILD_SHARED) +@@ -315,11 +315,11 @@ target_link_libraries(mimalloc PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.lib) add_custom_command(TARGET mimalloc POST_BUILD COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll" $ COMMENT "Copy mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll to output directory") -+ install ( -+ FILES $/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll -+ DESTINATION ${CMAKE_INSTALL_BINDIR} -+ ) +- install(FILES "$/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll" DESTINATION ${mi_install_libdir}) ++ install(FILES "$/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll" DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() - + - install(TARGETS mimalloc EXPORT mimalloc DESTINATION ${mi_install_libdir} LIBRARY) -- install(EXPORT mimalloc DESTINATION ${mi_install_cmakedir}) -+ install(TARGETS mimalloc EXPORT mimalloc ARCHIVE DESTINATION lib RUNTIME DESTINATION bin LIBRARY DESTINATION lib NAMELINK_SKIP) ++ install(TARGETS mimalloc EXPORT mimalloc ARCHIVE DESTINATION ${mi_install_libdir} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${mi_install_libdir} NAMELINK_SKIP) + install(EXPORT mimalloc DESTINATION ${mi_install_cmakedir}) endif() # static library -@@ -332,6 +335,8 @@ if (MI_BUILD_STATIC) - install(TARGETS mimalloc-static EXPORT mimalloc DESTINATION ${mi_install_libdir} LIBRARY) - endif() - -+install(EXPORT mimalloc DESTINATION ${mi_install_cmakedir}) -+ - # install include files - install(FILES include/mimalloc.h DESTINATION ${mi_install_incdir}) - install(FILES include/mimalloc-override.h DESTINATION ${mi_install_incdir}) -@@ -366,9 +371,6 @@ if (MI_BUILD_OBJECT) - - # the FILES expression can also be: $ - # but that fails cmake versions less than 3.10 so we leave it as is for now -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/mimalloc-obj.dir/src/static.c${CMAKE_C_OUTPUT_EXTENSION} -- DESTINATION ${mi_install_libdir} -- RENAME ${mi_basename}${CMAKE_C_OUTPUT_EXTENSION} ) - endif() - - # ----------------------------------------------------------------------------- diff --git a/external_imported/vcpkg/ports/mimalloc/portfile.cmake b/external_imported/vcpkg/ports/mimalloc/portfile.cmake index 405cc9426..c1a47d2bd 100644 --- a/external_imported/vcpkg/ports/mimalloc/portfile.cmake +++ b/external_imported/vcpkg/ports/mimalloc/portfile.cmake @@ -1,10 +1,8 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/mimalloc - REF v2.0.3 - SHA512 275a5249d09a57c9a039714fc6eef24ae778496954972419f3ac8e33f3d12e9837ba0691a3c08a4ab807c26b868aad3a5b2c28ee10ecaa60fe21ffe1d416f08f + REF v2.0.5 + SHA512 d164392ace523a3fa0aa00fc58d8a9e8fbe913f07957e19ca977675b389e6d2a2eaf4772e72cae0d87aabb960f3fd6ea3923a066ece4ba4fdaa0c6860cfa414d HEAD_REF master PATCHES fix-cmake.patch @@ -26,15 +24,13 @@ vcpkg_cmake_configure( OPTIONS_RELEASE -DMI_DEBUG_FULL=OFF OPTIONS - -DMI_INTERPOSE=ON - -DMI_USE_CXX=OFF + -DMI_USE_CXX=ON -DMI_BUILD_TESTS=OFF + -DMI_BUILD_OBJECT=OFF ${FEATURE_OPTIONS} -DMI_BUILD_STATIC=${MI_BUILD_STATIC} -DMI_BUILD_SHARED=${MI_BUILD_SHARED} -DMI_INSTALL_TOPLEVEL=ON - MAYBE_UNUSED_VARIABLES - MI_INTERPOSE ) vcpkg_cmake_install() @@ -57,4 +53,4 @@ 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) \ 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/mimalloc/vcpkg.json b/external_imported/vcpkg/ports/mimalloc/vcpkg.json index 4a0840969..1a9c98b72 100644 --- a/external_imported/vcpkg/ports/mimalloc/vcpkg.json +++ b/external_imported/vcpkg/ports/mimalloc/vcpkg.json @@ -1,9 +1,10 @@ { "name": "mimalloc", - "version": "2.0.3", + "version": "2.0.5", "port-version": 1, "description": "Compact general purpose allocator with excellent performance", "homepage": "https://github.com/microsoft/mimalloc", + "license": "MIT", "supports": "!(arm | uwp)", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/minhook/portfile.cmake b/external_imported/vcpkg/ports/minhook/portfile.cmake index bd022d5bc..8c95a4dcd 100644 --- a/external_imported/vcpkg/ports/minhook/portfile.cmake +++ b/external_imported/vcpkg/ports/minhook/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86") set(BUILD_ARCH "Win32") set(OUTPUT_DIR "Win32") @@ -29,15 +27,14 @@ vcpkg_from_github( fix-usage.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/minhook) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/minhook) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +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/minhook/vcpkg.json b/external_imported/vcpkg/ports/minhook/vcpkg.json index 707945ccc..e2a0b7b77 100644 --- a/external_imported/vcpkg/ports/minhook/vcpkg.json +++ b/external_imported/vcpkg/ports/minhook/vcpkg.json @@ -1,7 +1,17 @@ { "name": "minhook", - "version-string": "1.3.3", - "port-version": 2, + "version": "1.3.3", + "port-version": 3, "description": "The Minimalistic x86/x64 API Hooking Library for Windows.", - "supports": "!uwp" + "supports": "windows & !uwp & !arm", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/minizip-ng/portfile.cmake b/external_imported/vcpkg/ports/minizip-ng/portfile.cmake index 9faecfc48..8dac2781f 100644 --- a/external_imported/vcpkg/ports/minizip-ng/portfile.cmake +++ b/external_imported/vcpkg/ports/minizip-ng/portfile.cmake @@ -1,8 +1,12 @@ +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zlib-ng/minizip-ng - REF 3.0.2 - SHA512 eee4d35d273ab0a32972b119c8faabd8c242e2d9f506fab0dd21fdd24c78b932c01bf7f15e9cf7c452776fc4c2e27a5ff09e376adb7a706336d11114929182fc + REF 3.0.5 + SHA512 da0c230951caafd986331300b840d09a4c27a677183174f8b1782c2515209b51cf00133dd5fc5f9fc88a349134db7f93d3daa7c05b7d0270be99b9cf85a6c133 HEAD_REF master PATCHES Modify-header-file-path.patch diff --git a/external_imported/vcpkg/ports/minizip-ng/vcpkg.json b/external_imported/vcpkg/ports/minizip-ng/vcpkg.json index eeab4ef8e..a8e680134 100644 --- a/external_imported/vcpkg/ports/minizip-ng/vcpkg.json +++ b/external_imported/vcpkg/ports/minizip-ng/vcpkg.json @@ -1,7 +1,6 @@ { "name": "minizip-ng", - "version": "3.0.2", - "port-version": 1, + "version": "3.0.5", "description": "minizip-ng is a zip manipulation library written in C that is supported on Windows, macOS, and Linux.", "homepage": "https://github.com/zlib-ng/minizip-ng", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/minizip/portfile.cmake b/external_imported/vcpkg/ports/minizip/portfile.cmake index 20cc0184e..5e5a56e38 100644 --- a/external_imported/vcpkg/ports/minizip/portfile.cmake +++ b/external_imported/vcpkg/ports/minizip/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/external_imported/vcpkg/ports/minizip/vcpkg.json b/external_imported/vcpkg/ports/minizip/vcpkg.json index 9e8c24b81..c8bc8dbb6 100644 --- a/external_imported/vcpkg/ports/minizip/vcpkg.json +++ b/external_imported/vcpkg/ports/minizip/vcpkg.json @@ -1,7 +1,7 @@ { "name": "minizip", "version-semver": "1.2.11", - "port-version": 9, + "port-version": 10, "description": "Zip compression library", "homepage": "https://github.com/madler/zlib", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/mman/portfile.cmake b/external_imported/vcpkg/ports/mman/portfile.cmake index 7482a7f74..4e57ba973 100644 --- a/external_imported/vcpkg/ports/mman/portfile.cmake +++ b/external_imported/vcpkg/ports/mman/portfile.cmake @@ -8,12 +8,11 @@ vcpkg_from_github( mman-static.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include/mman) file(RENAME ${CURRENT_PACKAGES_DIR}/include/sys ${CURRENT_PACKAGES_DIR}/include/mman/sys) @@ -23,9 +22,7 @@ file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(READ ${CURRENT_PACKAGES_DIR}/include/mman/sys/mman.h _contents) - string(REPLACE "__declspec(dllimport)" "" _contents "${_contents}") - file(WRITE ${CURRENT_PACKAGES_DIR}/include/mman/sys/mman.h "${_contents}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mman/sys/mman.h" "__declspec(dllimport)" "") endif() vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/mman/vcpkg.json b/external_imported/vcpkg/ports/mman/vcpkg.json index 37516b679..2554140e8 100644 --- a/external_imported/vcpkg/ports/mman/vcpkg.json +++ b/external_imported/vcpkg/ports/mman/vcpkg.json @@ -1,7 +1,14 @@ { "name": "mman", "version-string": "git-f5ff813", - "port-version": 4, + "port-version": 5, "description": "A light implementation of the mmap functions for MinGW.", - "homepage": "https://github.com/witwall/mman-win32" + "homepage": "https://github.com/witwall/mman-win32", + "supports": "windows", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/mmloader/portfile.cmake b/external_imported/vcpkg/ports/mmloader/portfile.cmake index 4ad635693..72d653484 100644 --- a/external_imported/vcpkg/ports/mmloader/portfile.cmake +++ b/external_imported/vcpkg/ports/mmloader/portfile.cmake @@ -1,12 +1,3 @@ -# fail early for unsupported triplets -vcpkg_fail_port_install( - MESSAGE "mmLoader supports only x86/x64-windows-static triplets" - ON_TARGET "UWP" "LINUX" "OSX" "ANDROID" "FREEBSD" - ON_ARCH "arm" "arm64" - ON_CRT_LINKAGE "dynamic" - ON_LIBRARY_LINKAGE "dynamic" -) - # source vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/external_imported/vcpkg/ports/mmloader/vcpkg.json b/external_imported/vcpkg/ports/mmloader/vcpkg.json index 79d7c4b5a..30d49748f 100644 --- a/external_imported/vcpkg/ports/mmloader/vcpkg.json +++ b/external_imported/vcpkg/ports/mmloader/vcpkg.json @@ -1,6 +1,7 @@ { "name": "mmloader", "version-date": "2021-12-13", + "port-version": 1, "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", diff --git a/external_imported/vcpkg/ports/mnn/portfile.cmake b/external_imported/vcpkg/ports/mnn/portfile.cmake index 8147fddb1..b3a7dc3fc 100644 --- a/external_imported/vcpkg/ports/mnn/portfile.cmake +++ b/external_imported/vcpkg/ports/mnn/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp" "ios" "android") if(VCPKG_TARGET_IS_WINDOWS) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) endif() diff --git a/external_imported/vcpkg/ports/mnn/vcpkg.json b/external_imported/vcpkg/ports/mnn/vcpkg.json index 27676e863..0b21ba2f4 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": 1, + "port-version": 2, "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/mongoose/portfile.cmake b/external_imported/vcpkg/ports/mongoose/portfile.cmake index 972a36a0f..d5912f6e0 100644 --- a/external_imported/vcpkg/ports/mongoose/portfile.cmake +++ b/external_imported/vcpkg/ports/mongoose/portfile.cmake @@ -1,32 +1,30 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cesanta/mongoose - REF 8e520756366ca5739f13dc6ad65fcf269dbbc994 #v7.1 - SHA512 a966a8b4e47e36da0f630c3cf343c85a1c1138508a82e506b21e4b8bd72573d0e0145318f97b32a67f423e033b348de76a00b780430e4e69d1a98bd7494a3e0a + REF 9d38e26b817b6b151fd925e9a8420a46c99a8375 #v7.5 + SHA512 ce488a6b9dc1e7437b17ea32e62c2c90fe05b298df995e624f24f05c539ee96444fa892dab7958a81541c711bb3e399808f793c8ce317b0fd904b037955d81fa 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 - ssl ENABLE_SSL + FEATURES + ssl ENABLE_SSL ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT}) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT} CONFIG_PATH share/unofficial-${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/mongoose/vcpkg.json b/external_imported/vcpkg/ports/mongoose/vcpkg.json index 9313383b6..1177b737e 100644 --- a/external_imported/vcpkg/ports/mongoose/vcpkg.json +++ b/external_imported/vcpkg/ports/mongoose/vcpkg.json @@ -1,9 +1,20 @@ { "name": "mongoose", - "version": "7.1", + "version": "7.5", + "port-version": 1, "description": "Embedded web server / embedded networking library", "homepage": "https://cesanta.com/", "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "ssl": { "description": "Build with openssl", diff --git a/external_imported/vcpkg/ports/monkeys-audio/portfile.cmake b/external_imported/vcpkg/ports/monkeys-audio/portfile.cmake index 40c2bccde..39cc57853 100644 --- a/external_imported/vcpkg/ports/monkeys-audio/portfile.cmake +++ b/external_imported/vcpkg/ports/monkeys-audio/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP" "OSX" "Linux") - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) set(MA_VERSION 570) diff --git a/external_imported/vcpkg/ports/monkeys-audio/vcpkg.json b/external_imported/vcpkg/ports/monkeys-audio/vcpkg.json index ceb22ba8b..208a85119 100644 --- a/external_imported/vcpkg/ports/monkeys-audio/vcpkg.json +++ b/external_imported/vcpkg/ports/monkeys-audio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "monkeys-audio", - "version-string": "5.70", - "port-version": 1, + "version": "5.70", + "port-version": 2, "description": [ "Monkey's Audio is an excellent audio compression tool which has multiple advantages over traditional methods.", "Audio files compressed with it end with .ape extension." diff --git a/external_imported/vcpkg/ports/mpc/gmpd.patch b/external_imported/vcpkg/ports/mpc/gmpd.patch deleted file mode 100644 index b08625777..000000000 --- a/external_imported/vcpkg/ports/mpc/gmpd.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index ab3da6092..2533df1d8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -151,7 +151,9 @@ AC_CHECK_FUNCS([dup dup2],, - - AC_CHECK_LIB([gmp], [__gmpz_init], - [LIBS="-lgmp $LIBS"], -- [AC_MSG_ERROR([libgmp not found or uses a different ABI (including static vs shared).])]) -+ [AC_CHECK_LIB([gmpd], [__gmpz_init], -+ [LIBS="-lgmpd $LIBS"], -+ [AC_MSG_ERROR([libgmp not found or uses a different ABI (including static vs shared).])])]) - - AC_MSG_CHECKING(for MPFR) - LIBS="-lmpfr $LIBS" diff --git a/external_imported/vcpkg/ports/mpc/portfile.cmake b/external_imported/vcpkg/ports/mpc/portfile.cmake index 66aeb9f18..7ecd9b325 100644 --- a/external_imported/vcpkg/ports/mpc/portfile.cmake +++ b/external_imported/vcpkg/ports/mpc/portfile.cmake @@ -7,7 +7,6 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} - PATCHES gmpd.patch ) vcpkg_configure_make( diff --git a/external_imported/vcpkg/ports/mpc/vcpkg.json b/external_imported/vcpkg/ports/mpc/vcpkg.json index 2c8e38d1d..9f79c44a8 100644 --- a/external_imported/vcpkg/ports/mpc/vcpkg.json +++ b/external_imported/vcpkg/ports/mpc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mpc", - "version-string": "1.2.0", - "port-version": 1, + "version": "1.2.0", + "port-version": 2, "description": "GNU MPC is a C library for the arithmetic of complex numbers with arbitrarily high precision and correct rounding of the result.", "homepage": "http://www.multiprecision.org/mpc/", "dependencies": [ diff --git a/external_imported/vcpkg/ports/mpfr/gmpd.patch b/external_imported/vcpkg/ports/mpfr/gmpd.patch deleted file mode 100644 index d34027d36..000000000 --- a/external_imported/vcpkg/ports/mpfr/gmpd.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index ea92c1f97..9621a70e5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -693,8 +693,9 @@ See 'config.log' for details (search for GMP_NUMB_BITS).])], - - dnl Check if we can link with GMP - AC_CHECK_LIB(gmp, __gmpz_init, [LIBS="-lgmp $LIBS"], -+ [AC_CHECK_LIB(gmpd, __gmpz_init, [LIBS="-lgmpd $LIBS"], - [AC_MSG_ERROR([libgmp not found or uses a different ABI (including static vs shared). --Please read the INSTALL file -- see "In case of problem".])]) -+Please read the INSTALL file -- see "In case of problem".])])]) - - dnl Check for corresponding 'gmp.h' and libgmp - AC_MSG_CHECKING(if gmp.h version and libgmp version are the same) diff --git a/external_imported/vcpkg/ports/mpfr/portfile.cmake b/external_imported/vcpkg/ports/mpfr/portfile.cmake index 4d6910900..83354d7d9 100644 --- a/external_imported/vcpkg/ports/mpfr/portfile.cmake +++ b/external_imported/vcpkg/ports/mpfr/portfile.cmake @@ -1,5 +1,5 @@ if (VCPKG_TARGET_IS_LINUX) - message(WARNING "${PORT} currently requires the following packages:\n autoconf-archive\n texinfo\nThese can be installed on Ubuntu systems via\n sudo apt-get update -y\n sudo apt-get install -y autoconf-archive texinfo\n") + 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() set(VERSION 4.1.0) @@ -11,29 +11,25 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" PATCHES - gmpd.patch dll.patch + src-only.patch ) - file(REMOVE_RECURSE "${SOURCE_PATH}/m4") + vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG - ADDITIONAL_MSYS_PACKAGES texinfo gettext autoconf-archive + ADDITIONAL_MSYS_PACKAGES autoconf-archive ) vcpkg_install_make() vcpkg_copy_pdbs() - -if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mpfr.pc" AND VCPKG_TARGET_IS_WINDOWS) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mpfr.pc" " -lgmp" " -lgmpd") -endif() 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" 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/mpfr/src-only.patch b/external_imported/vcpkg/ports/mpfr/src-only.patch new file mode 100644 index 000000000..505570986 --- /dev/null +++ b/external_imported/vcpkg/ports/mpfr/src-only.patch @@ -0,0 +1,20 @@ +diff --git a/Makefile.am b/Makefile.am +index 89242c6..662ce24 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -24,12 +24,14 @@ AUTOMAKE_OPTIONS = gnu + # old Automake version. + ACLOCAL_AMFLAGS = -I m4 + +-SUBDIRS = doc src tests tune tools/bench ++SUBDIRS = src # Skipping: doc tests tune tools/bench + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = mpfr.pc + + nobase_dist_doc_DATA = AUTHORS BUGS COPYING COPYING.LESSER NEWS TODO \ ++ # BREAK ++VCPKG_SKIP_EXAMPLES = \ + examples/ReadMe examples/can_round.c examples/divworst.c \ + examples/rndo-add.c examples/sample.c examples/threads.c \ + examples/version.c diff --git a/external_imported/vcpkg/ports/mpfr/vcpkg.json b/external_imported/vcpkg/ports/mpfr/vcpkg.json index 1dc8f5a56..195d7efbe 100644 --- a/external_imported/vcpkg/ports/mpfr/vcpkg.json +++ b/external_imported/vcpkg/ports/mpfr/vcpkg.json @@ -1,9 +1,10 @@ { "name": "mpfr", - "version-string": "4.1.0", - "port-version": 2, + "version": "4.1.0", + "port-version": 4, "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", "dependencies": [ "gmp" ] diff --git a/external_imported/vcpkg/ports/mpg123/portfile.cmake b/external_imported/vcpkg/ports/mpg123/portfile.cmake index ceca50482..87a07c267 100644 --- a/external_imported/vcpkg/ports/mpg123/portfile.cmake +++ b/external_imported/vcpkg/ports/mpg123/portfile.cmake @@ -12,8 +12,10 @@ vcpkg_from_sourceforge( fix-modulejack.patch ) -include("${CURRENT_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake") -yasm_tool_helper(APPEND_TO_PATH) +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + include("${CURRENT_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake") + yasm_tool_helper(APPEND_TO_PATH) +endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/ports/cmake" diff --git a/external_imported/vcpkg/ports/mpg123/vcpkg.json b/external_imported/vcpkg/ports/mpg123/vcpkg.json index dba644357..a2723881a 100644 --- a/external_imported/vcpkg/ports/mpg123/vcpkg.json +++ b/external_imported/vcpkg/ports/mpg123/vcpkg.json @@ -1,9 +1,10 @@ { "name": "mpg123", "version": "1.29.2", - "port-version": 1, + "port-version": 2, "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", "dependencies": [ { "name": "vcpkg-cmake", @@ -13,6 +14,9 @@ "name": "vcpkg-cmake-config", "host": true }, - "yasm-tool-helper" + { + "name": "yasm-tool-helper", + "platform": "windows" + } ] } diff --git a/external_imported/vcpkg/ports/mpir/portfile.cmake b/external_imported/vcpkg/ports/mpir/portfile.cmake index 856e4e273..1b8e188c3 100644 --- a/external_imported/vcpkg/ports/mpir/portfile.cmake +++ b/external_imported/vcpkg/ports/mpir/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") - if(EXISTS "${CURRENT_INSTALLED_DIR}/include/gmp.h" OR "${CURRENT_INSTALLED_DIR}/include/gmpxx.h") message(FATAL_ERROR "Can't build ${PORT} if gmp is installed. Please remove gmp, and try to install ${PORT} again if you need it.") endif() @@ -8,31 +6,25 @@ if(VCPKG_CRT_LINKAGE STREQUAL "static" AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynam message(FATAL_ERROR "${PORT} currently can only be built using the dynamic CRT when building DLLs") endif() -set(MPIR_VERSION 3.0.0) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO wbhart/mpir + REF cdd444aedfcbb190f00328526ef278428702d56e # 3.0.0 + SHA512 f46e45bdba27c9f89953ba23186b694486fd3010bd370ea2de71a4649a2816e716a6520c9baa96936f1884437ef03f92b21c0b1fb5b757beba5a05fed30b2bfc + HEAD_REF master + PATCHES enable-runtimelibrary-toggle.patch +) if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) - vcpkg_download_distfile( - ARCHIVE - URLS "http://mpir.org/mpir-${MPIR_VERSION}.tar.bz2" - FILENAME mpir-${MPIR_VERSION}.tar.bz2 - SHA512 c735105db8b86db739fd915bf16064e6bc82d0565ad8858059e4e93f62c9d72d9a1c02a5ca9859b184346a8dc64fa714d4d61404cff1e405dc548cbd54d0a88e - ) - - vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${MPIR_VERSION} - ) - vcpkg_find_acquire_program(YASM) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(SHARED_STATIC --enable-static --disable-shared) + set(SHARED_STATIC "--enable-static --disable-shared") else() - set(SHARED_STATIC --disable-static --enable-shared) + set(SHARED_STATIC "--disable-static --enable-shared") endif() - set(OPTIONS --disable-silent-rules --enable-gmpcompat --enable-cxx ${SHARED_STATIC}) + set(OPTIONS "--disable-silent-rules --enable-gmpcompat --enable-cxx ${SHARED_STATIC}") string(APPEND VCPKG_C_FLAGS " -Wno-implicit-function-declaration") string(APPEND VCPKG_CXX_FLAGS " -Wno-implicit-function-declaration") @@ -41,32 +33,21 @@ if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) if(VCPKG_TARGET_IS_LINUX) set(AUTOCONFIG "AUTOCONFIG") endif() - + vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" ${AUTOCONFIG} - OPTIONS ${OPTIONS} + OPTIONS ${OPTIONS} ) - + vcpkg_install_make() - + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") endif() - - configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) elseif(VCPKG_TARGET_IS_WINDOWS) - vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO wbhart/mpir - REF mpir-${MPIR_VERSION} - SHA512 7d37f60645c533a6638dde5d9c48f5535022fa0ea02bafd5b714649c70814e88c5e5e3b0bef4c5a749aaf8772531de89c331716ee00ba1c2f9521c2cc8f3c61b - HEAD_REF master - PATCHES enable-runtimelibrary-toggle.patch - ) - if(VCPKG_PLATFORM_TOOLSET MATCHES "v141") set(MSVC_VERSION 15) else() @@ -85,69 +66,69 @@ elseif(VCPKG_TARGET_IS_WINDOWS) set(RuntimeLibraryExt "DLL") endif() - file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) - file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) - file(GLOB FILES ${SOURCE_PATH}/*) - file(COPY ${FILES} DESTINATION ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") + file(GLOB FILES "${SOURCE_PATH}/*") + file(COPY ${FILES} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") vcpkg_build_msbuild( - PROJECT_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/build.vc${MSVC_VERSION}/${DLL_OR_LIB}_mpir_gc/${DLL_OR_LIB}_mpir_gc.vcxproj + PROJECT_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/build.vc${MSVC_VERSION}/${DLL_OR_LIB}_mpir_gc/${DLL_OR_LIB}_mpir_gc.vcxproj" OPTIONS_DEBUG "/p:RuntimeLibrary=MultiThreadedDebug${RuntimeLibraryExt}" OPTIONS_RELEASE "/p:RuntimeLibrary=MultiThreaded${RuntimeLibraryExt}" ) - + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") vcpkg_build_msbuild( - PROJECT_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/build.vc${MSVC_VERSION}/${DLL_OR_LIB}_mpir_cxx/${DLL_OR_LIB}_mpir_cxx.vcxproj + PROJECT_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/build.vc${MSVC_VERSION}/${DLL_OR_LIB}_mpir_cxx/${DLL_OR_LIB}_mpir_cxx.vcxproj" OPTIONS_DEBUG "/p:RuntimeLibrary=MultiThreadedDebug${RuntimeLibraryExt}" OPTIONS_RELEASE "/p:RuntimeLibrary=MultiThreaded${RuntimeLibraryExt}" ) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(GLOB REL_LIBS_CXX ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/mpirxx.lib) + file(GLOB REL_LIBS_CXX "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/mpirxx.lib") endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(GLOB DBG_LIBS_CXX ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/mpirxx.lib) + file(GLOB DBG_LIBS_CXX "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/mpirxx.lib") endif() endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") file(GLOB HEADERS - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/gmp.h - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/gmpxx.h - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/mpir.h - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/mpirxx.h + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/gmp.h" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/gmpxx.h" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/mpir.h" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/mpirxx.h" ) - file(INSTALL ${HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include) - - file(GLOB REL_DLLS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/mpir.dll) - file(GLOB REL_LIBS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/mpir.lib) - list(APPEND REL_LIBS ${REL_LIBS_CXX}) - - file(INSTALL ${REL_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - file(INSTALL ${REL_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(INSTALL ${HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include") + + file(GLOB REL_DLLS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/mpir.dll") + file(GLOB REL_LIBS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Release/mpir.lib") + list(APPEND REL_LIBS ${REL_LIBS_CXX}) + + file(INSTALL ${REL_DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL ${REL_LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/lib") endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") file(GLOB HEADERS - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/gmp.h - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/gmpxx.h - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/mpir.h - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/mpirxx.h + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/gmp.h" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/gmpxx.h" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/mpir.h" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/mpirxx.h" ) - file(INSTALL ${HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include) - - file(GLOB DBG_DLLS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/mpir.dll) - file(GLOB DBG_LIBS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/mpir.lib) + file(INSTALL ${HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include") + + file(GLOB DBG_DLLS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/mpir.dll") + file(GLOB DBG_LIBS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/*/*/Debug/mpir.lib") list(APPEND DBG_LIBS ${DBG_LIBS_CXX}) - - file(INSTALL ${DBG_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - file(INSTALL ${DBG_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - + + file(INSTALL ${DBG_DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL ${DBG_LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() endif() - - vcpkg_copy_pdbs() - file(INSTALL ${SOURCE_PATH}/COPYING.lib DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + vcpkg_copy_pdbs() endif() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/mpir/vcpkg.json b/external_imported/vcpkg/ports/mpir/vcpkg.json index 29754ccd9..3d5a05a43 100644 --- a/external_imported/vcpkg/ports/mpir/vcpkg.json +++ b/external_imported/vcpkg/ports/mpir/vcpkg.json @@ -1,8 +1,8 @@ { "name": "mpir", - "version-string": "3.0.0", - "port-version": 10, + "version-date": "2022-03-02", "description": "Multiple Precision Integers and Rationals", "homepage": "https://github.com/wbhart/mpir", + "license": "GPL-3.0-only", "supports": "!(uwp | arm)" } diff --git a/external_imported/vcpkg/ports/ms-gltf/portfile.cmake b/external_imported/vcpkg/ports/ms-gltf/portfile.cmake index 1382dc046..c59b61bbe 100644 --- a/external_imported/vcpkg/ports/ms-gltf/portfile.cmake +++ b/external_imported/vcpkg/ports/ms-gltf/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(MESSAGE "ms-gltf currently only supports Windows and Mac platforms" ON_TARGET "linux" "ios") if(VCPKG_TARGET_IS_WINDOWS) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) endif() diff --git a/external_imported/vcpkg/ports/ms-gltf/vcpkg.json b/external_imported/vcpkg/ports/ms-gltf/vcpkg.json index 9b7983b27..34728d11b 100644 --- a/external_imported/vcpkg/ports/ms-gltf/vcpkg.json +++ b/external_imported/vcpkg/ports/ms-gltf/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ms-gltf", "version-string": "r1.9.5.4", + "port-version": 1, "description": "glTF-SDK is a C++ Software Development Kit for glTF", "homepage": "https://github.com/microsoft/glTF-SDK", "supports": "!linux", diff --git a/external_imported/vcpkg/ports/ms-gsl/portfile.cmake b/external_imported/vcpkg/ports/ms-gsl/portfile.cmake index 73ce94674..5713e346a 100644 --- a/external_imported/vcpkg/ports/ms-gsl/portfile.cmake +++ b/external_imported/vcpkg/ports/ms-gsl/portfile.cmake @@ -2,23 +2,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/GSL - REF 0f6dbc9e2915ef5c16830f3fa3565738de2a9230 - SHA512 f72d7d9a18b8055401feb99d99f17c70c0c2015b1a2112ae13fedd27949ff7f9b30718b6afd0b5730ed5573390cb1cc987cd45b7e7fbb92f4134f11d1637ddb7 - HEAD_REF master + REF a3534567187d2edc428efd3f13466ff75fe5805c + SHA512 5bd6aad37fee3b56a2ee2fed10d6ef02fdcf37a1f40b3fb1bbec8146a573e235169b315405d010ab75175674ed82658c8202f40b128a849c5250b4a1b8b0a1b3 + HEAD_REF main ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DGSL_TEST=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets( +vcpkg_cmake_config_fixup( + PACKAGE_NAME Microsoft.GSL CONFIG_PATH share/cmake/Microsoft.GSL - TARGET_PATH share/Microsoft.GSL ) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") diff --git a/external_imported/vcpkg/ports/ms-gsl/vcpkg.json b/external_imported/vcpkg/ports/ms-gsl/vcpkg.json index e8f6f9adc..ace0f12e7 100644 --- a/external_imported/vcpkg/ports/ms-gsl/vcpkg.json +++ b/external_imported/vcpkg/ports/ms-gsl/vcpkg.json @@ -1,7 +1,16 @@ { "name": "ms-gsl", - "version-string": "3.1.0", - "port-version": 1, + "version": "4.0.0", "description": "Microsoft implementation of the Guidelines Support Library", - "homepage": "https://github.com/Microsoft/GSL" + "homepage": "https://github.com/Microsoft/GSL", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/msmpi/portfile.cmake b/external_imported/vcpkg/ports/msmpi/portfile.cmake index cf5b69afe..c94e2c304 100644 --- a/external_imported/vcpkg/ports/msmpi/portfile.cmake +++ b/external_imported/vcpkg/ports/msmpi/portfile.cmake @@ -1,12 +1,10 @@ -vcpkg_fail_port_install(ON_TARGET "Linux" "OSX" "UWP") - set(MSMPI_VERSION "10.1.12498") 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" FILENAME "msmpisdk-${MSMPI_VERSION}-b0087dfd.msi" - SHA512 b0087dfd21423bf87b94b17d7cb03576838585371bbf8b03cca95c3ad73670108c7bc6517b0de852ef595072cc4143be2011636e7242bcb080394d94294848a7 + SHA512 b0087dfd21423bf87b94b17d7cb03576838585371bbf8b03cca95c3ad73670108c7bc6517b0de852ef595072cc4143be2011636e7242bcb080394d94294848a7 ) diff --git a/external_imported/vcpkg/ports/msmpi/vcpkg.json b/external_imported/vcpkg/ports/msmpi/vcpkg.json index fa32759b4..d220c1d61 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": 2, + "port-version": 3, "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/munit/portfile.cmake b/external_imported/vcpkg/ports/munit/portfile.cmake index 6a8c8e194..37802974d 100644 --- a/external_imported/vcpkg/ports/munit/portfile.cmake +++ b/external_imported/vcpkg/ports/munit/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( @@ -21,5 +19,5 @@ vcpkg_install_meson() vcpkg_copy_pdbs() file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -vcpkg_fixup_pkgconfig() + +vcpkg_fixup_pkgconfig() diff --git a/external_imported/vcpkg/ports/munit/vcpkg.json b/external_imported/vcpkg/ports/munit/vcpkg.json index 63c511f31..4f5cfb85c 100644 --- a/external_imported/vcpkg/ports/munit/vcpkg.json +++ b/external_imported/vcpkg/ports/munit/vcpkg.json @@ -1,10 +1,10 @@ { "name": "munit", - "version-string": "2019-04-06", - "port-version": 4, + "version-date": "2019-04-06", + "port-version": 5, "description": "A small but full-featured unit testing framework for C", "homepage": "https://github.com/nemequ/munit", - "supports": "!(arm | arm64 | uwp)", + "supports": "!(arm | uwp)", "dependencies": [ { "name": "vcpkg-tool-meson", diff --git a/external_imported/vcpkg/ports/muparser/portfile.cmake b/external_imported/vcpkg/ports/muparser/portfile.cmake index dcc548737..57efea012 100644 --- a/external_imported/vcpkg/ports/muparser/portfile.cmake +++ b/external_imported/vcpkg/ports/muparser/portfile.cmake @@ -1,27 +1,34 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO beltoforion/muparser - REF 207d5b77c05c9111ff51ab91082701221220c477 # v2.3.2 - SHA512 75cebef831eeb08c92c08d2b29932a4af550edbda56c2adb6bc86b1228775294013a07d51974157b39460e60dab937b0b641553cd7ddeef72ba0b23f65c52bf4 + REF 6d65387be8f4ef329829c6d6ace779b26942e075 # v2.3.3-1 + SHA512 cda1133b534b1c77d80b15d50d71f372a423fab2bc7b9204d106589350b3cfc955dbfdcfe8c17890e3cfd747b559f4d3c4f0ea6c9c3c73e6aa159afc82bcc6c0 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS -DENABLE_SAMPLES=OFF -DENABLE_OPENMP=OFF - OPTIONS_DEBUG - -DDISABLE_INSTALL_HEADERS=ON + -DENABLE_WIDE_CHAR=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/muparser") vcpkg_fixup_pkgconfig() + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/muParserDef.h" "#if defined(_UNICODE)" "#if 0") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/muParserDLL.h" "#ifndef _UNICODE" "#if 1") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/muParserFixes.h" "#ifndef MUPARSER_STATIC" "#if 0") +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/muParserFixes.h" "#ifndef MUPARSER_STATIC" "#if 1") +endif() + +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/muparser/vcpkg.json b/external_imported/vcpkg/ports/muparser/vcpkg.json index 967c3712e..87f52f1dc 100644 --- a/external_imported/vcpkg/ports/muparser/vcpkg.json +++ b/external_imported/vcpkg/ports/muparser/vcpkg.json @@ -1,8 +1,19 @@ { "name": "muparser", - "version-string": "2.3.2", + "version": "2.3.3", "port-version": 2, "description": "Fast math parser library", "homepage": "https://github.com/beltoforion/muparser", - "supports": "!uwp" + "license": "BSD-2-Clause", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/murmurhash/portfile.cmake b/external_imported/vcpkg/ports/murmurhash/portfile.cmake index 380570b2f..c83ebe084 100644 --- a/external_imported/vcpkg/ports/murmurhash/portfile.cmake +++ b/external_imported/vcpkg/ports/murmurhash/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/external_imported/vcpkg/ports/murmurhash/vcpkg.json b/external_imported/vcpkg/ports/murmurhash/vcpkg.json index 98789370d..34166cf24 100644 --- a/external_imported/vcpkg/ports/murmurhash/vcpkg.json +++ b/external_imported/vcpkg/ports/murmurhash/vcpkg.json @@ -1,7 +1,8 @@ { "name": "murmurhash", - "version-string": "2016-01-09", - "port-version": 4, + "version-date": "2016-01-09", + "port-version": 5, "description": "MurmurHash a family of hash functions.", - "homepage": "https://github.com/aappleby/smhasher" + "homepage": "https://github.com/aappleby/smhasher", + "supports": "!uwp & !arm" } diff --git a/external_imported/vcpkg/ports/mvfst/portfile.cmake b/external_imported/vcpkg/ports/mvfst/portfile.cmake index 16acf66fa..79dbbeba3 100644 --- a/external_imported/vcpkg/ports/mvfst/portfile.cmake +++ b/external_imported/vcpkg/ports/mvfst/portfile.cmake @@ -1,14 +1,11 @@ -vcpkg_fail_port_install(ON_TARGET "Windows") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebookincubator/mvfst - REF 531b935a - SHA512 47683907e5c19aa7392bffc0f23378636e73e03bbbd598640d20042234a9385ac7ca2fb8202905e1c101713bfb3467df78b12fd1629ca83a3ccf2bae2f58a2e1 + REF 7c52380a5c445fe478096d7ca10e92797747ae87 + SHA512 5ccebec9652e7a481b599b20a07b0d6585d300cdde3e6b62985c5ce448c0890d537bced6c9dbd77009f89c16311c56fde1f2131064ff5cc3fcb34bf69cb11f06 HEAD_REF main ) - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -16,9 +13,16 @@ vcpkg_cmake_configure( -DBUILD_EXAMPLES=OFF ) +# Prefer installed config files +file(REMOVE + ${SOURCE_PATH}/fizz/cmake/FindGMock.cmake + ${SOURCE_PATH}/fizz/cmake/FindGflags.cmake + ${SOURCE_PATH}/fizz/cmake/FindGlog.cmake + ${SOURCE_PATH}/fizz/cmake/FindLibevent.cmake +) + vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/mvfst) 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/mvfst/vcpkg.json b/external_imported/vcpkg/ports/mvfst/vcpkg.json index 7aec0054b..4e3df9f61 100644 --- a/external_imported/vcpkg/ports/mvfst/vcpkg.json +++ b/external_imported/vcpkg/ports/mvfst/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mvfst", - "version": "0.1", + "version-date": "2022-03-27", "description": "mvfst (Pronounced move fast) is a client and server implementation of IETF QUIC protocol in C++ by Facebook.", "homepage": "https://github.com/facebookincubator/mvfst", "supports": "!windows", diff --git a/external_imported/vcpkg/ports/mygui/vcpkg.json b/external_imported/vcpkg/ports/mygui/vcpkg.json index 2e1ddc764..aabd5655a 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": 1, + "port-version": 2, "description": "Fast, flexible and simple GUI", "homepage": "http://mygui.info", + "supports": "!uwp", "dependencies": [ "freetype", "sdl2-image", diff --git a/external_imported/vcpkg/ports/nanobench/portfile.cmake b/external_imported/vcpkg/ports/nanobench/portfile.cmake index 86b144ca5..77b60e380 100644 --- a/external_imported/vcpkg/ports/nanobench/portfile.cmake +++ b/external_imported/vcpkg/ports/nanobench/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO martinus/nanobench - REF ee8b36e956bb2b8753dd1f6732b4d9d90afb09f9 #v4.3.0 - SHA512 46807f3b945d062dd3c829ec349cc892f9b2334c8a3c74c1225b0cd918af6864a1e539ac2bbad0ee6e20d285b5ad8e307e72996f2531377c55683cb0593ed3e7 + REF v4.3.6 + SHA512 03e92a9fe903d273ee76c30bb6474c739858f0a65adebdcdd1e4b9ae294bd790a8e20161cb2d493fc1ea2987dbfa25a2a620cf7c3739d909595f81693f1f17d4 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/nanobench/vcpkg.json b/external_imported/vcpkg/ports/nanobench/vcpkg.json index d8c6a583e..ebcf47cdc 100644 --- a/external_imported/vcpkg/ports/nanobench/vcpkg.json +++ b/external_imported/vcpkg/ports/nanobench/vcpkg.json @@ -1,7 +1,7 @@ { "name": "nanobench", - "version-string": "4.3.0", - "port-version": 1, + "version": "4.3.6", "description": "Simple, fast, accurate single-header microbenchmarking functionality for C++11/14/17/20", - "homepage": "https://nanobench.ankerl.com" + "homepage": "https://nanobench.ankerl.com", + "license": "MIT" } diff --git a/external_imported/vcpkg/ports/nanogui/portfile.cmake b/external_imported/vcpkg/ports/nanogui/portfile.cmake index 06c899c5e..937c2c0a0 100644 --- a/external_imported/vcpkg/ports/nanogui/portfile.cmake +++ b/external_imported/vcpkg/ports/nanogui/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wjakob/nanogui @@ -22,4 +20,4 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +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 c4c7b4325..f075b3dc6 100644 --- a/external_imported/vcpkg/ports/nanogui/vcpkg.json +++ b/external_imported/vcpkg/ports/nanogui/vcpkg.json @@ -1,7 +1,7 @@ { "name": "nanogui", - "version-string": "2019-09-23", - "port-version": 2, + "version-date": "2019-09-23", + "port-version": 3, "description": "NanoGUI is a minimalistic cross-platform widget library for OpenGL 3.x or higher.", "homepage": "https://github.com/wjakob/nanogui", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/nanorange/portfile.cmake b/external_imported/vcpkg/ports/nanorange/portfile.cmake index c516ecb80..1b22c4868 100644 --- a/external_imported/vcpkg/ports/nanorange/portfile.cmake +++ b/external_imported/vcpkg/ports/nanorange/portfile.cmake @@ -1,22 +1,11 @@ -# header-only vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tcbrindle/NanoRange + REF bf32251d65673fe170d602777c087786c529ead8 + SHA512 74dc8497fd20f56de39e54a104007840450466648f7b216f83265294e24582b486392ad6bf0cc85ca9877655640f08f833bc5d82ebee991b8a57d4fa44f0934f HEAD_REF master ) -# -#vcpkg_configure_cmake( -# SOURCE_PATH ${SOURCE_PATH} -# PREFER_NINJA -#) -#vcpkg_build_cmake() -# - -# Copy header files -file(COPY ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR} FILES_MATCHING PATTERN "*.hpp") - -# Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/nanorange) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/nanorange/LICENSE_1_0.txt ${CURRENT_PACKAGES_DIR}/share/nanorange/copyright) +file(COPY "${SOURCE_PATH}/include" DESTINATION "${CURRENT_PACKAGES_DIR}" FILES_MATCHING PATTERN "*.hpp") +file(INSTALL "${SOURCE_PATH}/LICENSE_1_0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/nanorange/vcpkg.json b/external_imported/vcpkg/ports/nanorange/vcpkg.json index 7ed217cb0..3aed5b7a9 100644 --- a/external_imported/vcpkg/ports/nanorange/vcpkg.json +++ b/external_imported/vcpkg/ports/nanorange/vcpkg.json @@ -1,6 +1,7 @@ { "name": "nanorange", - "version-string": "0.0.0", - "port-version": 1, - "description": "NanoRange is a C++14 implementation of the C++20 Ranges proposals." + "version-date": "2020-07-06", + "description": "NanoRange is a C++14 implementation of the C++20 Ranges proposals.", + "homepage": "https://github.com/tcbrindle/NanoRange", + "license": "BSL-1.0" } diff --git a/external_imported/vcpkg/ports/nanovg/portfile.cmake b/external_imported/vcpkg/ports/nanovg/portfile.cmake index 6a838808b..5df6def4e 100644 --- a/external_imported/vcpkg/ports/nanovg/portfile.cmake +++ b/external_imported/vcpkg/ports/nanovg/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO memononen/nanovg diff --git a/external_imported/vcpkg/ports/nanovg/vcpkg.json b/external_imported/vcpkg/ports/nanovg/vcpkg.json index 39e3cd017..b5f854527 100644 --- a/external_imported/vcpkg/ports/nanovg/vcpkg.json +++ b/external_imported/vcpkg/ports/nanovg/vcpkg.json @@ -1,9 +1,10 @@ { "name": "nanovg", - "version-string": "2019-8-30", - "port-version": 4, + "version-date": "2019-08-30", + "port-version": 5, "description": "NanoVG is small antialiased vector graphics rendering library for OpenGL.", "homepage": "https://github.com/memononen/nanovg", + "supports": "!uwp", "dependencies": [ "stb" ] diff --git a/external_imported/vcpkg/ports/nativefiledialog/portfile.cmake b/external_imported/vcpkg/ports/nativefiledialog/portfile.cmake index c31caab40..5b4bf0e18 100644 --- a/external_imported/vcpkg/ports/nativefiledialog/portfile.cmake +++ b/external_imported/vcpkg/ports/nativefiledialog/portfile.cmake @@ -7,8 +7,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mlabbe/nativefiledialog - REF ceb75f7abf30736aa8ee4800cde0d444c798f8b9 - SHA512 dd2bff28bb08fb1f6b07ad28530da039f176fb641e300b816040a2b2b840611e418cad44fdaf395ec565c50149ce58c80f88f6a77b403b843f2b14f1f2c91d7d + REF 67345b80ebb429ecc2aeda94c478b3bcc5f7888e + SHA512 55edb3730b718b18d4fee7ec9bb479794d0e193ff13f05f26cbcf9ff44c43adb93e228ed7fd708e30c08476366f098bf69139031a84f5e4d6a85eba096fe4654 HEAD_REF master ) @@ -20,8 +20,7 @@ vcpkg_check_features( ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} ) @@ -31,8 +30,8 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT} CONFIG_PATH share/unofficial-${PORT}) vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # 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/nativefiledialog/vcpkg.json b/external_imported/vcpkg/ports/nativefiledialog/vcpkg.json index a9fb97379..e78d27349 100644 --- a/external_imported/vcpkg/ports/nativefiledialog/vcpkg.json +++ b/external_imported/vcpkg/ports/nativefiledialog/vcpkg.json @@ -1,7 +1,6 @@ { "name": "nativefiledialog", - "version-date": "2019-08-28", - "port-version": 1, + "version-date": "2022-01-20", "description": "A tiny, neat C library that portably invokes native file open and save dialogs", "homepage": "https://github.com/mlabbe/nativefiledialog", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/nayuki-qr-code-generator/CMakeLists.txt b/external_imported/vcpkg/ports/nayuki-qr-code-generator/CMakeLists.txt new file mode 100644 index 000000000..8ef0f2dd6 --- /dev/null +++ b/external_imported/vcpkg/ports/nayuki-qr-code-generator/CMakeLists.txt @@ -0,0 +1,24 @@ +cmake_minimum_required(VERSION 3.14) + +project(nayuki-qr-code-generator LANGUAGES CXX) + +include(GNUInstallDirs) + +add_library(nayuki-qr-code-generator qrcodegen.cpp) +target_compile_features(nayuki-qr-code-generator PUBLIC cxx_std_11) +target_include_directories( + nayuki-qr-code-generator + PUBLIC + $ +) + +install(FILES qrcodegen.hpp DESTINATION include) + +install(TARGETS nayuki-qr-code-generator EXPORT unofficial-nayuki-qr-code-generator-config) + +install( + EXPORT unofficial-nayuki-qr-code-generator-config + NAMESPACE unofficial::nayuki-qr-code-generator:: + DESTINATION share/nayuki-qr-code-generator + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +) diff --git a/external_imported/vcpkg/ports/nayuki-qr-code-generator/portfile.cmake b/external_imported/vcpkg/ports/nayuki-qr-code-generator/portfile.cmake new file mode 100644 index 000000000..cd09aff5f --- /dev/null +++ b/external_imported/vcpkg/ports/nayuki-qr-code-generator/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nayuki/QR-Code-generator + REF v1.7.0 + SHA512 34efa40c382b6e7d060a764936c4e2faa4fbbecd5ea4730492a2cb1960656ed67242d84e20a42400ffdee063ed6bcf3b860fef309d09ee71303f44abaafe9328 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}/cpp") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/cpp" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +configure_file("${SOURCE_PATH}/Readme.markdown" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/external_imported/vcpkg/ports/nayuki-qr-code-generator/vcpkg.json b/external_imported/vcpkg/ports/nayuki-qr-code-generator/vcpkg.json new file mode 100644 index 000000000..cce8d1dc6 --- /dev/null +++ b/external_imported/vcpkg/ports/nayuki-qr-code-generator/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "nayuki-qr-code-generator", + "version": "1.7.0", + "description": "High-quality QR Code generator library in C++", + "homepage": "https://github.com/nayuki/QR-Code-generator", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/nccl/portfile.cmake b/external_imported/vcpkg/ports/nccl/portfile.cmake index e6c184daa..5909c49d5 100644 --- a/external_imported/vcpkg/ports/nccl/portfile.cmake +++ b/external_imported/vcpkg/ports/nccl/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "Windows" "OSX" ON_ARCH "x86" "arm") # Find NCCL. We can use FindNCCL directly since it doesn't call any functions # that are disallowed in CMake script mode @@ -16,4 +15,6 @@ else() message(FATAL_ERROR "Please install NCCL using your system package manager (the same way you installed CUDA). For example: apt install libnccl2 libnccl-dev.") endif() +file(INSTALL "${CURRENT_PORT_DIR}/FindNCCL.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +configure_file("${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/external_imported/vcpkg/ports/nccl/vcpkg.json b/external_imported/vcpkg/ports/nccl/vcpkg.json index 479c4df48..47aeef6a6 100644 --- a/external_imported/vcpkg/ports/nccl/vcpkg.json +++ b/external_imported/vcpkg/ports/nccl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "nccl", - "version-string": "2.4.6", - "port-version": 1, + "version": "2.4.6", + "port-version": 2, "description": "Optimized primitives for collective multi-GPU communication.", "supports": "linux & x64", "dependencies": [ diff --git a/external_imported/vcpkg/ports/ncurses/portfile.cmake b/external_imported/vcpkg/ports/ncurses/portfile.cmake index 65ed48e71..f93d4d9c3 100644 --- a/external_imported/vcpkg/ports/ncurses/portfile.cmake +++ b/external_imported/vcpkg/ports/ncurses/portfile.cmake @@ -41,10 +41,12 @@ endif() set(OPTIONS_DEBUG "--with-pkg-config-libdir=${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" --with-debug + --without-normal ) set(OPTIONS_RELEASE "--with-pkg-config-libdir=${CURRENT_INSTALLED_DIR}/lib/pkgconfig" --without-debug + --with-normal ) vcpkg_configure_make( diff --git a/external_imported/vcpkg/ports/ncurses/vcpkg.json b/external_imported/vcpkg/ports/ncurses/vcpkg.json index 7396cf748..465e15d47 100644 --- a/external_imported/vcpkg/ports/ncurses/vcpkg.json +++ b/external_imported/vcpkg/ports/ncurses/vcpkg.json @@ -1,6 +1,9 @@ { "name": "ncurses", - "version-string": "6.3", + "version": "6.3", + "port-version": 1, "description": "free software emulation of curses in System V Release 4.0", + "homepage": "https://invisible-island.net/ncurses/announce.html", + "license": "MIT", "supports": "!windows | mingw" } diff --git a/external_imported/vcpkg/ports/ned14-internal-quickcpplib/portfile.cmake b/external_imported/vcpkg/ports/ned14-internal-quickcpplib/portfile.cmake index 124fa3157..d4c6318e6 100644 --- a/external_imported/vcpkg/ports/ned14-internal-quickcpplib/portfile.cmake +++ b/external_imported/vcpkg/ports/ned14-internal-quickcpplib/portfile.cmake @@ -10,14 +10,16 @@ include(${CURRENT_PORT_DIR}/sha_manifest.cmake) -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: - "overrides": [ - { "name": "gsl-lite", "version": "0.38.1" }, - { "name": "byte-lite", "version": "0.3.0" } - ] -Do not report issues to upstream without first pinning these previous versions. -]=]) +if (NOT "cxx20" IN_LIST FEATURES) + 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: + "overrides": [ + { "name": "gsl-lite", "version": "0.38.1" }, + { "name": "byte-lite", "version": "0.3.0" } + ] + Do not report issues to upstream without first pinning these previous versions. + ]=]) +endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -30,12 +32,16 @@ vcpkg_from_github( ) # Quickcpplib deploys subsets of the dependency headers into a private subdirectory -file(COPY "${CURRENT_INSTALLED_DIR}/include/nonstd/byte.hpp" - DESTINATION "${SOURCE_PATH}/include/quickcpplib/byte/include/nonstd") -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 "cxx17" IN_LIST FEATURES) + 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") +endif() vcpkg_from_github( OUT_SOURCE_PATH OPT_SOURCE_PATH @@ -50,25 +56,35 @@ 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_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS -DPROJECT_IS_DEPENDENCY=On - -DQUICKCPPLIB_USE_VCPKG_BYTE_LITE=ON - -DQUICKCPPLIB_USE_VCPKG_GSL_LITE=ON -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON + -DCMAKE_INSTALL_DATADIR=${CURRENT_PACKAGES_DIR}/share/ned14-internal-quickcpplib + ${FEATURE_OPTIONS} + MAYBE_UNUSED_VARIABLES + CMAKE_DISABLE_FIND_PACKAGE_Doxygen ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/quickcpplib) +vcpkg_cmake_config_fixup( + PACKAGE_NAME quickcpplib + CONFIG_PATH lib/cmake/quickcpplib +) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") -file(RENAME "${CURRENT_PACKAGES_DIR}/share/cmakelib" "${CURRENT_PACKAGES_DIR}/share/ned14-internal-quickcpplib/cmakelib") -file(RENAME "${CURRENT_PACKAGES_DIR}/share/scripts" "${CURRENT_PACKAGES_DIR}/share/ned14-internal-quickcpplib/scripts") 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) 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 babc10208..2ac6943a6 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 8089a9480d28a539cfc821158f0b2ea8339f2495) -set(QUICKCPPLIB_SHA512 da3c6792bafb0fd374787bd4ff092904ca9b98742b9bb5fc89f7fb7dc45753aad6365d9a403b4f0c992d1337d89d689a756d077af60dd38f64645b7b8adc6ac7) +set(QUICKCPPLIB_REF cad832c8083c8eb984c26ee995609817f27f9847) +set(QUICKCPPLIB_SHA512 4a2cd3d3e90317a201088291781d13bbc66f4beadfead61ed894f6f5fa38001fb94b68f0965ae77efd9e43c274583e74c00a0781018cd1714ec99e00c9b17824) 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 95b501d33..d79bfba95 100644 --- a/external_imported/vcpkg/ports/ned14-internal-quickcpplib/vcpkg.json +++ b/external_imported/vcpkg/ports/ned14-internal-quickcpplib/vcpkg.json @@ -1,10 +1,35 @@ { "name": "ned14-internal-quickcpplib", - "version-string": "0.0.0-8089a948", + "version-string": "0.0.0-cad832c8", "description": "NOT FOR EXTERNAL CONSUMPTION, a set of internal scripts used by ned14's libraries.", "homepage": "https://github.com/ned14/quickcpplib", "dependencies": [ "byte-lite", - "gsl-lite" - ] + "gsl-lite", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "cxx17": { + "description": "Do not polyfill C++17 entities" + }, + "cxx20": { + "description": "Do not polyfill C++20 entities", + "dependencies": [ + { + "name": "ned14-internal-quickcpplib", + "default-features": false, + "features": [ + "cxx17" + ] + } + ] + } + } } diff --git a/external_imported/vcpkg/ports/netcdf-c/fix-dependency-mpi.patch b/external_imported/vcpkg/ports/netcdf-c/fix-dependency-mpi.patch new file mode 100644 index 000000000..91eb2434b --- /dev/null +++ b/external_imported/vcpkg/ports/netcdf-c/fix-dependency-mpi.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1207,7 +1207,8 @@ + IF(NOT HDF5_PARALLEL) + SET(USE_PARALLEL OFF CACHE BOOL "") + MESSAGE(STATUS "Cannot find HDF5 library built with parallel support. Disabling parallel build.") + ELSE() + FIND_PACKAGE(MPI REQUIRED) ++ list(REMOVE_ITEM MPI_C_INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}") + SET(HDF5_PARALLEL ON CACHE BOOL "") + SET(USE_PARALLEL ON CACHE BOOL "") diff --git a/external_imported/vcpkg/ports/netcdf-c/portfile.cmake b/external_imported/vcpkg/ports/netcdf-c/portfile.cmake index 62f580e6f..441d422cc 100644 --- a/external_imported/vcpkg/ports/netcdf-c/portfile.cmake +++ b/external_imported/vcpkg/ports/netcdf-c/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( fix-pkgconfig.patch fix-manpage-msys.patch fix-dependency-libzip.patch + fix-dependency-mpi.patch ) #Remove outdated find modules diff --git a/external_imported/vcpkg/ports/netcdf-c/vcpkg.json b/external_imported/vcpkg/ports/netcdf-c/vcpkg.json index 80fbcdd10..77df76e4d 100644 --- a/external_imported/vcpkg/ports/netcdf-c/vcpkg.json +++ b/external_imported/vcpkg/ports/netcdf-c/vcpkg.json @@ -1,7 +1,7 @@ { "name": "netcdf-c", "version": "4.8.1", - "port-version": 1, + "port-version": 2, "description": "A set of self-describing, machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data.", "homepage": "https://github.com/Unidata/netcdf-c", "dependencies": [ diff --git a/external_imported/vcpkg/ports/nethost/portfile.cmake b/external_imported/vcpkg/ports/nethost/portfile.cmake index 3809d9872..c7d4aae3b 100644 --- a/external_imported/vcpkg/ports/nethost/portfile.cmake +++ b/external_imported/vcpkg/ports/nethost/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - set(COMMIT_HASH 188427d7e18102c45fc6d0e20c135e226f215992) vcpkg_from_github( diff --git a/external_imported/vcpkg/ports/nethost/vcpkg.json b/external_imported/vcpkg/ports/nethost/vcpkg.json index 467d4249c..0f65e50da 100644 --- a/external_imported/vcpkg/ports/nethost/vcpkg.json +++ b/external_imported/vcpkg/ports/nethost/vcpkg.json @@ -1,7 +1,8 @@ { "name": "nethost", - "version-string": "2019-12-21", - "port-version": 1, + "version-date": "2019-12-21", + "port-version": 2, "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" + "homepage": "https://github.com/dotnet/runtime/tree/master/src/installer/corehost/cli/nethost", + "supports": "!uwp" } diff --git a/external_imported/vcpkg/ports/nettle/compile.patch b/external_imported/vcpkg/ports/nettle/compile.patch new file mode 100644 index 000000000..2aa1891c8 --- /dev/null +++ b/external_imported/vcpkg/ports/nettle/compile.patch @@ -0,0 +1,39 @@ +diff --git a/examples/Makefile.in b/examples/Makefile.in +index eb6a81790..1d927079c 100644 +--- a/examples/Makefile.in ++++ b/examples/Makefile.in +@@ -11,7 +11,7 @@ PRE_CPPFLAGS = -I.. -I$(top_srcdir) + PRE_LDFLAGS = -L.. + + OPENSSL_LIBFLAGS = @OPENSSL_LIBFLAGS@ +-BENCH_LIBS = @BENCH_LIBS@ -lm ++BENCH_LIBS = @BENCH_LIBS@ + + HOGWEED_TARGETS = rsa-keygen$(EXEEXT) rsa-sign$(EXEEXT) \ + rsa-verify$(EXEEXT) rsa-encrypt$(EXEEXT) rsa-decrypt$(EXEEXT) \ +diff --git a/streebog.c b/streebog.c +index 7ad619d5e..85609a473 100644 +--- a/streebog.c ++++ b/streebog.c +@@ -1233,7 +1233,7 @@ streebog512_compress (struct streebog512_ctx *ctx, const uint8_t *input, uint64_ + static void + streebog_final (struct streebog512_ctx *ctx) + { +- uint64_t Z[8] = {}; ++ uint64_t Z[8] = {0,0,0,0,0,0,0,0}; + unsigned int i; + + /* PAD. It does not count towards message length */ +diff --git a/Makefile.in b/Makefile.in +index b65ff4960..3887d0c8f 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -322,7 +322,7 @@ $(LIBHOGWEED_FORLINK): $(hogweed_OBJS) $(LIBNETTLE_FORLINK) + + # For building the various *data.c programs. -lm needed for shadata. + %$(EXEEXT_FOR_BUILD): %.c +- $(CC_FOR_BUILD) $< $(CFLAGS) -lm -o $@ ++ $(CC_FOR_BUILD) $< $(CFLAGS) -o $@ + + # Explicit dependency. + eccdata$(EXEEXT_FOR_BUILD): mini-gmp.c mini-gmp.h diff --git a/external_imported/vcpkg/ports/nettle/gmp.patch b/external_imported/vcpkg/ports/nettle/gmp.patch deleted file mode 100644 index c54298a28..000000000 --- a/external_imported/vcpkg/ports/nettle/gmp.patch +++ /dev/null @@ -1,205 +0,0 @@ -diff --git a/SMP/config.h b/SMP/config.h -index e4de0f1..ba41eb4 100644 ---- a/SMP/config.h -+++ b/SMP/config.h -@@ -102,7 +102,7 @@ - #define HAVE_SYS_TYPES_H 1 - - /* Define to 1 if you have the header file. */ --#define HAVE_UNISTD_H 1 -+//#define HAVE_UNISTD_H 1 - - /* Define to 1 if you have the header file. */ - /* #undef HAVE_VALGRIND_MEMCHECK_H */ -diff --git a/SMP/libhogweed_winrt.vcxproj b/SMP/libhogweed_winrt.vcxproj -index 476f7a7..308bd0b 100644 ---- a/SMP/libhogweed_winrt.vcxproj -+++ b/SMP/libhogweed_winrt.vcxproj -@@ -247,7 +247,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libhogweed.def -- nettled_winrt.lib;gmpd_winrt.lib;%(AdditionalDependencies) -+ nettled_winrt.lib;gmpd.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -362,7 +362,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libhogweed.def -- nettled_winrt.lib;gmpd_winrt.lib;%(AdditionalDependencies) -+ nettled_winrt.lib;gmpd.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -705,7 +705,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libhogweed.def -- nettle_winrt.lib;gmp_winrt.lib;%(AdditionalDependencies) -+ nettle_winrt.lib;gmp.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -935,7 +935,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libhogweed.def -- nettle_winrt.lib;gmp_winrt.lib;%(AdditionalDependencies) -+ nettle_winrt.lib;gmp.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -diff --git a/SMP/libnettle.vcxproj b/SMP/libnettle.vcxproj -index 088cb85..cc2cbeb 100644 ---- a/SMP/libnettle.vcxproj -+++ b/SMP/libnettle.vcxproj -@@ -18,7 +18,7 @@ - 4244;4146;4267;4098;%(DisableSpecificWarnings) - - -- libgmpd.lib;%(AdditionalDependencies) -+ %(AdditionalDependencies) - - - mkdir "$(OutDir)"\include -@@ -131,7 +131,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - 4244;4146;4267;4098;%(DisableSpecificWarnings) - - -- libgmpd.lib;%(AdditionalDependencies) -+ %(AdditionalDependencies) - - - mkdir "$(OutDir)"\include -@@ -472,7 +472,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - 4244;4146;4267;4098;%(DisableSpecificWarnings) - - -- libgmp.lib;%(AdditionalDependencies) -+ %(AdditionalDependencies) - - - mkdir "$(OutDir)"\include -@@ -586,7 +586,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - 4244;4146;4267;4098;%(DisableSpecificWarnings) - - -- libgmp.lib;%(AdditionalDependencies) -+ %(AdditionalDependencies) - - - mkdir "$(OutDir)"\include -@@ -815,7 +815,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libnettle.def -- libgmp.lib;%(AdditionalDependencies) -+ gmp.lib;%(AdditionalDependencies) - - - mkdir "$(OutDir)"\include -@@ -1043,7 +1043,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libnettle.def -- libgmp.lib;%(AdditionalDependencies) -+ gmp.lib;%(AdditionalDependencies) - - - mkdir "$(OutDir)"\include -diff --git a/SMP/libnettle_winrt.vcxproj b/SMP/libnettle_winrt.vcxproj -index cb650ab..188f67a 100644 ---- a/SMP/libnettle_winrt.vcxproj -+++ b/SMP/libnettle_winrt.vcxproj -@@ -18,7 +18,7 @@ - 4244;4146;4267;4098;%(DisableSpecificWarnings) - - -- libgmpd_winrt.lib;%(AdditionalDependencies) -+ %(AdditionalDependencies) - - - mkdir "$(OutDir)"\include -@@ -131,7 +131,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - 4244;4146;4267;4098;%(DisableSpecificWarnings) - - -- libgmpd_winrt.lib;%(AdditionalDependencies) -+ %(AdditionalDependencies) - - - mkdir "$(OutDir)"\include -@@ -245,7 +245,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libnettle.def -- gmpd_winrt.lib;%(AdditionalDependencies) -+ gmpd.lib;%(AdditionalDependencies) - - - mkdir "$(OutDir)"\include -@@ -359,7 +359,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libnettle.def -- gmpd_winrt.lib;%(AdditionalDependencies) -+ gmpd.lib;%(AdditionalDependencies) - - - mkdir "$(OutDir)"\include -@@ -472,7 +472,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - 4244;4146;4267;4098;%(DisableSpecificWarnings) - - -- libgmp_winrt.lib;%(AdditionalDependencies) -+ %(AdditionalDependencies) - - - mkdir "$(OutDir)"\include -@@ -585,7 +585,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - 4244;4146;4267;4098;%(DisableSpecificWarnings) - - -- libgmp_winrt.lib;%(AdditionalDependencies) -+ %(AdditionalDependencies) - - - mkdir "$(OutDir)"\include -@@ -699,7 +699,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libnettle.def -- gmp_winrt.lib;%(AdditionalDependencies) -+ gmp.lib;%(AdditionalDependencies) - - - mkdir "$(OutDir)"\include -@@ -813,7 +813,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libnettle.def -- libgmp_winrt.lib;%(AdditionalDependencies) -+ gmp.lib;%(AdditionalDependencies) - - - mkdir "$(OutDir)"\include -@@ -927,7 +927,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libnettle.def -- gmp_winrt.lib;%(AdditionalDependencies) -+ gmp.lib;%(AdditionalDependencies) - - - mkdir "$(OutDir)"\include -@@ -1041,7 +1041,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libnettle.def -- libgmp_winrt.lib;%(AdditionalDependencies) -+ gmp.lib;%(AdditionalDependencies) - - - mkdir "$(OutDir)"\include diff --git a/external_imported/vcpkg/ports/nettle/hogweed-x64.def b/external_imported/vcpkg/ports/nettle/hogweed-x64.def new file mode 100644 index 000000000..14a8bcad7 --- /dev/null +++ b/external_imported/vcpkg/ports/nettle/hogweed-x64.def @@ -0,0 +1,288 @@ +EXPORTS + _nettle_ecc_curve448_modp + _nettle_ecc_curve25519_modp + _nettle_ecc_secp521r1_modp + _nettle_ecc_secp384r1_modp + _nettle_ecc_secp256r1_redc + _nettle_ecc_secp224r1_modp + _nettle_ecc_secp192r1_modp + nettle_ed448_shake256_verify + nettle_ed448_shake256_sign + nettle_ed448_shake256_public_key + _nettle_ed448_shake256 + nettle_ed25519_sha512_verify + nettle_ed25519_sha512_sign + nettle_ed25519_sha512_public_key + _nettle_ed25519_sha512 + _nettle_eddsa_verify + _nettle_eddsa_verify_itch + _nettle_eddsa_sign + _nettle_eddsa_sign_itch + _nettle_eddsa_public_key + _nettle_eddsa_public_key_itch + _nettle_eddsa_hash + _nettle_eddsa_expand_key + _nettle_eddsa_decompress + _nettle_eddsa_decompress_itch + _nettle_eddsa_compress + _nettle_eddsa_compress_itch + _nettle_curve448_eh_to_x + nettle_curve448_mul + nettle_curve448_mul_g + _nettle_curve25519_eh_to_x + nettle_curve25519_mul + nettle_curve25519_mul_g + nettle_gostdsa_vko + nettle_gostdsa_verify + nettle_ecc_gostdsa_verify + nettle_ecc_gostdsa_verify_itch + nettle_gostdsa_sign + nettle_ecc_gostdsa_sign + nettle_ecc_gostdsa_sign_itch + nettle_ecdsa_generate_keypair + nettle_ecdsa_verify + nettle_ecc_ecdsa_verify + nettle_ecc_ecdsa_verify_itch + nettle_ecdsa_sign + nettle_ecc_ecdsa_sign + nettle_ecc_ecdsa_sign_itch + nettle_ecc_point_mul_g + nettle_ecc_point_mul + nettle_ecc_scalar_clear + nettle_ecc_scalar_get + nettle_ecc_scalar_init + nettle_ecc_scalar_set + nettle_ecc_point_clear + nettle_ecc_point_get + nettle_ecc_point_init + nettle_ecc_point_set + _nettle_ecc_mod_random + nettle_ecc_scalar_random + _nettle_ecc_hash + _nettle_gost_hash + _nettle_ecc_mul_a + _nettle_ecc_mul_g + _nettle_ecc_mul_m + _nettle_ecc_mul_a_eh + _nettle_ecc_mul_g_eh + _nettle_ecc_add_thh + _nettle_ecc_add_th + _nettle_ecc_dup_th + _nettle_ecc_add_ehh + _nettle_ecc_add_eh + _nettle_ecc_dup_eh + _nettle_ecc_eh_to_a + _nettle_ecc_add_jjj + _nettle_ecc_add_jja + _nettle_ecc_dup_jj + _nettle_ecc_a_to_j + _nettle_ecc_j_to_a + nettle_ecc_bit_size + nettle_ecc_size + nettle_ecc_size_a + nettle_ecc_size_j + _nettle_secp_521r1 + nettle_get_secp_521r1 + _nettle_secp_384r1 + nettle_get_secp_384r1 + _nettle_secp_256r1 + nettle_get_secp_256r1 + _nettle_secp_224r1 + nettle_get_secp_224r1 + _nettle_secp_192r1 + nettle_get_secp_192r1 + _nettle_gost_gc512a + nettle_get_gost_gc512a + _nettle_gost_gc256b + nettle_get_gost_gc256b + _nettle_curve448 + _nettle_curve25519 + _nettle_ecc_pm1_redc + _nettle_ecc_pp1_redc + _nettle_ecc_mod_add + _nettle_ecc_mod_addmul_1 + _nettle_ecc_mod_mul + _nettle_ecc_mod_mul_1 + _nettle_ecc_mod_mul_canonical + _nettle_ecc_mod_pow_2k + _nettle_ecc_mod_pow_2k_mul + _nettle_ecc_mod_sqr + _nettle_ecc_mod_sqr_canonical + _nettle_ecc_mod_sub + _nettle_ecc_mod_submul_1 + _nettle_ecc_mod_inv + _nettle_ecc_mod + _nettle_cnd_copy + _nettle_gmp_alloc + _nettle_gmp_alloc_limbs + _nettle_gmp_free + _nettle_gmp_free_limbs + _nettle_mpn_get_base256 + _nettle_mpn_get_base256_le + _nettle_mpn_set_base256 + _nettle_mpn_set_base256_le + _nettle_mpz_limbs_cmp + _nettle_mpz_limbs_copy + _nettle_mpz_limbs_read_n + _nettle_mpz_set_n + _nettle_sec_tabselect + _nettle_sec_sub_1 + _nettle_sec_add_1 + nettle_dsa_openssl_private_key_from_der_iterator + nettle_dsa_params_from_der_iterator + nettle_dsa_public_key_from_der_iterator + nettle_openssl_provate_key_from_der + nettle_rsa_keypair_from_der + nettle_rsa_private_key_from_der_iterator + nettle_rsa_public_key_from_der_iterator + nettle_asn1_der_decode_bitstring + nettle_asn1_der_decode_bitstring_last + nettle_asn1_der_decode_constructed + nettle_asn1_der_decode_constructed_last + nettle_asn1_der_get_bignum + nettle_asn1_der_get_uint32 + nettle_asn1_der_iterator_first + nettle_asn1_der_iterator_next + nettle_rsa_keypair_to_openpgp + nettle_pgp_armor + nettle_pgp_crc24 + nettle_pgp_put_header + nettle_pgp_put_header_length + nettle_pgp_put_length + nettle_pgp_put_mpi + nettle_pgp_put_public_rsa_key + nettle_pgp_put_rsa_sha1_signature + nettle_pgp_put_string + nettle_pgp_put_sub_packet + nettle_pgp_put_uint16 + nettle_pgp_put_uint32 + nettle_pgp_put_userid + nettle_pgp_sub_packet_end + nettle_pgp_sub_packet_start + nettle_dsa_keypair_from_sexp_alist + nettle_dsa_sha1_keypair_from_sexp + nettle_dsa_sha256_keypair_from_sexp + nettle_dsa_signature_from_sexp + nettle_dsa_keypair_to_sexp + nettle_dsa_sha256_verify + nettle_dsa_sha256_verify_digest + nettle_dsa_sha256_sign + nettle_dsa_sha256_sign_digest + nettle_dsa_sha1_verify + nettle_dsa_sha1_verify_digest + nettle_dsa_sha1_sign + nettle_dsa_sha1_sign_digest + _nettle_dsa_hash + nettle_dsa_generate_keypair + nettle_dsa_verify + nettle_dsa_sign + nettle_dsa_generate_params + nettle_dsa_compat_generate_keypair + nettle_dsa_private_key_clear + nettle_dsa_private_key_init + nettle_dsa_public_key_clear + nettle_dsa_public_key_init + nettle_dsa_params_clear + nettle_dsa_params_init + nettle_dsa_signature_clear + nettle_dsa_signature_init + nettle_rsa_keypair_from_sexp + nettle_rsa_keypair_from_sexp_alist + nettle_rsa_keypair_to_sexp + _nettle_rsa_blind + _nettle_rsa_unblind + nettle_rsa_generate_keypair + nettle_rsa_decrypt_tr + nettle_rsa_sec_decrypt + nettle_rsa_decrypt + nettle_rsa_encrypt + nettle_rsa_pss_sha384_verify_digest + nettle_rsa_pss_sha512_verify_digest + nettle_rsa_pss_sha384_sign_digest_tr + nettle_rsa_pss_sha512_sign_digest_tr + nettle_rsa_pss_sha256_verify_digest + nettle_rsa_pss_sha256_sign_digest_tr + nettle_rsa_sha512_verify + nettle_rsa_sha512_verify_digest + nettle_rsa_sha512_sign_digest_tr + nettle_rsa_sha512_sign_tr + nettle_rsa_sha512_sign + nettle_rsa_sha512_sign_digest + nettle_rsa_sha256_verify + nettle_rsa_sha256_verify_digest + nettle_rsa_sha256_sign_digest_tr + nettle_rsa_sha256_sign_tr + nettle_rsa_sha256_sign + nettle_rsa_sha256_sign_digest + nettle_rsa_sha1_verify + nettle_rsa_sha1_verify_digest + nettle_rsa_sha1_sign_digest_tr + nettle_rsa_sha1_sign_tr + nettle_rsa_sha1_sign + nettle_rsa_sha1_sign_digest + nettle_rsa_md5_verify + nettle_rsa_md5_verify_digest + nettle_rsa_md5_sign_digest_tr + nettle_rsa_md5_sign_tr + nettle_rsa_md5_sign + nettle_rsa_md5_sign_digest + nettle_rsa_pkcs1_verify + nettle_rsa_pkcs1_sign_tr + nettle_rsa_pkcs1_sign + _nettle_rsa_sec_compute_root + _nettle_rsa_sec_compute_root_itch + _nettle_rsa_verify + _nettle_rsa_verify_recover + _nettle_rsa_sec_compute_root_tr + nettle_rsa_compute_root_tr + nettle_rsa_compute_root + nettle_rsa_private_key_clear + nettle_rsa_private_key_init + nettle_rsa_private_key_prepare + _nettle_rsa_check_size + nettle_rsa_public_key_clear + nettle_rsa_public_key_init + nettle_rsa_public_key_prepare + nettle_pss_mgf1 + nettle_pss_encode_mgf1 + nettle_pss_verify_mgf1 + nettle_pkcs1_rsa_sha512_encode + nettle_pkcs1_rsa_sha512_encode_digest + nettle_pkcs1_rsa_sha256_encode + nettle_pkcs1_rsa_sha256_encode_digest + nettle_pkcs1_rsa_sha1_encode + nettle_pkcs1_rsa_sha1_encode_digest + nettle_pkcs1_rsa_md5_encode + nettle_pkcs1_rsa_md5_encode_digest + nettle_pkcs1_rsa_digest_encode + _nettle_pkcs1_sec_decrypt + _nettle_pkcs1_sec_decrypt_variable + nettle_pkcs1_decrypt + nettle_pkcs1_encrypt + _nettle_pkcs1_signature_prefix + nettle_mpz_set_sexp + _nettle_generate_pocklington_prime + nettle_random_prime + nettle_mpz_random + nettle_mpz_random_size + nettle_mpz_get_str_256 + nettle_mpz_init_set_str_256_s + nettle_mpz_init_set_str_256_u + nettle_mpz_set_str_256_s + nettle_mpz_set_str_256_u + nettle_mpz_sizeinbase_256_s + nettle_mpz_sizeinbase_256_u + nettle_sexp_transport_format + nettle_sexp_transport_vformat + nettle_sexp_transport_iterator_first + nettle_sexp_format + nettle_sexp_vformat + nettle_sexp_iterator_assoc + nettle_sexp_iterator_check_type + nettle_sexp_iterator_check_types + nettle_sexp_iterator_enter_list + nettle_sexp_iterator_exit_list + nettle_sexp_iterator_first + nettle_sexp_iterator_get_uint32 + nettle_sexp_iterator_next + nettle_sexp_iterator_subexpr diff --git a/external_imported/vcpkg/ports/nettle/hogweed-x86.def b/external_imported/vcpkg/ports/nettle/hogweed-x86.def new file mode 100644 index 000000000..8824a537c --- /dev/null +++ b/external_imported/vcpkg/ports/nettle/hogweed-x86.def @@ -0,0 +1,281 @@ +EXPORTS + nettle_ed448_shake256_verify + nettle_ed448_shake256_sign + nettle_ed448_shake256_public_key + _nettle_ed448_shake256 + nettle_ed25519_sha512_verify + nettle_ed25519_sha512_sign + nettle_ed25519_sha512_public_key + _nettle_ed25519_sha512 + _nettle_eddsa_verify + _nettle_eddsa_verify_itch + _nettle_eddsa_sign + _nettle_eddsa_sign_itch + _nettle_eddsa_public_key + _nettle_eddsa_public_key_itch + _nettle_eddsa_hash + _nettle_eddsa_expand_key + _nettle_eddsa_decompress + _nettle_eddsa_decompress_itch + _nettle_eddsa_compress + _nettle_eddsa_compress_itch + _nettle_curve448_eh_to_x + nettle_curve448_mul + nettle_curve448_mul_g + _nettle_curve25519_eh_to_x + nettle_curve25519_mul + nettle_curve25519_mul_g + nettle_gostdsa_vko + nettle_gostdsa_verify + nettle_ecc_gostdsa_verify + nettle_ecc_gostdsa_verify_itch + nettle_gostdsa_sign + nettle_ecc_gostdsa_sign + nettle_ecc_gostdsa_sign_itch + nettle_ecdsa_generate_keypair + nettle_ecdsa_verify + nettle_ecc_ecdsa_verify + nettle_ecc_ecdsa_verify_itch + nettle_ecdsa_sign + nettle_ecc_ecdsa_sign + nettle_ecc_ecdsa_sign_itch + nettle_ecc_point_mul_g + nettle_ecc_point_mul + nettle_ecc_scalar_clear + nettle_ecc_scalar_get + nettle_ecc_scalar_init + nettle_ecc_scalar_set + nettle_ecc_point_clear + nettle_ecc_point_get + nettle_ecc_point_init + nettle_ecc_point_set + _nettle_ecc_mod_random + nettle_ecc_scalar_random + _nettle_ecc_hash + _nettle_gost_hash + _nettle_ecc_mul_a + _nettle_ecc_mul_g + _nettle_ecc_mul_m + _nettle_ecc_mul_a_eh + _nettle_ecc_mul_g_eh + _nettle_ecc_add_thh + _nettle_ecc_add_th + _nettle_ecc_dup_th + _nettle_ecc_add_ehh + _nettle_ecc_add_eh + _nettle_ecc_dup_eh + _nettle_ecc_eh_to_a + _nettle_ecc_add_jjj + _nettle_ecc_add_jja + _nettle_ecc_dup_jj + _nettle_ecc_a_to_j + _nettle_ecc_j_to_a + nettle_ecc_bit_size + nettle_ecc_size + nettle_ecc_size_a + nettle_ecc_size_j + _nettle_secp_521r1 + nettle_get_secp_521r1 + _nettle_secp_384r1 + nettle_get_secp_384r1 + _nettle_secp_256r1 + nettle_get_secp_256r1 + _nettle_secp_224r1 + nettle_get_secp_224r1 + _nettle_secp_192r1 + nettle_get_secp_192r1 + _nettle_gost_gc512a + nettle_get_gost_gc512a + _nettle_gost_gc256b + nettle_get_gost_gc256b + _nettle_curve448 + _nettle_curve25519 + _nettle_ecc_pm1_redc + _nettle_ecc_pp1_redc + _nettle_ecc_mod_add + _nettle_ecc_mod_addmul_1 + _nettle_ecc_mod_mul + _nettle_ecc_mod_mul_1 + _nettle_ecc_mod_mul_canonical + _nettle_ecc_mod_pow_2k + _nettle_ecc_mod_pow_2k_mul + _nettle_ecc_mod_sqr + _nettle_ecc_mod_sqr_canonical + _nettle_ecc_mod_sub + _nettle_ecc_mod_submul_1 + _nettle_ecc_mod_inv + _nettle_ecc_mod + _nettle_cnd_copy + _nettle_gmp_alloc + _nettle_gmp_alloc_limbs + _nettle_gmp_free + _nettle_gmp_free_limbs + _nettle_mpn_get_base256 + _nettle_mpn_get_base256_le + _nettle_mpn_set_base256 + _nettle_mpn_set_base256_le + _nettle_mpz_limbs_cmp + _nettle_mpz_limbs_copy + _nettle_mpz_limbs_read_n + _nettle_mpz_set_n + _nettle_sec_tabselect + _nettle_sec_sub_1 + _nettle_sec_add_1 + nettle_dsa_openssl_private_key_from_der_iterator + nettle_dsa_params_from_der_iterator + nettle_dsa_public_key_from_der_iterator + nettle_openssl_provate_key_from_der + nettle_rsa_keypair_from_der + nettle_rsa_private_key_from_der_iterator + nettle_rsa_public_key_from_der_iterator + nettle_asn1_der_decode_bitstring + nettle_asn1_der_decode_bitstring_last + nettle_asn1_der_decode_constructed + nettle_asn1_der_decode_constructed_last + nettle_asn1_der_get_bignum + nettle_asn1_der_get_uint32 + nettle_asn1_der_iterator_first + nettle_asn1_der_iterator_next + nettle_rsa_keypair_to_openpgp + nettle_pgp_armor + nettle_pgp_crc24 + nettle_pgp_put_header + nettle_pgp_put_header_length + nettle_pgp_put_length + nettle_pgp_put_mpi + nettle_pgp_put_public_rsa_key + nettle_pgp_put_rsa_sha1_signature + nettle_pgp_put_string + nettle_pgp_put_sub_packet + nettle_pgp_put_uint16 + nettle_pgp_put_uint32 + nettle_pgp_put_userid + nettle_pgp_sub_packet_end + nettle_pgp_sub_packet_start + nettle_dsa_keypair_from_sexp_alist + nettle_dsa_sha1_keypair_from_sexp + nettle_dsa_sha256_keypair_from_sexp + nettle_dsa_signature_from_sexp + nettle_dsa_keypair_to_sexp + nettle_dsa_sha256_verify + nettle_dsa_sha256_verify_digest + nettle_dsa_sha256_sign + nettle_dsa_sha256_sign_digest + nettle_dsa_sha1_verify + nettle_dsa_sha1_verify_digest + nettle_dsa_sha1_sign + nettle_dsa_sha1_sign_digest + _nettle_dsa_hash + nettle_dsa_generate_keypair + nettle_dsa_verify + nettle_dsa_sign + nettle_dsa_generate_params + nettle_dsa_compat_generate_keypair + nettle_dsa_private_key_clear + nettle_dsa_private_key_init + nettle_dsa_public_key_clear + nettle_dsa_public_key_init + nettle_dsa_params_clear + nettle_dsa_params_init + nettle_dsa_signature_clear + nettle_dsa_signature_init + nettle_rsa_keypair_from_sexp + nettle_rsa_keypair_from_sexp_alist + nettle_rsa_keypair_to_sexp + _nettle_rsa_blind + _nettle_rsa_unblind + nettle_rsa_generate_keypair + nettle_rsa_decrypt_tr + nettle_rsa_sec_decrypt + nettle_rsa_decrypt + nettle_rsa_encrypt + nettle_rsa_pss_sha384_verify_digest + nettle_rsa_pss_sha512_verify_digest + nettle_rsa_pss_sha384_sign_digest_tr + nettle_rsa_pss_sha512_sign_digest_tr + nettle_rsa_pss_sha256_verify_digest + nettle_rsa_pss_sha256_sign_digest_tr + nettle_rsa_sha512_verify + nettle_rsa_sha512_verify_digest + nettle_rsa_sha512_sign_digest_tr + nettle_rsa_sha512_sign_tr + nettle_rsa_sha512_sign + nettle_rsa_sha512_sign_digest + nettle_rsa_sha256_verify + nettle_rsa_sha256_verify_digest + nettle_rsa_sha256_sign_digest_tr + nettle_rsa_sha256_sign_tr + nettle_rsa_sha256_sign + nettle_rsa_sha256_sign_digest + nettle_rsa_sha1_verify + nettle_rsa_sha1_verify_digest + nettle_rsa_sha1_sign_digest_tr + nettle_rsa_sha1_sign_tr + nettle_rsa_sha1_sign + nettle_rsa_sha1_sign_digest + nettle_rsa_md5_verify + nettle_rsa_md5_verify_digest + nettle_rsa_md5_sign_digest_tr + nettle_rsa_md5_sign_tr + nettle_rsa_md5_sign + nettle_rsa_md5_sign_digest + nettle_rsa_pkcs1_verify + nettle_rsa_pkcs1_sign_tr + nettle_rsa_pkcs1_sign + _nettle_rsa_sec_compute_root + _nettle_rsa_sec_compute_root_itch + _nettle_rsa_verify + _nettle_rsa_verify_recover + _nettle_rsa_sec_compute_root_tr + nettle_rsa_compute_root_tr + nettle_rsa_compute_root + nettle_rsa_private_key_clear + nettle_rsa_private_key_init + nettle_rsa_private_key_prepare + _nettle_rsa_check_size + nettle_rsa_public_key_clear + nettle_rsa_public_key_init + nettle_rsa_public_key_prepare + nettle_pss_mgf1 + nettle_pss_encode_mgf1 + nettle_pss_verify_mgf1 + nettle_pkcs1_rsa_sha512_encode + nettle_pkcs1_rsa_sha512_encode_digest + nettle_pkcs1_rsa_sha256_encode + nettle_pkcs1_rsa_sha256_encode_digest + nettle_pkcs1_rsa_sha1_encode + nettle_pkcs1_rsa_sha1_encode_digest + nettle_pkcs1_rsa_md5_encode + nettle_pkcs1_rsa_md5_encode_digest + nettle_pkcs1_rsa_digest_encode + _nettle_pkcs1_sec_decrypt + _nettle_pkcs1_sec_decrypt_variable + nettle_pkcs1_decrypt + nettle_pkcs1_encrypt + _nettle_pkcs1_signature_prefix + nettle_mpz_set_sexp + _nettle_generate_pocklington_prime + nettle_random_prime + nettle_mpz_random + nettle_mpz_random_size + nettle_mpz_get_str_256 + nettle_mpz_init_set_str_256_s + nettle_mpz_init_set_str_256_u + nettle_mpz_set_str_256_s + nettle_mpz_set_str_256_u + nettle_mpz_sizeinbase_256_s + nettle_mpz_sizeinbase_256_u + nettle_sexp_transport_format + nettle_sexp_transport_vformat + nettle_sexp_transport_iterator_first + nettle_sexp_format + nettle_sexp_vformat + nettle_sexp_iterator_assoc + nettle_sexp_iterator_check_type + nettle_sexp_iterator_check_types + nettle_sexp_iterator_enter_list + nettle_sexp_iterator_exit_list + nettle_sexp_iterator_first + nettle_sexp_iterator_get_uint32 + nettle_sexp_iterator_next + nettle_sexp_iterator_subexpr diff --git a/external_imported/vcpkg/ports/nettle/libname-windows.patch b/external_imported/vcpkg/ports/nettle/libname-windows.patch new file mode 100644 index 000000000..6a4e38cf4 --- /dev/null +++ b/external_imported/vcpkg/ports/nettle/libname-windows.patch @@ -0,0 +1,67 @@ +diff --git a/Makefile.in b/Makefile.in +index b65ff4960..3887d0c8f 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -27,7 +27,7 @@ PRE_CPPFLAGS = -I. + EXTRA_CFLAGS = $(CCPIC) + + # FIXME: Add configuration of LIBEXT? +-LIBTARGETS = @IF_STATIC@ libnettle.a @IF_HOGWEED@ libhogweed.a ++LIBTARGETS = @IF_STATIC@ $(LIBNETTLE_FILE) @IF_HOGWEED@ $(LIBHOGWEED_FILE) + SHLIBTARGETS = @IF_SHARED@ $(LIBNETTLE_FORLINK) @IF_HOGWEED@ $(LIBHOGWEED_FORLINK) + + getopt_SOURCES = getopt.c getopt1.c +@@ -277,13 +277,13 @@ nettle_OBJS = $(nettle_SOURCES:.c=.$(OBJEXT)) \ + hogweed_OBJS = $(hogweed_SOURCES:.c=.$(OBJEXT)) \ + $(OPT_HOGWEED_OBJS) @IF_MINI_GMP@ mini-gmp.$(OBJEXT) + +-libnettle.a: $(nettle_OBJS) ++$(LIBNETTLE_FILE): $(nettle_OBJS) + -rm -f $@ + $(AR) $(ARFLAGS) $@ $(nettle_OBJS) + $(RANLIB) $@ + echo nettle > libnettle.stamp + +-libhogweed.a: $(hogweed_OBJS) ++$(LIBHOGWEED_FILE): $(hogweed_OBJS) + -rm -f $@ + $(AR) $(ARFLAGS) $@ $(hogweed_OBJS) + $(RANLIB) $@ +diff --git a/configure.ac b/configure.ac +index e95f1c825..1d7ef36bb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -662,8 +665,8 @@ case "$host_os" in + # linking to the DLL, is installed into the lib dir. + case "$host_os" in + mingw32*) +- LIBNETTLE_FORLINK='libnettle-$(LIBNETTLE_MAJOR).dll' +- LIBHOGWEED_FORLINK='libhogweed-$(LIBHOGWEED_MAJOR).dll' ++ LIBNETTLE_FORLINK='nettle-$(LIBNETTLE_MAJOR).dll' ++ LIBHOGWEED_FORLINK='hogweed-$(LIBHOGWEED_MAJOR).dll' + ;; + cygwin*) + LIBNETTLE_FORLINK='cygnettle-$(LIBNETTLE_MAJOR).dll' +@@ -684,16 +687,16 @@ case "$host_os" in + W64_ABI=yes + fi + LIBNETTLE_SONAME='' +- LIBNETTLE_FILE='libnettle.dll.a' ++ LIBNETTLE_FILE='nettle.lib' + LIBNETTLE_FILE_SRC='$(LIBNETTLE_FILE)' +- LIBNETTLE_LINK='$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,--out-implib=$(LIBNETTLE_FILE) -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--whole-archive' ++ LIBNETTLE_LINK='$(CC) $(CPPFLAGS) -Wl,$(LDFLAGS) -Wl,-DLL -Wl,-IMPLIB:$(LIBNETTLE_FILE) -Wl,-DEF:nettle.def' +- LIBNETTLE_LIBS='-Wl,--no-whole-archive $(LIBS)' ++ LIBNETTLE_LIBS='$(LIBS)' + + LIBHOGWEED_SONAME='' +- LIBHOGWEED_FILE='libhogweed.dll.a' ++ LIBHOGWEED_FILE='hogweed.lib' + LIBHOGWEED_FILE_SRC='$(LIBHOGWEED_FILE)' +- LIBHOGWEED_LINK='$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,--out-implib=$(LIBHOGWEED_FILE) -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--whole-archive' ++ LIBHOGWEED_LINK='$(CC) $(CPPFLAGS) -Wl,$(LDFLAGS) -Wl,-DLL -Wl,-IMPLIB:$(LIBHOGWEED_FILE) -Wl,-DEF:hogweed.def' +- LIBHOGWEED_LIBS='-Wl,--no-whole-archive $(LIBS) libnettle.dll.a' ++ LIBHOGWEED_LIBS='$(LIBS) $(LIBNETTLE_FILE)' + IF_DLL='' + ;; + darwin*) diff --git a/external_imported/vcpkg/ports/nettle/name.dir.patch b/external_imported/vcpkg/ports/nettle/name.dir.patch deleted file mode 100644 index 834a04409..000000000 --- a/external_imported/vcpkg/ports/nettle/name.dir.patch +++ /dev/null @@ -1,381 +0,0 @@ -diff --git a/SMP/libhogweed.vcxproj b/SMP/libhogweed.vcxproj -index 976d9fc..5fd42ba 100644 ---- a/SMP/libhogweed.vcxproj -+++ b/SMP/libhogweed.vcxproj -@@ -18,7 +18,7 @@ - 4146;4267;4028;4244;%(DisableSpecificWarnings) - - -- libnettled.lib;%(AdditionalDependencies) -+ nettled.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -132,7 +132,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - 4146;4267;4028;4244;%(DisableSpecificWarnings) - - -- libnettled.lib;%(AdditionalDependencies) -+ nettled.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -476,7 +476,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - 4146;4267;4028;4244;%(DisableSpecificWarnings) - - -- libnettle.lib;%(AdditionalDependencies) -+ nettle.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -590,7 +590,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - 4146;4267;4028;4244;%(DisableSpecificWarnings) - - -- libnettle.lib;%(AdditionalDependencies) -+ nettle.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -820,7 +820,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libhogweed.def -- libnettle.lib;%(AdditionalDependencies) -+ nettle.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -1050,7 +1050,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libhogweed.def -- libnettle.lib;%(AdditionalDependencies) -+ nettle.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -diff --git a/SMP/libhogweed_winrt.vcxproj b/SMP/libhogweed_winrt.vcxproj -index 308bd0b..a436c69 100644 ---- a/SMP/libhogweed_winrt.vcxproj -+++ b/SMP/libhogweed_winrt.vcxproj -@@ -18,7 +18,7 @@ - 4146;4267;4028;4244;%(DisableSpecificWarnings) - - -- libnettled_winrt.lib;%(AdditionalDependencies) -+ nettled.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -132,7 +132,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - 4146;4267;4028;4244;%(DisableSpecificWarnings) - - -- libnettled_winrt.lib;%(AdditionalDependencies) -+ nettled.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -247,7 +247,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libhogweed.def -- nettled_winrt.lib;gmpd.lib;%(AdditionalDependencies) -+ nettled.lib;gmpd.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -362,7 +362,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libhogweed.def -- nettled_winrt.lib;gmpd.lib;%(AdditionalDependencies) -+ nettled.lib;gmpd.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -476,7 +476,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - 4146;4267;4028;4244;%(DisableSpecificWarnings) - - -- libnettle_winrt.lib;%(AdditionalDependencies) -+ nettle.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -590,7 +590,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - 4146;4267;4028;4244;%(DisableSpecificWarnings) - - -- libnettle_winrt.lib;%(AdditionalDependencies) -+ nettle.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -705,7 +705,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libhogweed.def -- nettle_winrt.lib;gmp.lib;%(AdditionalDependencies) -+ nettle.lib;gmp.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -820,7 +820,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libhogweed.def -- libnettle_winrt.lib;%(AdditionalDependencies) -+ nettle.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -935,7 +935,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libhogweed.def -- nettle_winrt.lib;gmp.lib;%(AdditionalDependencies) -+ nettle.lib;gmp.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -1050,7 +1050,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libhogweed.def -- libnettle_winrt.lib;%(AdditionalDependencies) -+ nettle.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -diff --git a/SMP/smp_deps.props b/SMP/smp_deps.props -index 487099d..1eade47 100644 ---- a/SMP/smp_deps.props -+++ b/SMP/smp_deps.props -@@ -104,16 +104,16 @@ - - - -- lib$(RootNamespace)d -- $(ProjectDir)..\..\..\msvc\ -+ $(RootNamespace)d -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean - MSB8012 - - -- lib$(RootNamespace)d -- $(ProjectDir)..\..\..\msvc\ -+ $(RootNamespace)d -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -121,7 +121,7 @@ - - - $(RootNamespace)d -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -129,23 +129,23 @@ - - - $(RootNamespace)d -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean - MSB8012 - - -- lib$(RootNamespace) -- $(ProjectDir)..\..\..\msvc\ -+ $(RootNamespace) -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean - MSB8012 - - -- lib$(RootNamespace) -- $(ProjectDir)..\..\..\msvc\ -+ $(RootNamespace) -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -153,7 +153,7 @@ - - - $(RootNamespace) -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -161,7 +161,7 @@ - - - $(RootNamespace) -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -169,7 +169,7 @@ - - - $(RootNamespace) -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -177,7 +177,7 @@ - - - $(RootNamespace) -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -diff --git a/SMP/smp_winrt_deps.props b/SMP/smp_winrt_deps.props -index d44408a..b44482c 100644 ---- a/SMP/smp_winrt_deps.props -+++ b/SMP/smp_winrt_deps.props -@@ -115,80 +115,80 @@ - - - -- lib$(RootNamespace)d_winrt -- $(ProjectDir)..\..\..\msvc\ -+ $(RootNamespace)d -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean - MSB8012 - - -- lib$(RootNamespace)d_winrt -- $(ProjectDir)..\..\..\msvc\ -+ $(RootNamespace)d -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean - MSB8012 - - -- $(RootNamespace)d_winrt -- $(ProjectDir)..\..\..\msvc\ -+ $(RootNamespace)d -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean - MSB8012 - - -- $(RootNamespace)d_winrt -- $(ProjectDir)..\..\..\msvc\ -+ $(RootNamespace)d -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean - MSB8012 - - -- lib$(RootNamespace)_winrt -- $(ProjectDir)..\..\..\msvc\ -+ $(RootNamespace) -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean - MSB8012 - - -- lib$(RootNamespace)_winrt -- $(ProjectDir)..\..\..\msvc\ -+ $(RootNamespace) -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean - MSB8012 - - -- $(RootNamespace)_winrt -- $(ProjectDir)..\..\..\msvc\ -+ $(RootNamespace) -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean - MSB8012 - - -- $(RootNamespace)_winrt -- $(ProjectDir)..\..\..\msvc\ -+ $(RootNamespace) -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean - MSB8012 - - -- $(RootNamespace)_winrt -- $(ProjectDir)..\..\..\msvc\ -+ $(RootNamespace) -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean - MSB8012 - - -- $(RootNamespace)_winrt -- $(ProjectDir)..\..\..\msvc\ -+ $(RootNamespace) -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -diff --git a/hogweed.pc.in b/hogweed.pc.in -index 97fb9d4..ce977c0 100644 ---- a/hogweed.pc.in -+++ b/hogweed.pc.in -@@ -13,7 +13,7 @@ URL: http://www.lysator.liu.se/~nisse/nettle - Version: @PACKAGE_VERSION@ - Requires: @IF_NOT_SHARED@ nettle - Requires.private: @IF_SHARED@ nettle --Libs: -L${libdir} -lhogweed @IF_NOT_SHARED@ @LIBS@ -+Libs: -L${libdir} @HOGWEED@ @IF_NOT_SHARED@ @LIBS@ - Libs.private: @IF_SHARED@ @LIBS@ - Cflags: -I${includedir} - -diff --git a/nettle.pc.in b/nettle.pc.in -index eb0020c..6e3ed1e 100644 ---- a/nettle.pc.in -+++ b/nettle.pc.in -@@ -7,5 +7,6 @@ Name: Nettle - Description: Nettle low-level cryptographic library (symmetric algorithms) - URL: http://www.lysator.liu.se/~nisse/nettle - Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -lnettle -+Requires.private: gmp -+Libs: -L${libdir} @LIBS@ - Cflags: -I${includedir} diff --git a/external_imported/vcpkg/ports/nettle/nettle-x64.def b/external_imported/vcpkg/ports/nettle/nettle-x64.def new file mode 100644 index 000000000..e202f46fb --- /dev/null +++ b/external_imported/vcpkg/ports/nettle/nettle-x64.def @@ -0,0 +1,509 @@ +EXPORTS + _nettle_sha256_compress_sha_ni + _nettle_sha1_compress_sha_ni + _nettle_salsa20_2core + _nettle_memxor_sse2 + _nettle_aes_decrypt_aesni + _nettle_aes_encrypt_aesni + _nettle_cpuid + _nettle_gcm_hash8 + _nettle_aes_decrypt + _nettle_aes_encrypt + _nettle_sha256_compress + nettle_memxor + nettle_sha1_compress + nettle_xts_aes256_decrypt_message + nettle_xts_aes256_encrypt_message + nettle_xts_aes256_set_decrypt_key + nettle_xts_aes256_set_encrypt_key + nettle_xts_aes128_decrypt_message + nettle_xts_aes128_encrypt_message + nettle_xts_aes128_set_decrypt_key + nettle_xts_aes128_set_encrypt_key + nettle_xts_decrypt_message + nettle_xts_encrypt_message + nettle_yarrow_key_event_estimate + nettle_yarrow_key_event_init + nettle_yarrow256_fast_reseed + nettle_yarrow256_init + nettle_yarrow256_is_seeded + nettle_yarrow256_needed_sources + nettle_yarrow256_random + nettle_yarrow256_seed + nettle_yarrow256_slow_reseed + nettle_yarrow256_update + _nettle_write_le64 + _nettle_write_le32 + _nettle_write_be32 + nettle_version_major + nettle_version_minor + nettle_umac128_digest + nettle_umac128_set_key + nettle_umac128_set_nonce + nettle_umac128_update + nettle_umac96_digest + nettle_umac96_set_key + nettle_umac96_set_nonce + nettle_umac96_update + nettle_umac64_digest + nettle_umac64_set_key + nettle_umac64_set_nonce + nettle_umac64_update + nettle_umac32_digest + nettle_umac32_set_key + nettle_umac32_set_nonce + nettle_umac32_update + _nettle_umac_set_key + _nettle_umac_poly128 + _nettle_umac_poly64 + _nettle_umac_l3 + _nettle_umac_l3_init + _nettle_umac_l2 + _nettle_umac_l2_final + _nettle_umac_l2_init + _nettle_umac_nh_n + _nettle_umac_nh + nettle_twofish128 + nettle_twofish192 + nettle_twofish256 + nettle_twofish128_set_key + nettle_twofish192_set_key + nettle_twofish256_set_key + nettle_twofish_decrypt + nettle_twofish_encrypt + nettle_twofish_set_key + nettle_streebog256 + nettle_streebog512 + nettle_streebog256_digest + nettle_streebog256_init + nettle_streebog512_digest + nettle_streebog512_init + nettle_streebog512_update + nettle_serpent128 + nettle_serpent192 + nettle_serpent256 + nettle_serpent_decrypt + nettle_serpent_encrypt + nettle_serpent128_set_key + nettle_serpent192_set_key + nettle_serpent256_set_key + nettle_serpent_set_key + nettle_sha3_256_shake + nettle_sha3_512 + nettle_sha3_512_digest + nettle_sha3_512_init + nettle_sha3_512_update + nettle_sha3_384 + nettle_sha3_384_digest + nettle_sha3_384_init + nettle_sha3_384_update + nettle_sha3_256 + nettle_sha3_256_digest + nettle_sha3_256_init + nettle_sha3_256_update + nettle_sha3_224 + nettle_sha3_224_digest + nettle_sha3_224_init + nettle_sha3_224_update + nettle_sha3_permute + _nettle_sha3_pad + _nettle_sha3_update + nettle_sha512_256 + nettle_sha512_224 + nettle_sha512 + nettle_sha384 + _nettle_sha512_compress + nettle_sha384_digest + nettle_sha384_init + nettle_sha512_224_digest + nettle_sha512_224_init + nettle_sha512_256_digest + nettle_sha512_256_init + nettle_sha512_digest + nettle_sha512_init + nettle_sha512_update + nettle_sha256 + nettle_sha224 + _nettle_sha256_compress_x86_64 + nettle_sha224_digest + nettle_sha224_init + nettle_sha256_digest + nettle_sha256_init + nettle_sha256_update + nettle_sha1 + _nettle_sha1_compress_x86_64 + nettle_sha1_digest + nettle_sha1_init + nettle_sha1_update + nettle_salsa20_256_set_key + nettle_salsa20_128_set_key + nettle_salsa20_set_nonce + nettle_salsa20_set_key + nettle_salsa20r12_crypt + nettle_salsa20_crypt + _nettle_salsa20_crypt + _nettle_salsa20_core + nettle_ripemd160 + _nettle_ripemd160_compress + nettle_ripemd160_digest + nettle_ripemd160_init + nettle_ripemd160_update + nettle_realloc + nettle_xrealloc + _nettle_poly1305_block + _nettle_poly1305_digest + _nettle_poly1305_set_key + nettle_poly1305_aes_digest + nettle_poly1305_aes_set_key + nettle_poly1305_aes_set_nonce + nettle_poly1305_aes_update + nettle_pbkdf2_hmac_sha512 + nettle_pbkdf2_hmac_sha384 + nettle_pbkdf2_hmac_sha256 + nettle_pbkdf2_hmac_sha1 + nettle_pbkdf2_hmac_gosthash94cp + nettle_pbkdf2 + _nettle_macs + nettle_get_macs + _nettle_hashes + nettle_get_hashes + _nettle_ciphers + nettle_get_ciphers + _nettle_armors + nettle_get_armors + _nettle_aeads + nettle_get_aeads + nettle_lookup_hash + nettle_memxor3 + _nettle_memxor_x86_64 + nettle_memeql_sec + nettle_md5 + nettle_MD5Final + nettle_MD5Init + nettle_MD5Update + nettle_md5_compress + nettle_md5_digest + nettle_md5_init + nettle_md5_update + nettle_md4 + nettle_md4_digest + nettle_md4_init + nettle_md4_update + nettle_md2 + nettle_md2_digest + nettle_md2_init + nettle_md2_update + nettle_hkdf_expand + nettle_hkdf_extract + nettle_knuth_lfib_get + nettle_knuth_lfib_get_array + nettle_knuth_lfib_init + nettle_knuth_lfib_random + nettle_hmac_streebog256 + nettle_hmac_streebog512 + nettle_hmac_sha512 + nettle_hmac_sha384 + nettle_hmac_sha256 + nettle_hmac_sha224 + nettle_hmac_sha1 + nettle_hmac_ripemd160 + nettle_hmac_md5 + nettle_hmac_streebog256_digest + nettle_hmac_streebog256_set_key + nettle_hmac_streebog512_digest + nettle_hmac_streebog512_set_key + nettle_hmac_streebog512_update + nettle_hmac_sha512_digest + nettle_hmac_sha512_set_key + nettle_hmac_sha512_update + nettle_hmac_sha384_digest + nettle_hmac_sha384_set_key + nettle_hmac_sha256_digest + nettle_hmac_sha256_set_key + nettle_hmac_sha256_update + nettle_hmac_sha224_digest + nettle_hmac_sha224_set_key + nettle_hmac_sha1_digest + nettle_hmac_sha1_set_key + nettle_hmac_sha1_update + nettle_hmac_ripemd160_digest + nettle_hmac_ripemd160_set_key + nettle_hmac_ripemd160_update + nettle_hmac_md5_digest + nettle_hmac_md5_set_key + nettle_hmac_md5_update + nettle_hmac_gosthash94_digest + nettle_hmac_gosthash94_set_key + nettle_hmac_gosthash94_update + nettle_hmac_gosthash94cp_digest + nettle_hmac_gosthash94cp_set_key + nettle_hmac_gosthash94cp_update + nettle_hmac_digest + nettle_hmac_set_key + nettle_hmac_update + nettle_gosthash94 + nettle_gosthash94cp + nettle_gosthash94_digest + nettle_gosthash94_init + nettle_gosthash94_update + nettle_gosthash94cp_digest + nettle_gosthash94cp_update + _nettle_gost28147_encrypt_block + _nettle_gost28147_param_CryptoPro_3411 + _nettle_gost28147_param_test_3411 + nettle_cmac_des3 + nettle_cmac_aes256 + nettle_cmac_aes128 + nettle_cmac_des3_digest + nettle_cmac_des3_set_key + nettle_cmac_des3_update + nettle_cmac_aes256_digest + nettle_cmac_aes256_set_key + nettle_cmac_aes256_update + nettle_cmac_aes128_digest + nettle_cmac_aes128_set_key + nettle_cmac_aes128_update + nettle_cmac64_digest + nettle_cmac64_init + nettle_cmac64_set_key + nettle_cmac64_update + nettle_cmac128_digest + nettle_cmac128_init + nettle_cmac128_set_key + nettle_cmac128_update + nettle_gcm_camellia256 + nettle_gcm_camellia256_decrypt + nettle_gcm_camellia256_digest + nettle_gcm_camellia256_encrypt + nettle_gcm_camellia256_set_iv + nettle_gcm_camellia256_set_key + nettle_gcm_camellia256_update + nettle_gcm_camellia128 + nettle_gcm_camellia128_decrypt + nettle_gcm_camellia128_digest + nettle_gcm_camellia128_encrypt + nettle_gcm_camellia128_set_iv + nettle_gcm_camellia128_set_key + nettle_gcm_camellia128_update + nettle_gcm_aes256 + nettle_gcm_aes256_decrypt + nettle_gcm_aes256_digest + nettle_gcm_aes256_encrypt + nettle_gcm_aes256_set_iv + nettle_gcm_aes256_set_key + nettle_gcm_aes256_update + nettle_gcm_aes192 + nettle_gcm_aes192_decrypt + nettle_gcm_aes192_digest + nettle_gcm_aes192_encrypt + nettle_gcm_aes192_set_iv + nettle_gcm_aes192_set_key + nettle_gcm_aes192_update + nettle_gcm_aes128 + nettle_gcm_aes128_decrypt + nettle_gcm_aes128_digest + nettle_gcm_aes128_encrypt + nettle_gcm_aes128_set_iv + nettle_gcm_aes128_set_key + nettle_gcm_aes128_update + nettle_gcm_aes_decrypt + nettle_gcm_aes_digest + nettle_gcm_aes_encrypt + nettle_gcm_aes_set_iv + nettle_gcm_aes_set_key + nettle_gcm_aes_update + nettle_gcm_decrypt + nettle_gcm_digest + nettle_gcm_encrypt + nettle_gcm_set_iv + nettle_gcm_set_key + nettle_gcm_update + nettle_eax_aes128 + nettle_eax_aes128_decrypt + nettle_eax_aes128_digest + nettle_eax_aes128_encrypt + nettle_eax_aes128_set_key + nettle_eax_aes128_set_nonce + nettle_eax_aes128_update + nettle_eax_decrypt + nettle_eax_digest + nettle_eax_encrypt + nettle_eax_set_key + nettle_eax_set_nonce + nettle_eax_update + nettle_des3_decrypt + nettle_des3_encrypt + nettle_des3_set_key + nettle_des_check_parity + nettle_des_decrypt + nettle_des_encrypt + nettle_des_fix_parity + nettle_des_set_key + _nettle_ctr_crypt16 + nettle_ctr_crypt + nettle_chacha_set_counter + nettle_chacha_set_counter32 + nettle_chacha_set_nonce + nettle_chacha_set_nonce96 + nettle_chacha_set_key + nettle_chacha_poly1305 + nettle_chacha_poly1305_decrypt + nettle_chacha_poly1305_digest + nettle_chacha_poly1305_encrypt + nettle_chacha_poly1305_set_key + nettle_chacha_poly1305_set_nonce + nettle_chacha_poly1305_update + _nettle_chacha_core + nettle_chacha_crypt + nettle_chacha_crypt32 + nettle_cnd_memcpy + nettle_siv_cmac_aes256_decrypt_message + nettle_siv_cmac_aes256_encrypt_message + nettle_siv_cmac_aes256_set_key + nettle_siv_cmac_aes128_decrypt_message + nettle_siv_cmac_aes128_encrypt_message + nettle_siv_cmac_aes128_set_key + nettle_siv_cmac_decrypt_message + nettle_siv_cmac_encrypt_message + nettle_siv_cmac_set_key + nettle_cfb8_decrypt + nettle_cfb8_encrypt + nettle_cfb_decrypt + nettle_cfb_encrypt + nettle_ccm_aes256_decrypt + nettle_ccm_aes256_decrypt_message + nettle_ccm_aes256_digest + nettle_ccm_aes256_encrypt + nettle_ccm_aes256_encrypt_message + nettle_ccm_aes256_set_key + nettle_ccm_aes256_set_nonce + nettle_ccm_aes256_update + nettle_ccm_aes192_decrypt + nettle_ccm_aes192_decrypt_message + nettle_ccm_aes192_digest + nettle_ccm_aes192_encrypt + nettle_ccm_aes192_encrypt_message + nettle_ccm_aes192_set_key + nettle_ccm_aes192_set_nonce + nettle_ccm_aes192_update + nettle_ccm_aes128_decrypt + nettle_ccm_aes128_decrypt_message + nettle_ccm_aes128_digest + nettle_ccm_aes128_encrypt + nettle_ccm_aes128_encrypt_message + nettle_ccm_aes128_set_key + nettle_ccm_aes128_set_nonce + nettle_ccm_aes128_update + nettle_ccm_decrypt + nettle_ccm_decrypt_message + nettle_ccm_digest + nettle_ccm_encrypt + nettle_ccm_encrypt_message + nettle_ccm_set_nonce + nettle_ccm_update + nettle_cbc_decrypt + nettle_cbc_encrypt + nettle_cast128 + nettle_cast128_decrypt + nettle_cast128_encrypt + nettle_cast128_set_key + nettle_cast5_set_key + nettle_camellia256 + nettle_camellia192_set_decrypt_key + nettle_camellia256_invert_key + nettle_camellia256_set_decrypt_key + nettle_camellia256_crypt + nettle_camellia192_set_encrypt_key + nettle_camellia256_set_encrypt_key + nettle_camellia192 + nettle_camellia128 + nettle_camellia128_invert_key + nettle_camellia_set_decrypt_key + nettle_camellia128_crypt + nettle_camellia128_set_encrypt_key + _nettle_camellia_invert_key + _nettle_camellia_absorb + _nettle_camellia_table + _nettle_camellia_crypt + nettle_buffer_init + nettle_buffer_clear + nettle_buffer_copy + nettle_buffer_grow + nettle_buffer_init_realloc + nettle_buffer_init_size + nettle_buffer_reset + nettle_buffer_space + nettle_buffer_write + nettle_base64url + nettle_base64url_decode_init + nettle_base64url_encode_init + nettle_base64 + nettle_base64_decode_final + nettle_base64_decode_init + nettle_base64_decode_single + nettle_base64_decode_update + nettle_base64_encode_final + nettle_base64_encode_group + nettle_base64_encode_init + nettle_base64_encode_raw + nettle_base64_encode_single + nettle_base64_encode_update + nettle_base16 + nettle_base16_decode_final + nettle_base16_decode_init + nettle_base16_decode_single + nettle_base16_decode_update + nettle_base16_encode_single + nettle_base16_encode_update + nettle_blowfish_bcrypt_hash + nettle_blowfish_bcrypt_verify + _nettle_blowfish_encround + _nettle_blowfish_initial_ctx + nettle_blowfish128_set_key + nettle_blowfish_decrypt + nettle_blowfish_encrypt + nettle_blowfish_set_key + nettle_arctwo128 + nettle_arctwo40 + nettle_arctwo64 + nettle_arctwo_gutmann128 + nettle_arctwo128_set_key + nettle_arctwo128_set_key_gutmann + nettle_arctwo40_set_key + nettle_arctwo64_set_key + nettle_arctwo_decrypt + nettle_arctwo_encrypt + nettle_arctwo_set_key + nettle_arctwo_set_key_ekb + nettle_arctwo_set_key_gutmann + nettle_arcfour_crypt + nettle_arcfour128_set_key + nettle_arcfour_set_key + nettle_aes256 + nettle_aes256_invert_key + nettle_aes256_set_decrypt_key + nettle_aes256_set_encrypt_key + nettle_aes192 + nettle_aes192_invert_key + nettle_aes192_set_decrypt_key + nettle_aes192_set_encrypt_key + nettle_aes128 + nettle_aes128_invert_key + nettle_aes128_set_decrypt_key + nettle_aes128_set_encrypt_key + nettle_aes_invert_key + nettle_aes_set_decrypt_key + nettle_aes_set_encrypt_key + _nettle_aes_set_key + _nettle_aes_invert + _nettle_aes_encrypt_table + nettle_aes128_encrypt + nettle_aes192_encrypt + nettle_aes256_encrypt + nettle_aes_encrypt + _nettle_aes_encrypt_x86_64 + nettle_aes128_decrypt + nettle_aes192_decrypt + nettle_aes256_decrypt + nettle_aes_decrypt + _nettle_aes_decrypt_x86_64 diff --git a/external_imported/vcpkg/ports/nettle/nettle-x86.def b/external_imported/vcpkg/ports/nettle/nettle-x86.def new file mode 100644 index 000000000..213449531 --- /dev/null +++ b/external_imported/vcpkg/ports/nettle/nettle-x86.def @@ -0,0 +1,496 @@ +EXPORTS + nettle_xts_aes256_decrypt_message + nettle_xts_aes256_encrypt_message + nettle_xts_aes256_set_decrypt_key + nettle_xts_aes256_set_encrypt_key + nettle_xts_aes128_decrypt_message + nettle_xts_aes128_encrypt_message + nettle_xts_aes128_set_decrypt_key + nettle_xts_aes128_set_encrypt_key + nettle_xts_decrypt_message + nettle_xts_encrypt_message + nettle_yarrow_key_event_estimate + nettle_yarrow_key_event_init + nettle_yarrow256_fast_reseed + nettle_yarrow256_init + nettle_yarrow256_is_seeded + nettle_yarrow256_needed_sources + nettle_yarrow256_random + nettle_yarrow256_seed + nettle_yarrow256_slow_reseed + nettle_yarrow256_update + _nettle_write_le64 + _nettle_write_le32 + _nettle_write_be32 + nettle_version_major + nettle_version_minor + nettle_umac128_digest + nettle_umac128_set_key + nettle_umac128_set_nonce + nettle_umac128_update + nettle_umac96_digest + nettle_umac96_set_key + nettle_umac96_set_nonce + nettle_umac96_update + nettle_umac64_digest + nettle_umac64_set_key + nettle_umac64_set_nonce + nettle_umac64_update + nettle_umac32_digest + nettle_umac32_set_key + nettle_umac32_set_nonce + nettle_umac32_update + _nettle_umac_set_key + _nettle_umac_poly128 + _nettle_umac_poly64 + _nettle_umac_l3 + _nettle_umac_l3_init + _nettle_umac_l2 + _nettle_umac_l2_final + _nettle_umac_l2_init + _nettle_umac_nh_n + _nettle_umac_nh + nettle_twofish128 + nettle_twofish192 + nettle_twofish256 + nettle_twofish128_set_key + nettle_twofish192_set_key + nettle_twofish256_set_key + nettle_twofish_decrypt + nettle_twofish_encrypt + nettle_twofish_set_key + nettle_streebog256 + nettle_streebog512 + nettle_streebog256_digest + nettle_streebog256_init + nettle_streebog512_digest + nettle_streebog512_init + nettle_streebog512_update + nettle_serpent128 + nettle_serpent192 + nettle_serpent256 + nettle_serpent_decrypt + nettle_serpent_encrypt + nettle_serpent128_set_key + nettle_serpent192_set_key + nettle_serpent256_set_key + nettle_serpent_set_key + nettle_sha3_256_shake + nettle_sha3_512 + nettle_sha3_512_digest + nettle_sha3_512_init + nettle_sha3_512_update + nettle_sha3_384 + nettle_sha3_384_digest + nettle_sha3_384_init + nettle_sha3_384_update + nettle_sha3_256 + nettle_sha3_256_digest + nettle_sha3_256_init + nettle_sha3_256_update + nettle_sha3_224 + nettle_sha3_224_digest + nettle_sha3_224_init + nettle_sha3_224_update + nettle_sha3_permute + _nettle_sha3_pad + _nettle_sha3_update + nettle_sha512_256 + nettle_sha512_224 + nettle_sha512 + nettle_sha384 + _nettle_sha512_compress + nettle_sha384_digest + nettle_sha384_init + nettle_sha512_224_digest + nettle_sha512_224_init + nettle_sha512_256_digest + nettle_sha512_256_init + nettle_sha512_digest + nettle_sha512_init + nettle_sha512_update + nettle_sha256 + nettle_sha224 + _nettle_sha256_compress + nettle_sha224_digest + nettle_sha224_init + nettle_sha256_digest + nettle_sha256_init + nettle_sha256_update + nettle_sha1 + nettle_sha1_compress + nettle_sha1_digest + nettle_sha1_init + nettle_sha1_update + nettle_salsa20_256_set_key + nettle_salsa20_128_set_key + nettle_salsa20_set_nonce + nettle_salsa20_set_key + nettle_salsa20r12_crypt + nettle_salsa20_crypt + _nettle_salsa20_crypt + _nettle_salsa20_core + nettle_ripemd160 + _nettle_ripemd160_compress + nettle_ripemd160_digest + nettle_ripemd160_init + nettle_ripemd160_update + nettle_realloc + nettle_xrealloc + _nettle_poly1305_block + _nettle_poly1305_digest + _nettle_poly1305_set_key + nettle_poly1305_aes_digest + nettle_poly1305_aes_set_key + nettle_poly1305_aes_set_nonce + nettle_poly1305_aes_update + nettle_pbkdf2_hmac_sha512 + nettle_pbkdf2_hmac_sha384 + nettle_pbkdf2_hmac_sha256 + nettle_pbkdf2_hmac_sha1 + nettle_pbkdf2_hmac_gosthash94cp + nettle_pbkdf2 + _nettle_macs + nettle_get_macs + _nettle_hashes + nettle_get_hashes + _nettle_ciphers + nettle_get_ciphers + _nettle_armors + nettle_get_armors + _nettle_aeads + nettle_get_aeads + nettle_lookup_hash + nettle_memxor3 + nettle_memxor + nettle_memeql_sec + nettle_md5 + nettle_MD5Final + nettle_MD5Init + nettle_MD5Update + nettle_md5_compress + nettle_md5_digest + nettle_md5_init + nettle_md5_update + nettle_md4 + nettle_md4_digest + nettle_md4_init + nettle_md4_update + nettle_md2 + nettle_md2_digest + nettle_md2_init + nettle_md2_update + nettle_hkdf_expand + nettle_hkdf_extract + nettle_knuth_lfib_get + nettle_knuth_lfib_get_array + nettle_knuth_lfib_init + nettle_knuth_lfib_random + nettle_hmac_streebog256 + nettle_hmac_streebog512 + nettle_hmac_sha512 + nettle_hmac_sha384 + nettle_hmac_sha256 + nettle_hmac_sha224 + nettle_hmac_sha1 + nettle_hmac_ripemd160 + nettle_hmac_md5 + nettle_hmac_streebog256_digest + nettle_hmac_streebog256_set_key + nettle_hmac_streebog512_digest + nettle_hmac_streebog512_set_key + nettle_hmac_streebog512_update + nettle_hmac_sha512_digest + nettle_hmac_sha512_set_key + nettle_hmac_sha512_update + nettle_hmac_sha384_digest + nettle_hmac_sha384_set_key + nettle_hmac_sha256_digest + nettle_hmac_sha256_set_key + nettle_hmac_sha256_update + nettle_hmac_sha224_digest + nettle_hmac_sha224_set_key + nettle_hmac_sha1_digest + nettle_hmac_sha1_set_key + nettle_hmac_sha1_update + nettle_hmac_ripemd160_digest + nettle_hmac_ripemd160_set_key + nettle_hmac_ripemd160_update + nettle_hmac_md5_digest + nettle_hmac_md5_set_key + nettle_hmac_md5_update + nettle_hmac_gosthash94_digest + nettle_hmac_gosthash94_set_key + nettle_hmac_gosthash94_update + nettle_hmac_gosthash94cp_digest + nettle_hmac_gosthash94cp_set_key + nettle_hmac_gosthash94cp_update + nettle_hmac_digest + nettle_hmac_set_key + nettle_hmac_update + nettle_gosthash94 + nettle_gosthash94cp + nettle_gosthash94_digest + nettle_gosthash94_init + nettle_gosthash94_update + nettle_gosthash94cp_digest + nettle_gosthash94cp_update + _nettle_gost28147_encrypt_block + _nettle_gost28147_param_CryptoPro_3411 + _nettle_gost28147_param_test_3411 + nettle_cmac_des3 + nettle_cmac_aes256 + nettle_cmac_aes128 + nettle_cmac_des3_digest + nettle_cmac_des3_set_key + nettle_cmac_des3_update + nettle_cmac_aes256_digest + nettle_cmac_aes256_set_key + nettle_cmac_aes256_update + nettle_cmac_aes128_digest + nettle_cmac_aes128_set_key + nettle_cmac_aes128_update + nettle_cmac64_digest + nettle_cmac64_init + nettle_cmac64_set_key + nettle_cmac64_update + nettle_cmac128_digest + nettle_cmac128_init + nettle_cmac128_set_key + nettle_cmac128_update + nettle_gcm_camellia256 + nettle_gcm_camellia256_decrypt + nettle_gcm_camellia256_digest + nettle_gcm_camellia256_encrypt + nettle_gcm_camellia256_set_iv + nettle_gcm_camellia256_set_key + nettle_gcm_camellia256_update + nettle_gcm_camellia128 + nettle_gcm_camellia128_decrypt + nettle_gcm_camellia128_digest + nettle_gcm_camellia128_encrypt + nettle_gcm_camellia128_set_iv + nettle_gcm_camellia128_set_key + nettle_gcm_camellia128_update + nettle_gcm_aes256 + nettle_gcm_aes256_decrypt + nettle_gcm_aes256_digest + nettle_gcm_aes256_encrypt + nettle_gcm_aes256_set_iv + nettle_gcm_aes256_set_key + nettle_gcm_aes256_update + nettle_gcm_aes192 + nettle_gcm_aes192_decrypt + nettle_gcm_aes192_digest + nettle_gcm_aes192_encrypt + nettle_gcm_aes192_set_iv + nettle_gcm_aes192_set_key + nettle_gcm_aes192_update + nettle_gcm_aes128 + nettle_gcm_aes128_decrypt + nettle_gcm_aes128_digest + nettle_gcm_aes128_encrypt + nettle_gcm_aes128_set_iv + nettle_gcm_aes128_set_key + nettle_gcm_aes128_update + nettle_gcm_aes_decrypt + nettle_gcm_aes_digest + nettle_gcm_aes_encrypt + nettle_gcm_aes_set_iv + nettle_gcm_aes_set_key + nettle_gcm_aes_update + nettle_gcm_decrypt + nettle_gcm_digest + nettle_gcm_encrypt + nettle_gcm_set_iv + nettle_gcm_set_key + nettle_gcm_update + nettle_eax_aes128 + nettle_eax_aes128_decrypt + nettle_eax_aes128_digest + nettle_eax_aes128_encrypt + nettle_eax_aes128_set_key + nettle_eax_aes128_set_nonce + nettle_eax_aes128_update + nettle_eax_decrypt + nettle_eax_digest + nettle_eax_encrypt + nettle_eax_set_key + nettle_eax_set_nonce + nettle_eax_update + nettle_des3_decrypt + nettle_des3_encrypt + nettle_des3_set_key + nettle_des_check_parity + nettle_des_decrypt + nettle_des_encrypt + nettle_des_fix_parity + nettle_des_set_key + _nettle_ctr_crypt16 + nettle_ctr_crypt + nettle_chacha_set_counter + nettle_chacha_set_counter32 + nettle_chacha_set_nonce + nettle_chacha_set_nonce96 + nettle_chacha_set_key + nettle_chacha_poly1305 + nettle_chacha_poly1305_decrypt + nettle_chacha_poly1305_digest + nettle_chacha_poly1305_encrypt + nettle_chacha_poly1305_set_key + nettle_chacha_poly1305_set_nonce + nettle_chacha_poly1305_update + _nettle_chacha_core + nettle_chacha_crypt + nettle_chacha_crypt32 + nettle_cnd_memcpy + nettle_siv_cmac_aes256_decrypt_message + nettle_siv_cmac_aes256_encrypt_message + nettle_siv_cmac_aes256_set_key + nettle_siv_cmac_aes128_decrypt_message + nettle_siv_cmac_aes128_encrypt_message + nettle_siv_cmac_aes128_set_key + nettle_siv_cmac_decrypt_message + nettle_siv_cmac_encrypt_message + nettle_siv_cmac_set_key + nettle_cfb8_decrypt + nettle_cfb8_encrypt + nettle_cfb_decrypt + nettle_cfb_encrypt + nettle_ccm_aes256_decrypt + nettle_ccm_aes256_decrypt_message + nettle_ccm_aes256_digest + nettle_ccm_aes256_encrypt + nettle_ccm_aes256_encrypt_message + nettle_ccm_aes256_set_key + nettle_ccm_aes256_set_nonce + nettle_ccm_aes256_update + nettle_ccm_aes192_decrypt + nettle_ccm_aes192_decrypt_message + nettle_ccm_aes192_digest + nettle_ccm_aes192_encrypt + nettle_ccm_aes192_encrypt_message + nettle_ccm_aes192_set_key + nettle_ccm_aes192_set_nonce + nettle_ccm_aes192_update + nettle_ccm_aes128_decrypt + nettle_ccm_aes128_decrypt_message + nettle_ccm_aes128_digest + nettle_ccm_aes128_encrypt + nettle_ccm_aes128_encrypt_message + nettle_ccm_aes128_set_key + nettle_ccm_aes128_set_nonce + nettle_ccm_aes128_update + nettle_ccm_decrypt + nettle_ccm_decrypt_message + nettle_ccm_digest + nettle_ccm_encrypt + nettle_ccm_encrypt_message + nettle_ccm_set_nonce + nettle_ccm_update + nettle_cbc_decrypt + nettle_cbc_encrypt + nettle_cast128 + nettle_cast128_decrypt + nettle_cast128_encrypt + nettle_cast128_set_key + nettle_cast5_set_key + nettle_camellia256 + nettle_camellia192_set_decrypt_key + nettle_camellia256_invert_key + nettle_camellia256_set_decrypt_key + nettle_camellia256_crypt + nettle_camellia192_set_encrypt_key + nettle_camellia256_set_encrypt_key + nettle_camellia192 + nettle_camellia128 + nettle_camellia128_invert_key + nettle_camellia_set_decrypt_key + nettle_camellia128_crypt + nettle_camellia128_set_encrypt_key + _nettle_camellia_invert_key + _nettle_camellia_absorb + _nettle_camellia_table + _nettle_camellia_crypt + nettle_buffer_init + nettle_buffer_clear + nettle_buffer_copy + nettle_buffer_grow + nettle_buffer_init_realloc + nettle_buffer_init_size + nettle_buffer_reset + nettle_buffer_space + nettle_buffer_write + nettle_base64url + nettle_base64url_decode_init + nettle_base64url_encode_init + nettle_base64 + nettle_base64_decode_final + nettle_base64_decode_init + nettle_base64_decode_single + nettle_base64_decode_update + nettle_base64_encode_final + nettle_base64_encode_group + nettle_base64_encode_init + nettle_base64_encode_raw + nettle_base64_encode_single + nettle_base64_encode_update + nettle_base16 + nettle_base16_decode_final + nettle_base16_decode_init + nettle_base16_decode_single + nettle_base16_decode_update + nettle_base16_encode_single + nettle_base16_encode_update + nettle_blowfish_bcrypt_hash + nettle_blowfish_bcrypt_verify + _nettle_blowfish_encround + _nettle_blowfish_initial_ctx + nettle_blowfish128_set_key + nettle_blowfish_decrypt + nettle_blowfish_encrypt + nettle_blowfish_set_key + nettle_arctwo128 + nettle_arctwo40 + nettle_arctwo64 + nettle_arctwo_gutmann128 + nettle_arctwo128_set_key + nettle_arctwo128_set_key_gutmann + nettle_arctwo40_set_key + nettle_arctwo64_set_key + nettle_arctwo_decrypt + nettle_arctwo_encrypt + nettle_arctwo_set_key + nettle_arctwo_set_key_ekb + nettle_arctwo_set_key_gutmann + nettle_arcfour_crypt + nettle_arcfour128_set_key + nettle_arcfour_set_key + nettle_aes256 + nettle_aes256_invert_key + nettle_aes256_set_decrypt_key + nettle_aes256_set_encrypt_key + nettle_aes192 + nettle_aes192_invert_key + nettle_aes192_set_decrypt_key + nettle_aes192_set_encrypt_key + nettle_aes128 + nettle_aes128_invert_key + nettle_aes128_set_decrypt_key + nettle_aes128_set_encrypt_key + nettle_aes_invert_key + nettle_aes_set_decrypt_key + nettle_aes_set_encrypt_key + _nettle_aes_set_key + _nettle_aes_invert + _nettle_aes_encrypt_table + nettle_aes128_encrypt + nettle_aes192_encrypt + nettle_aes256_encrypt + nettle_aes_encrypt + _nettle_aes_encrypt + nettle_aes128_decrypt + nettle_aes192_decrypt + nettle_aes256_decrypt + nettle_aes_decrypt + _nettle_aes_decrypt diff --git a/external_imported/vcpkg/ports/nettle/portfile.cmake b/external_imported/vcpkg/ports/nettle/portfile.cmake index 731017de7..329cbddc1 100644 --- a/external_imported/vcpkg/ports/nettle/portfile.cmake +++ b/external_imported/vcpkg/ports/nettle/portfile.cmake @@ -1,136 +1,116 @@ -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO ShiftMediaProject/nettle - REF bf483378326c67d634977287dd576279734b7acc #v3.6 - SHA512 ba125a27c81a800be8bc8d1b0d4f3125587330ef64d8a605b4d3ae211fb675c5ef89e9bf4bcf63b07d0f004c6c5ff851630690cdd1eda6b5b8a526d84edffe73 - HEAD_REF master - PATCHES - gmp.patch - name.dir.patch - runtime.patch +vcpkg_list(SET patches) +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + vcpkg_list(SET patches + yasm.patch # the asm changes are a downgrade to an older version + compile.patch + libname-windows.patch # Apply common libtool rules for lib naming. ) +endif() - include(${CURRENT_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() +vcpkg_from_gitlab( + GITLAB_URL https://git.lysator.liu.se/ + OUT_SOURCE_PATH SOURCE_PATH + REPO nettle/nettle + REF 52bacacaf4339fd78289f58919732f1f35bea1c1 #v3.7.3 + SHA512 0130d14195274eeec11e8299793e3037f4b84d8fb4b5c5c9392b63ee693ed5713434070744b1a44e14a6a5090d655917c1dd296e2011cd99e3c316ef5d8ee395 + HEAD_REF master + PATCHES + fix-InstallLibPath.patch + flags.patch + ${patches} +) - if(VCPKG_TARGET_IS_UWP) - string(APPEND CONFIGURATION_RELEASE WinRT) - string(APPEND CONFIGURATION_DEBUG WinRT) - endif() +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_list(SET OPTIONS --disable-static) +else() + vcpkg_list(SET OPTIONS --disable-shared) +endif() - #Setup YASM integration - set(_nettleproject) - set(_hogweedproject) - if(VCPKG_TARGET_IS_UWP) - set(_nettleproject "${SOURCE_PATH}/SMP/libnettle_winrt.vcxproj") - set(_hogweedproject "${SOURCE_PATH}/SMP/libhogweed_winrt.vcxproj") - else() - set(_nettleproject "${SOURCE_PATH}/SMP/libnettle.vcxproj") - set(_hogweedproject "${SOURCE_PATH}/SMP/libhogweed.vcxproj") +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(ENV{CCAS} "${CURRENT_HOST_INSTALLED_DIR}/tools/yasm/yasm${VCPKG_HOST_EXECUTABLE_SUFFIX}") + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(asmflag win64) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(asmflag win32) endif() + set(ENV{ASMFLAGS} "-Xvc -f ${asmflag} -pgas -rraw") + vcpkg_list(APPEND OPTIONS + ac_cv_func_memset=yes + nettle_cv_asm_type_percent_function=no + nettle_cv_asm_align_log=no + ) +endif() - file(READ "${_nettleproject}" _contents) - string(REPLACE [[]] - "" - _contents "${_contents}") - string(REPLACE [[]] - "" - _contents "${_contents}") - string(REGEX REPLACE "${VCPKG_ROOT_DIR}/installed/[^/]+/share" "${CURRENT_INSTALLED_DIR}/share" _contents "${_contents}") # Above already - file(WRITE "${_nettleproject}" "${_contents}") +if(VCPKG_CROSSCOMPILING) + # Silly trick to make configure accept CC_FOR_BUILD but in reallity CC_FOR_BUILD is deactivated. + set(ENV{CC_FOR_BUILD} "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true") +endif() - file(READ "${_hogweedproject}" _contents) - string(REPLACE [[]] - "" - _contents "${_contents}") - string(REPLACE [[]] - "" - _contents "${_contents}") - string(REGEX REPLACE "${VCPKG_ROOT_DIR}/installed/[^/]+/share" "${CURRENT_INSTALLED_DIR}/share" _contents "${_contents}") # Above already - file(WRITE "${_hogweedproject}" "${_contents}") +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + OPTIONS + --disable-documentation + --disable-openssl + ${OPTIONS} +) - vcpkg_install_msbuild( - USE_VCPKG_INTEGRATION - SOURCE_PATH ${SOURCE_PATH} - PROJECT_SUBPATH SMP/libnettle.sln - PLATFORM ${TRIPLET_SYSTEM_ARCH} - LICENSE_SUBPATH COPYING.LESSERv3 - TARGET Rebuild - RELEASE_CONFIGURATION ${CONFIGURATION_RELEASE} - DEBUG_CONFIGURATION ${CONFIGURATION_DEBUG} - SKIP_CLEAN - OPTIONS "/p:YasmPath=${YASM}" - ) +set(tool_names des ecc) # aes gcm sha twofish? +list(TRANSFORM tool_names APPEND "data") +list(TRANSFORM tool_names APPEND "${VCPKG_HOST_EXECUTABLE_SUFFIX}") - get_filename_component(SOURCE_PATH_SUFFIX "${SOURCE_PATH}" NAME) - file(RENAME "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${SOURCE_PATH_SUFFIX}/msvc/include" "${CURRENT_PACKAGES_DIR}/include") - set(PACKAGE_VERSION 3.6) - set(prefix "${CURRENT_INSTALLED_DIR}") - set(exec_prefix "\${prefix}") - set(libdir "\${prefix}/lib") - set(includedir "\${prefix}/include") - set(LIBS "-lnettle -lgmp") - configure_file("${SOURCE_PATH}/nettle.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/nettle.pc" @ONLY) - set(HOGWEED -lhogweed) - set(LIBS -lnettle) - configure_file("${SOURCE_PATH}/hogweed.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libhogweed.pc" @ONLY) - set(prefix "${CURRENT_INSTALLED_DIR}/debug") - set(exec_prefix "\${prefix}") - set(libdir "\${prefix}/lib") - set(includedir "\${prefix}/../include") - set(LIBS "-lnettled -lgmpd") - configure_file("${SOURCE_PATH}/nettle.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/nettle.pc" @ONLY) - set(LIBS -lnettled) - set(HOGWEED -lhogweedd) - configure_file("${SOURCE_PATH}/hogweed.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libhogweed.pc" @ONLY) - vcpkg_fixup_pkgconfig() -else() - vcpkg_from_gitlab( - GITLAB_URL https://git.lysator.liu.se/ - OUT_SOURCE_PATH SOURCE_PATH - REPO nettle/nettle - REF 9e2bea82b9fb606bffd2d3f648e05248e146e54f #v3.6 - SHA512 008089eba2ef197a0ec6a266baac485e72051e646d19861f3fb605915a591bc2dd38edcb4ea7eaad958ea5d56f7744d42c25b691b49921a1285edd22f9c90b7f - HEAD_REF master - PATCHES - fix-InstallLibPath.patch - flags.patch - ) - - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(OPTIONS --disable-static) - else() - set(OPTIONS --disable-shared) +if(VCPKG_CROSSCOMPILING) + list(TRANSFORM tool_names PREPEND "${CURRENT_HOST_INSTALLED_DIR}/manual-tools/${PORT}/") + file(COPY ${tool_names} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/") + if(NOT VCPKG_BUILD_TYPE) + file(COPY ${tool_names} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/") + endif() +endif() +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + # def files are created by running 'llvm-nm | findstr /R /C:"[RT] _*nettle_"' on the static build and replacing '00[0-9abcdef]+ [RT]' with spaces + # please update the defs if the version is bumped + set(build_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/") + configure_file( + "${CURRENT_PORT_DIR}/nettle-${VCPKG_TARGET_ARCHITECTURE}.def" + "${build_dir}/nettle.def" + COPYONLY + ) + configure_file( + "${CURRENT_PORT_DIR}/hogweed-${VCPKG_TARGET_ARCHITECTURE}.def" + "${build_dir}/hogweed.def" + COPYONLY + ) + if(NOT VCPKG_BUILD_TYPE) + set(build_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/") + configure_file( + "${CURRENT_PORT_DIR}/nettle-${VCPKG_TARGET_ARCHITECTURE}.def" + "${build_dir}/nettle.def" + COPYONLY + ) + configure_file("${CURRENT_PORT_DIR}/hogweed-${VCPKG_TARGET_ARCHITECTURE}.def" + "${build_dir}/hogweed.def" + COPYONLY + ) + endif() endif() +endif() +vcpkg_install_make() - vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} - AUTOCONFIG - OPTIONS - --disable-documentation - --disable-openssl - ${OPTIONS} - ) +if(NOT VCPKG_CROSSCOMPILING) + list(TRANSFORM tool_names PREPEND "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/") + file(COPY ${tool_names} DESTINATION "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}") +endif() - vcpkg_install_make() - vcpkg_fixup_pkgconfig() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +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}/COPYINGv3" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYINGv3" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR VCPKG_TARGET_IS_LINUX) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") - endif() +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR VCPKG_TARGET_IS_LINUX) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() diff --git a/external_imported/vcpkg/ports/nettle/remove_gmpd.patch b/external_imported/vcpkg/ports/nettle/remove_gmpd.patch new file mode 100644 index 000000000..a248d81e2 --- /dev/null +++ b/external_imported/vcpkg/ports/nettle/remove_gmpd.patch @@ -0,0 +1,44 @@ +diff --git a/SMP/libnettle.vcxproj b/SMP/libnettle.vcxproj +index 51fa24113..5d418b53e 100644 +--- a/SMP/libnettle.vcxproj ++++ b/SMP/libnettle.vcxproj +@@ -245,7 +245,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + + + libnettle.def +- gmpd.lib;%(AdditionalDependencies) ++ gmp.lib;%(AdditionalDependencies) + + + mkdir "$(OutDir)"\include +@@ -359,7 +359,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + + + libnettle.def +- gmpd.lib;%(AdditionalDependencies) ++ gmp.lib;%(AdditionalDependencies) + + + mkdir "$(OutDir)"\include +diff --git a/SMP/libhogweed.vcxproj b/SMP/libhogweed.vcxproj +index 8f2f433bc..dae3458d8 100644 +--- a/SMP/libhogweed.vcxproj ++++ b/SMP/libhogweed.vcxproj +@@ -247,7 +247,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + + + libhogweed.def +- nettled.lib;gmpd.lib;%(AdditionalDependencies) ++ nettled.lib;gmp.lib;%(AdditionalDependencies) + /IGNORE:4006,4221,4078 %(AdditionalOptions) + + +@@ -362,7 +362,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + + + libhogweed.def +- nettled.lib;gmpd.lib;%(AdditionalDependencies) ++ nettled.lib;gmp.lib;%(AdditionalDependencies) + /IGNORE:4006,4221,4078 %(AdditionalOptions) + + diff --git a/external_imported/vcpkg/ports/nettle/runtime.patch b/external_imported/vcpkg/ports/nettle/runtime.patch deleted file mode 100644 index 3c232d882..000000000 --- a/external_imported/vcpkg/ports/nettle/runtime.patch +++ /dev/null @@ -1,168 +0,0 @@ -diff --git a/SMP/smp_deps.props b/SMP/smp_deps.props -index 1eade47..ab279f4 100644 ---- a/SMP/smp_deps.props -+++ b/SMP/smp_deps.props -@@ -193,6 +193,7 @@ - $(OutDir)\lib\x86\$(TargetName).pdb - false - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDebug - - - $(OutDir)\lib\x86\$(TargetName)$(TargetExt) -@@ -211,6 +212,7 @@ - $(OutDir)\lib\x64\$(TargetName).pdb - false - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDebug - - - $(OutDir)\lib\x64\$(TargetName)$(TargetExt) -@@ -230,6 +232,7 @@ - $(IntDir)$(TargetName).pdb - false - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDebugDLL - - - $(OutDir)\bin\x86\$(TargetName)$(TargetExt) -@@ -253,6 +256,7 @@ - $(IntDir)$(TargetName).pdb - false - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDebugDLL - - - $(OutDir)\bin\x64\$(TargetName)$(TargetExt) -@@ -282,6 +286,7 @@ - SingleFile - $(OutDir)\lib\x86\$(TargetName).pdb - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreaded - - - $(OutDir)\lib\x86\$(TargetName)$(TargetExt) -@@ -307,6 +312,7 @@ - SingleFile - $(OutDir)\lib\x64\$(TargetName).pdb - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreaded - - - $(OutDir)\lib\x64\$(TargetName)$(TargetExt) -@@ -331,6 +337,7 @@ - $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) - $(IntDir)$(TargetName).pdb - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDLL - - - true -@@ -362,6 +369,7 @@ - $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) - $(IntDir)$(TargetName).pdb - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDLL - - - true -@@ -392,6 +400,7 @@ - $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) - $(IntDir)$(TargetName).pdb - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDLL - - - true -@@ -423,6 +432,7 @@ - $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) - $(IntDir)$(TargetName).pdb - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDLL - - - true -diff --git a/SMP/smp_winrt_deps.props b/SMP/smp_winrt_deps.props -index b44482c..35ae231 100644 ---- a/SMP/smp_winrt_deps.props -+++ b/SMP/smp_winrt_deps.props -@@ -206,6 +206,7 @@ - NotUsing - false - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDebug - - - $(OutDir)\lib\x86\$(TargetName)$(TargetExt) -@@ -226,6 +227,7 @@ - NotUsing - false - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDebug - - - $(OutDir)\lib\x64\$(TargetName)$(TargetExt) -@@ -247,6 +249,7 @@ - NotUsing - false - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDebugDLL - - - $(OutDir)\bin\x86\$(TargetName)$(TargetExt) -@@ -274,6 +277,7 @@ - NotUsing - false - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDebugDLL - - - $(OutDir)\bin\x64\$(TargetName)$(TargetExt) -@@ -307,6 +311,7 @@ - NotUsing - false - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreaded - - - $(OutDir)\lib\x86\$(TargetName)$(TargetExt) -@@ -335,6 +340,7 @@ - NotUsing - false - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreaded - - - $(OutDir)\lib\x64\$(TargetName)$(TargetExt) -@@ -361,6 +367,7 @@ - NotUsing - false - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDLL - - - true -@@ -396,6 +403,7 @@ - NotUsing - false - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDLL - - - true -@@ -430,6 +438,7 @@ - NotUsing - false - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDLL - - - true -@@ -465,6 +474,7 @@ - NotUsing - false - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDLL - - - true diff --git a/external_imported/vcpkg/ports/nettle/vcpkg.json b/external_imported/vcpkg/ports/nettle/vcpkg.json index 1a653be5f..e9f7830bd 100644 --- a/external_imported/vcpkg/ports/nettle/vcpkg.json +++ b/external_imported/vcpkg/ports/nettle/vcpkg.json @@ -1,17 +1,21 @@ { "name": "nettle", - "version-string": "3.6", - "port-version": 1, + "version": "3.7.3", "description": "Nettle is a low-level cryptographic library that is designed to fit easily in more or less any context: In crypto toolkits for object-oriented languages (C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel space.", "homepage": "https://git.lysator.liu.se/nettle/nettle", + "license": null, "dependencies": [ "gmp", { - "name": "vs-yasm", - "platform": "windows" + "name": "nettle", + "host": true }, { - "name": "yasm-tool-helper", + "name": "yasm", + "host": true, + "features": [ + "tools" + ], "platform": "windows" } ] diff --git a/external_imported/vcpkg/ports/nettle/yasm.patch b/external_imported/vcpkg/ports/nettle/yasm.patch new file mode 100644 index 000000000..4fa449f32 --- /dev/null +++ b/external_imported/vcpkg/ports/nettle/yasm.patch @@ -0,0 +1,96 @@ +diff --git a/Makefile.in b/Makefile.in +index b65ff4960..3887d0c8f 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -291,7 +291,7 @@ libhogweed.a: $(hogweed_OBJS) + + %.$(OBJEXT): %.asm $(srcdir)/m4-utils.m4 $(srcdir)/asm.m4 config.m4 machine.m4 + $(M4) $(srcdir)/m4-utils.m4 $(srcdir)/asm.m4 config.m4 machine.m4 $< >$*.s +- $(COMPILE) -c $*.s ++ $(COMPILE_AS) -o $*.$(OBJEXT) $*.s + + %.$(OBJEXT): %.c + $(COMPILE) -c $< \ +diff --git a/config.make.in b/config.make.in +index f8e1f74ef..3ae593385 100644 +--- a/config.make.in ++++ b/config.make.in +@@ -73,6 +73,7 @@ TEST_SHLIB_DIR = ${abs_top_builddir}/.lib + # flags before CPPFLAGS and LDFLAGS. While EXTRA_CFLAGS are added at the end. + + COMPILE = $(CC) $(PRE_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(DEP_FLAGS) ++COMPILE_AS = $(CCAS) $(PRE_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(ASMFLAGS) $(DEP_FLAGS) + COMPILE_CXX = $(CXX) $(PRE_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) $(DEP_FLAGS) + LINK = $(CC) $(CFLAGS) $(PRE_LDFLAGS) $(LDFLAGS) + LINK_CXX = $(CXX) $(CXXFLAGS) $(PRE_LDFLAGS) $(LDFLAGS) +diff --git a/configure.ac b/configure.ac +index e95f1c825..1d7ef36bb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -118,6 +118,9 @@ LSH_RPATH_INIT([`echo $with_lib_path | sed 's/:/ /g'` \ + + # Checks for programs. + AC_PROG_CC ++# Copied from gmp ++test -n "$CCAS" || CCAS="$CC -c" ++AC_SUBST(CCAS) + + NETTLE_CHECK_IFUNC + +@@ -302,7 +305,7 @@ ABI=standard + case "$host_cpu" in + [x86_64 | amd64]) + AC_TRY_COMPILE([ +-#if defined(__x86_64__) || defined(__arch64__) ++#if defined(__x86_64__) || defined(__arch64__) || defined(_M_AMD64) + #error 64-bit x86 + #endif + ], [], [ +diff --git a/x86_64/aes.m4 b/x86_64/aes.m4 +index 3bec9eae2..85cafc046 100644 +--- a/x86_64/aes.m4 ++++ b/x86_64/aes.m4 +@@ -77,9 +77,9 @@ define(`AES_STORE', ` + dnl AES_ROUND(table,a,b,c,d,out,ptr) + dnl Computes one word of the AES round. Leaves result in $6. + define(`AES_ROUND', ` +- movzb LREG($2), $7 ++ movzbq LREG($2), $7 + movl AES_TABLE0 ($1, $7, 4),$6 +- movzb HREG($3), XREG($7) ++ movzbq HREG($3), XREG($7) + xorl AES_TABLE1 ($1, $7, 4),$6 + movl $4,XREG($7) + shr `$'16,$7 +@@ -94,7 +94,7 @@ dnl Computes one word of the final round. Leaves result in $6. Also + dnl performs the first substitution step, on the least significant + dnl byte, and rotates 8 bits. + define(`AES_FINAL_ROUND', ` +- movzb LREG($1),$7 ++ movzbq LREG($1),$7 + movzbl ($5, $7), $6 + movl $2,XREG($7) + andl `$'0x0000ff00,XREG($7) +@@ -113,18 +113,18 @@ dnl each of eax, ebx, ecx and edx, and also rotates + dnl the words one byte to the left. + dnl Uses that AES_SBOX == 0 + define(`AES_SUBST_BYTE', ` +- movzb LREG($1),$6 ++ movzbq LREG($1),$6 + movb ($5, $6),LREG($1) + roll `$'8,$1 + +- movzb LREG($2),$6 ++ movzbq LREG($2),$6 + movb ($5, $6),LREG($2) + roll `$'8,$2 + +- movzb LREG($3),$6 ++ movzbq LREG($3),$6 + movb ($5, $6),LREG($3) + roll `$'8,$3 + +- movzb LREG($4),$6 ++ movzbq LREG($4),$6 + movb ($5, $6),LREG($4) + roll `$'8,$4')dnl diff --git a/external_imported/vcpkg/ports/networkdirect-sdk/portfile.cmake b/external_imported/vcpkg/ports/networkdirect-sdk/portfile.cmake index 2b97eb8a1..bd378607f 100644 --- a/external_imported/vcpkg/ports/networkdirect-sdk/portfile.cmake +++ b/external_imported/vcpkg/ports/networkdirect-sdk/portfile.cmake @@ -1,6 +1,3 @@ -#only supports windows -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp" "linux" "osx") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_download_distfile(ARCHIVE diff --git a/external_imported/vcpkg/ports/networkdirect-sdk/vcpkg.json b/external_imported/vcpkg/ports/networkdirect-sdk/vcpkg.json index ec8ec3f98..8313f8f60 100644 --- a/external_imported/vcpkg/ports/networkdirect-sdk/vcpkg.json +++ b/external_imported/vcpkg/ports/networkdirect-sdk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "networkdirect-sdk", - "version-string": "2.0.1", - "port-version": 2, + "version": "2.0.1", + "port-version": 3, "description": "The Network Direct architecture allows hardware vendors to expose the advanced capabilities of their networking devices.", "homepage": "https://www.nuget.org/packages/NetworkDirect", "supports": "windows & (x64 | x86) & !uwp" diff --git a/external_imported/vcpkg/ports/ngspice/Fix-C2065.patch b/external_imported/vcpkg/ports/ngspice/Fix-C2065.patch new file mode 100644 index 000000000..527b2bf44 --- /dev/null +++ b/external_imported/vcpkg/ports/ngspice/Fix-C2065.patch @@ -0,0 +1,170 @@ +diff --git a/visualc/sharedspice.vcxproj b/visualc/sharedspice.vcxproj +index 51a5725..6f41ea1 100644 +--- a/visualc/sharedspice.vcxproj ++++ b/visualc/sharedspice.vcxproj +@@ -113,7 +113,7 @@ + + Disabled + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;SHARED_MODULE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;%(PreprocessorDefinitions) + false + false + false +@@ -157,7 +157,7 @@ + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;SHARED_MODULE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);%(PreprocessorDefinitions) + false + + MultiThreaded +@@ -199,7 +199,7 @@ + + Disabled + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;%(PreprocessorDefinitions) + false + false + false +@@ -248,7 +248,7 @@ + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);%(PreprocessorDefinitions) + false + + +@@ -292,7 +292,7 @@ + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;SHARED_MODULE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;%(PreprocessorDefinitions) + false + + MultiThreaded +@@ -337,7 +337,7 @@ + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;%(PreprocessorDefinitions) + false + + +diff --git a/visualc/vngspice.vcxproj b/visualc/vngspice.vcxproj +index a9d916e..393a128 100644 +--- a/visualc/vngspice.vcxproj ++++ b/visualc/vngspice.vcxproj +@@ -212,7 +212,7 @@ + + Disabled + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;%(PreprocessorDefinitions) + false + + +@@ -259,7 +259,7 @@ + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);%(PreprocessorDefinitions) + false + + +@@ -310,7 +310,7 @@ + + Disabled + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;CONFIG64;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;CONFIG64;%(PreprocessorDefinitions) + false + + +@@ -361,7 +361,7 @@ + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONFIG64;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONFIG64;%(PreprocessorDefinitions) + false + + +@@ -411,7 +411,7 @@ + + Disabled + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;CONSOLE;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;CONSOLE;%(PreprocessorDefinitions) + false + + +@@ -458,7 +458,7 @@ + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONSOLE;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONSOLE;%(PreprocessorDefinitions) + false + + +@@ -508,7 +508,7 @@ + + Disabled + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;CONSOLE;CONFIG64;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;CONSOLE;CONFIG64;%(PreprocessorDefinitions) + false + + +@@ -559,7 +559,7 @@ + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONSOLE;CONFIG64;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONSOLE;CONFIG64;%(PreprocessorDefinitions) + false + + +@@ -610,7 +610,7 @@ + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;%(PreprocessorDefinitions) + false + + +@@ -664,7 +664,7 @@ + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;CONFIG64;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;CONFIG64;%(PreprocessorDefinitions) + false + + +@@ -718,7 +718,7 @@ + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONSOLE;USE_OMP;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONSOLE;USE_OMP;%(PreprocessorDefinitions) + false + + +@@ -772,7 +772,7 @@ + Speed + true + ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\spicelib\parser;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) +- _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONSOLE;CONFIG64;USE_OMP;%(PreprocessorDefinitions) ++ _CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS;SIMULATOR;XSPICE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);CONSOLE;CONFIG64;USE_OMP;%(PreprocessorDefinitions) + false + + diff --git a/external_imported/vcpkg/ports/ngspice/portfile.cmake b/external_imported/vcpkg/ports/ngspice/portfile.cmake index e128d737e..ecf9cf967 100644 --- a/external_imported/vcpkg/ports/ngspice/portfile.cmake +++ b/external_imported/vcpkg/ports/ngspice/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "Linux" "OSX" "UWP" ON_ARCH "arm" "arm64") - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) # ngspice produces self-contained DLLs @@ -16,7 +14,7 @@ vcpkg_from_sourceforge( use-winbison-vngspice.patch remove-post-build.patch remove-64-in-codemodel-name.patch - + Fix-C2065.patch ) vcpkg_find_acquire_program(BISON) @@ -27,14 +25,14 @@ vcpkg_add_to_path(PREPEND "${BISON_DIR}") # Sadly, vcpkg globs .libs inside install_msbuild and whines that the 47 year old SPICE format isn't a MSVC lib ;) # We need to kill them off first before the source tree is copied to a tmp location by install_msbuild -file(REMOVE_RECURSE ${SOURCE_PATH}/contrib) -file(REMOVE_RECURSE ${SOURCE_PATH}/examples) -file(REMOVE_RECURSE ${SOURCE_PATH}/man) -file(REMOVE_RECURSE ${SOURCE_PATH}/tests) +file(REMOVE_RECURSE "${SOURCE_PATH}/contrib") +file(REMOVE_RECURSE "${SOURCE_PATH}/examples") +file(REMOVE_RECURSE "${SOURCE_PATH}/man") +file(REMOVE_RECURSE "${SOURCE_PATH}/tests") # this builds the main dll vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" INCLUDES_SUBPATH /src/include LICENSE_SUBPATH COPYING # install_msbuild swaps x86 for win32(bad) if we dont force our own setting @@ -46,12 +44,12 @@ vcpkg_install_msbuild( if("codemodels" IN_LIST FEATURES) # vngspice generates "codemodels" to enhance simulation capabilities # we cannot use install_msbuild as they output with ".cm" extensions on purpose - set(BUILDTREE_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) - file(REMOVE_RECURSE ${BUILDTREE_PATH}) - file(COPY ${SOURCE_PATH}/ DESTINATION ${BUILDTREE_PATH}) + set(BUILDTREE_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") + file(REMOVE_RECURSE "${BUILDTREE_PATH}") + file(COPY "${SOURCE_PATH}/" DESTINATION "${BUILDTREE_PATH}") vcpkg_build_msbuild( - PROJECT_PATH ${BUILDTREE_PATH}/visualc/vngspice.sln + PROJECT_PATH "${BUILDTREE_PATH}/visualc/vngspice.sln" # build_msbuild swaps x86 for win32(bad) if we dont force our own setting PLATFORM ${TRIPLET_SYSTEM_ARCH} TARGET Build @@ -66,29 +64,29 @@ if("codemodels" IN_LIST FEATURES) else() message(FATAL_ERROR "Unsupported target architecture") endif() - + #put the code models in the intended location file(GLOB NGSPICE_CODEMODELS_DEBUG - ${BUILDTREE_PATH}/visualc/codemodels/${OUT_ARCH}/Debug/*.cm + "${BUILDTREE_PATH}/visualc/codemodels/${OUT_ARCH}/Debug/*.cm" ) - file(COPY ${NGSPICE_CODEMODELS_DEBUG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/ngspice) - + file(COPY ${NGSPICE_CODEMODELS_DEBUG} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/ngspice") + file(GLOB NGSPICE_CODEMODELS_RELEASE - ${BUILDTREE_PATH}/visualc/codemodels/${OUT_ARCH}/Release/*.cm + "${BUILDTREE_PATH}/visualc/codemodels/${OUT_ARCH}/Release/*.cm" ) - file(COPY ${NGSPICE_CODEMODELS_RELEASE} DESTINATION ${CURRENT_PACKAGES_DIR}/lib/ngspice) - - + file(COPY ${NGSPICE_CODEMODELS_RELEASE} DESTINATION "${CURRENT_PACKAGES_DIR}/lib/ngspice") + + # copy over spinit (spice init) - file(RENAME ${BUILDTREE_PATH}/visualc/spinit_all ${BUILDTREE_PATH}/visualc/spinit) - file(COPY ${BUILDTREE_PATH}/visualc/spinit DESTINATION ${CURRENT_PACKAGES_DIR}/share/ngspice) + file(RENAME "${BUILDTREE_PATH}/visualc/spinit_all" "${BUILDTREE_PATH}/visualc/spinit") + file(COPY "${BUILDTREE_PATH}/visualc/spinit" DESTINATION "${CURRENT_PACKAGES_DIR}/share/ngspice") endif() vcpkg_copy_pdbs() # Unforunately install_msbuild isn't able to dual include directories that effectively layer -file(GLOB NGSPICE_INCLUDES ${SOURCE_PATH}/visualc/src/include/ngspice/*) -file(COPY ${NGSPICE_INCLUDES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/ngspice) +file(GLOB NGSPICE_INCLUDES "${SOURCE_PATH}/visualc/src/include/ngspice/*") +file(COPY ${NGSPICE_INCLUDES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/ngspice") # This gets copied by install_msbuild but should not be shared -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/cppduals) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/cppduals") diff --git a/external_imported/vcpkg/ports/ngspice/vcpkg.json b/external_imported/vcpkg/ports/ngspice/vcpkg.json index 1b6da85d1..11517e0c1 100644 --- a/external_imported/vcpkg/ports/ngspice/vcpkg.json +++ b/external_imported/vcpkg/ports/ngspice/vcpkg.json @@ -1,8 +1,10 @@ { "name": "ngspice", - "version-string": "35", + "version": "35", + "port-version": 2, "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", "supports": "!(linux | osx | arm | uwp)", "default-features": [ "codemodels" diff --git a/external_imported/vcpkg/ports/nlohmann-json/portfile.cmake b/external_imported/vcpkg/ports/nlohmann-json/portfile.cmake index 623392a78..19343c426 100644 --- a/external_imported/vcpkg/ports/nlohmann-json/portfile.cmake +++ b/external_imported/vcpkg/ports/nlohmann-json/portfile.cmake @@ -1,17 +1,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nlohmann/json - REF v3.10.4 - SHA512 f78592db6218165cbc74c10bcba40366f1bfea84405b7ee25fe97a056d5b7a15aeeb956d93296673928dcbd6e26ffcfb152f885b4a44d5d55751396ccf090835 + REF v3.10.5 + SHA512 4a9d6416f383e76bf95425fc02a4e12c605fcbcae910b704e354396a493454cf8a1ffbecba11f231e020ffd2842908df7e67dbc09f62d1202d40b6815c24cfd2 HEAD_REF master ) +if(NOT DEFINED nlohmann-json_IMPLICIT_CONVERSIONS) + set(nlohmann-json_IMPLICIT_CONVERSIONS ON) +endif() + vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} 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") @@ -35,3 +40,6 @@ file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/nlohmann_json.natvis") # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE.MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +# Handle usage +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/external_imported/vcpkg/ports/nlohmann-json/usage b/external_imported/vcpkg/ports/nlohmann-json/usage new file mode 100644 index 000000000..a078bbd38 --- /dev/null +++ b/external_imported/vcpkg/ports/nlohmann-json/usage @@ -0,0 +1,12 @@ +The package nlohmann-json provides CMake targets: + + find_package(nlohmann_json CONFIG REQUIRED) + target_link_libraries(main PRIVATE nlohmann_json::nlohmann_json) + +The package nlohmann-json can be configured to not provide implicit conversions via a custom triplet file: + + set(nlohmann-json_IMPLICIT_CONVERSIONS OFF) + +For more information, see the docs here: + + https://json.nlohmann.me/features/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 1b13bdbbc..bccb3d74b 100644 --- a/external_imported/vcpkg/ports/nlohmann-json/vcpkg.json +++ b/external_imported/vcpkg/ports/nlohmann-json/vcpkg.json @@ -1,6 +1,7 @@ { "name": "nlohmann-json", - "version-semver": "3.10.4", + "version-semver": "3.10.5", + "port-version": 2, "description": "JSON for Modern C++", "homepage": "https://github.com/nlohmann/json", "dependencies": [ diff --git a/external_imported/vcpkg/ports/nmslib/portfile.cmake b/external_imported/vcpkg/ports/nmslib/portfile.cmake index 1ca78c811..a6f6a0bd4 100644 --- a/external_imported/vcpkg/ports/nmslib/portfile.cmake +++ b/external_imported/vcpkg/ports/nmslib/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/external_imported/vcpkg/ports/nmslib/vcpkg.json b/external_imported/vcpkg/ports/nmslib/vcpkg.json index 1d53e2e02..eb475f07d 100644 --- a/external_imported/vcpkg/ports/nmslib/vcpkg.json +++ b/external_imported/vcpkg/ports/nmslib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "nmslib", "version": "2.1.1", + "port-version": 1, "description": "Non-Metric Space Library (NMSLIB) is an efficient similarity search library and a toolkit for evaluation of k-NN methods for generic non-metric spaces.", "homepage": "https://github.com/searchivarius/nmslib", "supports": "!(arm | uwp)", diff --git a/external_imported/vcpkg/ports/nnpack/fix-cmakelists.patch b/external_imported/vcpkg/ports/nnpack/fix-cmakelists.patch index 046443d80..bd80f1000 100644 --- a/external_imported/vcpkg/ports/nnpack/fix-cmakelists.patch +++ b/external_imported/vcpkg/ports/nnpack/fix-cmakelists.patch @@ -42,8 +42,8 @@ index 5ecd2df..8565044 100644 "${CONFU_DEPENDENCIES_BINARY_DIR}/cpuinfo") ENDIF() -TARGET_LINK_LIBRARIES(nnpack PRIVATE cpuinfo) -+find_package(unofficial-cpuinfo CONFIG REQUIRED) -+target_link_libraries(nnpack PUBLIC unofficial::cpuinfo::cpuinfo) ++find_package(cpuinfo CONFIG REQUIRED) ++target_link_libraries(nnpack PUBLIC cpuinfo::cpuinfo) # ---[ Configure pthreadpool -IF(NOT TARGET pthreadpool) diff --git a/external_imported/vcpkg/ports/nnpack/portfile.cmake b/external_imported/vcpkg/ports/nnpack/portfile.cmake index 51432669a..7e3203223 100644 --- a/external_imported/vcpkg/ports/nnpack/portfile.cmake +++ b/external_imported/vcpkg/ports/nnpack/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "Windows") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Maratyszcza/nnpack @@ -8,16 +7,15 @@ vcpkg_from_github( fix-cmakelists.patch ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DNNPACK_BACKEND=psimd -DNNPACK_BUILD_TESTS=OFF -DNNPACK_BUILD_BENCHMARKS=OFF -DNNPACK_CUSTOM_THREADPOOL=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/external_imported/vcpkg/ports/nnpack/vcpkg.json b/external_imported/vcpkg/ports/nnpack/vcpkg.json index a0e0a4ea2..fe1878175 100644 --- a/external_imported/vcpkg/ports/nnpack/vcpkg.json +++ b/external_imported/vcpkg/ports/nnpack/vcpkg.json @@ -1,15 +1,20 @@ { "name": "nnpack", "version-date": "2021-02-21", - "port-version": 1, + "port-version": 3, "description": "Acceleration package for neural networks on multi-core CPUs", "homepage": "https://github.com/Maratyszcza/NNPACK", - "supports": "linux & osx", + "license": "BSD-2-Clause", + "supports": "linux | osx", "dependencies": [ "cpuinfo", "fp16", "fxdiv", "psimd", - "pthreadpool" + "pthreadpool", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/nspr/portfile.cmake b/external_imported/vcpkg/ports/nspr/portfile.cmake new file mode 100644 index 000000000..c3302609f --- /dev/null +++ b/external_imported/vcpkg/ports/nspr/portfile.cmake @@ -0,0 +1,94 @@ +set(NSPR_VERSION "4.33") + +vcpkg_download_distfile(ARCHIVE + URLS "https://releases.mozilla.org/pub/nspr/releases/v${NSPR_VERSION}/src/nspr-${NSPR_VERSION}.tar.gz" + FILENAME "nspr-${NSPR_VERSION}.tar.gz" + SHA512 8064f826c977f1302a341ca7a7aaf7977b5d10102062c030b1d42b856638e3408ab262447e8c7cfd5a98879b9b1043d17ceae66fbb1e5ed86d6bc3531f26667e +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF "${NSPR_VERSION}" +) + +set(MOZBUILD_ROOT "${CURRENT_HOST_INSTALLED_DIR}/tools/mozbuild") + +set(MOZBUILD_BINDIR "${MOZBUILD_ROOT}/bin") +vcpkg_add_to_path("${MOZBUILD_BINDIR}") + +set(MOZBUILD_MSYS_ROOT "${MOZBUILD_ROOT}/msys") +vcpkg_add_to_path(PREPEND "${MOZBUILD_MSYS_ROOT}") + +set(OPTIONS "") +if (VCPKG_CRT_LINKAGE STREQUAL "dynamic") + list(APPEND OPTIONS "--disable-static-rtl") +else() + list(APPEND OPTIONS "--enable-static-rtl") +endif() + +list(APPEND OPTIONS "--enable-win32-target=win95") + +if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + list(APPEND OPTIONS "--enable-64bit") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + list(APPEND OPTIONS "--disable-64bit") +else() + message(FATAL_ERROR "Unsupported arch: ${VCPKG_TARGET_ARCHITECTURE}") +endif() + +set(OPTIONS_DEBUG + "--enable-debug-rtl" +) + +set(OPTIONS_RELEASE + "--disable-debug-rtl" +) + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + CONFIGURE_ENVIRONMENT_VARIABLES CC CXX LD + PROJECT_SUBPATH "nspr" + OPTIONS ${OPTIONS} + OPTIONS_DEBUG ${OPTIONS_DEBUG} + OPTIONS_RELEASE ${OPTIONS_RELEASE} + DISABLE_VERBOSE_FLAGS true +) +vcpkg_install_make() +vcpkg_copy_pdbs() + +# +# VCPKG FHS adjustments +# + +# Release +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(GLOB BIN_RELEASE "${CURRENT_PACKAGES_DIR}/lib/*.dll" "${CURRENT_PACKAGES_DIR}/lib/*.pdb") + list(LENGTH BIN_RELEASE BIN_RELEASE_SIZE) + if (BIN_RELEASE_SIZE GREATER 0) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + + foreach(path ${BIN_RELEASE}) + get_filename_component(name "${path}" NAME) + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/${name}" "${CURRENT_PACKAGES_DIR}/bin/${name}") + endforeach() + endif() +endif() + +# Debug +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + file(GLOB BIN_DEBUG "${CURRENT_PACKAGES_DIR}/debug/lib/*.dll" "${CURRENT_PACKAGES_DIR}/debug/lib/*.pdb") + list(LENGTH BIN_DEBUG BIN_DEBUG_SIZE) + if (BIN_DEBUG_SIZE GREATER 0) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + + foreach(path IN LISTS BIN_DEBUG) + get_filename_component(name "${path}" NAME) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/${name}" "${CURRENT_PACKAGES_DIR}/debug/bin/${name}") + endforeach() + endif() +endif() + +# Copy license +file(INSTALL "${SOURCE_PATH}/nspr/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/nspr" RENAME copyright) diff --git a/external_imported/vcpkg/ports/nspr/vcpkg.json b/external_imported/vcpkg/ports/nspr/vcpkg.json new file mode 100644 index 000000000..096df7d4a --- /dev/null +++ b/external_imported/vcpkg/ports/nspr/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "nspr", + "version": "4.33", + "description": "Netscape portable runtime", + "homepage": "https://releases.mozilla.org/pub/nspr/", + "license": "MPL-2.0", + "supports": "windows & !(arm | uwp | static)", + "dependencies": [ + { + "name": "vcpkg-tool-mozbuild", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/nss/01-nspr-no-lib-prefix.patch b/external_imported/vcpkg/ports/nss/01-nspr-no-lib-prefix.patch new file mode 100644 index 000000000..0351c0db6 --- /dev/null +++ b/external_imported/vcpkg/ports/nss/01-nspr-no-lib-prefix.patch @@ -0,0 +1,12 @@ +diff -ur x64-windows-rel/nss/coreconf/config.gypi src/3.66-485ec2a7fc.clean/nss/coreconf/config.gypi +--- a/nss/coreconf/config.gypi 2021-05-28 02:50:43.000000000 -0700 ++++ b/nss/coreconf/config.gypi 2021-11-09 07:51:35.884650900 -0800 +@@ -44,7 +44,7 @@ + }], + ['OS=="win"', { + 'use_system_zlib%': 0, +- 'nspr_libs%': ['libnspr4.lib', 'libplc4.lib', 'libplds4.lib'], ++ 'nspr_libs%': ['nspr4.lib', 'plc4.lib', 'plds4.lib'], + 'zlib_libs%': [], + #TODO + 'moz_debug_flags%': '', diff --git a/external_imported/vcpkg/ports/nss/02-gen-debug-info-for-release.patch b/external_imported/vcpkg/ports/nss/02-gen-debug-info-for-release.patch new file mode 100644 index 000000000..435abea2d --- /dev/null +++ b/external_imported/vcpkg/ports/nss/02-gen-debug-info-for-release.patch @@ -0,0 +1,15 @@ +diff -ur +--- a/nss/coreconf/config.gypi 2021-11-09 22:46:52.555246500 -0800 ++++ b/nss/coreconf/config.gypi 2021-11-10 00:49:48.044560100 -0800 +@@ -638,9 +638,11 @@ + 'VCCLCompilerTool': { + 'Optimization': '<(release_optimization_level)', + 'RuntimeLibrary': '2', # /MD ++ 'DebugInformationFormat': '3', + }, + 'VCLinkerTool': { + 'LinkIncremental': '1', ++ 'GenerateDebugInformation' : 'true', + }, + }, + }, diff --git a/external_imported/vcpkg/ports/nss/portfile.cmake b/external_imported/vcpkg/ports/nss/portfile.cmake new file mode 100644 index 000000000..3e60e20dc --- /dev/null +++ b/external_imported/vcpkg/ports/nss/portfile.cmake @@ -0,0 +1,208 @@ +set(NSS_VERSION "3.77") +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 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF "${NSS_VERSION}" + PATCHES "01-nspr-no-lib-prefix.patch" +) + +# setup ninja +vcpkg_find_acquire_program(NINJA) +get_filename_component(NINJA_ROOT "${NINJA}" DIRECTORY) +list(APPEND CMAKE_PROGRAM_PATH "${NINJA_ROOT}") +vcpkg_add_to_path(APPEND "${NINJA_ROOT}") + +# setup mozbuild for windows +if (VCPKG_TARGET_IS_WINDOWS) + set(MOZBUILD_ROOT "${CURRENT_HOST_INSTALLED_DIR}/tools/mozbuild") + + set(MOZBUILD_BINDIR "${MOZBUILD_ROOT}/bin") + vcpkg_add_to_path(PREPEND "${MOZBUILD_BINDIR}") + + set(MOZBUILD_MSYS_ROOT "${MOZBUILD_ROOT}/msys") + vcpkg_add_to_path(PREPEND "${MOZBUILD_MSYS_ROOT}/bin") + + find_program(MOZBUILD_MAKE_COMMAND make PATHS "${MOZBUILD_MSYS_ROOT}/bin" NO_DEFAULT_PATH REQUIRED) + message(STATUS "Found make: ${MOZBUILD_MAKE_COMMAND}") + + find_program(MOZBUILD_BASH bash PATHS "${MOZBUILD_MSYS_ROOT}/bin" NO_DEFAULT_PATH REQUIRED) + message(STATUS "Found bash: ${MOZBUILD_BASH}") + + set(MOZBUILD_PYTHON_ROOT "${MOZBUILD_ROOT}/python") + find_program(MOZBUILD_PYTHON python PATHS "${MOZBUILD_ROOT}/python" NO_DEFAULT_PATH REQUIRED) + message(STATUS "Found python: ${MOZBUILD_PYTHON}") + vcpkg_add_to_path(PREPEND "${MOZBUILD_PYTHON_ROOT}") + +else() + # TODO: setup non-windows build environment + +endif() + +set(GYP_NSS_ROOT "${CURRENT_HOST_INSTALLED_DIR}/tools/gyp-nss") +if (VCPKG_HOST_IS_WINDOWS) + find_file(GYP_NSS NAMES gyp.bat PATHS "${GYP_NSS_ROOT}" NO_DEFAULT_PATH REQUIRED) +else() + find_program(GYP_NSS NAMES gyp PATHS "${GYP_NSS_ROOT}" NO_DEFAULT_PATH REQUIRED) +endif() +vcpkg_add_to_path(PREPEND "${GYP_NSS_ROOT}") +message(STATUS "Found gyp: ${GYP_NSS}") + +# setup paths +execute_process( + COMMAND ${MOZBUILD_BASH} -c pwd + WORKING_DIRECTORY ${CURRENT_INSTALLED_DIR}/include + OUTPUT_VARIABLE VCPKG_INCLUDEDIR + OUTPUT_STRIP_TRAILING_WHITESPACE +) +message(STATUS "Using headers from: ${VCPKG_INCLUDEDIR} arch: ${VCPKG_TARGET_ARCHITECTURE}") + +execute_process( + COMMAND ${MOZBUILD_BASH} -c pwd + WORKING_DIRECTORY ${CURRENT_INSTALLED_DIR}/lib + OUTPUT_VARIABLE VCPKG_LIBDIR + OUTPUT_STRIP_TRAILING_WHITESPACE +) +message(STATUS "Using libraries from: ${VCPKG_LIBDIR} arch: ${VCPKG_TARGET_ARCHITECTURE}") + +# +# get to work +# + +# see help.txt in nss root +set(OPTIONS + "-v" "-g" + "--disable-tests" + "--with-nspr=${VCPKG_INCLUDEDIR}/nspr:${VCPKG_LIBDIR}" + "--system-sqlite" + "-Dsign_libs=0" +) + +if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + list(APPEND OPTIONS "--target=x64") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + list(APPEND OPTIONS "--target=ia32") +else() + message(FATAL_ERROR "Unsupported arch: ${VCPKG_TARGET_ARCHITECTURE}") +endif() + +if (VCPKG_TARGET_IS_WINDOWS) + list(APPEND OPTIONS + "--msvc" + ) +endif() + +set(VCPKG_BINARY_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") + +# build debug +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + message(STATUS "Copying sources to debug build dir ...") + file(COPY "${SOURCE_PATH}/nss" DESTINATION "${VCPKG_BINARY_DIR}-dbg") + message(STATUS "Building debug ...") + vcpkg_execute_required_process( + COMMAND ${MOZBUILD_BASH} ./build.sh ${OPTIONS} + WORKING_DIRECTORY ${VCPKG_BINARY_DIR}-dbg/nss + LOGNAME build-${TARGET_TRIPLET}${short_buildtype} + ) +endif() + +# build release +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + message(STATUS "Copying sources to release build dir ...") + file(COPY "${SOURCE_PATH}/nss" DESTINATION "${VCPKG_BINARY_DIR}-rel") + message(STATUS "Building release ...") + vcpkg_execute_required_process( + COMMAND ${MOZBUILD_BASH} ./build.sh ${OPTIONS} "--opt" + WORKING_DIRECTORY ${VCPKG_BINARY_DIR}-rel/nss + LOGNAME build-${TARGET_TRIPLET}${short_buildtype} + ) +endif() + +# +# VCPKG FHS adjustments +# + +# Headers + +file( + COPY "${VCPKG_BINARY_DIR}-rel/dist/public/nss" + DESTINATION "${CURRENT_PACKAGES_DIR}/include" +) + +file( + COPY "${VCPKG_BINARY_DIR}-rel/dist/private/nss/" + DESTINATION "${CURRENT_PACKAGES_DIR}/include/nss/private" +) + +# Release libraries + +file(GLOB LIB_RELEASE + "${VCPKG_BINARY_DIR}-rel/dist/Release/lib/*.dll" + "${VCPKG_BINARY_DIR}-rel/dist/Release/lib/*.pdb" +) +list(LENGTH LIB_RELEASE LIB_RELEASE_SIZE) + +if (LIB_RELEASE_SIZE GREATER 0) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + + foreach(path ${LIB_RELEASE}) + get_filename_component(name "${path}" NAME) + file(RENAME "${path}" "${CURRENT_PACKAGES_DIR}/bin/${name}") + endforeach() + + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib") + file(COPY "${VCPKG_BINARY_DIR}-rel/dist/Release/lib" DESTINATION "${CURRENT_PACKAGES_DIR}") +endif() + +# Release tools + +vcpkg_copy_tools( + TOOL_NAMES + "certutil" + "cmsutil" + "crlutil" + "hw-support" + "modutil" + "nss" + "pk12util" + "pwdecrypt" + "shlibsign" + "signtool" + "signver" + "ssltap" + "symkeyutil" + "validation" + SEARCH_DIR "${VCPKG_BINARY_DIR}-rel/dist/Release/bin/" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}" +) + +# Debug libraries +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(GLOB LIB_DEBUG + "${VCPKG_BINARY_DIR}-dbg/dist/Debug/lib/*.dll" + "${VCPKG_BINARY_DIR}-dbg/dist/Debug/lib/*.pdb" + ) + list(LENGTH LIB_DEBUG LIB_DEBUG_SIZE) + + if (LIB_DEBUG_SIZE GREATER 0) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + + foreach(path ${LIB_DEBUG}) + get_filename_component(name "${path}" NAME) + file(RENAME "${path}" "${CURRENT_PACKAGES_DIR}/debug/bin/${name}") + endforeach() + + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib") + file(COPY "${VCPKG_BINARY_DIR}-dbg/dist/Debug/lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug") + endif() +endif() + +# Copy license +file(INSTALL "${SOURCE_PATH}/nss/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/nss" RENAME copyright) diff --git a/external_imported/vcpkg/ports/nss/vcpkg.json b/external_imported/vcpkg/ports/nss/vcpkg.json new file mode 100644 index 000000000..83143405c --- /dev/null +++ b/external_imported/vcpkg/ports/nss/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "nss", + "version": "3.77", + "description": "Network Security Services from Mozilla", + "homepage": "https://ftp.mozilla.org/pub/security/nss/releases/", + "license": "MPL-2.0", + "supports": "windows & !arm", + "dependencies": [ + "nspr", + "sqlite3", + { + "name": "vcpkg-tool-gyp-nss", + "host": true + }, + { + "name": "vcpkg-tool-mozbuild", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/nsync/export-targets.patch b/external_imported/vcpkg/ports/nsync/export-targets.patch new file mode 100644 index 000000000..cbae3d366 --- /dev/null +++ b/external_imported/vcpkg/ports/nsync/export-targets.patch @@ -0,0 +1,36 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 328f9b6..6a71b5b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -41,6 +41,9 @@ function (set_cpp_target tgtname files) + "${PROJECT_SOURCE_DIR}/platform/c++11.futex" + ) + endif () ++ ++ target_include_directories("${tgtname}" PUBLIC $) ++ + + target_compile_definitions ("${tgtname}" PRIVATE "${NSYNC_CPP_DEFINITIONS}") + +@@ -399,14 +402,19 @@ endif () + # By default, install nsync always + # set (CMAKE_SKIP_INSTALL_ALL_DEPENDENCY ON) + +-install (TARGETS nsync ++install (TARGETS nsync EXPORT unofficial-nsyncConfig + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development) + +-install (TARGETS nsync_cpp OPTIONAL ++install (TARGETS nsync_cpp OPTIONAL EXPORT unofficial-nsyncConfig + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development) + ++install(EXPORT unofficial-nsyncConfig ++ NAMESPACE unofficial::nsync:: ++ DESTINATION share/unofficial-nsync ++) ++ + set (NSYNC_INCLUDES + "public/nsync.h" + "public/nsync_atomic.h" diff --git a/external_imported/vcpkg/ports/nsync/portfile.cmake b/external_imported/vcpkg/ports/nsync/portfile.cmake index 65abd9c87..fe2ff4d51 100644 --- a/external_imported/vcpkg/ports/nsync/portfile.cmake +++ b/external_imported/vcpkg/ports/nsync/portfile.cmake @@ -10,16 +10,18 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-install.patch + export-targets.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DNSYNC_ENABLE_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-nsync CONFIG_PATH share/unofficial-nsync) + +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/nsync/vcpkg.json b/external_imported/vcpkg/ports/nsync/vcpkg.json index 292da006c..54c24f43f 100644 --- a/external_imported/vcpkg/ports/nsync/vcpkg.json +++ b/external_imported/vcpkg/ports/nsync/vcpkg.json @@ -1,6 +1,18 @@ { "name": "nsync", "version": "1.24.0", + "port-version": 1, "description": "nsync is a C library that exports various synchronization primitives, such as mutexes", - "homepage": "https://github.com/google/nsync" + "homepage": "https://github.com/google/nsync", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } 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 new file mode 100644 index 000000000..6a69fc0b6 --- /dev/null +++ b/external_imported/vcpkg/ports/nu-book-zxing-cpp/ignore-pdb-install-symbols-in-lib.patch @@ -0,0 +1,12 @@ +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 new file mode 100644 index 000000000..2facb6b5d --- /dev/null +++ b/external_imported/vcpkg/ports/nu-book-zxing-cpp/portfile.cmake @@ -0,0 +1,37 @@ +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 + HEAD_REF master + PATCHES ignore-pdb-install-symbols-in-lib.patch +) + +if (VCPKG_TARGET_IS_UWP) + set(ENV{CL} "$ENV{CL} -wd4996") +endif() +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_BLACKBOX_TESTS=OFF + -DBUILD_EXAMPLES=OFF + -DBUILD_SYSTEM_DEPS=ALWAYS + MAYBE_UNUSED_VARIABLES + # Currently no dependencies, but this defends against future additions + BUILD_SYSTEM_DEPS +) + +vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup( + CONFIG_PATH lib/cmake/ZXing + PACKAGE_NAME ZXing +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/nu-book-zxing-cpp" RENAME copyright) diff --git a/external_imported/vcpkg/ports/nu-book-zxing-cpp/vcpkg.json b/external_imported/vcpkg/ports/nu-book-zxing-cpp/vcpkg.json new file mode 100644 index 000000000..1dae685b1 --- /dev/null +++ b/external_imported/vcpkg/ports/nu-book-zxing-cpp/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "nu-book-zxing-cpp", + "version": "1.2.0", + "description": "Barcode detection and decoding library.", + "homepage": "https://github.com/nu-book/zxing-cpp", + "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/nvtt/fix-intrinsic-function.patch b/external_imported/vcpkg/ports/nvtt/fix-intrinsic-function.patch new file mode 100644 index 000000000..397e81681 --- /dev/null +++ b/external_imported/vcpkg/ports/nvtt/fix-intrinsic-function.patch @@ -0,0 +1,19 @@ +diff --git a/src/nvmath/nvmath.h b/src/nvmath/nvmath.h +index 38532eb..e68d8f8 100644 +--- a/src/nvmath/nvmath.h ++++ b/src/nvmath/nvmath.h +@@ -118,12 +118,12 @@ inline float asinf_assert(const float f) + #endif + + #if NV_CC_MSVC +-NV_FORCEINLINE float log2f(float x) ++NV_FORCEINLINE float nv_log2f(float x) + { + nvCheck(x >= 0); + return logf(x) / logf(2.0f); + } +-NV_FORCEINLINE float exp2f(float x) ++NV_FORCEINLINE float nv_exp2f(float x) + { + return powf(2.0f, x); + } diff --git a/external_imported/vcpkg/ports/nvtt/portfile.cmake b/external_imported/vcpkg/ports/nvtt/portfile.cmake index f235be2d0..8ede40096 100644 --- a/external_imported/vcpkg/ports/nvtt/portfile.cmake +++ b/external_imported/vcpkg/ports/nvtt/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "x86") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( @@ -16,27 +14,27 @@ vcpkg_from_github( fix-build-error.patch add-compile-options-for-osx.patch skip-building-libsquish.patch + fix-intrinsic-function.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DNVTT_SHARED=0 -DCMAKE_DEBUG_POSTFIX=_d # required by OSG ) -vcpkg_install_cmake() +vcpkg_cmake_install() if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() 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") # Handle copyright -file(REMOVE ${CURRENT_PACKAGES_DIR}/share/doc/nvtt/LICENSE) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE "${CURRENT_PACKAGES_DIR}/share/doc/nvtt/LICENSE") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/nvtt/vcpkg.json b/external_imported/vcpkg/ports/nvtt/vcpkg.json index 24ad40926..931bca6b8 100644 --- a/external_imported/vcpkg/ports/nvtt/vcpkg.json +++ b/external_imported/vcpkg/ports/nvtt/vcpkg.json @@ -1,11 +1,16 @@ { "name": "nvtt", - "version-string": "2.1.2", - "port-version": 2, + "version": "2.1.2", + "port-version": 4, "description": "Texture processing tools with support for Direct3D 10 and 11 formats.", "homepage": "https://github.com/castano/nvidia-texture-tools", + "license": "MIT", "supports": "!x86", "dependencies": [ - "libsquish" + "libsquish", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/oatpp-consul/portfile.cmake b/external_imported/vcpkg/ports/oatpp-consul/portfile.cmake index 83c1889bd..bb7e363e0 100644 --- a/external_imported/vcpkg/ports/oatpp-consul/portfile.cmake +++ b/external_imported/vcpkg/ports/oatpp-consul/portfile.cmake @@ -1,4 +1,4 @@ -set(OATPP_VERSION "1.2.5") +set(OATPP_VERSION "1.3.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,21 +6,20 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp-consul REF ${OATPP_VERSION} - SHA512 6d73b869e5fea966451d15cbdc389f7c6c367a8e10124aadaa33121f0ef78bbf5b702a094b2ca6ad8583257ab7cb4187a7a0571b119c96d5d5e20b2d5cb4beae + SHA512 b7bfff564e70fe94f99e959e8bc095b6cda704764c54e3837fc5f808b610c9197fbd0d601cb481a9cbf0d17fc1dece8d7cce6881a604fccbe63bd9b1c2b871f0 HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-consul-${OATPP_VERSION}) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-consul CONFIG_PATH lib/cmake/oatpp-consul-${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-consul/vcpkg.json b/external_imported/vcpkg/ports/oatpp-consul/vcpkg.json index 0f3a90df3..e606a276c 100644 --- a/external_imported/vcpkg/ports/oatpp-consul/vcpkg.json +++ b/external_imported/vcpkg/ports/oatpp-consul/vcpkg.json @@ -1,9 +1,17 @@ { "name": "oatpp-consul", - "version": "1.2.5", + "version": "1.3.0", "description": "OAT++ Modern web framework consul module.", "homepage": "https://github.com/oatpp/oatpp-consul", "dependencies": [ - "oatpp" + "oatpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/oatpp-curl/portfile.cmake b/external_imported/vcpkg/ports/oatpp-curl/portfile.cmake index 9340560a5..f80968ec8 100644 --- a/external_imported/vcpkg/ports/oatpp-curl/portfile.cmake +++ b/external_imported/vcpkg/ports/oatpp-curl/portfile.cmake @@ -1,4 +1,4 @@ -set(OATPP_VERSION "1.2.5") +set(OATPP_VERSION "1.3.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,22 +6,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp-curl REF ${OATPP_VERSION} - SHA512 db2b4ab07dbf1140e44c131a1919c6ac29e9cea3df8dde8951028d6096ed5a66a248d3ddeeaabc32cac0fde38fd5905e706daaa7c9fbf6bcb49ccb9ba1cfb50e + SHA512 d9437a6b3a214bf0f17561e905709d741cd7d5fcad30ec0cdddeaacb3a72142bf8b24034d13201cd416898ffd0ab07ca50ec66d4025406acee1518ae65dac45e HEAD_REF master PATCHES "fix-find-curl.patch" ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-curl-${OATPP_VERSION}) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-curl CONFIG_PATH lib/cmake/oatpp-curl-${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-curl/vcpkg.json b/external_imported/vcpkg/ports/oatpp-curl/vcpkg.json index c552f8bee..5980921c1 100644 --- a/external_imported/vcpkg/ports/oatpp-curl/vcpkg.json +++ b/external_imported/vcpkg/ports/oatpp-curl/vcpkg.json @@ -1,10 +1,18 @@ { "name": "oatpp-curl", - "version": "1.2.5", + "version": "1.3.0", "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", "dependencies": [ "curl", - "oatpp" + "oatpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/oatpp-libressl/portfile.cmake b/external_imported/vcpkg/ports/oatpp-libressl/portfile.cmake index e53766e3a..b21fb9af2 100644 --- a/external_imported/vcpkg/ports/oatpp-libressl/portfile.cmake +++ b/external_imported/vcpkg/ports/oatpp-libressl/portfile.cmake @@ -1,4 +1,4 @@ -set(OATPP_VERSION "1.2.5") +set(OATPP_VERSION "1.3.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -7,23 +7,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp-libressl REF ${OATPP_VERSION} - SHA512 64b596576b7c976cd8ebd68ba16a38e7b9c65794d9dcea82d3537d2433f11645a25eb567aea6d16ddc51f8ff5f90e83f29e24555c3ae87f80883ec2f53366d99 + SHA512 8f16c4e0341dc20e4a8a5fcdcf8e58bac1cfbef51b8cac6f5ca4894acf296333fcc2b8f34c6353cbd31a1f2f2be021550ce859489a45f388f4b5ccec4c67eee9 HEAD_REF master PATCHES "libress-submodule-downgrade-required-libressl-version.patch" ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" "-DLIBRESSL_ROOT_DIR=${CURRENT_INSTALLED_DIR}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-libressl-${OATPP_VERSION}) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-libressl CONFIG_PATH lib/cmake/oatpp-libressl-${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-libressl/vcpkg.json b/external_imported/vcpkg/ports/oatpp-libressl/vcpkg.json index 3c34c9a99..96d4cc938 100644 --- a/external_imported/vcpkg/ports/oatpp-libressl/vcpkg.json +++ b/external_imported/vcpkg/ports/oatpp-libressl/vcpkg.json @@ -1,10 +1,18 @@ { "name": "oatpp-libressl", - "version": "1.2.5", + "version": "1.3.0", "description": "Oat++ libressl module providing secure server and client connection providers.", "homepage": "https://github.com/oatpp/oatpp-libressl", "dependencies": [ "libressl", - "oatpp" + "oatpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/oatpp-mbedtls/portfile.cmake b/external_imported/vcpkg/ports/oatpp-mbedtls/portfile.cmake index fd95c8c33..581d19049 100644 --- a/external_imported/vcpkg/ports/oatpp-mbedtls/portfile.cmake +++ b/external_imported/vcpkg/ports/oatpp-mbedtls/portfile.cmake @@ -1,4 +1,4 @@ -set(OATPP_VERSION "1.2.5") +set(OATPP_VERSION "1.3.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,21 +6,20 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp-mbedtls REF ${OATPP_VERSION} - SHA512 ffc7ef3614a4b3ef44c61af3db8c5b5a75ecc657b2f9f5ade4f9e78260427ca113be700065b6fcdc3e6f553648601fe4d8c68a54e10234949e004f40def0d343 + SHA512 3eea805f2a02110daec25b7455543c59d8e72acd37d412fa98cb1c90f58e4edcd9cc62c16331efcca36a524834fa0f314f2f69a7a4d0d1108a758f811a68e021 HEAD_REF master PATCHES find-mbedtls.patch ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-mbedtls-${OATPP_VERSION}) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-mbedtls CONFIG_PATH lib/cmake/oatpp-mbedtls-${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-mbedtls/vcpkg.json b/external_imported/vcpkg/ports/oatpp-mbedtls/vcpkg.json index 1c4b07d48..035f841b8 100644 --- a/external_imported/vcpkg/ports/oatpp-mbedtls/vcpkg.json +++ b/external_imported/vcpkg/ports/oatpp-mbedtls/vcpkg.json @@ -1,10 +1,18 @@ { "name": "oatpp-mbedtls", - "version": "1.2.5", + "version": "1.3.0", "description": "Oat++ Mbed TLS submodule providing secure server and client connection providers.", "homepage": "https://github.com/oatpp/oatpp-mbedtls", "dependencies": [ "mbedtls", - "oatpp" + "oatpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/oatpp-mongo/portfile.cmake b/external_imported/vcpkg/ports/oatpp-mongo/portfile.cmake index 2a244eda1..e4cccfcd3 100644 --- a/external_imported/vcpkg/ports/oatpp-mongo/portfile.cmake +++ b/external_imported/vcpkg/ports/oatpp-mongo/portfile.cmake @@ -1,4 +1,4 @@ -set(OATPP_VERSION "1.2.5") +set(OATPP_VERSION "1.3.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,22 +6,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp-mongo REF ${OATPP_VERSION} - SHA512 b4d15b40521fc731213decbb4a68edf9f04d918ebd6539ec56e71bdc5aa3536bcd170d4d1f5ee828dc666294f520140241dbcd2c4498247c6d9ea363d7f8ec56 + SHA512 11f4164948feb63ed3f5e8554a54348e29cd4d90333761f98c37f4eb49f129c6589955755e8e052c5c29e6b2980f1bb899657415d6480c3ae7a50fc2445afbfe 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_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-mongo-${OATPP_VERSION}) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-mongo CONFIG_PATH lib/cmake/oatpp-mongo-${OATPP_VERSION}) vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/external_imported/vcpkg/ports/oatpp-mongo/vcpkg.json b/external_imported/vcpkg/ports/oatpp-mongo/vcpkg.json index cbdf48c1a..6441e67d1 100644 --- a/external_imported/vcpkg/ports/oatpp-mongo/vcpkg.json +++ b/external_imported/vcpkg/ports/oatpp-mongo/vcpkg.json @@ -1,9 +1,17 @@ { "name": "oatpp-mongo", - "version": "1.2.5", + "version": "1.3.0", "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", "dependencies": [ - "oatpp" + "oatpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/oatpp-openssl/portfile.cmake b/external_imported/vcpkg/ports/oatpp-openssl/portfile.cmake index 9445ee700..feada9b69 100644 --- a/external_imported/vcpkg/ports/oatpp-openssl/portfile.cmake +++ b/external_imported/vcpkg/ports/oatpp-openssl/portfile.cmake @@ -1,4 +1,4 @@ -set(OATPP_VERSION "1.2.5") +set(OATPP_VERSION "1.3.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -7,7 +7,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp-openssl REF ${OATPP_VERSION} - SHA512 c5a40691d846703378c2965f2ad9b99edb2025d47854719bab4e80a4771258c2b72cfba0135b63dd9e2387da4549b5bc6cebfc1913a8006d14d59e250be19060 + SHA512 a358a98e4c7e779c4c799e55667af67530fea537103500bf07b62ee434e87241c8ce3899bd19945a942b81ae9df86e318f0a725a56f4cb7cfceb0f98e3c0378b HEAD_REF master ) @@ -18,8 +18,8 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/oatpp-openssl-${OATPP_VERSION}") +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-openssl CONFIG_PATH "lib/cmake/oatpp-openssl-${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(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/oatpp-openssl/vcpkg.json b/external_imported/vcpkg/ports/oatpp-openssl/vcpkg.json index b844deaa3..daa2c1850 100644 --- a/external_imported/vcpkg/ports/oatpp-openssl/vcpkg.json +++ b/external_imported/vcpkg/ports/oatpp-openssl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "oatpp-openssl", - "version-semver": "1.2.5", + "version-semver": "1.3.0", "description": "Oat++ openssl module providing secure server and client connection providers.", "homepage": "https://github.com/oatpp/oatpp-openssl", "dependencies": [ diff --git a/external_imported/vcpkg/ports/oatpp-postgresql/fix-windows-build.patch b/external_imported/vcpkg/ports/oatpp-postgresql/fix-windows-build.patch deleted file mode 100644 index 0b6a57d86..000000000 --- a/external_imported/vcpkg/ports/oatpp-postgresql/fix-windows-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/oatpp-postgresql/mapping/Serializer.hpp b/src/oatpp-postgresql/mapping/Serializer.hpp -index af76701..615d11b 100644 ---- a/src/oatpp-postgresql/mapping/Serializer.hpp -+++ b/src/oatpp-postgresql/mapping/Serializer.hpp -@@ -201,7 +201,7 @@ private: - - outData.oid = _this->getArrayTypeOid(itemType); - outData.dataSize = stream.getCurrentPosition(); -- outData.dataBuffer.template reset(new char[outData.dataSize]); -+ outData.dataBuffer.reset(new char[outData.dataSize]); - outData.data = outData.dataBuffer.get(); - outData.dataFormat = 1; - diff --git a/external_imported/vcpkg/ports/oatpp-postgresql/portfile.cmake b/external_imported/vcpkg/ports/oatpp-postgresql/portfile.cmake index ce8af28f8..3a080846f 100644 --- a/external_imported/vcpkg/ports/oatpp-postgresql/portfile.cmake +++ b/external_imported/vcpkg/ports/oatpp-postgresql/portfile.cmake @@ -1,4 +1,4 @@ -set(OATPP_VERSION "1.2.5") +set(OATPP_VERSION "1.3.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,24 +6,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp-postgresql REF ${OATPP_VERSION} - SHA512 43381422224f0254a823fdc702d1a007c405930157e6ea361f51e5232df4b04073181de175f61ab4986f3468d21f9ac25a0820d14efcecb0afb0096bdd674dcb + SHA512 6926194ae7d77db2a071fcb805ce048954908cf18d59f3095e1bf779748d9e5b9ceb657d97b1fc8a6ebfcf71936b211e2b10e68a62983e847c68ab58e1f3f2ba HEAD_REF master - PATCHES - fix-windows-build.patch # see https://github.com/oatpp/oatpp-postgresql/pull/8 ) 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_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-postgresql-${OATPP_VERSION}) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-postgresql CONFIG_PATH lib/cmake/oatpp-postgresql-${OATPP_VERSION}) vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/external_imported/vcpkg/ports/oatpp-postgresql/vcpkg.json b/external_imported/vcpkg/ports/oatpp-postgresql/vcpkg.json index 7a5eb7b01..ebc8584c5 100644 --- a/external_imported/vcpkg/ports/oatpp-postgresql/vcpkg.json +++ b/external_imported/vcpkg/ports/oatpp-postgresql/vcpkg.json @@ -1,10 +1,18 @@ { "name": "oatpp-postgresql", - "version": "1.2.5", + "version": "1.3.0", "description": "Oat++ PostgreSQL adapter for Oat++ ORM (alpha - not all datatypes are supported).", "homepage": "https://github.com/oatpp/oatpp-postgresql", "dependencies": [ "libpq", - "oatpp" + "oatpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/oatpp-sqlite/portfile.cmake b/external_imported/vcpkg/ports/oatpp-sqlite/portfile.cmake index f446876ad..68ce88266 100644 --- a/external_imported/vcpkg/ports/oatpp-sqlite/portfile.cmake +++ b/external_imported/vcpkg/ports/oatpp-sqlite/portfile.cmake @@ -1,4 +1,4 @@ -set(OATPP_VERSION "1.2.5") +set(OATPP_VERSION "1.3.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,21 +6,20 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp-sqlite REF ${OATPP_VERSION} - SHA512 b92d8c8b2afbbca38ecef7030648dcd7e15d7b2dd221bc32ea9778533ffcc9923b628308aa86bc53451b1ea4bb15dae8727bc6e0d8345fa611ef32469d850064 + SHA512 8a208145ee10ed858767b4b56c220b6befd83e6858759128103ce679b889e6218a95ed6627af5098e4d26367be8add82de26e1f1f8ef581b1913b8386f9d56de HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" "-DOATPP_SQLITE_AMALGAMATION:BOOL=OFF" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-sqlite-${OATPP_VERSION}) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-sqlite CONFIG_PATH lib/cmake/oatpp-sqlite-${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-sqlite/vcpkg.json b/external_imported/vcpkg/ports/oatpp-sqlite/vcpkg.json index 85fa46493..cb307cc1a 100644 --- a/external_imported/vcpkg/ports/oatpp-sqlite/vcpkg.json +++ b/external_imported/vcpkg/ports/oatpp-sqlite/vcpkg.json @@ -1,10 +1,18 @@ { "name": "oatpp-sqlite", - "version": "1.2.5", + "version": "1.3.0", "description": "Oat++ SQLite adapter for Oat++ ORM.", "homepage": "https://github.com/oatpp/oatpp-sqlite", "dependencies": [ "oatpp", - "sqlite3" + "sqlite3", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/oatpp-ssdp/fix_String_to_string.patch b/external_imported/vcpkg/ports/oatpp-ssdp/fix_String_to_string.patch new file mode 100644 index 000000000..28c506a31 --- /dev/null +++ b/external_imported/vcpkg/ports/oatpp-ssdp/fix_String_to_string.patch @@ -0,0 +1,20 @@ +diff --git i/src/oatpp-ssdp/SimpleUdpStreamProvider.cpp w/src/oatpp-ssdp/SimpleUdpStreamProvider.cpp +index d351c1e..7c430e9 100644 +--- i/src/oatpp-ssdp/SimpleUdpStreamProvider.cpp ++++ w/src/oatpp-ssdp/SimpleUdpStreamProvider.cpp +@@ -106,7 +106,7 @@ v_io_handle SimpleUdpStreamProvider::instantiateServer() { + hints.ai_flags = AI_PASSIVE; + auto portStr = oatpp::utils::conversion::int32ToStr(m_port); + +- ret = getaddrinfo(NULL, (const char*)portStr->getData(), &hints, &result); ++ ret = getaddrinfo(NULL, (const char*)portStr->c_str(), &hints, &result); + if (ret != 0) { + OATPP_LOGE("[oatpp::ssdp::SimpleUdpStreamProvider::instantiateServer()]", "Error. Call to getaddrinfo() failed with result=%d: %s", ret, strerror(errno)); + throw std::runtime_error("[oatpp::ssdp::SimpleUdpStreamProvider::instantiateServer()]: Error. Call to getaddrinfo() failed."); +@@ -233,4 +233,4 @@ provider::ResourceHandle SimpleUdpStreamProvider::get() + ); + } + +-}} +\ No newline at end of file ++}} diff --git a/external_imported/vcpkg/ports/oatpp-ssdp/fix_win_close.patch b/external_imported/vcpkg/ports/oatpp-ssdp/fix_win_close.patch new file mode 100644 index 000000000..c64101879 --- /dev/null +++ b/external_imported/vcpkg/ports/oatpp-ssdp/fix_win_close.patch @@ -0,0 +1,20 @@ +diff --git i/src/oatpp-ssdp/SimpleUdpStreamProvider.cpp w/src/oatpp-ssdp/SimpleUdpStreamProvider.cpp +index d351c1e..f5774bd 100644 +--- i/src/oatpp-ssdp/SimpleUdpStreamProvider.cpp ++++ w/src/oatpp-ssdp/SimpleUdpStreamProvider.cpp +@@ -129,7 +129,7 @@ v_io_handle SimpleUdpStreamProvider::instantiateServer() { + + ret = bind(serverHandle, result->ai_addr, (int)result->ai_addrlen); + if (ret != 0) { +- ::close(serverHandle); ++ ::_close(serverHandle); + OATPP_LOGE("[oatpp::ssdp::SimpleUdpStreamProvider::instantiateServer()]", "Error. Failed to bind port %d: %s", m_port, strerror(errno)); + throw std::runtime_error("[oatpp::ssdp::SimpleUdpStreamProvider::instantiateServer()]: Error. Can't bind to address: %s"); + } +@@ -233,4 +233,4 @@ provider::ResourceHandle SimpleUdpStreamProvider::get() + ); + } + +-}} +\ No newline at end of file ++}} diff --git a/external_imported/vcpkg/ports/oatpp-ssdp/portfile.cmake b/external_imported/vcpkg/ports/oatpp-ssdp/portfile.cmake new file mode 100644 index 000000000..05381b317 --- /dev/null +++ b/external_imported/vcpkg/ports/oatpp-ssdp/portfile.cmake @@ -0,0 +1,28 @@ +set(OATPP_VERSION "1.3.0") + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO oatpp/oatpp-ssdp + REF ${OATPP_VERSION} + SHA512 ab6f10bb79cb058eb7ce4115327e2f2d85133753d02dc2b4339505cc2ed4ef8b6284b5e832d0e190de17b8ae70e0b9a99b1b074d0691ca9a613873e8d4e1ace8 + HEAD_REF master + PATCHES + fix_String_to_string.patch + fix_win_close.patch +) + +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() +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-ssdp CONFIG_PATH lib/cmake/oatpp-ssdp-${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) diff --git a/external_imported/vcpkg/ports/oatpp-ssdp/vcpkg.json b/external_imported/vcpkg/ports/oatpp-ssdp/vcpkg.json new file mode 100644 index 000000000..fc169d634 --- /dev/null +++ b/external_imported/vcpkg/ports/oatpp-ssdp/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "oatpp-ssdp", + "version": "1.3.0", + "description": "Oat++ SSDP (Simple Service Discovery Protocol) submodule.", + "homepage": "https://github.com/oatpp/oatpp-ssdp", + "dependencies": [ + "oatpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/oatpp-swagger/portfile.cmake b/external_imported/vcpkg/ports/oatpp-swagger/portfile.cmake index c94eda0b6..2e24c320a 100644 --- a/external_imported/vcpkg/ports/oatpp-swagger/portfile.cmake +++ b/external_imported/vcpkg/ports/oatpp-swagger/portfile.cmake @@ -1,4 +1,4 @@ -set(OATPP_VERSION "1.2.5") +set(OATPP_VERSION "1.3.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,21 +6,27 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp-swagger REF ${OATPP_VERSION} - SHA512 ad9b92a2b8ef7c54533bde92d5a12eb4b62553ee0a5252a5dd15aba7dc7293202931acc0ad40fc6f3be566813221a309a0bfec8bdbefca2197767387fe68fa6c + SHA512 5b4ced90690f484ebe15c3a0be47b1b851fb7b650e70c99fddc20430724aac8eff89d8c6187df750bd2ceff0e1144336f258d740fc10cdfa67a65a2f3b00d80b HEAD_REF master ) -vcpkg_configure_cmake( +if (VCPKG_CRT_LINKAGE STREQUAL "static") + set(OATPP_MSVC_LINK_STATIC_RUNTIME TRUE) +else() + set(OATPP_MSVC_LINK_STATIC_RUNTIME FALSE) +endif() + +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" + "-DOATPP_MSVC_LINK_STATIC_RUNTIME=${OATPP_MSVC_LINK_STATIC_RUNTIME}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-swagger-${OATPP_VERSION}) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-swagger CONFIG_PATH lib/cmake/oatpp-swagger-${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-swagger/vcpkg.json b/external_imported/vcpkg/ports/oatpp-swagger/vcpkg.json index da63d6133..65dba327e 100644 --- a/external_imported/vcpkg/ports/oatpp-swagger/vcpkg.json +++ b/external_imported/vcpkg/ports/oatpp-swagger/vcpkg.json @@ -1,9 +1,17 @@ { "name": "oatpp-swagger", - "version": "1.2.5", + "version": "1.3.0", "description": "Oat++ OpenApi (Swagger) UI submodule.", "homepage": "https://github.com/oatpp/oatpp-swagger", "dependencies": [ - "oatpp" + "oatpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/oatpp-websocket/portfile.cmake b/external_imported/vcpkg/ports/oatpp-websocket/portfile.cmake index b0cbf4fe0..1c6e99128 100644 --- a/external_imported/vcpkg/ports/oatpp-websocket/portfile.cmake +++ b/external_imported/vcpkg/ports/oatpp-websocket/portfile.cmake @@ -1,4 +1,4 @@ -set(OATPP_VERSION "1.2.5") +set(OATPP_VERSION "1.3.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,20 +6,26 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp-websocket REF ${OATPP_VERSION} - SHA512 7bf4d8c8adf158e1b46b617d0aea201db32802dc89238d50c39bb10228ae59c8536ec198696f4e403da293c9b2dcc25a3c81aff1dedc49b38d4c7d94e97557e0 + SHA512 e5d5f974da4fd95599352d04d18422c74b274be50a803cdb0b65674ebde8dfe8587c44ddb8b376ad866de06841935687be4294ac5954f33f0a087b009da23177 HEAD_REF master ) -vcpkg_configure_cmake( +if (VCPKG_CRT_LINKAGE STREQUAL "static") + set(OATPP_MSVC_LINK_STATIC_RUNTIME TRUE) +else() + set(OATPP_MSVC_LINK_STATIC_RUNTIME FALSE) +endif() + +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" + "-DOATPP_MSVC_LINK_STATIC_RUNTIME=${OATPP_MSVC_LINK_STATIC_RUNTIME}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-websocket-${OATPP_VERSION}) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-websocket CONFIG_PATH lib/cmake/oatpp-websocket-${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-websocket/vcpkg.json b/external_imported/vcpkg/ports/oatpp-websocket/vcpkg.json index be7aa1176..5a28f2bdd 100644 --- a/external_imported/vcpkg/ports/oatpp-websocket/vcpkg.json +++ b/external_imported/vcpkg/ports/oatpp-websocket/vcpkg.json @@ -1,9 +1,17 @@ { "name": "oatpp-websocket", - "version": "1.2.5", + "version": "1.3.0", "description": "Oat++ websocket module.", "homepage": "https://github.com/oatpp/oatpp-websocket", "dependencies": [ - "oatpp" + "oatpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/oatpp-zlib/portfile.cmake b/external_imported/vcpkg/ports/oatpp-zlib/portfile.cmake index 84a4cf84a..3759757ef 100644 --- a/external_imported/vcpkg/ports/oatpp-zlib/portfile.cmake +++ b/external_imported/vcpkg/ports/oatpp-zlib/portfile.cmake @@ -1,4 +1,4 @@ -set(OATPP_VERSION "1.2.5") +set(OATPP_VERSION "1.3.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,22 +6,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp-zlib REF ${OATPP_VERSION} - SHA512 da132edc8c6476bf8d6d1df7d05eac45ac05057153fb0042f0fae54c1a20b3866174cffce2813a0cde7dbf0d8674babf61c84b62cba8dd22c440fef5f81e322b + SHA512 574f0440cbb2cd2bc14ad89e33538a1a300ad23ecc941629b74aa8ccb9aeae5158b1b57e2f1af09d7a6b9b97430a5685354677002dab2261120afa9c6ea74381 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_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-zlib-${OATPP_VERSION}) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-zlib CONFIG_PATH lib/cmake/oatpp-zlib-${OATPP_VERSION}) vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/external_imported/vcpkg/ports/oatpp-zlib/vcpkg.json b/external_imported/vcpkg/ports/oatpp-zlib/vcpkg.json index 4f624c3aa..5b0feb184 100644 --- a/external_imported/vcpkg/ports/oatpp-zlib/vcpkg.json +++ b/external_imported/vcpkg/ports/oatpp-zlib/vcpkg.json @@ -1,9 +1,17 @@ { "name": "oatpp-zlib", - "version": "1.2.5", + "version": "1.3.0", "description": "Oat++ functionality for automatically compressing/decompressing content with deflate and gzip.", "homepage": "https://github.com/oatpp/oatpp-zlib", "dependencies": [ - "oatpp" + "oatpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/oatpp/fix-windows-build.patch b/external_imported/vcpkg/ports/oatpp/fix-windows-build.patch deleted file mode 100644 index d017f7480..000000000 --- a/external_imported/vcpkg/ports/oatpp/fix-windows-build.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/oatpp/core/base/Environment.cpp b/src/oatpp/core/base/Environment.cpp -index b870835..ae36970 100644 ---- a/src/oatpp/core/base/Environment.cpp -+++ b/src/oatpp/core/base/Environment.cpp -@@ -36,14 +36,9 @@ - #include - #endif - --#if (defined(WIN32) || defined(_WIN32)) && defined(_WIN64) --struct tm* localtime_r(time_t *_clock, struct tm *_result) { -- _localtime64_s(_result, _clock); -- return _result; --} --#elif (defined(WIN32) || defined(_WIN32)) && not defined(_WIN64) -+#if defined(WIN32) || defined(_WIN32) - struct tm* localtime_r(time_t *_clock, struct tm *_result) { -- _localtime32_s(_result, _clock); -+ localtime_s(_result, _clock); - return _result; - } - #endif diff --git a/external_imported/vcpkg/ports/oatpp/portfile.cmake b/external_imported/vcpkg/ports/oatpp/portfile.cmake index 233bc2f22..cf8513449 100644 --- a/external_imported/vcpkg/ports/oatpp/portfile.cmake +++ b/external_imported/vcpkg/ports/oatpp/portfile.cmake @@ -1,4 +1,4 @@ -set(OATPP_VERSION "1.2.5") +set(OATPP_VERSION "1.3.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,22 +6,26 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp REF ${OATPP_VERSION} - SHA512 8c7c939860c02ade86234e46f907051b088c07d6975cf90190c9263bb7fd8081a7aaccd3e08bfe8a962c07ae39ff771cf17099a48812ecc69df20272a856d0ed + SHA512 4fe8587efe1b4ecae14554ec8edb209e5558a3e4a4e6ff49bbfaaf06d2cc12f2cc306c5edc43b8dafc465aff53098ad4bebb9971694761b91a553730d5acb59a HEAD_REF master - PATCHES - fix-windows-build.patch # see https://github.com/oatpp/oatpp/pull/428 ) -vcpkg_configure_cmake( +if (VCPKG_CRT_LINKAGE STREQUAL "static") + set(OATPP_MSVC_LINK_STATIC_RUNTIME TRUE) +else() + set(OATPP_MSVC_LINK_STATIC_RUNTIME FALSE) +endif() + +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" + "-DOATPP_MSVC_LINK_STATIC_RUNTIME=${OATPP_MSVC_LINK_STATIC_RUNTIME}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-${OATPP_VERSION}) +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) diff --git a/external_imported/vcpkg/ports/oatpp/vcpkg.json b/external_imported/vcpkg/ports/oatpp/vcpkg.json index 594939dcf..8e7a81840 100644 --- a/external_imported/vcpkg/ports/oatpp/vcpkg.json +++ b/external_imported/vcpkg/ports/oatpp/vcpkg.json @@ -1,6 +1,16 @@ { "name": "oatpp", - "version": "1.2.5", + "version": "1.3.0", "description": "Modern web framework.", - "homepage": "https://github.com/oatpp/oatpp" + "homepage": "https://github.com/oatpp/oatpp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/ocilib/fix-DisableWC4191.patch b/external_imported/vcpkg/ports/ocilib/fix-DisableWC4191.patch new file mode 100644 index 000000000..2e835bf07 --- /dev/null +++ b/external_imported/vcpkg/ports/ocilib/fix-DisableWC4191.patch @@ -0,0 +1,40 @@ +diff --git a/proj/dll/ocilib_dll_vs2019.vcxproj b/proj/dll/ocilib_dll_vs2019.vcxproj +index 2d5b3bf..35e4684 100644 +--- a/proj/dll/ocilib_dll_vs2019.vcxproj ++++ b/proj/dll/ocilib_dll_vs2019.vcxproj +@@ -116,7 +116,7 @@ + + + EnableAllWarnings +- true ++ false + + + CompileAsC +@@ -173,7 +173,7 @@ + + CompileAsC + 4255;4668;4996;4710;4711;4738;4774;4820;5045 +- true ++ false + + + OCI_CHARSET_ANSI;%(PreprocessorDefinitions) +@@ -223,7 +223,7 @@ + + CompileAsC + 4255;4668;4996;4710;4711;4738;4774;4820;5045 +- true ++ false + + + OCI_CHARSET_WIDE;%(PreprocessorDefinitions) +@@ -276,7 +276,7 @@ + + CompileAsC + 4255;4668;4996;4710;4711;4738;4774;4820;5045 +- true ++ false + + + OCI_CHARSET_WIDE;%(PreprocessorDefinitions) diff --git a/external_imported/vcpkg/ports/ocilib/portfile.cmake b/external_imported/vcpkg/ports/ocilib/portfile.cmake index 139ccab3f..2c53be8c9 100644 --- a/external_imported/vcpkg/ports/ocilib/portfile.cmake +++ b/external_imported/vcpkg/ports/ocilib/portfile.cmake @@ -1,11 +1,10 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO vrogier/ocilib REF v4.7.3 SHA512 80cf1f76420b506789b1f7edd9af826801236499dd0757be3438e3cdf286b95ddd7dd35909622b3862244f6b535a8744f0b25989fb3740a4a0fd984410fb420b HEAD_REF master + PATCHES fix-DisableWC4191.patch ) if(VCPKG_TARGET_IS_WINDOWS) @@ -14,7 +13,7 @@ if(VCPKG_TARGET_IS_WINDOWS) else() set(PLATFORM x64) endif() - + # There is no debug configuration # As it is a C library, build the release configuration and copy its output to the debug folder set(VCPKG_BUILD_TYPE release) @@ -39,7 +38,7 @@ else() COPY_SOURCE AUTOCONFIG SOURCE_PATH "${SOURCE_PATH}" - OPTIONS + OPTIONS --with-oracle-import=runtime ) diff --git a/external_imported/vcpkg/ports/ocilib/vcpkg.json b/external_imported/vcpkg/ports/ocilib/vcpkg.json index 6c7a56a11..741304b0a 100644 --- a/external_imported/vcpkg/ports/ocilib/vcpkg.json +++ b/external_imported/vcpkg/ports/ocilib/vcpkg.json @@ -1,7 +1,9 @@ { "name": "ocilib", "version": "4.7.3", + "port-version": 2, "description": "OCILIB is an open source and cross platform Oracle Driver that delivers efficient access to Oracle databases.", "homepage": "https://vrogier.github.io/ocilib/", + "license": "Apache-2.0", "supports": "!(arm | uwp)" } diff --git a/external_imported/vcpkg/ports/ogre-next/fix_find_package_sdl2.patch b/external_imported/vcpkg/ports/ogre-next/fix_find_package_sdl2.patch index aa72be664..47aa01afb 100644 --- a/external_imported/vcpkg/ports/ogre-next/fix_find_package_sdl2.patch +++ b/external_imported/vcpkg/ports/ogre-next/fix_find_package_sdl2.patch @@ -1,18 +1,77 @@ diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake -index 4b67ed8cb..7da194820 100644 +index 3f3e2d7..0cc9606 100644 --- a/CMake/Dependencies.cmake +++ b/CMake/Dependencies.cmake -@@ -292,11 +292,11 @@ macro_log_feature(PYTHONLIBS_FOUND "Python" "Language bindings to use OGRE from +@@ -267,7 +267,7 @@ endif() + ####################################################################### + # Find sdl2 - if(NOT ANDROID AND NOT EMSCRIPTEN) - # find script does not work in cross compilation environment -- find_package(SDL2) -+ find_package(SDL2 CONFIG) - macro_log_feature(SDL2_FOUND "SDL2" "Simple DirectMedia Library needed for input handling in samples" "https://www.libsdl.org/" FALSE "" "") - if(SDL2_FOUND AND WIN32 AND NOT SDL2_BINARY) - # fix linking static SDL2 on windows -- set(SDL2_LIBRARY ${SDL2_LIBRARY} winmm.lib imm32.lib version.lib) -+ set(SDL2_LIBRARY SDL2::SDL2 winmm.lib imm32.lib version.lib) - endif() +-find_package(SDL2) ++find_package(SDL2 CONFIG REQUIRED) + macro_log_feature(SDL2_FOUND "SDL2" "Simple DirectMedia Library" "https://www.libsdl.org/" FALSE "" "") + + ####################################################################### +diff --git a/CMake/InstallDependencies.cmake b/CMake/InstallDependencies.cmake +index f98b358..e5eb9ed 100644 +--- a/CMake/InstallDependencies.cmake ++++ b/CMake/InstallDependencies.cmake +@@ -100,8 +100,6 @@ if (OGRE_INSTALL_DEPENDENCIES) + endif () + + if( OGRE_BUILD_SAMPLES2 ) +- install_debug(SDL2.dll) +- install_release(SDL2.dll) + install_debug(openvr_api.dll) + install_release(openvr_api.dll) + install_debug(openvr_api.pdb) +diff --git a/CMake/Packages/FindSDL2.cmake b/CMake/Packages/FindSDL2.cmake +index 4b42a51..793eb71 100644 +--- a/CMake/Packages/FindSDL2.cmake ++++ b/CMake/Packages/FindSDL2.cmake +@@ -182,7 +182,7 @@ ENDIF(SDL2_LIBRARY_TEMP) + INCLUDE(FindPackageHandleStandardArgs) + + FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 +- REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR) ++ REQUIRED_VARS SDL2::SDL2 SDL2_INCLUDE_DIR) + + if (WIN32) + set(SDL2_BIN_SEARCH_PATH ${OGRE_DEPENDENCIES_DIR}/bin ${CMAKE_SOURCE_DIR}/Dependencies/bin ${SDL2_HOME}/dll +@@ -201,6 +201,6 @@ IF(SDL2_STATIC) + if (UNIX AND NOT APPLE) + EXECUTE_PROCESS(COMMAND sdl2-config --static-libs OUTPUT_VARIABLE SDL2_LINK_FLAGS) + STRING(REGEX REPLACE "(\r?\n)+$" "" SDL2_LINK_FLAGS "${SDL2_LINK_FLAGS}") +- SET(SDL2_LIBRARY ${SDL2_LINK_FLAGS}) ++ SET(SDL2::SDL2 ${SDL2_LINK_FLAGS}) + ENDIF() + ENDIF(SDL2_STATIC) +diff --git a/Samples/2.0/Common/CMakeLists.txt b/Samples/2.0/Common/CMakeLists.txt +index b21601e..4ef90bd 100644 +--- a/Samples/2.0/Common/CMakeLists.txt ++++ b/Samples/2.0/Common/CMakeLists.txt +@@ -49,4 +49,4 @@ add_library(${OGRE_SAMPLES_COMMON_LIBRARY} STATIC ${SOURCE_FILES} ${HEADER_FILES + + link_directories(${CMAKE_CURRENT_BINARY_DIR}) + +-target_link_libraries(${OGRE_SAMPLES_COMMON_LIBRARY} ${SDL2_LIBRARY} OgreHlmsPbs OgreHlmsUnlit) ++target_link_libraries(${OGRE_SAMPLES_COMMON_LIBRARY} SDL2::SDL2 OgreHlmsPbs OgreHlmsUnlit) +diff --git a/Samples/2.0/Tutorials/EmptyProject/CMake/Dependencies/OGRE.cmake b/Samples/2.0/Tutorials/EmptyProject/CMake/Dependencies/OGRE.cmake +index 5e80709..3ba9b5a 100644 +--- a/Samples/2.0/Tutorials/EmptyProject/CMake/Dependencies/OGRE.cmake ++++ b/Samples/2.0/Tutorials/EmptyProject/CMake/Dependencies/OGRE.cmake +@@ -224,13 +224,13 @@ endif() + + if( NOT IOS ) + set( CMAKE_PREFIX_PATH "${OGRE_SOURCE}/Dependencies ${CMAKE_PREFIX_PATH}" ) +- find_package( SDL2 ) ++ find_package(SDL2 CONFIG REQUIRED) + if( NOT SDL2_FOUND ) + message( "Could not find SDL2. https://www.libsdl.org/" ) + else() + message( STATUS "Found SDL2" ) + include_directories( ${SDL2_INCLUDE_DIR} ) +- set( OGRE_DEPENDENCY_LIBS ${OGRE_DEPENDENCY_LIBS} ${SDL2_LIBRARY} ) ++ set( OGRE_DEPENDENCY_LIBS ${OGRE_DEPENDENCY_LIBS} SDL2::SDL2 ) + endif() endif() diff --git a/external_imported/vcpkg/ports/ogre-next/portfile.cmake b/external_imported/vcpkg/ports/ogre-next/portfile.cmake index 02f147ab8..5766b5d9c 100644 --- a/external_imported/vcpkg/ports/ogre-next/portfile.cmake +++ b/external_imported/vcpkg/ports/ogre-next/portfile.cmake @@ -1,5 +1,4 @@ # This portfile is based (shamelessly copied and adapted a bit) on 'ogre' portfile. - if (EXISTS "${CURRENT_INSTALLED_DIR}/Media/HLMS/Blendfunctions_piece_fs.glslt") message(FATAL_ERROR "FATAL ERROR: ogre-next and ogre are incompatible.") endif() @@ -11,12 +10,11 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OGRECave/ogre-next - REF 8083067c1835147de5d82015347d95c710e36bc0 - SHA512 2660f739def7076b42009ba932a27532f2a20e7be8ec2674aff29116c7dcd7f2d75564d8ce07bef3dba13ece5293d604573ad4f8734f6086c1750127f52834cd + REF 10b56694f33fd6ead1c501eb90379bcac671d841 #v2.3.0 + SHA512 b2f1c55655582b2844b7c10cce965cc5268829a0702b09abcfe04fba8db00ad032f605d683c88811f77f9b7b4fb8a1095079f1a1c96bbe9fd022621f4ff4cf81 HEAD_REF master PATCHES toolchain_fixes.patch - rename_config_cmake.patch fix_find_package_sdl2.patch ) @@ -28,18 +26,21 @@ else() set(OGRE_STATIC OFF) endif() + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - d3d9 OGRE_BUILD_RENDERSYSTEM_D3D9 - java OGRE_BUILD_COMPONENT_JAVA - python OGRE_BUILD_COMPONENT_PYTHON - csharp OGRE_BUILD_COMPONENT_CSHARP + FEATURES + d3d9 OGRE_BUILD_RENDERSYSTEM_D3D9 + java OGRE_BUILD_COMPONENT_JAVA + python OGRE_BUILD_COMPONENT_PYTHON + csharp OGRE_BUILD_COMPONENT_CSHARP ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS + ${FEATURE_OPTIONS} -DOGRE_BUILD_DEPENDENCIES=OFF + -DOGRE_COPY_DEPENDENCIES=OFF -DOGRE_BUILD_SAMPLES=OFF -DOGRE_BUILD_TESTS=OFF -DOGRE_BUILD_TOOLS=OFF @@ -50,7 +51,6 @@ vcpkg_configure_cmake( -DOGRE_INSTALL_PDB=OFF -DOGRE_INSTALL_SAMPLES=OFF -DOGRE_INSTALL_TOOLS=OFF - -DOGRE_INSTALL_CMAKE=ON -DOGRE_INSTALL_VSPROPS=OFF -DOGRE_STATIC=${OGRE_STATIC} -DOGRE_CONFIG_THREAD_PROVIDER=std @@ -59,55 +59,52 @@ vcpkg_configure_cmake( -DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=ON -DOGRE_BUILD_RENDERSYSTEM_GLES=OFF -DOGRE_BUILD_RENDERSYSTEM_GLES2=OFF -# Optional stuff - ${FEATURE_OPTIONS} -# vcpkg specific stuff -DOGRE_CMAKE_DIR=share/ogre-next ) +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup() -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() -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) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Release") - 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/release/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/release/OgreMainStatic.lib" "${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMainStatic.lib") endif() endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Debug") - 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/debug/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/debug/OgreMainStatic_d.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreMainStatic_d.lib") endif() endif() - file(GLOB SHARE_FILES ${CURRENT_PACKAGES_DIR}/share/ogre-next/*.cmake) + file(GLOB SHARE_FILES "${CURRENT_PACKAGES_DIR}/share/ogre-next/*.cmake") foreach(SHARE_FILE ${SHARE_FILES}) file(READ "${SHARE_FILE}" _contents) string(REPLACE "lib/OgreMain" "lib/manual-link/OgreMain" _contents "${_contents}") @@ -116,6 +113,7 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -vcpkg_copy_pdbs() +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/rename_config_cmake.patch b/external_imported/vcpkg/ports/ogre-next/rename_config_cmake.patch deleted file mode 100644 index d85603290..000000000 --- a/external_imported/vcpkg/ports/ogre-next/rename_config_cmake.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMake/InstallResources.cmake b/CMake/InstallResources.cmake -index 79f7514..79bc033 100644 ---- a/CMake/InstallResources.cmake -+++ b/CMake/InstallResources.cmake -@@ -215,7 +215,7 @@ if(NOT DEFINED OGRE_CMAKE_DIR) - set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake") - endif() - endif() --configure_package_config_file(${OGRE_TEMPLATES_DIR}/OGREConfig.cmake.in ${PROJECT_BINARY_DIR}/cmake/OGREConfig.cmake -+configure_package_config_file(${OGRE_TEMPLATES_DIR}/OGREConfig.cmake.in ${PROJECT_BINARY_DIR}/cmake/ogre-nextConfig.cmake - INSTALL_DESTINATION ${OGRE_CMAKE_DIR} - PATH_VARS CMAKE_INSTALL_PREFIX) - write_basic_package_version_file( -@@ -223,7 +223,7 @@ write_basic_package_version_file( - VERSION ${OGRE_VERSION} - COMPATIBILITY SameMajorVersion) - install(FILES -- ${PROJECT_BINARY_DIR}/cmake/OGREConfig.cmake -+ ${PROJECT_BINARY_DIR}/cmake/ogre-nextConfig.cmake - ${PROJECT_BINARY_DIR}/cmake/OGREConfigVersion.cmake - DESTINATION ${OGRE_CMAKE_DIR} - ) diff --git a/external_imported/vcpkg/ports/ogre-next/toolchain_fixes.patch b/external_imported/vcpkg/ports/ogre-next/toolchain_fixes.patch index 9ff2d87df..ff5eb4850 100644 --- a/external_imported/vcpkg/ports/ogre-next/toolchain_fixes.patch +++ b/external_imported/vcpkg/ports/ogre-next/toolchain_fixes.patch @@ -1,5 +1,5 @@ diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt -index a7a3796..2e21403 100644 +index f3a62f2..b53df6f 100644 --- a/CMake/CMakeLists.txt +++ b/CMake/CMakeLists.txt @@ -13,10 +13,12 @@ @@ -18,41 +18,7 @@ index a7a3796..2e21403 100644 + endif() endif() - set(INST_FILES Utils/FindPkgMacros.cmake) -diff --git a/CMake/InstallResources.cmake b/CMake/InstallResources.cmake -index 783755e..79f7514 100644 ---- a/CMake/InstallResources.cmake -+++ b/CMake/InstallResources.cmake -@@ -208,10 +208,12 @@ endif () - # Create the CMake package files - include(CMakePackageConfigHelpers) - --if(WIN32 OR APPLE) -- set(OGRE_CMAKE_DIR "CMake") --else() -- set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake") -+if(NOT DEFINED OGRE_CMAKE_DIR) -+ if(WIN32 OR APPLE) -+ set(OGRE_CMAKE_DIR "CMake") -+ else() -+ set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake") -+ endif() - endif() - configure_package_config_file(${OGRE_TEMPLATES_DIR}/OGREConfig.cmake.in ${PROJECT_BINARY_DIR}/cmake/OGREConfig.cmake - INSTALL_DESTINATION ${OGRE_CMAKE_DIR} -diff --git a/CMake/Packages/FindCg.cmake b/CMake/Packages/FindCg.cmake -index 4501cf9..7eb57c3 100644 ---- a/CMake/Packages/FindCg.cmake -+++ b/CMake/Packages/FindCg.cmake -@@ -56,7 +56,7 @@ endif() - - find_library(Cg_LIBRARY_REL NAMES ${Cg_LIBRARY_NAMES} HINTS ${Cg_LIB_SEARCH_PATH} ${Cg_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel) - find_library(Cg_LIBRARY_DBG NAMES ${Cg_LIBRARY_NAMES_DBG} HINTS ${Cg_LIB_SEARCH_PATH} ${Cg_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug) --make_library_set(Cg_LIBRARY) -+make_library_set(Cg) - - if (WIN32) - if (CMAKE_CL_64) + set(INST_FILES diff --git a/CMake/Packages/FindFreeImage.cmake b/CMake/Packages/FindFreeImage.cmake index 7c89ec5..d8314f0 100644 --- a/CMake/Packages/FindFreeImage.cmake @@ -93,7 +59,7 @@ index 7125895..13a306f 100644 findpkg_finish(HLSL2GLSL) add_parent_dir(HLSL2GLSL_INCLUDE_DIRS HLSL2GLSL_INCLUDE_DIR) diff --git a/CMake/Packages/FindNVAPI.cmake b/CMake/Packages/FindNVAPI.cmake -index 2b9deba..f33a298 100644 +index 95c70cd..893ce01 100644 --- a/CMake/Packages/FindNVAPI.cmake +++ b/CMake/Packages/FindNVAPI.cmake @@ -44,7 +44,7 @@ findpkg_framework(NVAPI) @@ -155,7 +121,7 @@ index 6b6d7fa..3667b8b 100644 findpkg_finish(POCO_XML) diff --git a/CMake/Packages/FindTBB.cmake b/CMake/Packages/FindTBB.cmake -index 0c48510..c121966 100644 +index 4200aa0..35e4ea3 100644 --- a/CMake/Packages/FindTBB.cmake +++ b/CMake/Packages/FindTBB.cmake @@ -104,7 +104,7 @@ findpkg_framework(TBB) @@ -184,7 +150,7 @@ index 0c48510..c121966 100644 +make_library_set(TBB_MALLOC_PROXY) findpkg_finish(TBB_MALLOC_PROXY) diff --git a/CMake/Packages/FindZZip.cmake b/CMake/Packages/FindZZip.cmake -index e97951e..54c2567 100644 +index c112071..214d9e5 100644 --- a/CMake/Packages/FindZZip.cmake +++ b/CMake/Packages/FindZZip.cmake @@ -39,12 +39,12 @@ use_pkgconfig(ZZip_PKGC zziplib) @@ -203,7 +169,7 @@ index e97951e..54c2567 100644 findpkg_finish(ZZip) diff --git a/CMake/Utils/FindPkgMacros.cmake b/CMake/Utils/FindPkgMacros.cmake -index 374f84b..dc7066d 100644 +index 53111e0..8dffbbc 100644 --- a/CMake/Utils/FindPkgMacros.cmake +++ b/CMake/Utils/FindPkgMacros.cmake @@ -79,15 +79,21 @@ endmacro (use_pkgconfig) @@ -238,54 +204,28 @@ index 374f84b..dc7066d 100644 # Generate debug names from given release names diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3e09d2d..58968f0 100644 +index 48af55b..b18ac57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -274,7 +274,7 @@ elseif(EMSCRIPTEN) - elseif (APPLE AND NOT APPLE_IOS) +@@ -282,7 +282,7 @@ if (OGRE_BUILD_PLATFORM_APPLE_IOS) - set(XCODE_ATTRIBUTE_SDKROOT macosx) + # Set build variables + set(XCODE_ATTRIBUTE_SDKROOT iphoneos) - if(CMAKE_GENERATOR STREQUAL "Unix Makefiles") + if(1) execute_process(COMMAND xcodebuild -version -sdk "${XCODE_ATTRIBUTE_SDKROOT}" Path | head -n 1 OUTPUT_VARIABLE CMAKE_OSX_SYSROOT) string(REGEX REPLACE "(\r?\n)+$" "" CMAKE_OSX_SYSROOT "${CMAKE_OSX_SYSROOT}") else() -diff --git a/Components/Overlay/CMakeLists.txt b/Components/Overlay/CMakeLists.txt -index bdb303d..d9cc221 100644 ---- a/Components/Overlay/CMakeLists.txt -+++ b/Components/Overlay/CMakeLists.txt -@@ -21,7 +21,7 @@ file(GLOB SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp") - # setup target - add_library(OgreOverlay ${OGRE_COMP_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES} ${PLATFORM_HEADER_FILES} ${PLATFORM_SOURCE_FILES}) - set_target_properties(OgreOverlay PROPERTIES VERSION ${OGRE_SOVERSION} SOVERSION ${OGRE_SOVERSION}) --target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE "${FREETYPE_LIBRARIES}" ZLIB::ZLIB) -+target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE ${FREETYPE_LIBRARIES} ZLIB::ZLIB) - target_include_directories(OgreOverlay PUBLIC - "$" - $ diff --git a/OgreMain/CMakeLists.txt b/OgreMain/CMakeLists.txt -index 6ec4e34..cc9cb9d 100644 +index 0424ebb..b019269 100644 --- a/OgreMain/CMakeLists.txt +++ b/OgreMain/CMakeLists.txt -@@ -225,8 +225,6 @@ if (APPLE) +@@ -434,8 +434,6 @@ if (APPLE) set_target_properties(OgreMain PROPERTIES LINK_FLAGS "-framework IOKit -framework Cocoa -framework Carbon -framework OpenGL -framework CoreVideo" ) - - set(OGRE_OSX_BUILD_CONFIGURATION "$(PLATFORM_NAME)/$(CONFIGURATION)") - if(OGRE_BUILD_LIBS_AS_FRAMEWORKS) - add_custom_command(TARGET OgreMain POST_BUILD -diff --git a/PlugIns/EXRCodec/CMakeLists.txt b/PlugIns/EXRCodec/CMakeLists.txt -index e9c936a..bb8747e 100644 ---- a/PlugIns/EXRCodec/CMakeLists.txt -+++ b/PlugIns/EXRCodec/CMakeLists.txt -@@ -16,7 +16,7 @@ target_link_libraries(Codec_EXR OgreMain ${OPENEXR_LIBRARIES}) - target_include_directories(Codec_EXR PUBLIC - "$" - $) --target_include_directories(Codec_EXR SYSTEM PRIVATE "${OPENEXR_INCLUDE_DIR}/OpenEXR") -+target_include_directories(Codec_EXR SYSTEM PRIVATE "${OPENEXR_INCLUDE_DIR}") - - ogre_config_framework(Codec_EXR) - ogre_config_plugin(Codec_EXR) + add_custom_command(TARGET OgreMain POST_BUILD + COMMAND mkdir ARGS -p ${OGRE_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/Ogre.framework/Headers/Threading diff --git a/external_imported/vcpkg/ports/ogre-next/vcpkg.json b/external_imported/vcpkg/ports/ogre-next/vcpkg.json index a729f0bfd..7a6a81bd9 100644 --- a/external_imported/vcpkg/ports/ogre-next/vcpkg.json +++ b/external_imported/vcpkg/ports/ogre-next/vcpkg.json @@ -1,9 +1,9 @@ { "name": "ogre-next", - "version-string": "2019-10-20", - "port-version": 2, + "version": "2.3.0", "description": "Ogre 2.1 & 2.2 - scene-oriented, flexible 3D engine written in C++", "homepage": "https://github.com/OGRECave/ogre-next", + "license": "MIT", "dependencies": [ "boost-date-time", "boost-thread", @@ -15,6 +15,14 @@ "sdl2", "tbb", "tinyxml", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib", "zziplib" ], diff --git a/external_imported/vcpkg/ports/ogre/portfile.cmake b/external_imported/vcpkg/ports/ogre/portfile.cmake index c14da2fac..89d49b28d 100644 --- a/external_imported/vcpkg/ports/ogre/portfile.cmake +++ b/external_imported/vcpkg/ports/ogre/portfile.cmake @@ -30,10 +30,11 @@ endif() # Configure features vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES d3d9 OGRE_BUILD_RENDERSYSTEM_D3D9 java OGRE_BUILD_COMPONENT_JAVA python OGRE_BUILD_COMPONENT_PYTHON - csharp OGRE_BUILD_COMPONENT_CSHARP + csharp OGRE_BUILD_COMPONENT_CSHARP overlay OGRE_BUILD_COMPONENT_OVERLAY zziplib OGRE_CONFIG_ENABLE_ZIP strict OGRE_RESOURCEMANAGER_STRICT @@ -43,10 +44,10 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS string(REPLACE "OGRE_RESOURCEMANAGER_STRICT=ON" "OGRE_RESOURCEMANAGER_STRICT=1" FEATURE_OPTIONS "${FEATURE_OPTIONS}") string(REPLACE "OGRE_RESOURCEMANAGER_STRICT=OFF" "OGRE_RESOURCEMANAGER_STRICT=0" FEATURE_OPTIONS "${FEATURE_OPTIONS}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS + ${FEATURE_OPTIONS} -DOGRE_BUILD_DEPENDENCIES=OFF -DOGRE_BUILD_SAMPLES=OFF -DOGRE_BUILD_TESTS=OFF @@ -68,14 +69,11 @@ vcpkg_configure_cmake( -DOGRE_BUILD_RENDERSYSTEM_GLES=OFF -DOGRE_BUILD_RENDERSYSTEM_GLES2=OFF -DFREETYPE_FOUND=ON -# Optional stuff - ${FEATURE_OPTIONS} -# vcpkg specific stuff -DOGRE_CMAKE_DIR=share/ogre ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) @@ -99,15 +97,13 @@ 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) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Release") - 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) - else() - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/OgreMainStatic.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMainStatic.lib) - endif() + 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) + else() + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/OgreMainStatic.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMainStatic.lib) endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Debug") + if(NOT VCPKG_BUILD_TYPE) 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) @@ -124,7 +120,13 @@ if(VCPKG_TARGET_IS_WINDOWS) endforeach() endif() +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() diff --git a/external_imported/vcpkg/ports/ogre/vcpkg.json b/external_imported/vcpkg/ports/ogre/vcpkg.json index d084653e7..1abf6edac 100644 --- a/external_imported/vcpkg/ports/ogre/vcpkg.json +++ b/external_imported/vcpkg/ports/ogre/vcpkg.json @@ -1,12 +1,21 @@ { "name": "ogre", - "version-string": "1.12.9", - "port-version": 5, + "version": "1.12.9", + "port-version": 7, "description": "3D Object-Oriented Graphics Rendering Engine", "homepage": "https://github.com/OGRECave/ogre", + "license": "MIT", "dependencies": [ "pugixml", "sdl2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "default-features": [ diff --git a/external_imported/vcpkg/ports/ois/0001_install_pkgconfig_win32.patch b/external_imported/vcpkg/ports/ois/0001_install_pkgconfig_win32.patch new file mode 100644 index 000000000..2568e3f7c --- /dev/null +++ b/external_imported/vcpkg/ports/ois/0001_install_pkgconfig_win32.patch @@ -0,0 +1,29 @@ +diff -Naur a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2021-05-14 03:09:42.000000000 +0800 ++++ b/CMakeLists.txt 2022-03-08 12:48:17.012589000 +0800 +@@ -255,7 +255,12 @@ + install(FILES $ DESTINATION bin OPTIONAL) + endif(MSVC AND BUILD_SHARED_LIBS) + +-if(UNIX) +- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/OIS.pc.in ${CMAKE_BINARY_DIR}/OIS.pc @ONLY) +- install(FILES ${CMAKE_BINARY_DIR}/OIS.pc DESTINATION ${OIS_LIB_DIRECTORY}/pkgconfig) ++if (CMAKE_DEBUG_POSTFIX AND CMAKE_BUILD_TYPE STREQUAL "Debug") ++ set(OIS_POSTFIX ${CMAKE_DEBUG_POSTFIX}) ++else() ++ set(OIS_POSTFIX "") + endif() ++ ++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/OIS.pc.in ${CMAKE_BINARY_DIR}/OIS.pc @ONLY) ++install(FILES ${CMAKE_BINARY_DIR}/OIS.pc DESTINATION ${OIS_LIB_DIRECTORY}/pkgconfig) ++ +diff -Naur a/OIS.pc.in b/OIS.pc.in +--- a/OIS.pc.in 2021-05-14 03:09:42.000000000 +0800 ++++ b/OIS.pc.in 2022-03-08 12:48:33.599696300 +0800 +@@ -6,5 +6,5 @@ + Name: OIS + Description: Cross platform C++ Input Framework + Version: @OIS_VERSION@ +-Libs: -L${libdir} -lOIS ++Libs: -L${libdir} -lOIS@OIS_POSTFIX@ + Cflags: -I${includedir} -I${includedir}/ois diff --git a/external_imported/vcpkg/ports/ois/portfile.cmake b/external_imported/vcpkg/ports/ois/portfile.cmake index 69e24c439..e7b5d2bce 100644 --- a/external_imported/vcpkg/ports/ois/portfile.cmake +++ b/external_imported/vcpkg/ports/ois/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF v1.5.1 SHA512 20598aef999a70900cb7f75ffaf62059acf8e811822971cb21986b5d25d28dacb79e4b4cf4770c70e00d3c55cdd01ef3e68a77c2dd148677784fc4df38891340 HEAD_REF master + PATCHES + 0001_install_pkgconfig_win32.patch ) vcpkg_cmake_configure( diff --git a/external_imported/vcpkg/ports/ois/vcpkg.json b/external_imported/vcpkg/ports/ois/vcpkg.json index 9daa139ed..c73ac9131 100644 --- a/external_imported/vcpkg/ports/ois/vcpkg.json +++ b/external_imported/vcpkg/ports/ois/vcpkg.json @@ -1,8 +1,10 @@ { "name": "ois", "version": "1.5.1", + "port-version": 1, "description": "Cross Platform Object Oriented Input Lib System. Meant to be very robust and compatible with many systems and operating systems.", "homepage": "https://wgois.github.io/OIS/", + "license": "Zlib", "supports": "!(arm | arm64 | uwp)", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/onednn/portfile.cmake b/external_imported/vcpkg/ports/onednn/portfile.cmake index 964ed488c..f254c4e37 100644 --- a/external_imported/vcpkg/ports/onednn/portfile.cmake +++ b/external_imported/vcpkg/ports/onednn/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "x86" "arm" ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oneapi-src/oneDNN diff --git a/external_imported/vcpkg/ports/onednn/vcpkg.json b/external_imported/vcpkg/ports/onednn/vcpkg.json index c34f03429..b06a95264 100644 --- a/external_imported/vcpkg/ports/onednn/vcpkg.json +++ b/external_imported/vcpkg/ports/onednn/vcpkg.json @@ -1,6 +1,7 @@ { "name": "onednn", "version-semver": "2.4.3", + "port-version": 1, "description": "oneAPI Deep Neural Network Library (oneDNN)", "homepage": "https://github.com/oneapi-src/oneDNN", "supports": "x64 & !uwp", diff --git a/external_imported/vcpkg/ports/onnx/fix-dependency-protobuf.patch b/external_imported/vcpkg/ports/onnx/fix-dependency-protobuf.patch new file mode 100644 index 000000000..6ccdac665 --- /dev/null +++ b/external_imported/vcpkg/ports/onnx/fix-dependency-protobuf.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1295eab..0fb9f17 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -126,6 +126,7 @@ if(ONNX_BUILD_TESTS) + include(googletest) + endif() + ++find_package(protobuf CONFIG REQUIRED) + if((ONNX_USE_LITE_PROTO AND TARGET protobuf::libprotobuf-lite) OR ((NOT ONNX_USE_LITE_PROTO) AND TARGET protobuf::libprotobuf)) + # Sometimes we need to use protoc compiled for host architecture while linking + # libprotobuf against target architecture. See https://github.com/caffe2/caffe diff --git a/external_imported/vcpkg/ports/onnx/portfile.cmake b/external_imported/vcpkg/ports/onnx/portfile.cmake index 61c36b56f..8070f6dd9 100644 --- a/external_imported/vcpkg/ports/onnx/portfile.cmake +++ b/external_imported/vcpkg/ports/onnx/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( SHA512 7519d326cd2b2b13a269ec0d01af07c32115d183dae6e1eaae55f5b23b6c92b2aadbb2b1e555557f4201bbcf921fa563d09d45d7f1d3bd2399c1a94a6ef63303 PATCHES fix-cmakelists.patch + fix-dependency-protobuf.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_STATIC_RUNTIME) diff --git a/external_imported/vcpkg/ports/onnx/vcpkg.json b/external_imported/vcpkg/ports/onnx/vcpkg.json index 069934dd7..2eaace7ce 100644 --- a/external_imported/vcpkg/ports/onnx/vcpkg.json +++ b/external_imported/vcpkg/ports/onnx/vcpkg.json @@ -1,6 +1,7 @@ { "name": "onnx", "version-semver": "1.10.2", + "port-version": 1, "description": "Open standard for machine learning interoperability", "homepage": "https://onnx.ai", "license": "Apache-2.0", diff --git a/external_imported/vcpkg/ports/onnxruntime-gpu/portfile.cmake b/external_imported/vcpkg/ports/onnxruntime-gpu/portfile.cmake index 524936ac2..bce266e94 100644 --- a/external_imported/vcpkg/ports/onnxruntime-gpu/portfile.cmake +++ b/external_imported/vcpkg/ports/onnxruntime-gpu/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "x86" "arm" ON_TARGET "UWP" "LINUX" "ANDROID" "FREEBSD" "OSX") - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) set(VERSION 1.5.1) diff --git a/external_imported/vcpkg/ports/onnxruntime-gpu/vcpkg.json b/external_imported/vcpkg/ports/onnxruntime-gpu/vcpkg.json index b656e7df3..53723298a 100644 --- a/external_imported/vcpkg/ports/onnxruntime-gpu/vcpkg.json +++ b/external_imported/vcpkg/ports/onnxruntime-gpu/vcpkg.json @@ -1,6 +1,7 @@ { "name": "onnxruntime-gpu", - "version-string": "1.5.1", + "version": "1.5.1", + "port-version": 1, "description": "onnxruntime (GPU)", "homepage": "https://github.com/microsoft/onnxruntime", "supports": "windows & !x86 & !uwp & !static & !arm" diff --git a/external_imported/vcpkg/ports/open62541/openssl.patch b/external_imported/vcpkg/ports/open62541/openssl.patch new file mode 100644 index 000000000..cc68eb570 --- /dev/null +++ b/external_imported/vcpkg/ports/open62541/openssl.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9184b943..bd9203f7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -526,7 +526,7 @@ if(NOT UA_FORCE_CPP AND (CMAKE_COMPILER_IS_GNUCC OR "x${CMAKE_C_COMPILER_ID}" ST + check_add_cc_flag("-Wall") # Warnings + check_add_cc_flag("-Wextra") # More warnings + check_add_cc_flag("-Wpedantic") # Standard compliance +- check_add_cc_flag("-Werror") # All warnings are errors ++ #check_add_cc_flag("-Werror") # All warnings are errors + + check_add_cc_flag("-Wno-static-in-inline") # Clang doesn't like the use of static inline methods inside static inline methods + check_add_cc_flag("-Wno-overlength-strings") # May happen in the nodeset compiler when complex values are directly encoded +@@ -659,7 +659,7 @@ if(APPLE) + endif() + + if(MSVC) +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3 /WX /w44996") # Compiler warnings, error on warning ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3 /WX /w44996 /wd4090") # Compiler warnings, error on warning + + if(UA_MSVC_FORCE_STATIC_CRT AND NOT BUILD_SHARED_LIBS) + set(CompilerFlags CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_C_FLAGS diff --git a/external_imported/vcpkg/ports/open62541/portfile.cmake b/external_imported/vcpkg/ports/open62541/portfile.cmake index bb07150d2..a7536e758 100644 --- a/external_imported/vcpkg/ports/open62541/portfile.cmake +++ b/external_imported/vcpkg/ports/open62541/portfile.cmake @@ -1,11 +1,13 @@ -set(VERSION v1.2.2) +set(VERSION v1.2.3) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO open62541/open62541 REF "${VERSION}" - SHA512 E6A1EC2208EC29D8685D2A957FAE6F3FEDC0E847D6AB1BB8AC5C7980223BC377692334C87575956B53BB37A9B71C5DEDD1B5C4F19F122561543D04661FEFE1D5 + SHA512 ffcc697901ec978fb9d1f8996f8a4c5114c98a0ec19206cac95d1a84f8d0fcbe38bf73e88f1df59d53bc6be481102aa2f2a6a0efa29797e7ce11123bd23131c2 HEAD_REF master + PATCHES + openssl.patch ) vcpkg_check_features( @@ -14,6 +16,7 @@ vcpkg_check_features( openssl UA_ENABLE_ENCRYPTION_OPENSSL mbedtls UA_ENABLE_ENCRYPTION_MBEDTLS amalgamation UA_ENABLE_AMALGAMATION + historizing UA_ENABLE_HISTORIZING ) vcpkg_find_acquire_program(PYTHON3) @@ -30,7 +33,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_copy_pdbs() vcpkg_fixup_pkgconfig() diff --git a/external_imported/vcpkg/ports/open62541/vcpkg.json b/external_imported/vcpkg/ports/open62541/vcpkg.json index 0dacbc9e6..59c666d5f 100644 --- a/external_imported/vcpkg/ports/open62541/vcpkg.json +++ b/external_imported/vcpkg/ports/open62541/vcpkg.json @@ -1,9 +1,10 @@ { "name": "open62541", - "version": "1.2.2", + "version": "1.2.3", "port-version": 1, "description": "open62541 is an open source C (C99) implementation of OPC UA licensed under the Mozilla Public License v2.0.", "homepage": "https://open62541.org", + "license": "MPL-2.0", "dependencies": [ { "name": "vcpkg-cmake", @@ -21,6 +22,9 @@ "amalgamation": { "description": "Concatenate the library to a single file open62541.h/.c" }, + "historizing": { + "description": "Enable basic support for historical access (client and server)" + }, "mbedtls": { "description": "Enable encryption support (uses MbedTLS)", "dependencies": [ diff --git a/external_imported/vcpkg/ports/openal-soft/portfile.cmake b/external_imported/vcpkg/ports/openal-soft/portfile.cmake index 30c413ff4..c090c7406 100644 --- a/external_imported/vcpkg/ports/openal-soft/portfile.cmake +++ b/external_imported/vcpkg/ports/openal-soft/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kcat/openal-soft diff --git a/external_imported/vcpkg/ports/openal-soft/vcpkg.json b/external_imported/vcpkg/ports/openal-soft/vcpkg.json index 8f86e6bd5..4988f6635 100644 --- a/external_imported/vcpkg/ports/openal-soft/vcpkg.json +++ b/external_imported/vcpkg/ports/openal-soft/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openal-soft", "version-semver": "1.21.1", - "port-version": 3, + "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" diff --git a/external_imported/vcpkg/ports/openblas/fix-marco-conflict.patch b/external_imported/vcpkg/ports/openblas/fix-marco-conflict.patch deleted file mode 100644 index 939461875..000000000 --- a/external_imported/vcpkg/ports/openblas/fix-marco-conflict.patch +++ /dev/null @@ -1,244 +0,0 @@ -diff --git a/cmake/utils.cmake b/cmake/utils.cmake -index 1c21e77..3894011 100644 ---- a/cmake/utils.cmake -+++ b/cmake/utils.cmake -@@ -251,6 +251,19 @@ function(GenerateNamedObjects sources_in) - # now add the object and set the defines - set(obj_defines ${defines_in}) - -+ list(FIND obj_defines "RC" def_idx) -+ if (${def_idx} GREATER -1) -+ # list(REMOVE_AT ${obj_defines} ${def_idx}) -+ list (REMOVE_ITEM obj_defines "RC") -+ list(APPEND obj_defines "RC=RC") -+ endif () -+ list(FIND obj_defines "CR" def_idx) -+ if (${def_idx} GREATER -1) -+ # list(REMOVE_AT ${obj_defines} ${def_idx}) -+ list (REMOVE_ITEM obj_defines "CR") -+ list(APPEND obj_defines "CR=CR") -+ endif () -+ - if (use_cblas) - set(obj_name "cblas_${obj_name}") - list(APPEND obj_defines "CBLAS") -diff --git a/driver/level3/Makefile b/driver/level3/Makefile -index 09a62d9..970bc58 100644 ---- a/driver/level3/Makefile -+++ b/driver/level3/Makefile -@@ -371,7 +371,7 @@ cgemm_rr.$(SUFFIX) : gemm.c level3.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - cgemm_rc.$(SUFFIX) : gemm.c level3.c ../../param.h -- $(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - cgemm_cn.$(SUFFIX) : gemm.c level3.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -419,7 +419,7 @@ zgemm_rr.$(SUFFIX) : gemm.c level3.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - zgemm_rc.$(SUFFIX) : gemm.c level3.c ../../param.h -- $(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - zgemm_cn.$(SUFFIX) : gemm.c level3.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -467,7 +467,7 @@ xgemm_rr.$(SUFFIX) : gemm.c level3.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - xgemm_rc.$(SUFFIX) : gemm.c level3.c ../../param.h -- $(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - xgemm_cn.$(SUFFIX) : gemm.c level3.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -578,7 +578,7 @@ cgemm_thread_rr.$(SUFFIX) : gemm.c level3_thread.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - cgemm_thread_rc.$(SUFFIX) : gemm.c level3_thread.c ../../param.h -- $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - cgemm_thread_cn.$(SUFFIX) : gemm.c level3_thread.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -626,7 +626,7 @@ zgemm_thread_rr.$(SUFFIX) : gemm.c level3_thread.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - zgemm_thread_rc.$(SUFFIX) : gemm.c level3_thread.c ../../param.h -- $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - zgemm_thread_cn.$(SUFFIX) : gemm.c level3_thread.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -674,7 +674,7 @@ xgemm_thread_rr.$(SUFFIX) : gemm.c level3_thread.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - xgemm_thread_rc.$(SUFFIX) : gemm.c level3_thread.c ../../param.h -- $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - xgemm_thread_cn.$(SUFFIX) : gemm.c level3_thread.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -1841,7 +1841,7 @@ cgemm3m_rr.$(SUFFIX) : gemm3m.c gemm3m_level3.c - $(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - cgemm3m_rc.$(SUFFIX) : gemm3m.c gemm3m_level3.c -- $(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - cgemm3m_cn.$(SUFFIX) : gemm3m.c gemm3m_level3.c - $(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -1889,7 +1889,7 @@ zgemm3m_rr.$(SUFFIX) : gemm3m.c gemm3m_level3.c - $(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - zgemm3m_rc.$(SUFFIX) : gemm3m.c gemm3m_level3.c -- $(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - zgemm3m_cn.$(SUFFIX) : gemm3m.c gemm3m_level3.c - $(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -1937,7 +1937,7 @@ xgemm3m_rr.$(SUFFIX) : gemm3m.c gemm3m_level3.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - xgemm3m_rc.$(SUFFIX) : gemm3m.c gemm3m_level3.c ../../param.h -- $(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - xgemm3m_cn.$(SUFFIX) : gemm3m.c gemm3m_level3.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -1994,7 +1994,7 @@ cgemm3m_thread_rr.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - cgemm3m_thread_rc.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h -- $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - cgemm3m_thread_cn.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -2042,7 +2042,7 @@ zgemm3m_thread_rr.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - zgemm3m_thread_rc.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h -- $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - zgemm3m_thread_cn.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -2090,7 +2090,7 @@ xgemm3m_thread_rr.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - xgemm3m_thread_rc.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h -- $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - xgemm3m_thread_cn.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h - $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -2763,7 +2763,7 @@ cgemm_rr.$(PSUFFIX) : gemm.c level3.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - cgemm_rc.$(PSUFFIX) : gemm.c level3.c ../../param.h -- $(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - cgemm_cn.$(PSUFFIX) : gemm.c level3.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -2811,7 +2811,7 @@ zgemm_rr.$(PSUFFIX) : gemm.c level3.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - zgemm_rc.$(PSUFFIX) : gemm.c level3.c ../../param.h -- $(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - zgemm_cn.$(PSUFFIX) : gemm.c level3.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -2859,7 +2859,7 @@ xgemm_rr.$(PSUFFIX) : gemm.c level3.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - xgemm_rc.$(PSUFFIX) : gemm.c level3.c ../../param.h -- $(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - xgemm_cn.$(PSUFFIX) : gemm.c level3.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -2971,7 +2971,7 @@ cgemm_thread_rr.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - cgemm_thread_rc.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h -- $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - cgemm_thread_cn.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -3019,7 +3019,7 @@ zgemm_thread_rr.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - zgemm_thread_rc.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h -- $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - zgemm_thread_cn.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -3067,7 +3067,7 @@ xgemm_thread_rr.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - xgemm_thread_rc.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h -- $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - xgemm_thread_cn.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -4234,7 +4234,7 @@ cgemm3m_rr.$(PSUFFIX) : gemm3m.c gemm3m_level3.c - $(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - cgemm3m_rc.$(PSUFFIX) : gemm3m.c gemm3m_level3.c -- $(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - cgemm3m_cn.$(PSUFFIX) : gemm3m.c gemm3m_level3.c - $(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -4282,7 +4282,7 @@ zgemm3m_rr.$(PSUFFIX) : gemm3m.c gemm3m_level3.c - $(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - zgemm3m_rc.$(PSUFFIX) : gemm3m.c gemm3m_level3.c -- $(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - zgemm3m_cn.$(PSUFFIX) : gemm3m.c gemm3m_level3.c - $(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -4330,7 +4330,7 @@ xgemm3m_rr.$(PSUFFIX) : gemm3m.c gemm3m_level3.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - xgemm3m_rc.$(PSUFFIX) : gemm3m.c gemm3m_level3.c ../../param.h -- $(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - xgemm3m_cn.$(PSUFFIX) : gemm3m.c gemm3m_level3.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -4387,7 +4387,7 @@ cgemm3m_thread_rr.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - cgemm3m_thread_rc.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h -- $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - cgemm3m_thread_cn.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -4435,7 +4435,7 @@ zgemm3m_thread_rr.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - zgemm3m_thread_rc.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h -- $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - zgemm3m_thread_cn.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCN $< -o $(@F) -@@ -4483,7 +4483,7 @@ xgemm3m_thread_rr.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DRR $< -o $(@F) - - xgemm3m_thread_rc.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h -- $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DRC $< -o $(@F) -+ $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) - - xgemm3m_thread_cn.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h - $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCN $< -o $(@F) diff --git a/external_imported/vcpkg/ports/openblas/portfile.cmake b/external_imported/vcpkg/ports/openblas/portfile.cmake index 34e321a68..45c1f86c5 100644 --- a/external_imported/vcpkg/ports/openblas/portfile.cmake +++ b/external_imported/vcpkg/ports/openblas/portfile.cmake @@ -1,15 +1,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xianyi/OpenBLAS - REF 904f9a267dddb30e9f187e57231ed160ab2f2704 # v0.3.15 - SHA512 ddb1eba7b0def08483d7610675335648017eff41de3cbe24357bd15c6938c7997f12c449f32d8225abbb5ef8f7a2e7501320ec05e970e8ddf8e4c25fd81e8002 + REF 2480e5046e3b0120da8a7fd1442eca628df55f87 # v0.3.19 + SHA512 b85a96c8cd75bf7197732f3b923b8b0ffdc6261d7d6dc7b622d4bf24f061d02273ad99571cabe4686d92f77ff8e6f7e2de0851758cbb3c529d7c2ca96a0bc34d HEAD_REF develop PATCHES uwp.patch fix-space-path.patch fix-redefinition-function.patch fix-uwp-build.patch - fix-marco-conflict.patch install-tools.patch ) diff --git a/external_imported/vcpkg/ports/openblas/vcpkg.json b/external_imported/vcpkg/ports/openblas/vcpkg.json index 041c0f3e3..eaafc620b 100644 --- a/external_imported/vcpkg/ports/openblas/vcpkg.json +++ b/external_imported/vcpkg/ports/openblas/vcpkg.json @@ -1,7 +1,6 @@ { "name": "openblas", - "version": "0.3.15", - "port-version": 1, + "version": "0.3.19", "description": "OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.", "homepage": "https://github.com/xianyi/OpenBLAS", "dependencies": [ diff --git a/external_imported/vcpkg/ports/opencc/portfile.cmake b/external_imported/vcpkg/ports/opencc/portfile.cmake index ad68c29b2..f9d4a97fe 100644 --- a/external_imported/vcpkg/ports/opencc/portfile.cmake +++ b/external_imported/vcpkg/ports/opencc/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO BYVoid/OpenCC @@ -49,5 +47,5 @@ endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -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/opencc/vcpkg.json b/external_imported/vcpkg/ports/opencc/vcpkg.json index 3645c6d13..ef89e10e7 100644 --- a/external_imported/vcpkg/ports/opencc/vcpkg.json +++ b/external_imported/vcpkg/ports/opencc/vcpkg.json @@ -1,10 +1,10 @@ { "name": "opencc", - "version-string": "2020-04-26", - "port-version": 9, + "version-date": "2020-04-26", + "port-version": 10, "description": "A project for conversion between Traditional and Simplified Chinese", "homepage": "https://github.com/BYVoid/OpenCC", - "supports": "!(arm | arm64 | uwp)", + "supports": "!(arm | uwp)", "features": { "tools": { "description": "Build OpenCC command-line tools" diff --git a/external_imported/vcpkg/ports/opencolorio/fix-buildTools.patch b/external_imported/vcpkg/ports/opencolorio/fix-buildTools.patch new file mode 100644 index 000000000..24b1c3fd8 --- /dev/null +++ b/external_imported/vcpkg/ports/opencolorio/fix-buildTools.patch @@ -0,0 +1,13 @@ +diff --git a/src/OpenColorIO/CMakeLists.txt b/src/OpenColorIO/CMakeLists.txt +index b992bbc..804d3c5 100644 +--- a/src/OpenColorIO/CMakeLists.txt ++++ b/src/OpenColorIO/CMakeLists.txt +@@ -248,7 +248,7 @@ if(NOT BUILD_SHARED_LIBS) + else() + # Only exports selected symbols. + target_compile_definitions(OpenColorIO +- PUBLIC ++ PRIVATE + OpenColorIO_EXPORTS + ) + endif() diff --git a/external_imported/vcpkg/ports/opencolorio/fix-dependency.patch b/external_imported/vcpkg/ports/opencolorio/fix-dependency.patch new file mode 100644 index 000000000..1ddda42ec --- /dev/null +++ b/external_imported/vcpkg/ports/opencolorio/fix-dependency.patch @@ -0,0 +1,117 @@ +diff --git a/share/cmake/modules/FindExtPackages.cmake b/share/cmake/modules/FindExtPackages.cmake +index 8787b87..f953ceb 100644 +--- a/share/cmake/modules/FindExtPackages.cmake ++++ b/share/cmake/modules/FindExtPackages.cmake +@@ -26,15 +26,15 @@ set(CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY ON CACHE BOOL + + # expat + # https://github.com/libexpat/libexpat +-find_package(expat 2.2.8 REQUIRED) ++find_package(expat CONFIG REQUIRED) + + # yaml-cpp + # https://github.com/jbeder/yaml-cpp +-find_package(yaml-cpp 0.6.3 REQUIRED) ++find_package(yaml-cpp CONFIG REQUIRED) + + # pystring + # https://github.com/imageworks/pystring +-find_package(pystring 1.1.3 REQUIRED) ++find_package(pystring CONFIG REQUIRED) + + # Half + # NOTE: OCIO_USE_IMATH_HALF needs to be an integer for use in utils/Half.h.in +@@ -42,7 +42,7 @@ if(NOT OCIO_USE_OPENEXR_HALF) + + # Imath (>=3.0) + # https://github.com/AcademySoftwareFoundation/Imath +- find_package(Imath 3.1.2 REQUIRED) ++ find_package(Imath CONFIG REQUIRED) + + set(OCIO_HALF_LIB Imath::Imath CACHE STRING "Half library target" FORCE) + set(OCIO_USE_IMATH_HALF "1" CACHE STRING "Whether 'half' type will be sourced from the Imath library (>=v3.0)" FORCE) +@@ -50,7 +50,7 @@ else() + + # OpenEXR/IlmBase (<=2.5) + # https://github.com/AcademySoftwareFoundation/openexr +- find_package(Half 2.4.0 REQUIRED) ++ find_package(Half CONFIG REQUIRED) + + 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) + + # lcms2 + # https://github.com/mm2/Little-CMS +- find_package(lcms2 2.2 REQUIRED) ++ find_package(lcms2 CONFIG REQUIRED) + 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 ++++ b/src/OpenColorIO/CMakeLists.txt +@@ -226,9 +226,9 @@ target_link_libraries(OpenColorIO + expat::expat + ${OCIO_HALF_LIB} + pystring::pystring +- sampleicc::sampleicc +- utils::from_chars +- utils::strings ++ "$" ++ "$" ++ "$" + 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 @@ + + 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() ++ + include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake) diff --git a/external_imported/vcpkg/ports/opencolorio/portfile.cmake b/external_imported/vcpkg/ports/opencolorio/portfile.cmake index 2b51abda3..9465e4978 100644 --- a/external_imported/vcpkg/ports/opencolorio/portfile.cmake +++ b/external_imported/vcpkg/ports/opencolorio/portfile.cmake @@ -1,13 +1,20 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AcademySoftwareFoundation/OpenColorIO - REF v2.1.0 - SHA512 a0f4fb62c768b392ca1129e2046df96d670d785fc057d4103768440b7adb65d8faf5b7d39729060791794e83e6cd4e67821aed9b30f3f04b410c60809cd72267 + REF v2.1.1 + SHA512 86585ec860d460b158f24efb82f202deced7ce96a6bfefd42f39cad9c112add68cca6935f383f5d718c07fe1c121d8ed8b0d2069321f1dafb8ce68b49bc75194 HEAD_REF master + PATCHES + fix-dependency.patch + fix-buildTools.patch ) +file(REMOVE "${SOURCE_PATH}/share/cmake/modules/Findexpat.cmake") +file(REMOVE "${SOURCE_PATH}/share/cmake/modules/FindImath.cmake") +file(REMOVE "${SOURCE_PATH}/share/cmake/modules/Findpystring.cmake") +file(REMOVE "${SOURCE_PATH}/share/cmake/modules/Findyaml-cpp.cmake") +file(REMOVE "${SOURCE_PATH}/share/cmake/modules/Findlcms2.cmake") + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES tools OCIO_BUILD_APPS @@ -21,6 +28,9 @@ vcpkg_cmake_configure( -DOCIO_BUILD_TESTS:BOOL=OFF -DOCIO_BUILD_GPU_TESTS:BOOL=OFF -DOCIO_BUILD_PYTHON:BOOL=OFF + -DOCIO_BUILD_OPENFX:BOOL=OFF + -DOCIO_BUILD_JAVA:BOOL=OFF + -DOCIO_USE_OPENEXR_HALF:BOOL=OFF -DOCIO_INSTALL_EXT_PACKAGES=NONE -DCMAKE_DISABLE_FIND_PACKAGE_OpenImageIO=On ${FEATURE_OPTIONS} @@ -28,7 +38,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/OpenColorIO") +vcpkg_cmake_config_fixup(PACKAGE_NAME OpenColorIO CONFIG_PATH "lib/cmake/OpenColorIO") vcpkg_copy_pdbs() @@ -51,4 +61,4 @@ 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) \ 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/opencolorio/vcpkg.json b/external_imported/vcpkg/ports/opencolorio/vcpkg.json index 5190da8ac..751770137 100644 --- a/external_imported/vcpkg/ports/opencolorio/vcpkg.json +++ b/external_imported/vcpkg/ports/opencolorio/vcpkg.json @@ -1,9 +1,10 @@ { "name": "opencolorio", - "version-semver": "2.1.0", - "port-version": 1, + "version-semver": "2.1.1", + "port-version": 2, "description": "OpenColorIO (OCIO) is a complete color management solution geared towards motion picture production with an emphasis on visual effects and computer animation. OCIO provides a straightforward and consistent user experience across all supporting applications while allowing for sophisticated back-end configuration options suitable for high-end production usage. OCIO is compatible with the Academy Color Encoding Specification (ACES) and is LUT-format agnostic, supporting many popular formats.", "homepage": "https://opencolorio.org/", + "license": "BSD-3-Clause", "supports": "!uwp", "dependencies": [ "expat", diff --git a/external_imported/vcpkg/ports/opencv/vcpkg.json b/external_imported/vcpkg/ports/opencv/vcpkg.json index 9ee68190b..6732038cd 100644 --- a/external_imported/vcpkg/ports/opencv/vcpkg.json +++ b/external_imported/vcpkg/ports/opencv/vcpkg.json @@ -1,7 +1,6 @@ { "name": "opencv", - "version": "4.5.4", - "port-version": 1, + "version": "4.5.5", "description": "Computer vision library", "homepage": "https://github.com/opencv/opencv", "dependencies": [ @@ -123,6 +122,18 @@ } ] }, + "freetype": { + "description": "freetype support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "freetype" + ] + } + ] + }, "gdcm": { "description": "GDCM support for opencv", "dependencies": [ diff --git a/external_imported/vcpkg/ports/opencv2/portfile.cmake b/external_imported/vcpkg/ports/opencv2/portfile.cmake index d06f17ac1..9ef2ccc97 100644 --- a/external_imported/vcpkg/ports/opencv2/portfile.cmake +++ b/external_imported/vcpkg/ports/opencv2/portfile.cmake @@ -6,14 +6,8 @@ if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv4") message(FATAL_ERROR "OpenCV 4 is installed, please uninstall and try again:\n vcpkg remove opencv4") endif() -if (VCPKG_TARGET_IS_UWP) - # - opengl feature is broken on UWP - # - jasper and openexr are not available on UWP due to missing dependencies - # - opencv2 code itself fails even if previous conditions are avoided - message(FATAL_ERROR "${PORT} doesn't support UWP") -endif() - -set(OPENCV_VERSION "2.4.13.7") +file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" _contents) +string(JSON OPENCV_VERSION GET "${_contents}" version) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -204,4 +198,6 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE "${CURRENT_PACKAGES_DIR}/LICENSE") file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/LICENSE") +vcpkg_fixup_pkgconfig() + file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/opencv2/vcpkg.json b/external_imported/vcpkg/ports/opencv2/vcpkg.json index 0ef359dc3..77040ac4f 100644 --- a/external_imported/vcpkg/ports/opencv2/vcpkg.json +++ b/external_imported/vcpkg/ports/opencv2/vcpkg.json @@ -1,9 +1,11 @@ { "name": "opencv2", "version": "2.4.13.7", - "port-version": 9, + "port-version": 11, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", + "license": "BSD-3-Clause", + "supports": "!uwp", "dependencies": [ { "name": "vcpkg-cmake", @@ -70,7 +72,7 @@ ] }, "gtk": { - "description": "GDCM support for opencv", + "description": "GTK support for opencv", "dependencies": [ "gtk" ] diff --git a/external_imported/vcpkg/ports/opencv3/0012-fix-zlib.patch b/external_imported/vcpkg/ports/opencv3/0012-fix-zlib.patch new file mode 100644 index 000000000..7f01dabf3 --- /dev/null +++ b/external_imported/vcpkg/ports/opencv3/0012-fix-zlib.patch @@ -0,0 +1,14 @@ +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 @@ + # --- zlib (required) --- + if(BUILD_ZLIB) + ocv_clear_vars(ZLIB_FOUND) ++elseif(1) ++ ocv_clear_internal_cache_vars(ZLIB_LIBRARY ZLIB_INCLUDE_DIR) ++ find_package(ZLIB "${MIN_VER_ZLIB}" REQUIRED) + else() + ocv_clear_internal_cache_vars(ZLIB_LIBRARY ZLIB_INCLUDE_DIR) + if(ANDROID) diff --git a/external_imported/vcpkg/ports/opencv3/portfile.cmake b/external_imported/vcpkg/ports/opencv3/portfile.cmake index ae6c9d49c..cae0675f6 100644 --- a/external_imported/vcpkg/ports/opencv3/portfile.cmake +++ b/external_imported/vcpkg/ports/opencv3/portfile.cmake @@ -6,7 +6,9 @@ if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv4") message(FATAL_ERROR "OpenCV 4 is installed, please uninstall and try again:\n vcpkg remove opencv4") endif() -set(OPENCV_VERSION "3.4.16") +file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" _contents) +string(JSON OPENCV_VERSION GET "${_contents}" version) + set(USE_QT_VERSION "5") vcpkg_from_github( @@ -26,6 +28,7 @@ vcpkg_from_github( 0009-fix-protobuf.patch 0010-fix-uwp-tiff-imgcodecs.patch 0011-remove-python2.patch + 0012-fix-zlib.patch ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") @@ -404,6 +407,7 @@ vcpkg_cmake_configure( -DWITH_OPENCLAMDBLAS=OFF -DWITH_TBB=${WITH_TBB} -DWITH_OPENJPEG=OFF + -DWITH_CPUFEATURES=OFF ###### BUILD_options (mainly modules which require additional libraries) -DBUILD_opencv_ovis=${BUILD_opencv_ovis} -DBUILD_opencv_dnn=${BUILD_opencv_dnn} @@ -526,4 +530,6 @@ if(VCPKG_TARGET_IS_ANDROID) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/README.android") endif() +vcpkg_fixup_pkgconfig() + file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/opencv3/vcpkg.json b/external_imported/vcpkg/ports/opencv3/vcpkg.json index aaaba75fa..06404f659 100644 --- a/external_imported/vcpkg/ports/opencv3/vcpkg.json +++ b/external_imported/vcpkg/ports/opencv3/vcpkg.json @@ -1,9 +1,10 @@ { "name": "opencv3", "version": "3.4.16", - "port-version": 1, + "port-version": 5, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", + "license": "BSD-3-Clause", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/opencv4/0012-fix-zlib.patch b/external_imported/vcpkg/ports/opencv4/0012-fix-zlib.patch new file mode 100644 index 000000000..9c38fd892 --- /dev/null +++ b/external_imported/vcpkg/ports/opencv4/0012-fix-zlib.patch @@ -0,0 +1,14 @@ +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 @@ + # --- zlib (required) --- + if(BUILD_ZLIB) + ocv_clear_vars(ZLIB_FOUND) ++elseif(1) ++ ocv_clear_internal_cache_vars(ZLIB_LIBRARY ZLIB_INCLUDE_DIR) ++ find_package(ZLIB "${MIN_VER_ZLIB}" REQUIRED) + else() + ocv_clear_internal_cache_vars(ZLIB_LIBRARY ZLIB_INCLUDE_DIR) + if(ANDROID) diff --git a/external_imported/vcpkg/ports/opencv4/0013-fix-opengl.patch b/external_imported/vcpkg/ports/opencv4/0013-fix-opengl.patch new file mode 100644 index 000000000..8cd38c9bb --- /dev/null +++ b/external_imported/vcpkg/ports/opencv4/0013-fix-opengl.patch @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000..d75c5ec2e --- /dev/null +++ b/external_imported/vcpkg/ports/opencv4/0014-fix-gstreamer.patch @@ -0,0 +1,29 @@ +--- 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/0015-fix-freetype.patch b/external_imported/vcpkg/ports/opencv4/0015-fix-freetype.patch new file mode 100644 index 000000000..62c41f2f4 --- /dev/null +++ b/external_imported/vcpkg/ports/opencv4/0015-fix-freetype.patch @@ -0,0 +1,16 @@ +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) + endif() + + if(WITH_FREETYPE) +- ocv_check_modules(FREETYPE freetype2) +- if (FREETYPE_FOUND) ++ find_package(freetype CONFIG REQUIRED) + set(HAVE_FREETYPE TRUE) +- endif() + endif() + + if(WITH_PLAIDML) diff --git a/external_imported/vcpkg/ports/opencv4/0016-fix-freetype-contrib.patch b/external_imported/vcpkg/ports/opencv4/0016-fix-freetype-contrib.patch new file mode 100644 index 000000000..4d0637fd1 --- /dev/null +++ b/external_imported/vcpkg/ports/opencv4/0016-fix-freetype-contrib.patch @@ -0,0 +1,17 @@ +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) + 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/opencv4/portfile.cmake b/external_imported/vcpkg/ports/opencv4/portfile.cmake index c616a3990..6681d6676 100644 --- a/external_imported/vcpkg/ports/opencv4/portfile.cmake +++ b/external_imported/vcpkg/ports/opencv4/portfile.cmake @@ -6,14 +6,16 @@ if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv3") message(FATAL_ERROR "OpenCV 3 is installed, please uninstall and try again:\n vcpkg remove opencv3") endif() -set(OPENCV_VERSION "4.5.4") +file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" _contents) +string(JSON OPENCV_VERSION GET "${_contents}" version) + set(USE_QT_VERSION "5") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO opencv/opencv REF ${OPENCV_VERSION} - SHA512 39a7af95bc30d427c6df5e5d481469ab1ceea7878a93ae5c119991333e877a88d0a644e17dc6bd316e64b2840e48411a97f1b2397a8000719c5cec32751fa954 + SHA512 4d1783fd78425cc43bb2153446dd634cedd366a49592bccc0c538a40aa161fcf67db8f1b6b68f1ce0b4a93504b3f06f65931709277afb1a1ee9fe963094bca02 HEAD_REF master PATCHES 0001-disable-downloading.patch @@ -26,6 +28,10 @@ vcpkg_from_github( 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 ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") @@ -53,6 +59,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "cudnn" WITH_CUDNN "eigen" WITH_EIGEN "ffmpeg" WITH_FFMPEG + "freetype" WITH_FREETYPE "gdcm" WITH_GDCM "gstreamer" WITH_GSTREAMER "halide" WITH_HALIDE @@ -126,15 +133,18 @@ 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 ) + 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") + 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) @@ -154,26 +164,29 @@ if("python" IN_LIST FEATURES) 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() + 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() + 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) + endfunction() + vcpkg_get_python_package(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES numpy) + set(BUILD_opencv_python3 ON) + set(WITH_PYTHON ON) + endif() endif() if("dnn" IN_LIST FEATURES) @@ -208,10 +221,11 @@ if("contrib" IN_LIST FEATURES) OUT_SOURCE_PATH CONTRIB_SOURCE_PATH REPO opencv/opencv_contrib REF ${OPENCV_VERSION} - SHA512 a48d4b5d764170814d9027fdf50f61bb4a24f0b5a547dded79d06b948f86443f14734efc7bbb708b3870781cafc6bc9e3092d35dac34a81da2bf1740d5f93ff9 + SHA512 8469de524e8e6f4c50a74b8cbec5e4cfc48a63a6dfc787609696099eca40dc02b9dc7a347a014d4416fd4efd66955d3af5f4847f44612312a8362f453e6c2e35 HEAD_REF master PATCHES 0007-fix-hdf5.patch + 0016-fix-freetype-contrib.patch ) set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules") @@ -469,9 +483,11 @@ vcpkg_cmake_configure( -DWITH_OPENCLAMDBLAS=OFF -DWITH_TBB=${WITH_TBB} -DWITH_OPENJPEG=OFF + -DWITH_CPUFEATURES=OFF ###### 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} -DBUILD_opencv_gapi=${BUILD_opencv_gapi} @@ -540,7 +556,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)") @@ -594,4 +610,6 @@ if(VCPKG_TARGET_IS_ANDROID) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/README.android") endif() +vcpkg_fixup_pkgconfig() + file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/opencv4/vcpkg.json b/external_imported/vcpkg/ports/opencv4/vcpkg.json index 5f97c6cf5..bf3293b27 100644 --- a/external_imported/vcpkg/ports/opencv4/vcpkg.json +++ b/external_imported/vcpkg/ports/opencv4/vcpkg.json @@ -1,9 +1,10 @@ { "name": "opencv4", - "version": "4.5.4", - "port-version": 2, + "version": "4.5.5", + "port-version": 1, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", + "license": "Apache-2.0", "dependencies": [ { "name": "vcpkg-cmake", @@ -116,6 +117,13 @@ } ] }, + "freetype": { + "description": "Freetype support for opencv", + "dependencies": [ + "freetype", + "harfbuzz" + ] + }, "gdcm": { "description": "GDCM support for opencv", "dependencies": [ @@ -129,7 +137,7 @@ ] }, "gtk": { - "description": "GDCM support for opencv", + "description": "GTK support for opencv", "dependencies": [ "gtk" ] @@ -210,7 +218,10 @@ ] }, "python": { - "description": "Python wrapper support for opencv" + "description": "Python wrapper support for opencv", + "dependencies": [ + "python3" + ] }, "qt": { "description": "Qt GUI support for opencv", diff --git a/external_imported/vcpkg/ports/opendnp3/deps/asio.cmake b/external_imported/vcpkg/ports/opendnp3/deps/asio.cmake new file mode 100644 index 000000000..7645e466a --- /dev/null +++ b/external_imported/vcpkg/ports/opendnp3/deps/asio.cmake @@ -0,0 +1 @@ +find_package(asio CONFIG REQUIRED) diff --git a/external_imported/vcpkg/ports/opendnp3/portfile.cmake b/external_imported/vcpkg/ports/opendnp3/portfile.cmake index c1a5c8196..d0b5b976f 100644 --- a/external_imported/vcpkg/ports/opendnp3/portfile.cmake +++ b/external_imported/vcpkg/ports/opendnp3/portfile.cmake @@ -7,10 +7,34 @@ vcpkg_from_github( REPO dnp3/opendnp3 REF 3.1.1 SHA512 2d7b26753fa03596ab73944236e5f1d82656f38248cc23fd00f7a2cdac27f481e5fe51e68b5896b6740db1a6d9560f0262e473648e001601125f4af8b4a652c2 - HEAD_REF master ) -file(COPY "${CURRENT_PORT_DIR}/opendnp3-config.cmake.in" DESTINATION "${SOURCE_PATH}") +file(READ "${SOURCE_PATH}/deps/ser4cpp.cmake" ser4cpp_cmake) +if(ser4cpp_cmake MATCHES "https://github\\.com/automatak/ser4cpp/archive/([0-9a-f]*)\\.zip") + vcpkg_from_github( + OUT_SOURCE_PATH ser4cpp_src + REPO automatak/ser4cpp + REF "${CMAKE_MATCH_1}" + SHA512 cd8d634c0e9fadda357bdd832c382189461f4707ced4834604668df0aa4e396333cce8d676d4f98ba1b414664228518e9a24c6456204b9d96a5f2df078bada2c + ) +else() + message(FATAL_ERROR "Unable to determine version of ser4cpp") +endif() + +file(READ "${SOURCE_PATH}/deps/exe4cpp.cmake" exe4cpp_cmake) +if(exe4cpp_cmake MATCHES "https://github\\.com/automatak/exe4cpp/archive/([0-9a-f]*)\\.zip") + vcpkg_from_github( + OUT_SOURCE_PATH exe4cpp_src + REPO automatak/exe4cpp + REF "${CMAKE_MATCH_1}" + SHA512 c8946db752c0f8499d21c2da96b84676b8768954bcb1964f4c444c731d9871d8978cb96fe89b1125e91b861aef0984bdd943a4dccb91d17ba43f22c57673b7b2 + ) +else() + message(FATAL_ERROR "Unable to determine version of exe4cpp") +endif() + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/opendnp3-config.cmake.in" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/deps/" DESTINATION "${SOURCE_PATH}/deps/") string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATICLIBS) @@ -23,6 +47,9 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DDNP3_STATIC_LIBS=${STATICLIBS} + -DFETCHCONTENT_FULLY_DISCONNECTED=ON + -DFETCHCONTENT_SOURCE_DIR_SER4CPP=${ser4cpp_src} + -DFETCHCONTENT_SOURCE_DIR_EXE4CPP=${exe4cpp_src} ${FEATURE_OPTIONS} ) diff --git a/external_imported/vcpkg/ports/opendnp3/vcpkg.json b/external_imported/vcpkg/ports/opendnp3/vcpkg.json index 7262378ff..98d7f3370 100644 --- a/external_imported/vcpkg/ports/opendnp3/vcpkg.json +++ b/external_imported/vcpkg/ports/opendnp3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "opendnp3", "version": "3.1.1", + "port-version": 1, "description": "DNP3 (IEEE-1815) protocol stack. Modern C++ with bindings for .NET and Java.", "homepage": "https://github.com/dnp3/opendnp3/", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/opengl/glu.pc.in b/external_imported/vcpkg/ports/opengl/glu.pc.in new file mode 100644 index 000000000..1d086a91e --- /dev/null +++ b/external_imported/vcpkg/ports/opengl/glu.pc.in @@ -0,0 +1,10 @@ +prefix=${pcfiledir}/../.. +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: glu +Description: OpenGL Utility Library +Version: @WINDOWS_SDK_SEMVER@ +Requires: opengl +Libs: -L${libdir} -lGlU32 +Cflags: -I${includedir} diff --git a/external_imported/vcpkg/ports/opengl/opengl.pc.in b/external_imported/vcpkg/ports/opengl/opengl.pc.in new file mode 100644 index 000000000..231bce085 --- /dev/null +++ b/external_imported/vcpkg/ports/opengl/opengl.pc.in @@ -0,0 +1,9 @@ +prefix=${pcfiledir}/../.. +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: OpenGL +Description: OpenGL library and headers. +Version: @WINDOWS_SDK_SEMVER@ +Libs: -L${libdir} -lOpenGL32 +Cflags: -I${includedir} diff --git a/external_imported/vcpkg/ports/opengl/portfile.cmake b/external_imported/vcpkg/ports/opengl/portfile.cmake index 72625fa15..5a20f8ea0 100644 --- a/external_imported/vcpkg/ports/opengl/portfile.cmake +++ b/external_imported/vcpkg/ports/opengl/portfile.cmake @@ -62,6 +62,18 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore 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") 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}/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() + 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 da77cb58b..e921d648f 100644 --- a/external_imported/vcpkg/ports/opengl/vcpkg.json +++ b/external_imported/vcpkg/ports/opengl/vcpkg.json @@ -1,6 +1,5 @@ { "name": "opengl", - "version-string": "0.0", - "port-version": 9, + "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." } diff --git a/external_imported/vcpkg/ports/openimageio/fix-openjpeg-linkage.patch b/external_imported/vcpkg/ports/openimageio/fix-openjpeg-linkage.patch new file mode 100644 index 000000000..7d3a24c2f --- /dev/null +++ b/external_imported/vcpkg/ports/openimageio/fix-openjpeg-linkage.patch @@ -0,0 +1,13 @@ +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/portfile.cmake b/external_imported/vcpkg/ports/openimageio/portfile.cmake index 1a0d7f950..4f93c86cf 100644 --- a/external_imported/vcpkg/ports/openimageio/portfile.cmake +++ b/external_imported/vcpkg/ports/openimageio/portfile.cmake @@ -1,10 +1,3 @@ -if("field3d" IN_LIST FEATURES) - vcpkg_fail_port_install( - ON_TARGET WINDOWS UWP - MESSAGE "The field3d feature is not supported on Windows" - ) -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OpenImageIO/oiio @@ -14,6 +7,7 @@ vcpkg_from_github( PATCHES fix-dependencies.patch fix-config-cmake.patch + fix-openjpeg-linkage.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/ext") @@ -31,7 +25,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS libraw USE_LIBRAW opencolorio USE_OPENCOLORIO ffmpeg USE_FFMPEG - field3d USE_FIELD3D freetype USE_FREETYPE gif USE_GIF opencv USE_OPENCV diff --git a/external_imported/vcpkg/ports/openimageio/vcpkg.json b/external_imported/vcpkg/ports/openimageio/vcpkg.json index 643a3c3d8..e361f9955 100644 --- a/external_imported/vcpkg/ports/openimageio/vcpkg.json +++ b/external_imported/vcpkg/ports/openimageio/vcpkg.json @@ -1,8 +1,10 @@ { "name": "openimageio", "version": "2.3.10.1", + "port-version": 3, "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", "dependencies": [ "boost-algorithm", "boost-asio", @@ -47,12 +49,6 @@ } ] }, - "field3d": { - "description": "Enable field3D support for openimageio", - "dependencies": [ - "field3d" - ] - }, "freetype": { "description": "Enable freetype support for openimageio", "dependencies": [ diff --git a/external_imported/vcpkg/ports/openmpi/portfile.cmake b/external_imported/vcpkg/ports/openmpi/portfile.cmake index 09c746883..82b139a2a 100644 --- a/external_imported/vcpkg/ports/openmpi/portfile.cmake +++ b/external_imported/vcpkg/ports/openmpi/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "Windows" "UWP") - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) set(OpenMPI_FULL_VERSION "4.1.0") @@ -14,7 +12,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} - PATCHES + PATCHES keep_isystem.patch ) diff --git a/external_imported/vcpkg/ports/openmpi/vcpkg.json b/external_imported/vcpkg/ports/openmpi/vcpkg.json index 1d371474b..d880ce0f1 100644 --- a/external_imported/vcpkg/ports/openmpi/vcpkg.json +++ b/external_imported/vcpkg/ports/openmpi/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openmpi", "version": "4.1.0", - "port-version": 3, + "port-version": 4, "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/0002-eigen-3.4.patch b/external_imported/vcpkg/ports/openmvg/0002-eigen-3.4.patch new file mode 100644 index 000000000..19098d2ae --- /dev/null +++ b/external_imported/vcpkg/ports/openmvg/0002-eigen-3.4.patch @@ -0,0 +1,13 @@ +--- a/src/openMVG/multiview/CMakeLists.txt ++++ b/src/openMVG/multiview/CMakeLists.txt +@@ -38,6 +38,9 @@ target_include_directories(openMVG_multiview + $ + ) + set_target_properties(openMVG_multiview PROPERTIES SOVERSION ${OPENMVG_VERSION_MAJOR} VERSION "${OPENMVG_VERSION_MAJOR}.${OPENMVG_VERSION_MINOR}") ++if (MSVC) ++ set_target_properties(openMVG_multiview PROPERTIES COMPILE_FLAGS "/bigobj") ++endif (MSVC) + + add_library(openMVG_multiview_test_data ${MULTIVIEWTESTDATA}) + target_link_libraries(openMVG_multiview_test_data PRIVATE openMVG_numeric openMVG_multiview) + \ No newline at end of file diff --git a/external_imported/vcpkg/ports/openmvg/build_fixes.patch b/external_imported/vcpkg/ports/openmvg/build_fixes.patch index fecc458bd..8f61668be 100644 --- a/external_imported/vcpkg/ports/openmvg/build_fixes.patch +++ b/external_imported/vcpkg/ports/openmvg/build_fixes.patch @@ -99,7 +99,7 @@ index 5d909ec..ab7eb6f 100644 +endif() +find_package(cereal REQUIRED CONFIG) -+get_target_property(CEREAL_INCLUDE_DIRS cereal INTERFACE_INCLUDE_DIRECTORIES) ++get_target_property(CEREAL_INCLUDE_DIRS cereal::cereal INTERFACE_INCLUDE_DIRECTORIES) + # ============================================================================== # Eigen @@ -502,7 +502,7 @@ index cc5212f..acc57dd 100644 $ ) diff --git a/src/openMVG/matching/CMakeLists.txt b/src/openMVG/matching/CMakeLists.txt -index 2e0eafd..be0006f 100644 +index 2e0eafd7..d54d1e88 100644 --- a/src/openMVG/matching/CMakeLists.txt +++ b/src/openMVG/matching/CMakeLists.txt @@ -16,6 +16,7 @@ list(REMOVE_ITEM matching_files_cpp ${REMOVEFILESUNITTEST}) @@ -513,9 +513,12 @@ index 2e0eafd..be0006f 100644 set_source_files_properties(${matching_files_cpp} PROPERTIES LANGUAGE CXX) add_library(openMVG_matching -@@ -37,10 +38,10 @@ target_link_libraries(openMVG_matching +@@ -35,12 +36,12 @@ target_link_libraries(openMVG_matching + PUBLIC + openMVG_features Threads::Threads - cereal +- cereal ++ cereal::cereal ) -if (NOT DEFINED OpenMVG_USE_INTERNAL_FLANN) +if (NOT OpenMVG_USE_INTERNAL_FLANN) @@ -706,3 +709,55 @@ index 0d61c9f..05c8b29 100644 #Configure Eigen install set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/openMVG/third_party/eigen) add_subdirectory(eigen) +diff --git a/src/openMVG/cameras/CMakeLists.txt b/src/openMVG/cameras/CMakeLists.txt +index 333ab729..50c8f572 100644 +--- a/src/openMVG/cameras/CMakeLists.txt ++++ b/src/openMVG/cameras/CMakeLists.txt +@@ -4,7 +4,7 @@ set_property(TARGET openMVG_camera APPEND PROPERTY + INTERFACE_INCLUDE_DIRECTORIES "$") + + target_compile_features(openMVG_camera INTERFACE ${CXX11_FEATURES}) +-target_link_libraries(openMVG_camera INTERFACE openMVG_numeric cereal ${OPENMVG_LIBRARY_DEPENDENCIES}) ++target_link_libraries(openMVG_camera INTERFACE openMVG_numeric cereal::cereal ${OPENMVG_LIBRARY_DEPENDENCIES}) + install(TARGETS openMVG_camera DESTINATION lib EXPORT openMVG-targets) + + UNIT_TEST(openMVG Camera_Pinhole openMVG_camera) +diff --git a/src/openMVG/features/CMakeLists.txt b/src/openMVG/features/CMakeLists.txt +index 2e49701d..0b5e1c3d 100644 +--- a/src/openMVG/features/CMakeLists.txt ++++ b/src/openMVG/features/CMakeLists.txt +@@ -31,7 +31,7 @@ target_include_directories(openMVG_features + ) + target_link_libraries(openMVG_features + PRIVATE openMVG_fast ${STLPLUS_LIBRARY} +- PUBLIC ${OPENMVG_LIBRARY_DEPENDENCIES} cereal) ++ PUBLIC ${OPENMVG_LIBRARY_DEPENDENCIES} cereal::cereal) + if (MSVC) + set_target_properties(openMVG_features PROPERTIES COMPILE_FLAGS "/bigobj") + target_compile_options(openMVG_features PUBLIC "-D_USE_MATH_DEFINES") +diff --git a/src/openMVG/geometry/CMakeLists.txt b/src/openMVG/geometry/CMakeLists.txt +index 0a6a016a..e509a4d5 100644 +--- a/src/openMVG/geometry/CMakeLists.txt ++++ b/src/openMVG/geometry/CMakeLists.txt +@@ -21,7 +21,7 @@ set_property(TARGET openMVG_geometry PROPERTY FOLDER OpenMVG/OpenMVG) + target_link_libraries(openMVG_geometry + PUBLIC + openMVG_numeric +- cereal ++ cereal::cereal + PRIVATE + openMVG_linearProgramming + ) +diff --git a/src/openMVG/sfm/CMakeLists.txt b/src/openMVG/sfm/CMakeLists.txt +index b8928083..1d10f939 100644 +--- a/src/openMVG/sfm/CMakeLists.txt ++++ b/src/openMVG/sfm/CMakeLists.txt +@@ -25,7 +25,7 @@ target_link_libraries(openMVG_sfm + openMVG_graph + openMVG_matching + openMVG_multiview +- cereal ++ cereal::cereal + ${OPENMVG_LIBRARY_DEPENDENCIES} + ) + diff --git a/external_imported/vcpkg/ports/openmvg/portfile.cmake b/external_imported/vcpkg/ports/openmvg/portfile.cmake index aacf749be..a5de94bff 100644 --- a/external_imported/vcpkg/ports/openmvg/portfile.cmake +++ b/external_imported/vcpkg/ports/openmvg/portfile.cmake @@ -15,6 +15,7 @@ vcpkg_from_github( PATCHES build_fixes.patch 0001-eigen_3.4.0.patch + 0002-eigen-3.4.patch ) set(OpenMVG_USE_OPENMP OFF) @@ -74,7 +75,9 @@ vcpkg_cmake_config_fixup(CONFIG_PATH share/openMVG/cmake) if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/openMVG-targets.cmake" "${CURRENT_PACKAGES_DIR}/debug/lib/openMVG-targets-debug.cmake") endif() +file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/openMVG-targets.cmake" "${CURRENT_PACKAGES_DIR}/lib/openMVG-targets-release.cmake") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/openMVG/image/image_test" "${CURRENT_PACKAGES_DIR}/include/openMVG/exif/image_data" diff --git a/external_imported/vcpkg/ports/openmvg/vcpkg.json b/external_imported/vcpkg/ports/openmvg/vcpkg.json index 28732cc07..80a83a7d3 100644 --- a/external_imported/vcpkg/ports/openmvg/vcpkg.json +++ b/external_imported/vcpkg/ports/openmvg/vcpkg.json @@ -1,7 +1,9 @@ { "name": "openmvg", "version": "2.0", + "port-version": 3, "description": "open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion.", + "license": "MPL-2.0-no-copyleft-exception", "dependencies": [ "cereal", { diff --git a/external_imported/vcpkg/ports/openssl/portfile.cmake b/external_imported/vcpkg/ports/openssl/portfile.cmake index 12142f837..4a51777ab 100644 --- a/external_imported/vcpkg/ports/openssl/portfile.cmake +++ b/external_imported/vcpkg/ports/openssl/portfile.cmake @@ -1,13 +1,23 @@ -if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openssl/ssl.h") +if(EXISTS "${CURRENT_INSTALLED_DIR}/share/libressl/copyright" + OR EXISTS "${CURRENT_INSTALLED_DIR}/share/boringssl/copyright") message(FATAL_ERROR "Can't build openssl if libressl/boringssl is installed. Please remove libressl/boringssl, and try install openssl again if you need it.") endif() -set(OPENSSL_VERSION 1.1.1m) +if (VCPKG_TARGET_IS_LINUX) + message(WARNING +[[openssl currently requires the following library from the system package manager: + linux-headers +It can be installed on alpine systems via apk add linux-headers.]] + ) +endif() + +set(OPENSSL_VERSION 3.0.2) + vcpkg_download_distfile( ARCHIVE - URLS "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" "https://www.openssl.org/source/old/1.1.1/openssl-${OPENSSL_VERSION}.tar.gz" + URLS "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" FILENAME "openssl-${OPENSSL_VERSION}.tar.gz" - SHA512 ba0ef99b321546c13385966e4a607734df38b96f6ed45c4c67063a5f8d1482986855279797a6920d9f86c2ec31ce3e104dcc62c37328caacdd78aec59aa66156 + SHA512 f986850d5be908b4d6b5fd7091bc4652d7378c9bccebfbc5becd7753843c04c1eb61a1749c432139d263dfac33df0b1f6c773664b485cad47542266823a4eb03 ) 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 7bf45e27b..c375f0f35 100644 --- a/external_imported/vcpkg/ports/openssl/unix/CMakeLists.txt +++ b/external_imported/vcpkg/ports/openssl/unix/CMakeLists.txt @@ -60,9 +60,10 @@ message("CMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG}") message("CMAKE_INCLUDE_SYSTEM_FLAG_C=${CMAKE_INCLUDE_SYSTEM_FLAG_C}") message("CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG=${CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG}") -set(CFLAGS "${CMAKE_C_FLAGS}") -if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - set(CFLAGS "-Wno-error=unused-command-line-argument ${CMAKE_C_FLAGS}") +string(TOUPPER "${CMAKE_BUILD_TYPE}" BUILD_TYPE) +set(CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${BUILD_TYPE}}") +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + set(CFLAGS "${CFLAGS} -Wno-error=unused-command-line-argument") endif() if(CMAKE_C_COMPILER_TARGET AND CMAKE_C_COMPILE_OPTIONS_TARGET) set(CFLAGS "${CFLAGS} ${CMAKE_C_COMPILE_OPTIONS_TARGET}${CMAKE_C_COMPILER_TARGET}") @@ -107,10 +108,11 @@ get_filename_component(MSYS_BIN_DIR "${MAKE}" DIRECTORY) if(BUILD_SHARED_LIBS) set(SHARED shared) - file(STRINGS "${BUILDDIR}/include/openssl/opensslv.h" SHLIB_VERSION - REGEX "^#[\t ]*define[\t ]+SHLIB_VERSION_NUMBER[\t ]+\".*\".*") - string(REGEX REPLACE "^.*SHLIB_VERSION_NUMBER[\t ]+\"([^\"]*)\".*$" "\\1" + file(STRINGS "${BUILDDIR}/VERSION.dat" SHLIB_VERSION + REGEX "^SHLIB_VERSION=.*") + string(REGEX REPLACE "^(SHLIB_VERSION=)(.*)$" "\\2" SHLIB_VERSION "${SHLIB_VERSION}") + if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "iOS") set(LIB_EXT dylib) set(LIB_EXTS ${SHLIB_VERSION}.${LIB_EXT}) diff --git a/external_imported/vcpkg/ports/openssl/unix/portfile.cmake b/external_imported/vcpkg/ports/openssl/unix/portfile.cmake index 14a7e6b4a..c1c2b0ecb 100644 --- a/external_imported/vcpkg/ports/openssl/unix/portfile.cmake +++ b/external_imported/vcpkg/ports/openssl/unix/portfile.cmake @@ -1,7 +1,3 @@ -if (NOT VCPKG_TARGET_IS_MINGW) - vcpkg_fail_port_install(MESSAGE "${PORT} is only for openssl on Unix-like systems" ON_TARGET "UWP" "Windows") -endif() - vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH MASTER_COPY_SOURCE_PATH ARCHIVE "${ARCHIVE}" @@ -10,8 +6,8 @@ vcpkg_extract_source_archive_ex( if(CMAKE_HOST_WIN32) vcpkg_acquire_msys(MSYS_ROOT PACKAGES make perl) - set(MAKE ${MSYS_ROOT}/usr/bin/make.exe) - set(PERL ${MSYS_ROOT}/usr/bin/perl.exe) + set(MAKE "${MSYS_ROOT}/usr/bin/make.exe") + set(PERL "${MSYS_ROOT}/usr/bin/perl.exe") else() find_program(MAKE make) if(NOT MAKE) @@ -20,7 +16,7 @@ else() endif() vcpkg_cmake_configure( - SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR} + SOURCE_PATH "${CMAKE_CURRENT_LIST_DIR}" OPTIONS -DSOURCE_PATH=${MASTER_COPY_SOURCE_PATH} -DPERL=${PERL} @@ -31,12 +27,12 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_fixup_pkgconfig() -file(GLOB HEADERS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/include/openssl/*.h) +file(GLOB HEADERS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/include/openssl/*.h") set(RESOLVED_HEADERS) foreach(HEADER ${HEADERS}) get_filename_component(X "${HEADER}" REALPATH) list(APPEND RESOLVED_HEADERS "${X}") endforeach() -file(INSTALL ${RESOLVED_HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include/openssl) -file(INSTALL ${MASTER_COPY_SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +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) diff --git a/external_imported/vcpkg/ports/openssl/uwp/EnableUWPSupport.patch b/external_imported/vcpkg/ports/openssl/uwp/EnableUWPSupport.patch deleted file mode 100644 index fe7837445..000000000 --- a/external_imported/vcpkg/ports/openssl/uwp/EnableUWPSupport.patch +++ /dev/null @@ -1,170 +0,0 @@ -diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf -index 3c4299d264..99fcb1f713 100644 ---- a/Configurations/10-main.conf -+++ b/Configurations/10-main.conf -@@ -1287,7 +1287,7 @@ my %targets = ( - }, - "VC-WIN64I" => { - inherit_from => [ "VC-WIN64-common", asm("ia64_asm"), -- sub { $disabled{shared} ? () : "ia64_uplink" } ], -+ sub { $disabled{uplink} ? () : "ia64_uplink" } ], - AS => "ias", - ASFLAGS => "-d debug", - asoutflag => "-o ", -@@ -1299,7 +1299,7 @@ my %targets = ( - }, - "VC-WIN64A" => { - inherit_from => [ "VC-WIN64-common", asm("x86_64_asm"), -- sub { $disabled{shared} ? () : "x86_64_uplink" } ], -+ sub { $disabled{uplink} ? () : "x86_64_uplink" } ], - AS => sub { vc_win64a_info()->{AS} }, - ASFLAGS => sub { vc_win64a_info()->{ASFLAGS} }, - asoutflag => sub { vc_win64a_info()->{asoutflag} }, -@@ -1312,7 +1312,7 @@ my %targets = ( - }, - "VC-WIN32" => { - inherit_from => [ "VC-noCE-common", asm("x86_asm"), -- sub { $disabled{shared} ? () : "uplink_common" } ], -+ sub { $disabled{uplink} ? () : "uplink_common" } ], - AS => sub { vc_win32_info()->{AS} }, - ASFLAGS => sub { vc_win32_info()->{ASFLAGS} }, - asoutflag => sub { vc_win32_info()->{asoutflag} }, -@@ -1374,7 +1374,7 @@ my %targets = ( - #### MinGW - "mingw" => { - inherit_from => [ "BASE_unix", asm("x86_asm"), -- sub { $disabled{shared} ? () : "x86_uplink" } ], -+ sub { $disabled{uplink} ? () : "x86_uplink" } ], - CC => "gcc", - CFLAGS => picker(default => "-Wall", - debug => "-g -O0", -diff --git a/Configurations/50-win-onecore.conf b/Configurations/50-win-onecore.conf -index d478f42b0f..e0fb70daca 100644 ---- a/Configurations/50-win-onecore.conf -+++ b/Configurations/50-win-onecore.conf -@@ -1,3 +1,4 @@ -+## -*- mode: perl; -*- - # Windows OneCore targets. - # - # OneCore is new API stability "contract" that transcends Desktop, IoT and -@@ -10,6 +11,25 @@ - # TODO: extend error handling to use ETW based eventing - # (Or rework whole error messaging) - -+my $UWP_info = {}; -+sub UWP_info { -+ unless (%$UWP_info) { -+ my $SDKver = `pwsh.exe -Command \"& {\$(Get-Item \\\"hklm:\\SOFTWARE\\WOW6432Node\\Microsoft\\Microsoft SDKs\\Windows\\\").GetValue(\\\"CurrentVersion\\\")}\"`; -+ $SDKver =~ s|\R$||; -+ my @SDKver_split = split(/\./, $SDKver); -+ # SDK version older than 10.0.17763 don't support our ASM builds -+ if ($SDKver_split[0] < 10 -+ || ($SDKver_split[0] == 10 -+ && $SDKver_split[1] == 0 -+ && $SDKver_split[2] < 17763)) { -+ $UWP_info->{disable} = [ 'asm' ]; -+ } else { -+ $UWP_info->{disable} = [ ]; -+ } -+ } -+ return $UWP_info; -+} -+ - my %targets = ( - "VC-WIN32-ONECORE" => { - inherit_from => [ "VC-WIN32" ], -@@ -61,4 +81,57 @@ my %targets = ( - ex_libs => "onecore.lib", - multilib => "-arm64", - }, -+ -+ # Universal Windows Platform (UWP) App Support -+ -+ # TODO -+ # -+ # The 'disable' attribute should have 'uplink'. -+ # however, these are checked in some 'inherit_from', which is processed -+ # very early, before the 'disable' attributes are seen. -+ # This is a problem that needs to be resolved in Configure first. -+ # -+ # But if you want to build library with Windows 10 Version 1809 SDK or -+ # earlier, the 'disable' attribute should also have 'asm'. -+ -+ "VC-WIN32-UWP" => { -+ inherit_from => [ "VC-WIN32-ONECORE" ], -+ lflags => add("/APPCONTAINER"), -+ defines => add("WINAPI_FAMILY=WINAPI_FAMILY_APP", -+ "_WIN32_WINNT=0x0A00"), -+ dso_scheme => "", -+ disable => sub { [ 'ui-console', 'stdio', 'async', 'uplink', -+ @{ UWP_info()->{disable} } ] }, -+ ex_libs => "WindowsApp.lib", -+ }, -+ "VC-WIN64A-UWP" => { -+ inherit_from => [ "VC-WIN64A-ONECORE" ], -+ lflags => add("/APPCONTAINER"), -+ defines => add("WINAPI_FAMILY=WINAPI_FAMILY_APP", -+ "_WIN32_WINNT=0x0A00"), -+ dso_scheme => "", -+ disable => sub { [ 'ui-console', 'stdio', 'async', 'uplink', -+ @{ UWP_info()->{disable} } ] }, -+ ex_libs => "WindowsApp.lib", -+ }, -+ "VC-WIN32-ARM-UWP" => { -+ inherit_from => [ "VC-WIN32-ARM" ], -+ lflags => add("/APPCONTAINER"), -+ defines => add("WINAPI_FAMILY=WINAPI_FAMILY_APP", -+ "_WIN32_WINNT=0x0A00"), -+ dso_scheme => "", -+ disable => sub { [ 'ui-console', 'stdio', 'async', 'uplink', -+ @{ UWP_info()->{disable} } ] }, -+ ex_libs => "WindowsApp.lib", -+ }, -+ "VC-WIN64-ARM-UWP" => { -+ inherit_from => [ "VC-WIN64-ARM" ], -+ lflags => add("/APPCONTAINER"), -+ defines => add("WINAPI_FAMILY=WINAPI_FAMILY_APP", -+ "_WIN32_WINNT=0x0A00"), -+ dso_scheme => "", -+ disable => sub { [ 'ui-console', 'stdio', 'async', 'uplink', -+ @{ UWP_info()->{disable} } ] }, -+ ex_libs => "WindowsApp.lib", -+ }, - ); -diff --git a/Configure b/Configure -index 5a699836f3..de45f1e299 100755 ---- a/Configure -+++ b/Configure -@@ -407,6 +408,7 @@ my @disablables = ( - "ubsan", - "ui-console", - "unit-test", -+ "uplink", - "whirlpool", - "weak-ssl-ciphers", - "zlib", -@@ -491,8 +493,8 @@ my @disable_cascades = ( - - # Without position independent code, there can be no shared libraries or DSOs - "pic" => [ "shared" ], -- "shared" => [ "dynamic-engine" ], -+ "shared" => [ "dynamic-engine", "uplink" ], - "dso" => [ "dynamic-engine" ], - "engine" => [ "afalgeng", "devcryptoeng" ], - - # no-autoalginit is only useful when building non-shared -diff --git a/INSTALL b/INSTALL -index 2119cbae9e..ee54e8c215 100644 ---- a/INSTALL -+++ b/INSTALL -@@ -560,6 +560,10 @@ - likely to complement configuration command line with - suitable compiler-specific option. - -+ no-uplink -+ Don't build support for UPLINK interface. -+ -+ - no- - Don't build support for negotiating the specified SSL/TLS - protocol (one of ssl, ssl3, tls, tls1, tls1_1, tls1_2, diff --git a/external_imported/vcpkg/ports/openssl/uwp/portfile.cmake b/external_imported/vcpkg/ports/openssl/uwp/portfile.cmake index d474abe03..628380631 100644 --- a/external_imported/vcpkg/ports/openssl/uwp/portfile.cmake +++ b/external_imported/vcpkg/ports/openssl/uwp/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(MESSAGE "${PORT} is only for Windows Universal Platform" ON_TARGET "Linux" "OSX") - vcpkg_find_acquire_program(JOM) get_filename_component(JOM_EXE_PATH ${JOM} DIRECTORY) vcpkg_add_to_path("${PERL_EXE_PATH}") @@ -12,8 +10,6 @@ endif() vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} - PATCHES - uwp/EnableUWPSupport.patch ) vcpkg_find_acquire_program(NASM) @@ -46,8 +42,7 @@ endif() set(OPENSSL_MAKEFILE "makefile") -file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) - +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") @@ -73,7 +68,7 @@ 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}" build_libs WORKING_DIRECTORY "${SOURCE_PATH_RELEASE}" @@ -162,4 +157,4 @@ file(WRITE "${CURRENT_PACKAGES_DIR}/include/openssl/rand.h" "${_contents}") vcpkg_copy_pdbs() -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/openssl/vcpkg-cmake-wrapper.cmake.in b/external_imported/vcpkg/ports/openssl/vcpkg-cmake-wrapper.cmake.in index 4d9957c86..ee16a896b 100644 --- a/external_imported/vcpkg/ports/openssl/vcpkg-cmake-wrapper.cmake.in +++ b/external_imported/vcpkg/ports/openssl/vcpkg-cmake-wrapper.cmake.in @@ -1,40 +1,51 @@ -set(OPENSSL_ROOT_DIR_BAK ${OPENSSL_ROOT_DIR}) -get_filename_component(OPENSSL_ROOT_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) -get_filename_component(OPENSSL_ROOT_DIR "${OPENSSL_ROOT_DIR}" PATH) -get_filename_component(OPENSSL_ROOT_DIR "${OPENSSL_ROOT_DIR}" PATH) +cmake_policy(PUSH) +cmake_policy(SET CMP0012 NEW) +cmake_policy(SET CMP0054 NEW) +cmake_policy(SET CMP0057 NEW) -if(CMAKE_HOST_WIN32) - file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" Z_VCPKG_PROGRAMFILES) - set(Z_VCPKG_PROGRAMFILESX86_NAME "PROGRAMFILES(x86)") - file(TO_CMAKE_PATH "$ENV{${Z_VCPKG_PROGRAMFILESX86_NAME}}" Z_VCPKG_PROGRAMFILESX86) - set(CMAKE_SYSTEM_IGNORE_PATH - "${Z_VCPKG_PROGRAMFILES}/OpenSSL" - "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win32" - "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win64" - "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win32/lib/VC" - "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win64/lib/VC" - "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win32/lib/VC/static" - "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win64/lib/VC/static" - "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL" - "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win32" - "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win64" - "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win32/lib/VC" - "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win64/lib/VC" - "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win32/lib/VC/static" - "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win64/lib/VC/static" - "C:/OpenSSL/" - "C:/OpenSSL-Win32/" - "C:/OpenSSL-Win64/" - "C:/OpenSSL-Win32/lib/VC" - "C:/OpenSSL-Win64/lib/VC" - "C:/OpenSSL-Win32/lib/VC/static" - "C:/OpenSSL-Win64/lib/VC/static" - ) +set(OPENSSL_VERSION_MAJOR 3) +set(OPENSSL_VERSION_MINOR 0) +set(OPENSSL_VERSION_FIX 2) + +if(OPENSSL_USE_STATIC_LIBS) + if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "dynamic") + message(WARNING "OPENSSL_USE_STATIC_LIBS is set, but vcpkg port openssl was built with dynamic linkage") + endif() + set(OPENSSL_USE_STATIC_LIBS_BAK "${OPENSSL_USE_STATIC_LIBS}") + set(OPENSSL_USE_STATIC_LIBS FALSE) +endif() + +if(DEFINED OPENSSL_ROOT_DIR) + set(OPENSSL_ROOT_DIR_BAK "${OPENSSL_ROOT_DIR}") +endif() +get_filename_component(OPENSSL_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY) +get_filename_component(OPENSSL_ROOT_DIR "${OPENSSL_ROOT_DIR}" DIRECTORY) +find_path(OPENSSL_INCLUDE_DIR NAMES openssl/ssl.h PATH "${OPENSSL_ROOT_DIR}/include" NO_DEFAULT_PATH) +if(MSVC) + find_library(LIB_EAY_DEBUG NAMES libcrypto PATHS "${OPENSSL_ROOT_DIR}/debug/lib" NO_DEFAULT_PATH) + find_library(LIB_EAY_RELEASE NAMES libcrypto PATHS "${OPENSSL_ROOT_DIR}/lib" NO_DEFAULT_PATH) + find_library(SSL_EAY_DEBUG NAMES libssl PATHS "${OPENSSL_ROOT_DIR}/debug/lib" NO_DEFAULT_PATH) + find_library(SSL_EAY_RELEASE NAMES libssl PATHS "${OPENSSL_ROOT_DIR}/lib" NO_DEFAULT_PATH) +elseif(WIN32) + find_library(LIB_EAY NAMES libcrypto crypto NAMES_PER_DIR) + find_library(SSL_EAY NAMES libssl ssl NAMES_PER_DIR) +else() + find_library(OPENSSL_CRYPTO_LIBRARY NAMES crypto) + find_library(OPENSSL_SSL_LIBRARY NAMES ssl) endif() _find_package(${ARGS}) -set(OPENSSL_ROOT_DIR ${OPENSSL_ROOT_DIR_BAK}) +unset(OPENSSL_ROOT_DIR) +if(DEFINED OPENSSL_ROOT_DIR_BAK) + set(OPENSSL_ROOT_DIR "${OPENSSL_ROOT_DIR_BAK}") + unset(OPENSSL_ROOT_DIR_BAK) +endif() + +if(DEFINED OPENSSL_USE_STATIC_LIBS_BAK) + set(OPENSSL_USE_STATIC_LIBS "${OPENSSL_USE_STATIC_LIBS_BAK}") + unset(OPENSSL_USE_STATIC_LIBS_BAK) +endif() if(OPENSSL_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") if(WIN32) @@ -46,8 +57,6 @@ if(OPENSSL_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") set_property(TARGET OpenSSL::SSL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "crypt32;ws2_32") endif() else() - cmake_policy(PUSH) - cmake_policy(SET CMP0057 NEW) find_library(OPENSSL_DL_LIBRARY NAMES dl) if(OPENSSL_DL_LIBRARY) list(APPEND OPENSSL_LIBRARIES "dl") @@ -68,6 +77,6 @@ if(OPENSSL_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") if(TARGET OpenSSL::SSL) set_property(TARGET OpenSSL::SSL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Threads::Threads") endif() - cmake_policy(POP) endif() endif() +cmake_policy(POP) diff --git a/external_imported/vcpkg/ports/openssl/vcpkg.json b/external_imported/vcpkg/ports/openssl/vcpkg.json index aef75528e..dfde151f1 100644 --- a/external_imported/vcpkg/ports/openssl/vcpkg.json +++ b/external_imported/vcpkg/ports/openssl/vcpkg.json @@ -1,8 +1,10 @@ { "name": "openssl", - "version-string": "1.1.1m", + "version": "3.0.2", + "port-version": 2, "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", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/openssl/windows/portfile.cmake b/external_imported/vcpkg/ports/openssl/windows/portfile.cmake index 4987e8107..5cd487300 100644 --- a/external_imported/vcpkg/ports/openssl/windows/portfile.cmake +++ b/external_imported/vcpkg/ports/openssl/windows/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(MESSAGE "${PORT} is only for Windows Desktop" ON_TARGET "UWP" "Linux" "OSX") - vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} @@ -16,7 +14,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(OPENSSL_SHARED shared) endif() -set(CONFIGURE_OPTIONS +set(CONFIGURE_OPTIONS enable-static-engine enable-capieng no-ssl2 @@ -78,13 +76,13 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") # 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) execute_process( - COMMAND ${JOM} -k -j $ENV{NUMBER_OF_PROCESSORS} -f ${OPENSSL_MAKEFILE} + COMMAND "${JOM}" -k -j "${VCPKG_CONCURRENCY}" -f "${OPENSSL_MAKEFILE}" 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 + 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 nmake -f ${OPENSSL_MAKEFILE} install_sw install_ssldirs + COMMAND "${JOM}" -j 1 -f "${OPENSSL_MAKEFILE}" install_sw install_ssldirs WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} LOGNAME build-${TARGET_TRIPLET}-rel-1) @@ -113,29 +111,42 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") message(STATUS "Configure ${TARGET_TRIPLET}-dbg done") message(STATUS "Build ${TARGET_TRIPLET}-dbg") - make_directory(${SOURCE_PATH_DEBUG}/inc32/openssl) + make_directory("${SOURCE_PATH_DEBUG}/inc32/openssl") execute_process( - COMMAND "${JOM}" -k -j ${VCPKG_CONCURRENCY} -f "${OPENSSL_MAKEFILE}" + COMMAND "${JOM}" -k -j "${VCPKG_CONCURRENCY}" -f "${OPENSSL_MAKEFILE}" 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 + 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 nmake -f "${OPENSSL_MAKEFILE}" install_sw install_ssldirs + COMMAND "${JOM}" -j 1 -f "${OPENSSL_MAKEFILE}" install_sw install_ssldirs WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} LOGNAME build-${TARGET_TRIPLET}-dbg-1) - message(STATUS "Build ${TARGET_TRIPLET}-dbg done") + 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") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/certs") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/private") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/engines-1_1") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/engines-3") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/certs") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/engines-1_1") +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") +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") + file(REMOVE "${CURRENT_PACKAGES_DIR}/ct_log_list.cnf" "${CURRENT_PACKAGES_DIR}/ct_log_list.cnf.dist" @@ -171,4 +182,4 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/openssl/rand.h" vcpkg_copy_pdbs() -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/opensubdiv/portfile.cmake b/external_imported/vcpkg/ports/opensubdiv/portfile.cmake index faa42c309..cb218ab17 100644 --- a/external_imported/vcpkg/ports/opensubdiv/portfile.cmake +++ b/external_imported/vcpkg/ports/opensubdiv/portfile.cmake @@ -2,8 +2,6 @@ if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_IOS) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) endif() -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PixarAnimationStudios/OpenSubdiv @@ -122,7 +120,7 @@ endif() # The header files are read only and can't remove when remove this port file(GLOB_RECURSE OSD_HDRS "${CURRENT_PACKAGES_DIR}/include/*.h") -file(CHMOD_RECURSE ${OSD_HDRS} +file(CHMOD_RECURSE ${OSD_HDRS} PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_WRITE diff --git a/external_imported/vcpkg/ports/opensubdiv/vcpkg.json b/external_imported/vcpkg/ports/opensubdiv/vcpkg.json index f535d51b7..a94a9ea34 100644 --- a/external_imported/vcpkg/ports/opensubdiv/vcpkg.json +++ b/external_imported/vcpkg/ports/opensubdiv/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opensubdiv", "version-semver": "3.4.3", - "port-version": 3, + "port-version": 4, "description": "An Open-Source subdivision surface library.", "homepage": "https://github.com/PixarAnimationStudios/OpenSubdiv", "supports": "!arm & !uwp", diff --git a/external_imported/vcpkg/ports/opentelemetry-cpp/portfile.cmake b/external_imported/vcpkg/ports/opentelemetry-cpp/portfile.cmake index ff17db6ae..aead2761e 100644 --- a/external_imported/vcpkg/ports/opentelemetry-cpp/portfile.cmake +++ b/external_imported/vcpkg/ports/opentelemetry-cpp/portfile.cmake @@ -11,8 +11,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO open-telemetry/opentelemetry-cpp - REF v1.0.1 - SHA512 ddaf5f52f5c100f385e09a6eb69f08fced2e890145939d35f969b05743733409e43f4747713259b68641511401c2c1e01a498b9b7a20fab0f52ee6f4b5d3c77c + REF v1.2.0 + SHA512 5491fc21074f86d3b4ad5e8f7b16168b736491952942b7821984c4564fcb26f73630d83fe74ee7878848240a1b511f893e079154f42013bfe3bf1fd03c114c6d HEAD_REF main ) diff --git a/external_imported/vcpkg/ports/opentelemetry-cpp/vcpkg.json b/external_imported/vcpkg/ports/opentelemetry-cpp/vcpkg.json index bbf828464..1eb422a22 100644 --- a/external_imported/vcpkg/ports/opentelemetry-cpp/vcpkg.json +++ b/external_imported/vcpkg/ports/opentelemetry-cpp/vcpkg.json @@ -1,13 +1,13 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", "name": "opentelemetry-cpp", - "version-semver": "1.0.1", - "port-version": 1, + "version-semver": "1.2.0", "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", diff --git a/external_imported/vcpkg/ports/opentracing/portfile.cmake b/external_imported/vcpkg/ports/opentracing/portfile.cmake index 61c1516cb..9a6312e8f 100644 --- a/external_imported/vcpkg/ports/opentracing/portfile.cmake +++ b/external_imported/vcpkg/ports/opentracing/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET uwp) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(LOCAL_OPTIONS -DBUILD_STATIC_LIBS=OFF diff --git a/external_imported/vcpkg/ports/opentracing/vcpkg.json b/external_imported/vcpkg/ports/opentracing/vcpkg.json index d61870038..8061bc3d9 100644 --- a/external_imported/vcpkg/ports/opentracing/vcpkg.json +++ b/external_imported/vcpkg/ports/opentracing/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opentracing", - "version-string": "1.6.0", - "port-version": 1, + "version": "1.6.0", + "port-version": 2, "description": "C++ implementation of the OpenTracing API", "homepage": "https://opentracing.io", "supports": "!uwp" diff --git a/external_imported/vcpkg/ports/openvdb/0003-fix-cmake.patch b/external_imported/vcpkg/ports/openvdb/0003-fix-cmake.patch index 4bd86e5cf..52839ae14 100644 --- a/external_imported/vcpkg/ports/openvdb/0003-fix-cmake.patch +++ b/external_imported/vcpkg/ports/openvdb/0003-fix-cmake.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2a879f2..e0d9ab5 100644 +index 8dfbc5e..0ba8887 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -356,13 +356,9 @@ endif() +@@ -373,13 +373,9 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") if(OPENVDB_INSTALL_CMAKE_MODULES) set(OPENVDB_CMAKE_MODULES @@ -17,10 +17,10 @@ index 2a879f2..e0d9ab5 100644 cmake/OpenVDBHoudiniSetup.cmake cmake/OpenVDBMayaSetup.cmake diff --git a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake -index 86eaf84..15fe31a 100644 +index 0dac1de..5014c6a 100644 --- a/cmake/FindOpenVDB.cmake +++ b/cmake/FindOpenVDB.cmake -@@ -462,7 +462,7 @@ endif() +@@ -485,7 +485,7 @@ endif() # Add standard dependencies @@ -29,7 +29,7 @@ index 86eaf84..15fe31a 100644 if(NOT OPENVDB_USE_STATIC_LIBS AND NOT Boost_USE_STATIC_LIBS) # @note Both of these must be set for Boost 1.70 (VFX2020) to link against -@@ -612,7 +612,7 @@ elseif(NOT OPENVDB_USE_STATIC_LIBS) +@@ -635,7 +635,7 @@ elseif(NOT OPENVDB_USE_STATIC_LIBS) endif() if(OpenVDB_USES_BLOSC) @@ -38,7 +38,7 @@ index 86eaf84..15fe31a 100644 endif() if(OpenVDB_USES_ZLIB) -@@ -626,7 +626,7 @@ endif() +@@ -649,7 +649,7 @@ endif() if(OpenVDB_USES_IMATH_HALF) find_package(Imath CONFIG) if (NOT TARGET Imath::Imath) @@ -47,7 +47,7 @@ index 86eaf84..15fe31a 100644 endif() if(WIN32) -@@ -675,7 +675,7 @@ set(_OPENVDB_HIDDEN_DEPENDENCIES) +@@ -698,7 +698,7 @@ set(_OPENVDB_HIDDEN_DEPENDENCIES) if(NOT OPENVDB_USE_STATIC_LIBS) if(OpenVDB_USES_BLOSC) @@ -57,7 +57,7 @@ index 86eaf84..15fe31a 100644 if(OpenVDB_USES_ZLIB) list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES ZLIB::ZLIB) diff --git a/openvdb/openvdb/CMakeLists.txt b/openvdb/openvdb/CMakeLists.txt -index 9b6ba83..08b6bb3 100644 +index 1d5b75f..f2da6f9 100644 --- a/openvdb/openvdb/CMakeLists.txt +++ b/openvdb/openvdb/CMakeLists.txt @@ -127,9 +127,9 @@ if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_BOOST_VERSION) @@ -81,23 +81,35 @@ index 9b6ba83..08b6bb3 100644 if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_ILMBASE_VERSION) if(${IlmBase_VERSION} VERSION_LESS FUTURE_MINIMUM_ILMBASE_VERSION) message(DEPRECATION "Support for IlmBase versions < ${FUTURE_MINIMUM_ILMBASE_VERSION} " -@@ -157,14 +157,7 @@ endif() +@@ -157,26 +157,7 @@ endif() if(USE_BLOSC) # Find Blosc libraries - find_package(Blosc ${MINIMUM_BLOSC_VERSION} REQUIRED) -- if(Blosc_FOUND AND Blosc_VERSION VERSION_GREATER MINIMUM_BLOSC_VERSION) -- message(WARNING "The version of Blosc located is greater than ${MINIMUM_BLOSC_VERSION}. " -- "There have been reported issues with using later versions of Blosc with OpenVDB. " -- "OpenVDB has been tested fully against Blosc ${MINIMUM_BLOSC_VERSION}, it is " -- "recommended that you use this version where possible." -- ) +- if(Blosc_VERSION) +- if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_BLOSC_VERSION) +- if(${Blosc_VERSION} VERSION_LESS FUTURE_MINIMUM_BLOSC_VERSION) +- message(DEPRECATION "Support for Blosc versions < ${FUTURE_MINIMUM_BLOSC_VERSION} " +- "is deprecated and will be removed.") +- endif() +- endif() +- # Print a warning if using of the blosc versions with regression issues +- # with Blosc 1.5.0 caches. +- if((Blosc_VERSION VERSION_GREATER_EQUAL 1.11.0 AND +- Blosc_VERSION VERSION_LESS 1.14.0) OR +- (Blosc_VERSION VERSION_GREATER_EQUAL 1.16.0 AND +- Blosc_VERSION VERSION_LESS 1.16.2)) +- message(WARNING "The following Blosc versions are incompatible with the " +- "recommended builds of OpenVDB: [1.11.0 -> 1.14.0) [1.16.0, 1.16.1]. " +- "Found Blosc version '${Blosc_VERSION}' which falls in this range. We " +- "strongly recommend using the new future minimum version '${FUTURE_MINIMUM_BLOSC_VERSION}'") +- endif() - endif() + find_package(blosc CONFIG REQUIRED) else() message(WARNING "Blosc support is disabled. It is strongly recommended to " "enable blosc for optimal builds of OpenVDB and to support compatible " -@@ -222,7 +215,7 @@ endif() +@@ -234,7 +215,7 @@ endif() # /usr/local if(USE_BLOSC) @@ -107,7 +119,7 @@ index 9b6ba83..08b6bb3 100644 if(USE_BLOSC OR USE_ZLIB) diff --git a/openvdb/openvdb/cmd/CMakeLists.txt b/openvdb/openvdb/cmd/CMakeLists.txt -index 4d96425..d2037e8 100644 +index c1d5649..c173566 100644 --- a/openvdb/openvdb/cmd/CMakeLists.txt +++ b/openvdb/openvdb/cmd/CMakeLists.txt @@ -46,7 +46,7 @@ if(CONCURRENT_MALLOC STREQUAL "Jemalloc") @@ -119,14 +131,22 @@ index 4d96425..d2037e8 100644 list(APPEND OPENVDB_BINARIES_DEPENDENT_LIBS TBB::tbbmalloc) endif() -@@ -83,8 +83,8 @@ endif() - if(OPENVDB_BUILD_VDB_RENDER) - find_package(Imath CONFIG) - if (NOT TARGET Imath::Imath) -- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half Iex IlmThread Imath) -- find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED COMPONENTS IlmImf) -+ find_package(IlmBase CONFIG REQUIRED) -+ find_package(OpenEXR CONFIG REQUIRED) - else() - find_package(OpenEXR CONFIG) +@@ -90,17 +90,13 @@ if(OPENVDB_BUILD_VDB_RENDER) + find_package(Imath CONFIG) + if (NOT TARGET Imath::Imath) + if(USE_EXR) +- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half Iex IlmThread Imath) +- else() +- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half) ++ find_package(IlmBase CONFIG REQUIRED) + endif() + endif() + endif() + + if(USE_EXR) + if (NOT TARGET Imath::Imath) +- find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED COMPONENTS IlmImf) +- else() + find_package(OpenEXR CONFIG REQUIRED) + endif() endif() diff --git a/external_imported/vcpkg/ports/openvdb/fix-Target-notfound.patch b/external_imported/vcpkg/ports/openvdb/fix-Target-notfound.patch new file mode 100644 index 000000000..421ee5da2 --- /dev/null +++ b/external_imported/vcpkg/ports/openvdb/fix-Target-notfound.patch @@ -0,0 +1,19 @@ +diff --git a/openvdb/openvdb/cmd/CMakeLists.txt b/openvdb/openvdb/cmd/CMakeLists.txt +index c173566..53f8575 100644 +--- a/openvdb/openvdb/cmd/CMakeLists.txt ++++ b/openvdb/openvdb/cmd/CMakeLists.txt +@@ -137,9 +137,11 @@ if(OPENVDB_BUILD_VDB_RENDER) + + if(WIN32) + # @note OPENVDB_OPENEXR_STATICLIB is old functionality and should be removed +- get_target_property(ILMBASE_LIB_TYPE IlmBase::Half TYPE) +- if(OPENEXR_USE_STATIC_LIBS OR (${ILMBASE_LIB_TYPE} STREQUAL STATIC_LIBRARY)) +- target_compile_definitions(vdb_render PUBLIC -DOPENVDB_OPENEXR_STATICLIB) ++ if(USE_IMATH_HALF) ++ get_target_property(ILMBASE_LIB_TYPE IlmBase::Half TYPE) ++ if(OPENEXR_USE_STATIC_LIBS OR (${ILMBASE_LIB_TYPE} STREQUAL STATIC_LIBRARY)) ++ target_compile_definitions(vdb_render PUBLIC -DOPENVDB_OPENEXR_STATICLIB) ++ endif() + endif() + endif() + diff --git a/external_imported/vcpkg/ports/openvdb/portfile.cmake b/external_imported/vcpkg/ports/openvdb/portfile.cmake index b5a3e7779..6016632fa 100644 --- a/external_imported/vcpkg/ports/openvdb/portfile.cmake +++ b/external_imported/vcpkg/ports/openvdb/portfile.cmake @@ -1,10 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AcademySoftwareFoundation/openvdb - REF 89873d2bd29870cc9f176ed12b3f3a930ca38d1a # v8.2.0 - SHA512 d72a0eec6b7ce8e25fbe3100d4a291c35d7c2448f23131aaa9f247210f26e965198ef2991d9cf789afc754cbcddaace7a27ab62a2609a19a896034859c518699 + REF 0ed0f19ea4fbb0d8bf64d3dca07abab3c7429803 # v9.0.0 + SHA512 f033f2d5801327ab8aeffb12d1a74ff880e477a1f00da3b03a3087262a3e72ef77c13e05fe8e3c94a26721804230c0272d9ca069af997c36c992f3e2f3d962f2 PATCHES 0003-fix-cmake.patch + fix-Target-notfound.patch ) file(REMOVE "${SOURCE_PATH}/cmake/FindTBB.cmake") diff --git a/external_imported/vcpkg/ports/openvdb/vcpkg.json b/external_imported/vcpkg/ports/openvdb/vcpkg.json index 669107898..7acb002f7 100644 --- a/external_imported/vcpkg/ports/openvdb/vcpkg.json +++ b/external_imported/vcpkg/ports/openvdb/vcpkg.json @@ -1,8 +1,9 @@ { "name": "openvdb", - "version": "8.2.0", + "version": "9.0.0", "description": "Sparse volume data structure and tools", "homepage": "https://github.com/dreamworksanimation/openvdb", + "license": "MPL-2.0", "dependencies": [ "blosc", "boost-any", diff --git a/external_imported/vcpkg/ports/openvr/portfile.cmake b/external_imported/vcpkg/ports/openvr/portfile.cmake index 9b4b3d650..1aef03e9c 100644 --- a/external_imported/vcpkg/ports/openvr/portfile.cmake +++ b/external_imported/vcpkg/ports/openvr/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp" "osx") vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( diff --git a/external_imported/vcpkg/ports/openvr/vcpkg.json b/external_imported/vcpkg/ports/openvr/vcpkg.json index 3a3b00bab..3662ad5a0 100644 --- a/external_imported/vcpkg/ports/openvr/vcpkg.json +++ b/external_imported/vcpkg/ports/openvr/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openvr", - "version-string": "1.16.8", - "port-version": 1, + "version": "1.16.8", + "port-version": 2, "description": "an API and runtime that allows access to VR hardware from multiple vendors without requiring that applications have specific knowledge of the hardware they are targeting.", "homepage": "https://github.com/ValveSoftware/openvr", "supports": "!(arm | uwp | osx | android)" diff --git a/external_imported/vcpkg/ports/openxr-loader/fix-jinja2.patch b/external_imported/vcpkg/ports/openxr-loader/fix-jinja2.patch new file mode 100644 index 000000000..5d77cb4e4 --- /dev/null +++ b/external_imported/vcpkg/ports/openxr-loader/fix-jinja2.patch @@ -0,0 +1,23 @@ +From d80c7dc3f4810fc49e4444590d39ef71e8a9b01c Mon Sep 17 00:00:00 2001 +From: Adam Johnson +Date: Sat, 19 Feb 2022 19:42:31 -0500 +Subject: [PATCH] Fix bad import in jinja2 + +--- + external/python/jinja2/utils.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/external/python/jinja2/utils.py b/external/python/jinja2/utils.py +index db9c5d06..f198e3ef 100644 +--- a/external/python/jinja2/utils.py ++++ b/external/python/jinja2/utils.py +@@ -639,4 +639,8 @@ def __repr__(self): + + + # Imported here because that's where it was in the past +-from markupsafe import Markup, escape, soft_unicode ++from markupsafe import Markup, escape ++try: ++ from markupsafe import soft_unicode ++except ImportError: ++ from markupsafe import soft_str as soft_unicode diff --git a/external_imported/vcpkg/ports/openxr-loader/portfile.cmake b/external_imported/vcpkg/ports/openxr-loader/portfile.cmake index 4333e5cc4..04a518602 100644 --- a/external_imported/vcpkg/ports/openxr-loader/portfile.cmake +++ b/external_imported/vcpkg/ports/openxr-loader/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/OpenXR-SDK - REF release-1.0.20 - SHA512 26629edd9dcd17bae8d1089bfeb479914f3c7f7cd595345fad3e4be18d8dc7e079fd2ac89906199acc61ae5ce14c15ea66bcd0dfb44411788ab1ee0468c91192 + REF release-1.0.22 + SHA512 fe3c393c2d11981b42355acd8dbc337727120bcd0ff595abac1975c4ce5f68bb74a9a1b4c959e64e9a847ae5d504100d31979ffd7d9702c55b2dbd889de17d3e HEAD_REF master PATCHES fix-openxr-sdk-jsoncpp.patch @@ -12,18 +12,19 @@ vcpkg_from_github( vcpkg_from_github( OUT_SOURCE_PATH SDK_SOURCE_PATH REPO KhronosGroup/OpenXR-SDK-Source - REF release-1.0.20 - SHA512 1f989b76c76cdece3c47b758a1c77a78a4bc91cb01504cc033a543da6bc85b18a4e981b35a2875cab454660fbb2443ea4d09e98079aae6e6253f768428012a20 + REF release-1.0.22 + SHA512 92802d57a45ca1d697d3cea1b3f5619af4ba36156cb28c2c39b2295a74ebc45907caf371c916c54ec3be44a2f3ae447ffc1cd62f54b7b24f7a081408328c7651 HEAD_REF master PATCHES fix-openxr-sdk-jsoncpp.patch + fix-jinja2.patch ) vcpkg_from_github( OUT_SOURCE_PATH HPP_SOURCE_PATH REPO KhronosGroup/OpenXR-hpp - REF 6fcea9e472622c9c7f4df0b5f0bfe7ff5d8553f7 - SHA512 04d1f9db6fd0a01cdf3274089ab17bf17974ff799b4690561c16067e83710e1422a2aefd070b26023ff832eb58e6a3365297a818c9546ea4c531328bd1fb2de4 + REF release-1.0.21 + SHA512 cda111f20392a64d5f4de6bd71f1fe7fe39d688bb2376c6b1841763459e32fd6d03b9552804b5ee464ba84cd4c05cfdaa1a6e8a8e5da3eae6b94c7797c65cb36 HEAD_REF master PATCHES 002-fix-hpp-gen.patch @@ -68,9 +69,9 @@ foreach(HEADER ${HEADER_LIST}) endforeach() if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_cmake_config_fixup(CONFIG_PATH cmake) -else(VCPKG_TARGET_IS_WINDOWS) - vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/openxr) + vcpkg_cmake_config_fixup(PACKAGE_NAME OpenXR CONFIG_PATH cmake) +else() + vcpkg_cmake_config_fixup(PACKAGE_NAME OpenXR CONFIG_PATH lib/cmake/openxr) endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/external_imported/vcpkg/ports/openxr-loader/vcpkg.json b/external_imported/vcpkg/ports/openxr-loader/vcpkg.json index ab178db08..c2e6b9a40 100644 --- a/external_imported/vcpkg/ports/openxr-loader/vcpkg.json +++ b/external_imported/vcpkg/ports/openxr-loader/vcpkg.json @@ -1,10 +1,11 @@ { "name": "openxr-loader", - "version": "1.0.20", - "port-version": 1, + "version": "1.0.22", + "port-version": 3, "description": "A royalty-free, open standard that provides high-performance access to Augmented Reality (AR) and Virtual Reality (VR)—collectively known as XR—platforms and devices", "homepage": "https://github.com/KhronosGroup/OpenXR-SDK", - "supports": "!(arm | uwp)", + "license": "Apache-2.0", + "supports": "!uwp & !osx", "dependencies": [ "jsoncpp", { diff --git a/external_imported/vcpkg/ports/osgearth/blend2d-fix.patch b/external_imported/vcpkg/ports/osgearth/blend2d-fix.patch new file mode 100644 index 000000000..2b706573e --- /dev/null +++ b/external_imported/vcpkg/ports/osgearth/blend2d-fix.patch @@ -0,0 +1,15 @@ +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/portfile.cmake b/external_imported/vcpkg/ports/osgearth/portfile.cmake index 7d49d9ac3..edc87e6eb 100644 --- a/external_imported/vcpkg/ports/osgearth/portfile.cmake +++ b/external_imported/vcpkg/ports/osgearth/portfile.cmake @@ -21,6 +21,7 @@ vcpkg_from_github( remove-tool-debug-suffix.patch fix-imgui.patch fix-gcc11-compilation.patch + blend2d-fix.patch ) # Upstream bug, see https://github.com/gwaldron/osgearth/issues/1002 diff --git a/external_imported/vcpkg/ports/osgearth/vcpkg.json b/external_imported/vcpkg/ports/osgearth/vcpkg.json index 3d0ca8222..f9dcae84c 100644 --- a/external_imported/vcpkg/ports/osgearth/vcpkg.json +++ b/external_imported/vcpkg/ports/osgearth/vcpkg.json @@ -1,7 +1,7 @@ { "name": "osgearth", "version": "3.2", - "port-version": 3, + "port-version": 4, "description": "osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2021 Pelican Mapping.", "homepage": "https://github.com/gwaldron/osgearth", "supports": "!(x86 | wasm32)", diff --git a/external_imported/vcpkg/ports/otl/portfile.cmake b/external_imported/vcpkg/ports/otl/portfile.cmake index 54896c289..6809aa182 100644 --- a/external_imported/vcpkg/ports/otl/portfile.cmake +++ b/external_imported/vcpkg/ports/otl/portfile.cmake @@ -2,8 +2,8 @@ set(OTL_VERSION 40463) vcpkg_download_distfile(ARCHIVE URLS "http://otl.sourceforge.net/otlv4_${OTL_VERSION}.zip" - FILENAME "otlv4_${OTL_VERSION}-9485a0fe15a7.zip" - SHA512 9485a0fe15a737d55b0746a7e289b1a20e9435ed5c69bda7010705f8cde0a456163d83221d0103236a723837596613b578edc6d3d0007ce80a6cc76b4ed83888 + FILENAME "otlv4_${OTL_VERSION}-9485a0fe15a7-1.zip" + SHA512 46a50234009ca8e8dba3b0b781f4b496759f4c5697f045d816c7e4eddda61da63d03acf29b4d1f71ee035aba4c6daa72c9a546085a6d7b3c192353b854526392 ) vcpkg_extract_source_archive_ex( @@ -16,6 +16,16 @@ file(INSTALL "${SOURCE_PATH}/otlv${OTL_VERSION}.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}" RENAME otlv4.h) -file(INSTALL "${SOURCE_PATH}/otlv${OTL_VERSION}.h" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" - RENAME copyright) +file(READ "${SOURCE_PATH}/otlv${OTL_VERSION}.h" copyright_contents) +string(FIND "${copyright_contents}" "#ifndef OTL_H" start_of_source) +if(start_of_source EQUAL "-1") + message(FATAL_ERROR "Could not find start of source; the header file has changed in a way that we cannot get the license text.") +endif() +string(SUBSTRING "${copyright_contents}" 0 "${start_of_source}" copyright_contents) +string(REGEX REPLACE "// ?" "" copyright_contents "${copyright_contents}") +string(REGEX REPLACE "=+\n" "" copyright_contents "${copyright_contents}") + +file(WRITE + "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" + "${copyright_contents}" +) diff --git a/external_imported/vcpkg/ports/otl/vcpkg.json b/external_imported/vcpkg/ports/otl/vcpkg.json index e2a6b4697..0c0a12814 100644 --- a/external_imported/vcpkg/ports/otl/vcpkg.json +++ b/external_imported/vcpkg/ports/otl/vcpkg.json @@ -1,6 +1,8 @@ { "name": "otl", "version": "4.0.463", + "port-version": 1, "description": "Oracle, Odbc and DB2-CLI Template Library", - "homepage": "http://otl.sourceforge.net/" + "homepage": "http://otl.sourceforge.net/", + "license": "ISC" } diff --git a/external_imported/vcpkg/ports/pango/portfile.cmake b/external_imported/vcpkg/ports/pango/portfile.cmake index 6345bfdfc..3dd0e5b96 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 26aadb2508f9022cbfc72e73b558c6791f5d46d9 #v1.50.3 - SHA512 09c2578300d391b406c14dfbf7f28968d326c6861f7eb1a3a8d1d8c4700d6e9f74c8621a3f2d181abe1f695324c6e5fc3a55eb038ebbe53a53be086983e3a186 + REF 37a427018c92a2bc679ef104097e07a619609c9c #v1.50.6 + SHA512 4990022cae2130b4842d0d9d3161545c7214ac3dd445d85a7ec49b0a89e39319b404fecc66d4025965cd2407823c7476b937e6ee53e2e6763b35048db8ff387f HEAD_REF master # branch name ) diff --git a/external_imported/vcpkg/ports/pango/vcpkg.json b/external_imported/vcpkg/ports/pango/vcpkg.json index 498ca48fd..faf48574f 100644 --- a/external_imported/vcpkg/ports/pango/vcpkg.json +++ b/external_imported/vcpkg/ports/pango/vcpkg.json @@ -1,8 +1,9 @@ { "name": "pango", - "version": "1.50.3", + "version": "1.50.6", "description": "Text and font handling library.", "homepage": "https://ftp.gnome.org/pub/GNOME/sources/pango/", + "license": "LGPL-2.0-only", "dependencies": [ { "name": "cairo", diff --git a/external_imported/vcpkg/ports/pangomm/portfile.cmake b/external_imported/vcpkg/ports/pangomm/portfile.cmake index 356c8792d..3c2a0c32f 100644 --- a/external_imported/vcpkg/ports/pangomm/portfile.cmake +++ b/external_imported/vcpkg/ports/pangomm/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64") - 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" diff --git a/external_imported/vcpkg/ports/pangomm/vcpkg.json b/external_imported/vcpkg/ports/pangomm/vcpkg.json index 8de0afefc..b2a91c871 100644 --- a/external_imported/vcpkg/ports/pangomm/vcpkg.json +++ b/external_imported/vcpkg/ports/pangomm/vcpkg.json @@ -1,8 +1,10 @@ { "name": "pangomm", "version": "2.50.0", + "port-version": 1, "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", + "supports": "!arm", "dependencies": [ "cairo", "cairomm", diff --git a/external_imported/vcpkg/ports/parallel-hashmap/portfile.cmake b/external_imported/vcpkg/ports/parallel-hashmap/portfile.cmake index e8b81b15d..044226d8b 100644 --- a/external_imported/vcpkg/ports/parallel-hashmap/portfile.cmake +++ b/external_imported/vcpkg/ports/parallel-hashmap/portfile.cmake @@ -3,17 +3,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO greg7mdp/parallel-hashmap - REF 1.33 - SHA512 287f098229153d925632e68e3cdbabfae0ea0ab8864089e4c0553a166c6079ca82ed5246ba53afd2a2917abcf06f37bc18f098e721f5f3b8def4d2d8c1c8c745 + REF 1.34 + SHA512 3747422e80406aa77b009adee3c16325640dd1044560882fb881dac5ef4109f7d165d26ed7e64002c9285275f95962725ce20c918da12c0c113999c8ca3c7429 HEAD_REF master ) # Use greg7mdp/parallel-hashmap's own build process, skipping examples and tests -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Delete redundant directories file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/share/doc) diff --git a/external_imported/vcpkg/ports/parallel-hashmap/vcpkg.json b/external_imported/vcpkg/ports/parallel-hashmap/vcpkg.json index b1d7230cf..8393345a8 100644 --- a/external_imported/vcpkg/ports/parallel-hashmap/vcpkg.json +++ b/external_imported/vcpkg/ports/parallel-hashmap/vcpkg.json @@ -1,6 +1,12 @@ { "name": "parallel-hashmap", - "version-string": "1.33", - "port-version": 1, - "description": "A header-only, very fast and memory-friendly family of C++ hash maps." + "version": "1.34", + "description": "A header-only, very fast and memory-friendly family of C++ hash map & btree containers.", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/paraview/portfile.cmake b/external_imported/vcpkg/ports/paraview/portfile.cmake index 784efa6be..94ccea1a6 100644 --- a/external_imported/vcpkg/ports/paraview/portfile.cmake +++ b/external_imported/vcpkg/ports/paraview/portfile.cmake @@ -113,6 +113,9 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/paraview-${VERSION}) 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") + set(TOOLVER pv${VERSION}) set(TOOLS paraview pvbatch diff --git a/external_imported/vcpkg/ports/paraview/vcpkg.json b/external_imported/vcpkg/ports/paraview/vcpkg.json index 85570e754..c531933dc 100644 --- a/external_imported/vcpkg/ports/paraview/vcpkg.json +++ b/external_imported/vcpkg/ports/paraview/vcpkg.json @@ -1,6 +1,7 @@ { "name": "paraview", "version-semver": "5.9.1", + "port-version": 1, "description": "VTK-based Data Analysis and Visualization Application", "homepage": "https://www.paraview.org/", "dependencies": [ diff --git a/external_imported/vcpkg/ports/pbc/portfile.cmake b/external_imported/vcpkg/ports/pbc/portfile.cmake index 93b06c5db..235cb9f51 100644 --- a/external_imported/vcpkg/ports/pbc/portfile.cmake +++ b/external_imported/vcpkg/ports/pbc/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") - set(PBC_VERSION 0.5.14) if(NOT VCPKG_TARGET_IS_WINDOWS) diff --git a/external_imported/vcpkg/ports/pbc/vcpkg.json b/external_imported/vcpkg/ports/pbc/vcpkg.json index 3f9c2fc80..b7a040aa8 100644 --- a/external_imported/vcpkg/ports/pbc/vcpkg.json +++ b/external_imported/vcpkg/ports/pbc/vcpkg.json @@ -1,10 +1,10 @@ { "name": "pbc", - "version-string": "0.5.14", - "port-version": 5, + "version": "0.5.14", + "port-version": 6, "description": "Pairing-Based Crypto library provides low-level routines for pairing-based cryptosystems.", "homepage": "https://crypto.stanford.edu/pbc", - "supports": "!uwp", + "supports": "!uwp & !arm", "dependencies": [ { "name": "gmp", diff --git a/external_imported/vcpkg/ports/pcapplusplus/CMakeLists.txt b/external_imported/vcpkg/ports/pcapplusplus/CMakeLists.txt new file mode 100644 index 000000000..89ac75005 --- /dev/null +++ b/external_imported/vcpkg/ports/pcapplusplus/CMakeLists.txt @@ -0,0 +1,106 @@ +cmake_minimum_required(VERSION 3.12) + +project(pcapplusplus CXX) + +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") + +if (WIN32) + set(BUILD_SHARED_LIBS OFF) +endif() + +# dependencies +include(FindPackageHandleStandardArgs) +include(SelectLibraryConfigurations) +if (WIN32) + find_path(PCAP_INCLUDES NAMES pcap.h) + find_library(PCAP_LIBRARY_RELEASE NAMES wpcap PATH_SUFFIXES lib REQUIRED) + find_library(PCAP_LIBRARY_DEBUG NAMES wpcap PATH_SUFFIXES lib REQUIRED) + find_library(PACKET_LIBRARY_RELEASE NAMES Packet PATH_SUFFIXES lib REQUIRED) + find_library(PACKET_LIBRARY_DEBUG NAMES Packet PATH_SUFFIXES lib REQUIRED) + select_library_configurations(PCAP) + select_library_configurations(PACKET) + list(APPEND PCAP_LIBRARIES ${PACKET_LIBRARIES}) +else() + find_path(PCAP_INCLUDES NAMES pcap.h) + find_library(PCAP_LIBRARY_RELEASE NAMES pcap PATH_SUFFIXES lib REQUIRED) + find_library(PCAP_LIBRARY_DEBUG NAMES pcap PATH_SUFFIXES lib REQUIRED) + select_library_configurations(PCAP) +endif() + +find_package(Threads REQUIRED) + +# common++ +file(GLOB COMMONPP_HEADERS "${CMAKE_CURRENT_LIST_DIR}/Common++/header/*.h") +file(GLOB COMMONPP_SOURCES "${CMAKE_CURRENT_LIST_DIR}/Common++/src/*.cpp") + +add_library(commonpp ${COMMONPP_SOURCES}) + +target_include_directories(commonpp PUBLIC "${CMAKE_CURRENT_LIST_DIR}/Common++/header" + "${CMAKE_CURRENT_LIST_DIR}/3rdParty/EndianPortable/include") +set_target_properties(commonpp PROPERTIES OUTPUT_NAME Common++) +if (WIN32) + target_compile_definitions(commonpp PRIVATE WPCAP HAVE_REMOTE _CRT_SECURE_NO_WARNINGS) +elseif (UNIX AND NOT APPLE) + target_compile_definitions(commonpp PRIVATE LINUX) +elseif (APPLE) + target_compile_definitions(commonpp PRIVATE MAC_OS_X) +endif() + +# packet++ +file(GLOB PACKETPP_HEADERS "${CMAKE_CURRENT_LIST_DIR}/Packet++/header/*.h") +file(GLOB PACKETPP_SOURCES "${CMAKE_CURRENT_LIST_DIR}/Packet++/src/*.cpp") +list(APPEND PACKETPP_SOURCES "${CMAKE_CURRENT_LIST_DIR}/3rdParty/hash-library/md5.cpp") + +add_library(packetpp ${PACKETPP_SOURCES}) + +target_include_directories(packetpp PUBLIC "${CMAKE_CURRENT_LIST_DIR}/Packet++/header" + "${CMAKE_CURRENT_LIST_DIR}/3rdParty/hash-library") +target_link_libraries(packetpp PRIVATE commonpp) +set_target_properties(packetpp PROPERTIES OUTPUT_NAME Packet++) +if (WIN32) + target_compile_definitions(packetpp PRIVATE WPCAP HAVE_REMOTE _CRT_SECURE_NO_WARNINGS) +elseif (UNIX AND NOT APPLE) + target_compile_definitions(packetpp PRIVATE LINUX) +elseif (APPLE) + target_compile_definitions(packetpp PRIVATE MAC_OS_X) +endif() + +# pcap++ +file(GLOB PCAPPP_HEADERS "${CMAKE_CURRENT_LIST_DIR}/Pcap++/header/*.h") +file(GLOB PCAPPP_SOURCES "${CMAKE_CURRENT_LIST_DIR}/Pcap++/src/*.cpp") +file(GLOB LIGHTPCAPNG_SOURCES "${CMAKE_CURRENT_LIST_DIR}/3rdParty/LightPcapNg/LightPcapNg/src/*.cpp") + +add_library(pcappp ${PCAPPP_SOURCES}) + +target_include_directories(pcappp PUBLIC "${CMAKE_CURRENT_LIST_DIR}/Pcap++/header" "${PCAP_INCLUDES}" + "${CMAKE_CURRENT_LIST_DIR}/3rdParty/LightPcapNg/LightPcapNg/include") +target_link_libraries(pcappp PUBLIC commonpp packetpp ${PCAP_LIBRARIES} Threads::Threads) + +if (WIN32) + target_link_libraries(pcappp PUBLIC ws2_32 iphlpapi) +elseif (APPLE) + find_library(COREFOUNDATION_LIBRARY CoreFoundation) + find_library(SYSTEMCONFIGURATION_LIBRARY SystemConfiguration) + target_link_libraries(pcappp PUBLIC ${COREFOUNDATION_LIBRARY} ${SYSTEMCONFIGURATION_LIBRARY}) +endif() + +if (WIN32) + target_compile_definitions(pcappp PRIVATE WPCAP HAVE_REMOTE HAVE_STRUCT_TIMESPEC _CRT_SECURE_NO_WARNINGS) +elseif (UNIX AND NOT APPLE) + target_compile_definitions(pcappp PRIVATE LINUX) +elseif (APPLE) + target_compile_definitions(pcappp PRIVATE MAC_OS_X) +endif() + +set_target_properties(pcappp PROPERTIES OUTPUT_NAME Pcap++) + +# Install +install(FILES ${PCAPPP_HEADERS} ${COMMONPP_HEADERS} ${PACKETPP_HEADERS} DESTINATION include) +install(FILES "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION share/pcapplusplus) + +install( + TARGETS pcappp commonpp packetpp + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) diff --git a/external_imported/vcpkg/ports/pcapplusplus/portfile.cmake b/external_imported/vcpkg/ports/pcapplusplus/portfile.cmake index e280af3c3..1da5a37ab 100644 --- a/external_imported/vcpkg/ports/pcapplusplus/portfile.cmake +++ b/external_imported/vcpkg/ports/pcapplusplus/portfile.cmake @@ -1,4 +1,6 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -7,97 +9,15 @@ vcpkg_from_github( SHA512 ad10034950c0c3e6a4638e8b314c8983ce42609948d7d8d40ad0ff678820a2469807bd29aff77e657a150008602475b50cea84a0766ad87ea203985519cb38ac HEAD_REF master ) +file(COPY "${CURRENT_PORT_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -if(VCPKG_TARGET_IS_WINDOWS) - if(VCPKG_PLATFORM_TOOLSET STREQUAL "v140") - set(VS_VERSION "vs2015") - elseif(VCPKG_PLATFORM_TOOLSET STREQUAL "v141") - set(VS_VERSION "vs2017") - elseif(VCPKG_PLATFORM_TOOLSET STREQUAL "v142") - set(VS_VERSION "vs2019") - else() - message(FATAL_ERROR "Unsupported visual studio version") - endif() - - vcpkg_execute_required_process( - COMMAND configure-windows-visual-studio.bat -v ${VS_VERSION} -w . -p . - WORKING_DIRECTORY ${SOURCE_PATH} - ) - - vcpkg_install_msbuild( - SOURCE_PATH "${SOURCE_PATH}" - PROJECT_SUBPATH "mk/${VS_VERSION}/Common++.vcxproj" - PLATFORM ${TRIPLET_SYSTEM_ARCH} - INCLUDES_SUBPATH Dist/header - ALLOW_ROOT_INCLUDES - USE_VCPKG_INTEGRATION - ) - vcpkg_install_msbuild( - SOURCE_PATH "${SOURCE_PATH}" - PROJECT_SUBPATH "mk/${VS_VERSION}/Packet++.vcxproj" - PLATFORM ${TRIPLET_SYSTEM_ARCH} - INCLUDES_SUBPATH Dist/header - ALLOW_ROOT_INCLUDES - USE_VCPKG_INTEGRATION - ) - vcpkg_install_msbuild( - SOURCE_PATH "${SOURCE_PATH}" - PROJECT_SUBPATH "mk/${VS_VERSION}/Pcap++.vcxproj" - PLATFORM ${TRIPLET_SYSTEM_ARCH} - USE_VCPKG_INTEGRATION - INCLUDES_SUBPATH Dist/header - ALLOW_ROOT_INCLUDES - LICENSE_SUBPATH LICENSE - ) - - # Lib - file(GLOB LIB_FILES_RELEASE "${SOURCE_PATH}/Dist/**/Release/*") - file( - INSTALL ${LIB_FILES_RELEASE} - DESTINATION ${CURRENT_PACKAGES_DIR}/lib - ) - file(GLOB LIB_FILES_RELEASE "${SOURCE_PATH}/Dist/**/Debug/*") - file( - INSTALL ${LIB_FILES_RELEASE} - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib - ) - - file( - REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/tools" "${CURRENT_PACKAGES_DIR}/lib/LightPcapNg.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/LightPcapNg.lib" - ) -else() - if(VCPKG_TARGET_IS_LINUX) - set(CONFIG_CMD "./configure-linux.sh") - elseif(VCPKG_TARGET_IS_OSX) - set(CONFIG_CMD "./configure-mac_os_x.sh") - else() - message(FATAL_ERROR "Unsupported platform") - endif() - - vcpkg_execute_required_process( - COMMAND ${SOURCE_PATH}/${CONFIG_CMD} --libpcap-include-dir ${CURRENT_INSTALLED_DIR}/include - WORKING_DIRECTORY ${SOURCE_PATH} - ) - - vcpkg_execute_build_process( - COMMAND make libs - WORKING_DIRECTORY ${SOURCE_PATH} - ) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) - # Lib - file(GLOB LIB_FILES "${SOURCE_PATH}/Dist/*.a") - file( - INSTALL ${LIB_FILES} - DESTINATION ${CURRENT_PACKAGES_DIR}/lib - ) +vcpkg_cmake_install() +vcpkg_copy_pdbs() - # Include - file(GLOB HEADER_FILES "${SOURCE_PATH}/Dist/header/*.h") - file( - INSTALL ${HEADER_FILES} - DESTINATION ${CURRENT_PACKAGES_DIR}/include - ) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") - # Copyright - file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -endif() +file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") \ No newline at end of file diff --git a/external_imported/vcpkg/ports/pcapplusplus/vcpkg.json b/external_imported/vcpkg/ports/pcapplusplus/vcpkg.json index 0d37fff7e..b1df5ae7a 100644 --- a/external_imported/vcpkg/ports/pcapplusplus/vcpkg.json +++ b/external_imported/vcpkg/ports/pcapplusplus/vcpkg.json @@ -1,8 +1,10 @@ { "name": "pcapplusplus", - "version-string": "21.11", + "version": "21.11", + "port-version": 1, "description": "PcapPlusPlus is a multi-platform C++ library for capturing, parsing and crafting of network packets", "homepage": "https://github.com/seladb/PcapPlusPlus", + "license": null, "dependencies": [ { "name": "libpcap", @@ -12,6 +14,10 @@ "name": "pthreads", "platform": "windows" }, + { + "name": "vcpkg-cmake", + "host": true + }, { "name": "winpcap", "platform": "windows" diff --git a/external_imported/vcpkg/ports/pcl/Workaround-ICE-in-release.patch b/external_imported/vcpkg/ports/pcl/Workaround-ICE-in-release.patch new file mode 100644 index 000000000..36f66c8d6 --- /dev/null +++ b/external_imported/vcpkg/ports/pcl/Workaround-ICE-in-release.patch @@ -0,0 +1,20 @@ +diff --git a/surface/src/3rdparty/opennurbs/opennurbs_lookup.cpp b/surface/src/3rdparty/opennurbs/opennurbs_lookup.cpp +index 49e52b4..a9578bd 100644 +--- a/surface/src/3rdparty/opennurbs/opennurbs_lookup.cpp ++++ b/surface/src/3rdparty/opennurbs/opennurbs_lookup.cpp +@@ -666,6 +666,7 @@ std::size_t ON_SerialNumberMap::ActiveIdCount() const + return m_active_id_count; + } + ++#pragma optimize("", off) + struct ON_SerialNumberMap::SN_ELEMENT* ON_SerialNumberMap::FirstElement() const + { + struct SN_ELEMENT* e=0; +@@ -717,6 +718,7 @@ struct ON_SerialNumberMap::SN_ELEMENT* ON_SerialNumberMap::FirstElement() const + } + return e; + } ++#pragma optimize("", on) + + struct ON_SerialNumberMap::SN_ELEMENT* ON_SerialNumberMap::LastElement() const + { diff --git a/external_imported/vcpkg/ports/pcl/fix-error-C3052.patch b/external_imported/vcpkg/ports/pcl/fix-error-C3052.patch new file mode 100644 index 000000000..fce4fe6d7 --- /dev/null +++ b/external_imported/vcpkg/ports/pcl/fix-error-C3052.patch @@ -0,0 +1,20 @@ +diff --git a/common/src/fft/kiss_fft.c b/common/src/fft/kiss_fft.c +index a996887..37232bd 100644 +--- a/common/src/fft/kiss_fft.c ++++ b/common/src/fft/kiss_fft.c +@@ -260,11 +260,13 @@ void kf_work( + #if (defined _OPENMP && (_OPENMP <= 201307)) || (defined __GNUC__ && (__GNUC__ >= 6 && __GNUC__ < 9)) + #pragma omp parallel for \ + default(none) \ +- shared(f, factors, Fout, in_stride) ++ shared(f, factors, Fout, in_stride) \ ++ private(k) + #else + #pragma omp parallel for \ + default(none) \ +- shared(f, factors, Fout, fstride, in_stride, m, p, st) ++ shared(f, factors, Fout, fstride, in_stride, m, p, st) \ ++ private(k) + #endif + for (k=0;k -Date: Wed, 7 Jul 2021 16:11:12 -0400 -Subject: [PATCH] fix find qhull - ---- - CMakeLists.txt | 5 +---- - surface/CMakeLists.txt | 9 +++++++-- - 2 files changed, 8 insertions(+), 6 deletions(-) - diff --git a/CMakeLists.txt b/CMakeLists.txt -index a1d9bb58f..7cf86f74b 100644 +index a1d9bb5..73b1465 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -359,10 +359,7 @@ if(WITH_QHULL) +@@ -359,10 +359,8 @@ if(WITH_QHULL) if(NOT PCL_SHARED_LIBS OR ((WIN32 AND NOT MINGW) AND NOT PCL_BUILD_WITH_QHULL_DYNAMIC_LINKING_WIN32)) set(QHULL_USE_STATIC ON) endif() @@ -21,11 +11,12 @@ index a1d9bb58f..7cf86f74b 100644 - include_directories(SYSTEM ${QHULL_INCLUDE_DIRS}) - endif() + find_package(Qhull CONFIG REQUIRED) ++ set(HAVE_QHULL ON) endif() # Cuda diff --git a/surface/CMakeLists.txt b/surface/CMakeLists.txt -index d8a8566ea..1953c5566 100644 +index d8a8566..1953c55 100644 --- a/surface/CMakeLists.txt +++ b/surface/CMakeLists.txt @@ -12,7 +12,7 @@ if(NOT build) @@ -51,6 +42,3 @@ index d8a8566ea..1953c5566 100644 target_link_libraries("${LIB_NAME}" ${QHULL_LIBRARIES}) endif() --- -2.32.0.windows.1 - diff --git a/external_imported/vcpkg/ports/pcl/fix-namespace-cub.patch b/external_imported/vcpkg/ports/pcl/fix-namespace-cub.patch new file mode 100644 index 000000000..eb45eedec --- /dev/null +++ b/external_imported/vcpkg/ports/pcl/fix-namespace-cub.patch @@ -0,0 +1,130 @@ +diff --git a/gpu/features/src/centroid.cu b/gpu/features/src/centroid.cu +index 045fe6f..3e9ef8b 100644 +--- a/gpu/features/src/centroid.cu ++++ b/gpu/features/src/centroid.cu +@@ -44,7 +44,6 @@ + + #include "pcl/gpu/utils/device/vector_math.hpp" + +-using namespace thrust; + + namespace pcl + { +@@ -124,9 +123,10 @@ float3 pcl::device::getMaxDistance(const DeviceArray& cloud, const float + thrust::counting_iterator ce = cf + cloud.size(); + + thrust::tuple init(0.f, 0); +- thrust::maximum< tuple > op; ++ thrust::maximum> op; + +- tuple res = transform_reduce( ++ thrust::tuple res = ++ transform_reduce( + make_zip_iterator(make_tuple( src_beg, cf )), + make_zip_iterator(make_tuple( src_beg, ce )), + TupleDistCvt(pivot), init, op); +@@ -151,9 +151,9 @@ float3 pcl::device::getMaxDistance(const DeviceArray& cloud, const Indic + thrust::counting_iterator ce = cf + indices.size(); + + thrust::tuple init(0.f, 0); +- thrust::maximum< tuple > op; ++ thrust::maximum> op; + +- tuple res = transform_reduce( ++ thrust::tuple res = transform_reduce( + make_zip_iterator(make_tuple( make_permutation_iterator(src_beg, map_beg), cf )), + make_zip_iterator(make_tuple( make_permutation_iterator(src_beg, map_end), ce )), + TupleDistCvt(pivot), init, op); +diff --git a/gpu/octree/src/cuda/bfrs.cu b/gpu/octree/src/cuda/bfrs.cu +index d392f67..0635e1e 100644 +--- a/gpu/octree/src/cuda/bfrs.cu ++++ b/gpu/octree/src/cuda/bfrs.cu +@@ -43,7 +43,6 @@ + + #include "cuda.h" + +-using namespace thrust; + + namespace pcl + { +@@ -80,11 +79,11 @@ void pcl::device::bruteForceRadiusSearch(const OctreeImpl::PointCloud& cloud, co + + InSphere cond(query.x, query.y, query.z, radius); + +- device_ptr cloud_ptr((const PointType*)cloud.ptr()); +- device_ptr res_ptr(buffer.ptr()); ++ thrust::device_ptr cloud_ptr((const PointType*)cloud.ptr()); ++ thrust::device_ptr res_ptr(buffer.ptr()); + +- counting_iterator first(0); +- counting_iterator last = first + cloud.size(); ++ thrust::counting_iterator first(0); ++ thrust::counting_iterator last = first + cloud.size(); + + //main bottle neck is a kernel call overhead/allocs + //work time for 871k points ~0.8ms +diff --git a/gpu/octree/src/cuda/octree_builder.cu b/gpu/octree/src/cuda/octree_builder.cu +index dfd2093..faad764 100644 +--- a/gpu/octree/src/cuda/octree_builder.cu ++++ b/gpu/octree/src/cuda/octree_builder.cu +@@ -51,7 +51,6 @@ + #include + + using namespace pcl::gpu; +-using namespace thrust; + + namespace pcl + { +@@ -316,7 +315,7 @@ void pcl::device::OctreeImpl::build() + // 3 * sizeof(int) => +1 row + + const int transaction_size = 128 / sizeof(int); +- int cols = max(points_num, transaction_size * 4); ++ int cols = std::max(points_num, transaction_size * 4); + int rows = 10 + 1; // = 13 + + storage.create(rows, cols); +@@ -338,8 +337,8 @@ void pcl::device::OctreeImpl::build() + { + //ScopeTimer timer("reduce-morton-sort-permutations"); + +- device_ptr beg(points.ptr()); +- device_ptr end = beg + points.size(); ++ thrust::device_ptr beg(points.ptr()); ++ thrust::device_ptr end = beg + points.size(); + + { + PointType atmax, atmin; +@@ -355,15 +354,15 @@ void pcl::device::OctreeImpl::build() + octreeGlobal.maxp = make_float3(maxp.x, maxp.y, maxp.z); + } + +- device_ptr codes_beg(codes.ptr()); +- device_ptr codes_end = codes_beg + codes.size(); ++ thrust::device_ptr codes_beg(codes.ptr()); ++ thrust::device_ptr codes_end = codes_beg + codes.size(); + { + //ScopeTimer timer("morton"); + thrust::transform(beg, end, codes_beg, CalcMorton(octreeGlobal.minp, octreeGlobal.maxp)); + } + +- device_ptr indices_beg(indices.ptr()); +- device_ptr indices_end = indices_beg + indices.size(); ++ thrust::device_ptr indices_beg(indices.ptr()); ++ thrust::device_ptr indices_end = indices_beg + indices.size(); + { + //ScopeTimer timer("sort"); + thrust::sequence(indices_beg, indices_end); +@@ -378,9 +377,9 @@ void pcl::device::OctreeImpl::build() + } + + { +- device_ptr xs(points_sorted.ptr(0)); +- device_ptr ys(points_sorted.ptr(1)); +- device_ptr zs(points_sorted.ptr(2)); ++ thrust::device_ptr xs(points_sorted.ptr(0)); ++ thrust::device_ptr ys(points_sorted.ptr(1)); ++ thrust::device_ptr zs(points_sorted.ptr(2)); + //ScopeTimer timer("perm2"); + thrust::transform(make_permutation_iterator(beg, indices_beg), + make_permutation_iterator(end, indices_end), diff --git a/external_imported/vcpkg/ports/pcl/no-absolute.patch b/external_imported/vcpkg/ports/pcl/no-absolute.patch new file mode 100644 index 000000000..7c930e719 --- /dev/null +++ b/external_imported/vcpkg/ports/pcl/no-absolute.patch @@ -0,0 +1,21 @@ +diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in +index 4137ed1..167fde2 100644 +--- a/PCLConfig.cmake.in ++++ b/PCLConfig.cmake.in +@@ -230,7 +230,7 @@ macro(find_flann) + if(PCL_ALL_IN_ONE_INSTALLER) + set(FLANN_ROOT "${PCL_ROOT}/3rdParty/Flann") + elseif(NOT FLANN_ROOT) +- set(FLANN_ROOT "@FLANN_ROOT@") ++ set(FLANN_ROOT "${VCPKG_IMPORT_PREFIX}") + endif() + + set(FLANN_USE_STATIC @FLANN_USE_STATIC@) +@@ -402,7 +402,6 @@ elseif(EXISTS "${PCL_DIR}/include/pcl/pcl_config.h") + # pcl_message("PCL found into a build tree.") + set(PCL_CONF_INCLUDE_DIR "${PCL_DIR}/include") # for pcl_config.h + set(PCL_LIBRARY_DIRS "${PCL_DIR}/@LIB_INSTALL_DIR@") +- set(PCL_SOURCES_TREE "@CMAKE_SOURCE_DIR@") + else() + pcl_report_not_found("PCL can not be found on this machine") + endif() diff --git a/external_imported/vcpkg/ports/pcl/portfile.cmake b/external_imported/vcpkg/ports/pcl/portfile.cmake index cb11edf14..cee90574d 100644 --- a/external_imported/vcpkg/ports/pcl/portfile.cmake +++ b/external_imported/vcpkg/ports/pcl/portfile.cmake @@ -14,8 +14,12 @@ vcpkg_from_github( remove-broken-targets.patch fix-cmake_find_library_suffixes.patch fix-pkgconfig.patch # Remove this patch in the next update + fix-namespace-cub.patch # Remove this patch in the next update + fix-error-C3052.patch # Remove this patch in the next update fix-find-libusb.patch install-examples.patch + no-absolute.patch + Workaround-ICE-in-release.patch ) file(REMOVE "${SOURCE_PATH}/cmake/Modules/FindQhull.cmake" @@ -41,14 +45,11 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS cuda BUILD_GPU tools BUILD_tools opengl WITH_OPENGL - vtk WITH_VTK libusb WITH_LIBUSB + visualization WITH_VTK visualization BUILD_visualization examples BUILD_examples apps BUILD_apps - apps BUILD_apps_cloud_composer - apps BUILD_apps_modeler - apps BUILD_apps_point_cloud_editor # These 2 apps need openni1 #apps BUILD_apps_in_hand_scanner #apps BUILD_apps_3d_rec_framework diff --git a/external_imported/vcpkg/ports/pcl/vcpkg.json b/external_imported/vcpkg/ports/pcl/vcpkg.json index f50381e73..edb982fc8 100644 --- a/external_imported/vcpkg/ports/pcl/vcpkg.json +++ b/external_imported/vcpkg/ports/pcl/vcpkg.json @@ -1,9 +1,10 @@ { "name": "pcl", "version": "1.12.0", - "port-version": 2, + "port-version": 6, "description": "Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing.", "homepage": "https://github.com/PointCloudLibrary/pcl", + "license": "BSD-3-Clause", "supports": "!(arm64 & windows)", "dependencies": [ "boost-asio", diff --git a/external_imported/vcpkg/ports/pdal-c/cmake-project-include.cmake b/external_imported/vcpkg/ports/pdal-c/cmake-project-include.cmake new file mode 100644 index 000000000..39f3cca6d --- /dev/null +++ b/external_imported/vcpkg/ports/pdal-c/cmake-project-include.cmake @@ -0,0 +1,3 @@ +if(WIN32) + add_compile_definitions(NOMINMAX) +endif() diff --git a/external_imported/vcpkg/ports/pdal-c/fix-docs-version.patch b/external_imported/vcpkg/ports/pdal-c/fix-docs-version.patch deleted file mode 100644 index d44b50b61..000000000 --- a/external_imported/vcpkg/ports/pdal-c/fix-docs-version.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1fbc4a4..c8a325a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -23,7 +23,8 @@ set(CMAKE_RELWITHDEBINFO_POSTFIX "" CACHE STRING "CMake RelWithDebInfo suffix") - set(PDALC_ENABLE_CODE_COVERAGE ON CACHE BOOL "Enable code coverage calculation") - set(PDALC_GCC_PARAM_GGC_MIN_HEAPSIZE "131072" CACHE STRING "GCC garbage collection minimum heap size") - --include(ObtainProjectVersion) -+set(${PROJECT_NAME}_VERSION "1.8") -+set(BUILD_ID "vcpkg build") - include_directories("${CMAKE_SOURCE_DIR}/source") - - if(CMAKE_COMPILER_IS_GNUCXX) diff --git a/external_imported/vcpkg/ports/pdal-c/portfile.cmake b/external_imported/vcpkg/ports/pdal-c/portfile.cmake index 3e1b8c1a9..bb06b4d04 100644 --- a/external_imported/vcpkg/ports/pdal-c/portfile.cmake +++ b/external_imported/vcpkg/ports/pdal-c/portfile.cmake @@ -1,32 +1,28 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO PDAL/CAPI - REF 1.8 - SHA512 6a5f4cb3d36b419f3cd195028c3e6dc17abf3cdb7495aa3df638bc1f842ba98243c73e051e9cfcd3afe22787309cb871374b152ded92e6e06f404cd7b1ae50bf - HEAD_REF master - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/fix-docs-version.patch - ${CMAKE_CURRENT_LIST_DIR}/preserve-install-dir.patch - ${CMAKE_CURRENT_LIST_DIR}/remove-tests.patch + OUT_SOURCE_PATH SOURCE_PATH + REPO PDAL/CAPI + REF v2.1.0 + SHA512 07c671f83af93594d7792d770890205aad1a44803696f9567aa25f69a277fa5c3f4e9f9f5f0210ebd59f5cf75aff1f80ce532bd7bbd536a699724ceb6e3277fd + HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DPDALC_ENABLE_CODE_COVERAGE:BOOL=OFF +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake" + -DPDALC_ENABLE_CODE_COVERAGE:BOOL=OFF + -DPDALC_ENABLE_DOCS:BOOL=OFF + -DPDALC_ENABLE_TESTS:BOOL=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Git:BOOL=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() # Remove headers from debug -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Install copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.md - DESTINATION ${CURRENT_PACKAGES_DIR}/share/pdal-c - RENAME copyright -) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/pdal-c/preserve-install-dir.patch b/external_imported/vcpkg/ports/pdal-c/preserve-install-dir.patch deleted file mode 100644 index 87377ab2f..000000000 --- a/external_imported/vcpkg/ports/pdal-c/preserve-install-dir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1fbc4a4..075c86c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -13,8 +13,6 @@ set(CMAKE_CXX_STANDARD 11) - set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_CXX_EXTENSIONS OFF) - --# Install to the build directory --set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}" CACHE STRING "CMake install prefix" FORCE) - - # Use "d" suffix for debug builds - # Do not use a suffix for RelWithDebInfo diff --git a/external_imported/vcpkg/ports/pdal-c/remove-tests.patch b/external_imported/vcpkg/ports/pdal-c/remove-tests.patch deleted file mode 100644 index c50914e57..000000000 --- a/external_imported/vcpkg/ports/pdal-c/remove-tests.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1fbc4a4..e31e552 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -44,7 +44,3 @@ endif() - - add_subdirectory("source/pdal") - add_subdirectory("doc") -- --include(CTest) --add_subdirectory("tests/data") --add_subdirectory("tests/pdal") diff --git a/external_imported/vcpkg/ports/pdal-c/vcpkg.json b/external_imported/vcpkg/ports/pdal-c/vcpkg.json index c0629c990..f02d1afdf 100644 --- a/external_imported/vcpkg/ports/pdal-c/vcpkg.json +++ b/external_imported/vcpkg/ports/pdal-c/vcpkg.json @@ -1,9 +1,17 @@ { "name": "pdal-c", - "version-string": "1.8", - "port-version": 3, + "version-string": "2.1", "description": "C API for the Point Data Abstraction Library (PDAL)", + "homepage": "https://github.com/PDAL/CAPI#readme", + "supports": "!(windows & staticcrt)", "dependencies": [ - "pdal" + { + "name": "pdal", + "default-features": false + }, + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/pdal/0001-win32_compiler_options.cmake.patch b/external_imported/vcpkg/ports/pdal/0001-win32_compiler_options.cmake.patch deleted file mode 100644 index 8486cc1cd..000000000 --- a/external_imported/vcpkg/ports/pdal/0001-win32_compiler_options.cmake.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nuar a/cmake/win32_compiler_options.cmake b/cmake/win32_compiler_options.cmake ---- a/cmake/win32_compiler_options.cmake 2018-04-06 20:24:17.000000000 +0200 -+++ b/cmake/win32_compiler_options.cmake 2018-04-28 19:40:54.534593200 +0200 -@@ -67,10 +67,6 @@ - endif() - endif() - --set(CMAKE_INCLUDE_PATH "c:/OSGeo4W64/include;$ENV{CMAKE_INCLUDE_PATH}") --set(CMAKE_LIBRARY_PATH "c:/OSGeo4W64/lib;$ENV{CMAKE_LIBRARY_PATH}") --set(CMAKE_PREFIX_PATH "c:/OSGeo4W64/cmake;$ENV{CMAKE_LIBRARY_PATH}") -- - #ABELL (& gadomski) - WHY? - set(PDAL_PLATFORM_WIN32 1) - set(WINSOCK_LIBRARY ws2_32) 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 index f7ec12f6b..f739cdf7d 100644 --- a/external_imported/vcpkg/ports/pdal/0002-no-source-dir-writes.patch +++ b/external_imported/vcpkg/ports/pdal/0002-no-source-dir-writes.patch @@ -19,31 +19,3 @@ index dc146d1..9b82544 100644 ${PDAL_SRC_DIR}/compression/*.cpp) file(GLOB_RECURSE PRIVATE_SRCS ${PDAL_FILTERS_DIR}/private/*.cpp -diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt -index b02aa4a..d60b041 100644 ---- a/apps/CMakeLists.txt -+++ b/apps/CMakeLists.txt -@@ -66,9 +66,9 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pdal.pc - if(UNIX OR APPLE) - # Autoconf compatibility variables to use the same script source. - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pdal-config.in" -- "${CMAKE_CURRENT_SOURCE_DIR}/pdal-config" @ONLY) -+ "${CMAKE_CURRENT_BINARY_DIR}/pdal-config" @ONLY) - -- file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/pdal-config" -+ file(COPY "${CMAKE_CURRENT_BINARY_DIR}/pdal-config" - DESTINATION - "${PDAL_OUTPUT_BIN_DIR}/" - FILE_PERMISSIONS -@@ -85,9 +85,9 @@ if(UNIX OR APPLE) - elseif(WIN32) - # Autoconf compatibility variables to use the same script source. - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pdal-config-bat.in" -- "${CMAKE_CURRENT_SOURCE_DIR}/pdal-config.bat" @ONLY) -+ "${CMAKE_CURRENT_BINARY_DIR}/pdal-config.bat" @ONLY) - -- file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/pdal-config.bat" -+ file(COPY "${CMAKE_CURRENT_BINARY_DIR}/pdal-config.bat" - DESTINATION - "${PDAL_OUTPUT_BIN_DIR}/" - FILE_PERMISSIONS diff --git a/external_imported/vcpkg/ports/pdal/0003-fix-copy-vendor.patch b/external_imported/vcpkg/ports/pdal/0003-fix-copy-vendor.patch index 3aad7af32..092c4651f 100644 --- a/external_imported/vcpkg/ports/pdal/0003-fix-copy-vendor.patch +++ b/external_imported/vcpkg/ports/pdal/0003-fix-copy-vendor.patch @@ -1,59 +1,20 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 43e446a..c4c7d6f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -339,6 +339,30 @@ install(DIRECTORY ${PDAL_FILTERS_DIR} - install(FILES ${DIMENSION_OUTFILE} ${pdal_features_hpp} - DESTINATION include/pdal - ) -+# Install vendor headers -+install(DIRECTORY ${PDAL_VENDOR_ARBITER_DIR} -+ DESTINATION include/pdal/vendor -+ FILES_MATCHING PATTERN "*.hpp" -+ PATTERN "private" EXCLUDE -+) -+ -+install(DIRECTORY ${PDAL_VENDOR_JSONCPP_DIR} -+ DESTINATION include/pdal/vendor -+ FILES_MATCHING PATTERN "*.h" -+ PATTERN "private" EXCLUDE -+) -+ -+install(DIRECTORY ${PDAL_VENDOR_KAZHDAN_DIR} -+ DESTINATION include/pdal/vendor -+ FILES_MATCHING PATTERN "*.h" -+ PATTERN "private" EXCLUDE -+) -+ -+install(DIRECTORY ${PDAL_VENDOR_NANOFLANN_DIR} -+ DESTINATION include/pdal/vendor -+ FILES_MATCHING PATTERN "*.hpp" -+ PATTERN "private" EXCLUDE -+) - - # - # CPACK -@@ -348,7 +373,7 @@ add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source) - - export( - TARGETS -- ${PDAL_BASE_LIB_NAME} ${PDAL_UTIL_LIB_NAME} -+ ${PDAL_BASE_LIB_NAME} ${PDAL_ARBITER_LIB_NAME} ${PDAL_KAZHDAN_LIB_NAME} ${PDAL_UTIL_LIB_NAME} - FILE - "${PDAL_BINARY_DIR}/PDALTargets.cmake") - -diff --git a/cmake/directories.cmake b/cmake/directories.cmake -index f079ec7..8e366e8 100644 ---- a/cmake/directories.cmake -+++ b/cmake/directories.cmake -@@ -11,4 +11,7 @@ set(PDAL_KERNELS_DIR ${ROOT_DIR}/kernels) - set(PDAL_FILTERS_DIR ${ROOT_DIR}/filters) - set(PDAL_IO_DIR ${ROOT_DIR}/io) - set(PDAL_VENDOR_DIR ${ROOT_DIR}/vendor) -- -+set(PDAL_VENDOR_ARBITER_DIR ${PDAL_VENDOR_DIR}/arbiter) -+set(PDAL_VENDOR_JSONCPP_DIR ${PDAL_VENDOR_DIR}/jsoncpp) -+set(PDAL_VENDOR_KAZHDAN_DIR ${PDAL_VENDOR_DIR}/kazhdan) -+set(PDAL_VENDOR_NANOFLANN_DIR ${PDAL_VENDOR_DIR}/nanoflann) - -\ No newline at end of file +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/0004-fix-const-overloaded.patch b/external_imported/vcpkg/ports/pdal/0004-fix-const-overloaded.patch deleted file mode 100644 index 1f820aef3..000000000 --- a/external_imported/vcpkg/ports/pdal/0004-fix-const-overloaded.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/pdal/PointViewIter.hpp b/pdal/PointViewIter.hpp -index 0c387be..ccb0721 100644 ---- a/pdal/PointViewIter.hpp -+++ b/pdal/PointViewIter.hpp -@@ -139,7 +139,7 @@ public: - - bool operator==(const PointViewIter& i) - { return m_id == i.m_id; } -- bool operator!=(const PointViewIter& i) -+ bool operator!=(const PointViewIter& i) const - { return m_id != i.m_id; } - bool operator<=(const PointViewIter& i) - { return m_id <= i.m_id; } diff --git a/external_imported/vcpkg/ports/pdal/FindGEOS.cmake b/external_imported/vcpkg/ports/pdal/FindGEOS.cmake deleted file mode 100644 index 88d17b073..000000000 --- a/external_imported/vcpkg/ports/pdal/FindGEOS.cmake +++ /dev/null @@ -1,13 +0,0 @@ -find_path(GEOS_INCLUDE_DIR geos_c.h) - -find_library(GEOS_LIBRARY_DEBUG NAMES geos_cd) -find_library(GEOS_LIBRARY_RELEASE NAMES geos_c) - -include(SelectLibraryConfigurations) -select_library_configurations(GEOS) - -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS( - GEOS DEFAULT_MSG - GEOS_LIBRARY GEOS_INCLUDE_DIR -) diff --git a/external_imported/vcpkg/ports/pdal/fix-CPL_DLL.patch b/external_imported/vcpkg/ports/pdal/fix-CPL_DLL.patch deleted file mode 100644 index ef7c26472..000000000 --- a/external_imported/vcpkg/ports/pdal/fix-CPL_DLL.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/io/GeotiffSupport.cpp b/io/GeotiffSupport.cpp -index 7b75818..909992d 100644 ---- a/io/GeotiffSupport.cpp -+++ b/io/GeotiffSupport.cpp -@@ -43,8 +43,8 @@ PDAL_C_START - - // These functions are available from GDAL, but they - // aren't exported. --char CPL_DLL * GTIFGetOGISDefn(GTIF*, GTIFDefn*); --int CPL_DLL GTIFSetFromOGISDefn(GTIF*, const char*); -+char GTIF_DLL * GTIFGetOGISDefn(GTIF*, GTIFDefn*); -+int GTIF_DLL GTIFSetFromOGISDefn(GTIF*, const char*); - - PDAL_C_END - diff --git a/external_imported/vcpkg/ports/pdal/fix-dependency.patch b/external_imported/vcpkg/ports/pdal/fix-dependency.patch index 352eb1d43..8e7949464 100644 --- a/external_imported/vcpkg/ports/pdal/fix-dependency.patch +++ b/external_imported/vcpkg/ports/pdal/fix-dependency.patch @@ -1,231 +1,34 @@ -diff --git a/cmake/geos.cmake b/cmake/geos.cmake -index 90b79d9..5942ee5 100644 ---- a/cmake/geos.cmake -+++ b/cmake/geos.cmake -@@ -1,8 +1,5 @@ - # - # GEOS (required) - # --find_package(GEOS QUIET 3.3) --set_package_properties(GEOS PROPERTIES TYPE REQUIRED -- PURPOSE "Provides general purpose geometry support") -- --include_directories("${GEOS_INCLUDE_DIR}") -+find_package(geos CONFIG REQUIRED) -+set(GEOS_LIBRARY GEOS::geos GEOS::geos_c GEOS::geos_cxx_flags) -\ No newline at end of file -diff --git a/cmake/modules/FindPostgreSQL.cmake b/cmake/modules/FindPostgreSQL.cmake -index 8178418..31b54d6 100644 ---- a/cmake/modules/FindPostgreSQL.cmake -+++ b/cmake/modules/FindPostgreSQL.cmake -@@ -80,4 +80,11 @@ find_package_handle_standard_args(PostgreSQL - POSTGRESQL_LIBRARIES - POSTGRESQL_VERSION) - --mark_as_advanced(POSTGRESQL_INCLUDE_DIR POSTGRESQL_LIBRARIES) -+include (CMakeFindDependencyMacro) -+find_package(OpenSSL REQUIRED) -+set(POSTGRESQL_LIBRARIES ${POSTGRESQL_LIBRARIES} OpenSSL::SSL OpenSSL::Crypto) -+if (WIN32) -+ set(POSTGRESQL_LIBRARIES ${POSTGRESQL_LIBRARIES} Secur32) -+endif() -+ -+mark_as_advanced(POSTGRESQL_INCLUDE_DIR POSTGRESQL_LIBRARIES) -\ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 42cca1e..43b0ced 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -174,7 +174,6 @@ if (WITH_TESTS) - add_subdirectory(test) - endif() - add_subdirectory(dimbuilder) --add_subdirectory(vendor/pdalboost) - add_subdirectory(vendor/arbiter) - add_subdirectory(vendor/kazhdan) - if (NOT PDAL_HAVE_JSONCPP) -diff --git a/PDALConfig.cmake.in b/PDALConfig.cmake.in -index a03ef14..9d073e6 100644 ---- a/PDALConfig.cmake.in -+++ b/PDALConfig.cmake.in -@@ -15,6 +15,11 @@ foreach(_dir @PDAL_CONFIG_LIBRARY_DIRS@) - list(APPEND PDAL_LIBRARY_DIRS ${_foo}) - endforeach(_dir) - -+include(CMakeFindDependencyMacro) -+find_dependency(GeoTIFF) -+find_dependency(CURL) -+find_dependency(Boost COMPONENTS system filesystem) -+find_dependency(geos CONFIG) - include("${CMAKE_CURRENT_LIST_DIR}/PDALTargets.cmake") - - if (WIN32) -diff --git a/pdal/util/CMakeLists.txt b/pdal/util/CMakeLists.txt -index 19a2dd1..d498080 100644 ---- a/pdal/util/CMakeLists.txt -+++ b/pdal/util/CMakeLists.txt -@@ -8,6 +8,8 @@ endif() - - include(${PDAL_CMAKE_DIR}/execinfo.cmake) - -+find_package(Boost COMPONENTS system filesystem REQUIRED) -+ - set(PDAL_UTIL_SOURCES - "${PDAL_UTIL_DIR}/Bounds.cpp" - "${PDAL_UTIL_DIR}/Charbuf.cpp" -@@ -16,14 +18,14 @@ set(PDAL_UTIL_SOURCES - "${PDAL_UTIL_DIR}/Utils.cpp" - ) - --PDAL_ADD_FREE_LIBRARY(${PDAL_UTIL_LIB_NAME} SHARED ${PDAL_UTIL_SOURCES}) -+PDAL_ADD_FREE_LIBRARY(${PDAL_UTIL_LIB_NAME} ${PDAL_UTIL_SOURCES}) - target_link_libraries(${PDAL_UTIL_LIB_NAME} +@@ -266,7 +265,7 @@ target_include_directories(${PDAL_BASE_LIB_NAME} + target_link_libraries(${PDAL_BASE_LIB_NAME} PRIVATE - ${EXECINFO_LIBRARY} -- ${PDAL_BOOST_LIB_NAME} -+ PUBLIC -+ Boost::system -+ Boost::filesystem - ) --target_include_directories(${PDAL_UTIL_LIB_NAME} PRIVATE -- ${PDAL_VENDOR_DIR}/pdalboost) - - if (UNIX AND NOT APPLE) - target_link_libraries(${PDAL_UTIL_LIB_NAME} -diff --git a/pdal/util/FileUtils.cpp b/pdal/util/FileUtils.cpp -index 7679f22..b18b674 100644 ---- a/pdal/util/FileUtils.cpp -+++ b/pdal/util/FileUtils.cpp -@@ -124,19 +124,19 @@ std::ostream *createFile(std::string const& name, bool asBinary) - bool directoryExists(const std::string& dirname) - { - //ABELL - Seems we should be calling is_directory -- return pdalboost::filesystem::exists(dirname); -+ return boost::filesystem::exists(dirname); - } - - - bool createDirectory(const std::string& dirname) - { -- return pdalboost::filesystem::create_directory(dirname); -+ return boost::filesystem::create_directory(dirname); - } - - - void deleteDirectory(const std::string& dirname) - { -- pdalboost::filesystem::remove_all(dirname); -+ boost::filesystem::remove_all(dirname); - } - - -@@ -146,15 +146,15 @@ std::vector directoryList(const std::string& dir) - - try - { -- pdalboost::filesystem::directory_iterator it(dir); -- pdalboost::filesystem::directory_iterator end; -+ boost::filesystem::directory_iterator it(dir); -+ boost::filesystem::directory_iterator end; - while (it != end) - { - files.push_back(it->path().string()); - it++; - } - } -- catch (pdalboost::filesystem::filesystem_error) -+ catch (boost::filesystem::filesystem_error) - { - files.clear(); - } -@@ -194,13 +194,13 @@ void closeFile(std::istream* in) - - bool deleteFile(const std::string& file) - { -- return pdalboost::filesystem::remove(file); -+ return boost::filesystem::remove(file); - } - - - void renameFile(const std::string& dest, const std::string& src) - { -- pdalboost::filesystem::rename(src, dest); -+ boost::filesystem::rename(src, dest); - } - - -@@ -211,9 +211,9 @@ bool fileExists(const std::string& name) - - try - { -- return pdalboost::filesystem::exists(name); -+ return boost::filesystem::exists(name); - } -- catch (pdalboost::filesystem::filesystem_error) -+ catch (boost::filesystem::filesystem_error) - { - } - return false; -@@ -222,7 +222,7 @@ bool fileExists(const std::string& name) - - uintmax_t fileSize(const std::string& file) - { -- return pdalboost::filesystem::file_size(file); -+ return boost::filesystem::file_size(file); - } - - -@@ -243,7 +243,7 @@ std::string readFileIntoString(const std::string& filename) - - std::string getcwd() - { -- const pdalboost::filesystem::path p = pdalboost::filesystem::current_path(); -+ const boost::filesystem::path p = boost::filesystem::current_path(); - return addTrailingSlash(p.string()); - } - -@@ -271,7 +271,7 @@ std::string toAbsolutePath(const std::string& filename) - // otherwise, make it absolute (relative to current working dir) and return that - std::string toAbsolutePath(const std::string& filename) - { -- return pdalboost::filesystem::absolute(filename).string(); -+ return boost::filesystem::absolute(filename).string(); - } - - -@@ -283,7 +283,7 @@ std::string toAbsolutePath(const std::string& filename) - std::string toAbsolutePath(const std::string& filename, const std::string base) - { - const std::string newbase = toAbsolutePath(base); -- return pdalboost::filesystem::absolute(filename, newbase).string(); -+ return boost::filesystem::absolute(filename, newbase).string(); - } - - std::string getFilename(const std::string& path) -@@ -304,8 +304,8 @@ std::string getFilename(const std::string& path) - // Get the directory part of a filename. - std::string getDirectory(const std::string& path) - { -- const pdalboost::filesystem::path dir = -- pdalboost::filesystem::path(path).parent_path(); -+ const boost::filesystem::path dir = -+ boost::filesystem::path(path).parent_path(); - return addTrailingSlash(dir.string()); - } - -@@ -326,13 +326,13 @@ std::string stem(const std::string& path) - // Determine if the path represents a directory. - bool isDirectory(const std::string& path) - { -- return pdalboost::filesystem::is_directory(path); -+ return boost::filesystem::is_directory(path); - } - - // Determine if the path is an absolute path - bool isAbsolutePath(const std::string& path) - { -- return pdalboost::filesystem::path(path).is_absolute(); -+ return boost::filesystem::path(path).is_absolute(); - } - - + ${CMAKE_THREAD_LIBS_INIT} +- ${GDAL_LIBRARY} ++ ${GDAL_LIBRARIES} + ${GEOTIFF_LIBRARY} + ${LASZIP_LIBRARY} + ${LIBXML2_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 @@ + 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) ++ set(ZSTD_INCLUDE_DIRS "") ++ if(TARGET zstd::libzstd_static) ++ set(ZSTD_LIBRARIES zstd::libzstd_static) ++ set(ZSTD_STATIC_LIB zstd::libzstd_static) ++ else() ++ set(ZSTD_LIBRARIES zstd::libzstd_shared) ++ endif() + set_package_properties(ZSTD PROPERTIES TYPE + PURPOSE "General compression support") + if (ZSTD_FOUND) diff --git a/external_imported/vcpkg/ports/pdal/fix-find-library-suffix.patch b/external_imported/vcpkg/ports/pdal/fix-find-library-suffix.patch new file mode 100644 index 000000000..53eefb68d --- /dev/null +++ b/external_imported/vcpkg/ports/pdal/fix-find-library-suffix.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/libraries.cmake b/cmake/libraries.cmake +index dae98ea..edab055 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) +- set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_IMPORT_LIBRARY_SUFFIX}) +- endif() + endif() + mark_as_advanced(PDAL_BUILD_STATIC) diff --git a/external_imported/vcpkg/ports/pdal/fix-unix-compiler-options.patch b/external_imported/vcpkg/ports/pdal/fix-unix-compiler-options.patch new file mode 100644 index 000000000..79a379cb9 --- /dev/null +++ b/external_imported/vcpkg/ports/pdal/fix-unix-compiler-options.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 679b4e7..08965d9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -187,7 +187,7 @@ add_subdirectory(apps) + # so that users only need link libpdalcpp. + # + if (APPLE) +- set(PDAL_REEXPORT "-Wl,-reexport_library,$") ++ set(PDAL_REEXPORT "-Wl$-reexport_library$$") + # + # This allows the rpath reference for the reexported library (above) to + # be found. diff --git a/external_imported/vcpkg/ports/pdal/libpq.patch b/external_imported/vcpkg/ports/pdal/libpq.patch deleted file mode 100644 index 3aac2188c..000000000 --- a/external_imported/vcpkg/ports/pdal/libpq.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/cmake/postgres.cmake b/cmake/postgres.cmake -index 0dad71069..32fdae2f8 100644 ---- a/cmake/postgres.cmake -+++ b/cmake/postgres.cmake -@@ -7,3 +7,27 @@ find_package(PostgreSQL REQUIRED) - mark_as_advanced(CLEAR POSTGRESQL_INCLUDE_DIR) - mark_as_advanced(CLEAR POSTGRESQL_LIBRARIES) - include_directories(${POSTGRESQL_INCLUDE_DIR}) -+ -+include(SelectLibraryConfigurations) -+ -+find_library(PostgreSQLCommon_LIBRARY_DEBUG -+NAMES libpgcommond pgcommond pgcommon libpgcommon -+NAMES_PER_DIR -+) -+find_library(PostgreSQLCommon_LIBRARY_RELEASE -+NAMES pgcommon libpgcommon -+NAMES_PER_DIR -+) -+select_library_configurations(PostgreSQLCommon) -+ -+find_library(PostgreSQLPort_LIBRARY_DEBUG -+NAMES pgportd libpgportd pgport libpgport -+NAMES_PER_DIR -+) -+find_library(PostgreSQLPort_LIBRARY_RELEASE -+NAMES pgport libpgport -+NAMES_PER_DIR -+) -+select_library_configurations(PostgreSQLPort) -+ -+list(APPEND POSTGRESQL_LIBRARIES ${PostgreSQLPort_LIBRARIES} ${PostgreSQLCommon_LIBRARIES}) -\ No newline at end of file diff --git a/external_imported/vcpkg/ports/pdal/no-pkgconfig-requires.patch b/external_imported/vcpkg/ports/pdal/no-pkgconfig-requires.patch new file mode 100644 index 000000000..1f0841e2c --- /dev/null +++ b/external_imported/vcpkg/ports/pdal/no-pkgconfig-requires.patch @@ -0,0 +1,12 @@ +diff --git a/apps/pdal.pc.in b/apps/pdal.pc.in +index 6885221..cd2136c 100644 +--- a/apps/pdal.pc.in ++++ b/apps/pdal.pc.in +@@ -5,7 +5,6 @@ includedir=@CMAKE_INSTALL_PREFIX@/include + + Name: PDAL + Description: Point Data Abstraction Library +-Requires: @PKGCONFIG_LIBRARY_DEFINITIONS@ + Version: @PDAL_VERSION@ + Libs: -L${libdir} -l@PDAL_LIB_NAME@ + Cflags: -I${includedir}/pdal @PDAL_CONFIG_DEFINITIONS@ diff --git a/external_imported/vcpkg/ports/pdal/no-rpath.patch b/external_imported/vcpkg/ports/pdal/no-rpath.patch new file mode 100644 index 000000000..ab2c555c9 --- /dev/null +++ b/external_imported/vcpkg/ports/pdal/no-rpath.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/rpath.cmake b/cmake/rpath.cmake +index ba486b7..4323a77 100644 +--- a/cmake/rpath.cmake ++++ b/cmake/rpath.cmake +@@ -1,6 +1,7 @@ + # + # Set options and variable related to OSX rpath. + # ++return() + + # per http://www.cmake.org/Wiki/CMake_RPATH_handling + SET(CMAKE_SKIP_BUILD_RPATH FALSE) diff --git a/external_imported/vcpkg/ports/pdal/portfile.cmake b/external_imported/vcpkg/ports/pdal/portfile.cmake index 4fbabc1f0..dda2aead1 100644 --- a/external_imported/vcpkg/ports/pdal/portfile.cmake +++ b/external_imported/vcpkg/ports/pdal/portfile.cmake @@ -1,75 +1,86 @@ -set(PDAL_VERSION_STR "1.7.1") +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) -vcpkg_download_distfile(ARCHIVE - URLS "http://download.osgeo.org/pdal/PDAL-${PDAL_VERSION_STR}-src.tar.gz" - FILENAME "PDAL-${PDAL_VERSION_STR}-src.tar.gz" - SHA512 e3e63bb05930c1a28c4f46c7edfaa8e9ea20484f1888d845b660a29a76f1dd1daea3db30a98607be0c2eeb86930ec8bfd0965d5d7d84b07a4fe4cb4512da9b09 -) - -vcpkg_extract_source_archive_ex( - ARCHIVE ${ARCHIVE} +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH + REPO PDAL/PDAL + REF 2.3.0 + SHA512 898ea54c8c8e0a9bb8aed8d7f542da5a44b02c8656273783366d711b5b3f50b547438aa1cb4d41b490d187dae7bef20fe3b6c64dcb87c06e6f4cb91a8f79ac59 + HEAD_REF master PATCHES - 0001-win32_compiler_options.cmake.patch 0002-no-source-dir-writes.patch 0003-fix-copy-vendor.patch fix-dependency.patch - libpq.patch - fix-CPL_DLL.patch - 0004-fix-const-overloaded.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") -# Deploy custom CMake modules to enforce expected dependencies look-up -foreach(_module IN ITEMS FindGDAL FindGEOS FindGeoTIFF FindCurl) # Outdated; Supplied by CMake - file(REMOVE "${SOURCE_PATH}/cmake/modules/${_module}.cmake") -endforeach() -foreach(_module IN ITEMS FindGEOS) # Overwritten Modules. - file(REMOVE "${SOURCE_PATH}/cmake/modules/${_module}.cmake") - file(COPY ${CMAKE_CURRENT_LIST_DIR}/${_module}.cmake - DESTINATION ${SOURCE_PATH}/cmake/modules/ - ) +# Prefer pristine CMake find modules + wrappers and config files from vcpkg. +foreach(package IN ITEMS Curl GeoTIFF ICONV PostgreSQL ZSTD) + file(REMOVE "${SOURCE_PATH}/cmake/modules/Find${package}.cmake") endforeach() -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" VCPKG_BUILD_STATIC_LIBS) +unset(ENV{OSGEO4W_HOME}) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +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 +) +if(BUILD_PLUGIN_DRACO) + vcpkg_find_acquire_program(PKGCONFIG) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DPDAL_BUILD_STATIC:BOOL=${VCPKG_BUILD_STATIC_LIBS} + -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_install_cmake(ADD_BIN_TO_PATH) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/pdal/cmake) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/PDAL) +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -# Install PDAL executable -file(GLOB _pdal_apps ${CURRENT_PACKAGES_DIR}/bin/*.exe) -file(COPY ${_pdal_apps} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/pdal) -file(REMOVE ${_pdal_apps}) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +# Install and cleanup executables +file(GLOB pdal_unsupported + "${CURRENT_PACKAGES_DIR}/bin/*.bat" + "${CURRENT_PACKAGES_DIR}/bin/pdal-config" + "${CURRENT_PACKAGES_DIR}/debug/bin/*.bat" + "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe" + "${CURRENT_PACKAGES_DIR}/debug/bin/pdal-config" +) +file(REMOVE ${pdal_unsupported}) +vcpkg_copy_tools(TOOL_NAMES pdal AUTO_CLEAN) # Post-install clean-up file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/lib/pdal - ${CURRENT_PACKAGES_DIR}/debug/lib/pdal - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share + "${CURRENT_PACKAGES_DIR}/include/pdal/filters/private/csf" + "${CURRENT_PACKAGES_DIR}/include/pdal/filters/private/miniball" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin) -else() - file(GLOB _pdal_bats ${CURRENT_PACKAGES_DIR}/bin/*.bat) - file(REMOVE ${_pdal_bats}) - file(GLOB _pdal_bats ${CURRENT_PACKAGES_DIR}/debug/bin/*.bat) - file(REMOVE ${_pdal_bats}) - file(GLOB _pdal_apps ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) - file(REMOVE ${_pdal_apps}) -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/pdal/usage b/external_imported/vcpkg/ports/pdal/usage new file mode 100644 index 000000000..eaf378864 --- /dev/null +++ b/external_imported/vcpkg/ports/pdal/usage @@ -0,0 +1,9 @@ +The package pdal provides CMake variables: + + find_package(PDAL CONFIG REQUIRED) + target_include_directories(${PDAL_INCLUDE_DIRS}) + target_link_libraries(main PRIVATE ${PDAL_LIBRARIES}) + +If necessary, override the default plugin search path by setting the +environment variable PDAL_DRIVER_PATH to a list of directories that +pdal should search for plugins. diff --git a/external_imported/vcpkg/ports/pdal/use-vcpkg-boost.patch b/external_imported/vcpkg/ports/pdal/use-vcpkg-boost.patch new file mode 100644 index 000000000..d07bf6eea --- /dev/null +++ b/external_imported/vcpkg/ports/pdal/use-vcpkg-boost.patch @@ -0,0 +1,66 @@ +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 93d9cb70e..b4f2a01dd 100644 --- a/external_imported/vcpkg/ports/pdal/vcpkg.json +++ b/external_imported/vcpkg/ports/pdal/vcpkg.json @@ -1,15 +1,109 @@ { "name": "pdal", - "version": "1.7.1", - "port-version": 13, + "version": "2.3.0", "description": "PDAL - Point Data Abstraction Library is a library for manipulating point cloud data.", + "homepage": "https://pdal.io/", + "supports": "!(windows & staticcrt)", "dependencies": [ "boost-filesystem", "boost-system", - "gdal", - "geos", - "jsoncpp", + { + "name": "curl", + "default-features": false + }, + { + "name": "gdal", + "default-features": false + }, + "libgeotiff", + "libxml2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ "laszip", - "libgeotiff" - ] + "supported-plugins" + ], + "features": { + "draco": { + "description": "Build the Draco plugin", + "dependencies": [ + "draco" + ] + }, + "e57": { + "description": "Build the E57 plugin", + "dependencies": [ + "xerces-c" + ] + }, + "hdf": { + "description": "Build the HDF plugin", + "dependencies": [ + { + "name": "hdf5", + "default-features": false + } + ] + }, + "i3s": { + "description": "Build the SLPK/I3S plugins", + "dependencies": [ + "zlib" + ] + }, + "laszip": { + "description": "LASzip support", + "dependencies": [ + "laszip" + ] + }, + "liblzma": { + "description": "Support for compression/decompression with LZMA", + "dependencies": [ + "liblzma" + ] + }, + "pgpointcloud": { + "description": "Build the PgPointCloud plugin", + "dependencies": [ + "libpq" + ] + }, + "supported-plugins": { + "description": "Default set of plugins, dependent on platform", + "dependencies": [ + { + "name": "pdal", + "default-features": false, + "features": [ + "draco", + "e57", + "i3s" + ] + }, + { + "name": "pdal", + "default-features": false, + "features": [ + "hdf", + "pgpointcloud" + ], + "platform": "!uwp" + } + ] + }, + "zstd": { + "description": "Support for ZSTD compression/decompression", + "dependencies": [ + "zstd" + ] + } + } } diff --git a/external_imported/vcpkg/ports/pegtl/portfile.cmake b/external_imported/vcpkg/ports/pegtl/portfile.cmake index c6c99ee78..4183a1010 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.2 - SHA512 7ad055e38b362d6b90a49d5deb400948febfbcc30898e05548424bc758f38ffb3f69ca0db41e4480697f8916c90bdb3e48927a4db0caa7a20c8012b1a6d1fe08 - HEAD_REF master + REF 3.2.5 + SHA512 e531eaeef614d822e4bddbc6662fbe116cc1536fa308109f28ce5433607e6102f4e754a31094f9c349e4319914da6c83450dd2e8fa10dcfc3eee5a5dca547c14 + HEAD_REF main ) vcpkg_cmake_configure( @@ -22,4 +22,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH share/pegtl/cmake) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") # Handle copyright -file(RENAME "${CURRENT_PACKAGES_DIR}/share/pegtl/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/external_imported/vcpkg/ports/pegtl/vcpkg.json b/external_imported/vcpkg/ports/pegtl/vcpkg.json index 95a4f011a..b173e2ba8 100644 --- a/external_imported/vcpkg/ports/pegtl/vcpkg.json +++ b/external_imported/vcpkg/ports/pegtl/vcpkg.json @@ -1,8 +1,9 @@ { "name": "pegtl", - "version-semver": "3.2.2", + "version-semver": "3.2.5", "description": "The Parsing Expression Grammar Template Library (PEGTL) is a zero-dependency C++ header-only parser combinator library for creating parsers according to a Parsing Expression Grammar (PEG).", "homepage": "https://github.com/taocpp/PEGTL", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/pfring/portfile.cmake b/external_imported/vcpkg/ports/pfring/portfile.cmake index 967bdc5ee..9ef166735 100644 --- a/external_imported/vcpkg/ports/pfring/portfile.cmake +++ b/external_imported/vcpkg/ports/pfring/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux and Mac platforms" ON_TARGET "Windows") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ntop/PF_RING @@ -10,7 +8,7 @@ vcpkg_from_github( use-vcpkg-libpcap.patch makefile.patch ) - + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") file(COPY "${SOURCE_PATH}/" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") @@ -27,17 +25,17 @@ vcpkg_copy_pdbs() # Install manually because pfring cannot set prefix if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) set(PFRING_OBJ_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) - + if (VCPKG_BUILD_TYPE STREQUAL debug) file(GLOB_RECURSE PFRING_KO_FILES "${PFRING_OBJ_DIR}/*.ko") file(INSTALL ${PFRING_KO_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/share/${PORT}) - + file(INSTALL ${SOURCE_PATH}/userland/lib/pfring.h DESTINATION ${CURRENT_PACKAGES_DIR}/debug/include) endif() - + file(GLOB_RECURSE PFRING_LIBS "${PFRING_OBJ_DIR}/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") file(INSTALL ${PFRING_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(GLOB_RECURSE PFRING_DLLS "${PFRING_OBJ_DIR}/*${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") file(INSTALL ${PFRING_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) @@ -46,18 +44,18 @@ endif() if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release) set(PFRING_OBJ_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) - + file(GLOB_RECURSE PFRING_KO_FILES "${PFRING_OBJ_DIR}/*.ko") file(INSTALL ${PFRING_KO_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) - + file(GLOB_RECURSE PFRING_LIBS "${PFRING_OBJ_DIR}/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") file(INSTALL ${PFRING_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(GLOB_RECURSE PFRING_DLLS "${PFRING_OBJ_DIR}/*${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") file(INSTALL ${PFRING_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) endif() - + file(INSTALL ${SOURCE_PATH}/userland/lib/pfring.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) endif() diff --git a/external_imported/vcpkg/ports/pfring/vcpkg.json b/external_imported/vcpkg/ports/pfring/vcpkg.json index 9e78c638b..d0f6d9191 100644 --- a/external_imported/vcpkg/ports/pfring/vcpkg.json +++ b/external_imported/vcpkg/ports/pfring/vcpkg.json @@ -1,9 +1,10 @@ { "name": "pfring", - "version-string": "2019-10-17", - "port-version": 3, + "version-date": "2019-10-17", + "port-version": 4, "description": "PF_RING™ is a Linux kernel module and user-space framework that allows you to process packets at high-rates while providing you a consistent API for packet processing applications.", "homepage": "https://github.com/ntop/PF_RING", + "supports": "!windows", "dependencies": [ "libpcap" ] diff --git a/external_imported/vcpkg/ports/physx/portfile.cmake b/external_imported/vcpkg/ports/physx/portfile.cmake index 3b905cc01..7fe812dc2 100644 --- a/external_imported/vcpkg/ports/physx/portfile.cmake +++ b/external_imported/vcpkg/ports/physx/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET MINGW) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO NVIDIAGameWorks/PhysX diff --git a/external_imported/vcpkg/ports/physx/vcpkg.json b/external_imported/vcpkg/ports/physx/vcpkg.json index 1a93f3f51..fd3665a64 100644 --- a/external_imported/vcpkg/ports/physx/vcpkg.json +++ b/external_imported/vcpkg/ports/physx/vcpkg.json @@ -1,8 +1,10 @@ { "name": "physx", "version-semver": "4.1.2", + "port-version": 1, "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", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/piex/CMakeLists.txt b/external_imported/vcpkg/ports/piex/CMakeLists.txt index 35a881055..7b782a66d 100644 --- a/external_imported/vcpkg/ports/piex/CMakeLists.txt +++ b/external_imported/vcpkg/ports/piex/CMakeLists.txt @@ -17,6 +17,7 @@ add_library(image_type_recognition ) target_link_libraries(image_type_recognition binary_parse) +target_compile_features(image_type_recognition PUBLIC cxx_std_11) add_library(tiff_directory src/tiff_directory/tiff_directory.cc @@ -30,6 +31,7 @@ add_library(piex ) target_link_libraries(piex tiff_directory image_type_recognition binary_parse) +target_compile_features(piex PUBLIC cxx_std_11) install( TARGETS piex diff --git a/external_imported/vcpkg/ports/piex/portfile.cmake b/external_imported/vcpkg/ports/piex/portfile.cmake index 485210da0..44ff3fc7d 100644 --- a/external_imported/vcpkg/ports/piex/portfile.cmake +++ b/external_imported/vcpkg/ports/piex/portfile.cmake @@ -8,16 +8,15 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG - -DDISABLE_INSTALL_HEADERS=ON + -DDISABLE_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/piex RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/piex" RENAME copyright) diff --git a/external_imported/vcpkg/ports/piex/vcpkg.json b/external_imported/vcpkg/ports/piex/vcpkg.json index fdb727fb7..497b60aaa 100644 --- a/external_imported/vcpkg/ports/piex/vcpkg.json +++ b/external_imported/vcpkg/ports/piex/vcpkg.json @@ -1,7 +1,13 @@ { "name": "piex", - "version-string": "2019-07-11", - "port-version": 1, + "version-date": "2019-07-11", + "port-version": 2, "description": "The Preview Image Extractor (PIEX) is designed to find and extract the largest", - "homepage": "https://github.com/google/piex" + "homepage": "https://github.com/google/piex", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/pixel/001-prevent-examples.patch b/external_imported/vcpkg/ports/pixel/001-prevent-examples.patch new file mode 100644 index 000000000..ec958f867 --- /dev/null +++ b/external_imported/vcpkg/ports/pixel/001-prevent-examples.patch @@ -0,0 +1,38 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b910231..71f7ddf 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -34,6 +34,8 @@ else() + target_link_libraries(pixel PUBLIC SDL2::SDL2) + endif() + ++option(BUILD_EXAMPLES "Build examples" OFF) ++if(BUILD_EXAMPLES) + add_executable(image_swap examples/image_swap/src/image_swap.cpp) + target_link_libraries(image_swap PRIVATE pixel) + add_executable(randomdots examples/randomdots/src/randomdots.cpp) +@@ -50,7 +52,11 @@ add_executable(simple examples/simple/src/simple.cpp) + target_link_libraries(simple PRIVATE pixel) + add_executable(starfield examples/starfield/src/starfield.cpp) + target_link_libraries(starfield PRIVATE pixel) ++endif() + ++if(MSVC) ++ add_compile_definitions(_CRT_SECURE_NO_WARNINGS) ++endif() + + # Install Section + include(GNUInstallDirs) +@@ -87,12 +93,6 @@ install( + DESTINATION ${CMAKE_INSTALL_PREFIX} + ) + +-install( +- FILES +- ${PROJECT_SOURCE_DIR}/LICENSE +- DESTINATION ${CMAKE_INSTALL_DATADIR}/pixel/copyright +- ) +- + install( + FILES + ${PROJECT_BINARY_DIR}/pixelConfig.cmake diff --git a/external_imported/vcpkg/ports/pixel/portfile.cmake b/external_imported/vcpkg/ports/pixel/portfile.cmake index 0b63c66f7..1cac519bf 100644 --- a/external_imported/vcpkg/ports/pixel/portfile.cmake +++ b/external_imported/vcpkg/ports/pixel/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "Windows") - if(VCPKG_TARGET_IS_LINUX) 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") @@ -8,19 +6,24 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dascandy/pixel - REF v0.3 - SHA512 d7d622679195d0eb30c8ed411333711369b108e2171d1e4b0a93c7ae3bd1fb36a25fbe1f5771c858615c07ee139412e5353b8cb5489cb409dd94829253c18a7b + REF c4411f67746fdd811aa5f8c102ac340e9eaf4ec5 + SHA512 e4f704c076bb61220349524b0b1033a92c44128bb81e79dbd32ea2d1aa9d4abb0d6daab3617f69b59d1c1e50d750767153174fea015d8718804612f4d9f68ff6 HEAD_REF master + PATCHES + 001-prevent-examples.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_EXAMPLES=OFF ) -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") vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/pixel/vcpkg.json b/external_imported/vcpkg/ports/pixel/vcpkg.json index df2963bc9..00d5b4c22 100644 --- a/external_imported/vcpkg/ports/pixel/vcpkg.json +++ b/external_imported/vcpkg/ports/pixel/vcpkg.json @@ -1,10 +1,9 @@ { "name": "pixel", - "version-string": "0.3", - "port-version": 3, + "version-date": "2022-03-15", "description": "Simple 2D Graphics based on standard and portable OpenGL.", "homepage": "https://github.com/dascandy/pixel", - "supports": "!windows", + "license": "Apache-2.0", "dependencies": [ "glew", "opengl", @@ -19,6 +18,10 @@ { "name": "sdl2", "platform": "!linux" + }, + { + "name": "vcpkg-cmake", + "host": true } ] } diff --git a/external_imported/vcpkg/ports/pixman/no-host-cpu-checks.patch b/external_imported/vcpkg/ports/pixman/no-host-cpu-checks.patch new file mode 100644 index 000000000..f70c54a01 --- /dev/null +++ b/external_imported/vcpkg/ports/pixman/no-host-cpu-checks.patch @@ -0,0 +1,108 @@ +diff --git a/meson.build b/meson.build +index 1cec227..1b07ca8 100644 +--- a/meson.build ++++ b/meson.build +@@ -95,44 +95,7 @@ else + mmx_flags = ['-mmmx', '-Winline'] + endif + if not use_mmx.disabled() +- if host_machine.cpu_family() == 'x86_64' or cc.get_id() == 'msvc' +- have_mmx = true +- elif host_machine.cpu_family() == 'x86' and cc.compiles(''' +- #include +- #include +- +- /* Check support for block expressions */ +- #define _mm_shuffle_pi16(A, N) \ +- ({ \ +- __m64 ret; \ +- \ +- /* Some versions of clang will choke on K */ \ +- asm ("pshufw %2, %1, %0\n\t" \ +- : "=y" (ret) \ +- : "y" (A), "K" ((const int8_t)N) \ +- ); \ +- \ +- ret; \ +- }) +- +- int main () { +- __m64 v = _mm_cvtsi32_si64 (1); +- __m64 w; +- +- w = _mm_shuffle_pi16(v, 5); +- +- /* Some versions of clang will choke on this */ +- asm ("pmulhuw %1, %0\n\t" +- : "+y" (w) +- : "y" (v) +- ); +- +- return _mm_cvtsi64_si32 (v); +- }''', +- args : mmx_flags, +- name : 'MMX Intrinsic Support') +- have_mmx = true +- endif ++ have_mmx = true + endif + + if have_mmx +@@ -154,29 +117,7 @@ elif cc.get_id() != 'msvc' + sse2_flags = ['-msse2', '-Winline'] + endif + if not use_sse2.disabled() +- if host_machine.cpu_family() == 'x86' +- if cc.compiles(''' +- #if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2)) +- # if !defined(__amd64__) && !defined(__x86_64__) +- # error "Need GCC >= 4.2 for SSE2 intrinsics on x86" +- # endif +- #endif +- #include +- #include +- #include +- int param; +- int main () { +- __m128i a = _mm_set1_epi32 (param), b = _mm_set1_epi32 (param + 1), c; +- c = _mm_xor_si128 (a, b); +- return _mm_cvtsi128_si32(c); +- }''', +- args : sse2_flags, +- name : 'SSE2 Intrinsic Support') +- have_sse2 = true +- endif +- elif host_machine.cpu_family() == 'x86_64' +- have_sse2 = true +- endif ++ have_sse2 = true + endif + + if have_sse2 +@@ -192,24 +133,8 @@ if cc.get_id() != 'msvc' + ssse3_flags = ['-mssse3', '-Winline'] + endif + +-# x64 pre-2010 MSVC compilers crashes when building the ssse3 code +-if not use_ssse3.disabled() and not (cc.get_id() == 'msvc' and cc.version().version_compare('<16') and host_machine.cpu_family() == 'x86_64') +- if host_machine.cpu_family().startswith('x86') +- if cc.compiles(''' +- #include +- #include +- #include +- int param; +- int main () { +- __m128i a = _mm_set1_epi32 (param), b = _mm_set1_epi32 (param + 1), c; +- c = _mm_xor_si128 (a, b); +- return _mm_cvtsi128_si32(c); +- }''', +- args : ssse3_flags, +- name : 'SSSE3 Intrinsic Support') +- have_ssse3 = true +- endif +- endif ++if use_ssse3.enabled() ++ have_ssse3 = true + endif + + if have_ssse3 diff --git a/external_imported/vcpkg/ports/pixman/portfile.cmake b/external_imported/vcpkg/ports/pixman/portfile.cmake index 43f4f3ddb..fa6c8687a 100644 --- a/external_imported/vcpkg/ports/pixman/portfile.cmake +++ b/external_imported/vcpkg/ports/pixman/portfile.cmake @@ -39,7 +39,9 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} REF ${PIXMAN_VERSION} - PATCHES remove_test_demos.patch + PATCHES + remove_test_demos.patch + no-host-cpu-checks.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 916f1a4f0..b475c2fb7 100644 --- a/external_imported/vcpkg/ports/pixman/vcpkg.json +++ b/external_imported/vcpkg/ports/pixman/vcpkg.json @@ -1,9 +1,10 @@ { "name": "pixman", "version": "0.40.0", - "port-version": 1, + "port-version": 2, "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", "dependencies": [ "libpng", { diff --git a/external_imported/vcpkg/ports/pkgconf/portfile.cmake b/external_imported/vcpkg/ports/pkgconf/portfile.cmake index 1d8dda8dd..7c5ccb242 100644 --- a/external_imported/vcpkg/ports/pkgconf/portfile.cmake +++ b/external_imported/vcpkg/ports/pkgconf/portfile.cmake @@ -11,6 +11,59 @@ vcpkg_configure_meson( NO_PKG_CONFIG OPTIONS -Dtests=false ) + +set(systemsuffix "") +set(architectureprefix "") + +set(SYSTEM_LIBDIR "") +set(PKG_DEFAULT_PATH "") +set(SYSTEM_INCLUDEDIR "") +set(PERSONALITY_PATH "personality.d") + + +if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_CROSSCOMPILING AND VCPKG_TARGET_ARCHITECTURE MATCHES "x64") + # These defaults are obtained from pkgconf/pkg-config on Ubuntu and OpenSuse + # vcpkg cannot do system introspection to obtain/set these values since it would break binary caching. + set(SYSTEM_INCLUDEDIR "/usr/include") + # System lib dirs will be stripped from -L from the pkg-config output + set(SYSTEM_LIBDIR "/lib:/lib/i386-linux-gnu:/lib/x86_64-linux-gnu:/lib/x86_64-linux-gnux32:/lib64:/lib32:/libx32:/usr/lib:/usr/lib/i386-linux-gnu:/usr/lib/x86_64-linux-gnu:/usr/lib/x86_64-linux-gnux32:/usr/lib64:/usr/lib32:/usr/libx32") + set(PKG_DEFAULT_PATH "/usr/local/lib/x86_64-linux-gnu/pkgconfig:/usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib64/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig") + set(PERSONALITY_PATH "/usr/share/pkgconfig/personality.d:/etc/pkgconfig/personality.d") +endif() + +if(DEFINED VCPKG_pkgconf_SYSTEM_LIBDIR) + set(SYSTEM_LIBDIR "${VCPKG_pkgconf_SYSTEM_LIBDIR}") +endif() +if(DEFINED VCPKG_pkgconf_PKG_DEFAULT_PATH) + set(PKG_DEFAULT_PATH "${VCPKG_pkgconf_PKG_DEFAULT_PATH}") +endif() +if(DEFINED VCPKG_pkgconf_SYSTEM_INCLUDEDIR) + set(SYSTEM_INCLUDEDIR "${VCPKG_pkgconf_SYSTEM_INCLUDEDIR}") +endif() +if(DEFINED VCPKG_pkgconf_PERSONALITY_PATH) + set(PERSONALITY_PATH "${VCPKG_pkgconf_PERSONALITY_PATH}") +endif() + + +set(pkgconfig_file "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libpkgconf/config.h") +if(EXISTS "${pkgconfig_file}") + file(READ "${pkgconfig_file}" contents) + string(REGEX REPLACE "#define PKG_DEFAULT_PATH [^\n]+" "#define PKG_DEFAULT_PATH \"${PKG_DEFAULT_PATH}\"" contents "${contents}") + string(REGEX REPLACE "#define SYSTEM_INCLUDEDIR [^\n]+" "#define SYSTEM_INCLUDEDIR \"${SYSTEM_INCLUDEDIR}\"" contents "${contents}") + string(REGEX REPLACE "#define SYSTEM_LIBDIR [^\n]+" "#define SYSTEM_LIBDIR \"${SYSTEM_LIBDIR}\"" contents "${contents}") + string(REGEX REPLACE "#define PERSONALITY_PATH [^\n]+" "#define PERSONALITY_PATH \"${PERSONALITY_PATH}\"" contents "${contents}") + file(WRITE "${pkgconfig_file}" "${contents}") +endif() +set(pkgconfig_file "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libpkgconf/config.h") +if(EXISTS "${pkgconfig_file}") + file(READ "${pkgconfig_file}" contents) + string(REGEX REPLACE "#define PKG_DEFAULT_PATH [^\n]+" "#define PKG_DEFAULT_PATH \"${PKG_DEFAULT_PATH}\"" contents "${contents}") + string(REGEX REPLACE "#define SYSTEM_INCLUDEDIR [^\n]+" "#define SYSTEM_INCLUDEDIR \"${SYSTEM_INCLUDEDIR}\"" contents "${contents}") + string(REGEX REPLACE "#define SYSTEM_LIBDIR [^\n]+" "#define SYSTEM_LIBDIR \"${SYSTEM_LIBDIR}\"" contents "${contents}") + string(REGEX REPLACE "#define PERSONALITY_PATH [^\n]+" "#define PERSONALITY_PATH \"${PERSONALITY_PATH}\"" contents "${contents}") + file(WRITE "${pkgconfig_file}" "${contents}") +endif() + vcpkg_install_meson() vcpkg_fixup_pkgconfig(SKIP_CHECK) diff --git a/external_imported/vcpkg/ports/pkgconf/vcpkg.json b/external_imported/vcpkg/ports/pkgconf/vcpkg.json index 8143e9074..8ea4e30e7 100644 --- a/external_imported/vcpkg/ports/pkgconf/vcpkg.json +++ b/external_imported/vcpkg/ports/pkgconf/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pkgconf", "version": "1.8.0", - "port-version": 1, + "port-version": 2, "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", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/plibsys/portfile.cmake b/external_imported/vcpkg/ports/plibsys/portfile.cmake index c6ab653b6..777443c7b 100644 --- a/external_imported/vcpkg/ports/plibsys/portfile.cmake +++ b/external_imported/vcpkg/ports/plibsys/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO saprykin/plibsys @@ -31,5 +29,3 @@ vcpkg_copy_pdbs() 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}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - - diff --git a/external_imported/vcpkg/ports/plibsys/vcpkg.json b/external_imported/vcpkg/ports/plibsys/vcpkg.json index 4960c01a2..fa95157d3 100644 --- a/external_imported/vcpkg/ports/plibsys/vcpkg.json +++ b/external_imported/vcpkg/ports/plibsys/vcpkg.json @@ -1,7 +1,7 @@ { "name": "plibsys", - "version-string": "0.0.4", - "port-version": 5, + "version": "0.0.4", + "port-version": 6, "description": "Highly portable C system library: threads and synchronization, sockets, IPC, data structures and more.", "homepage": "https://github.com/saprykin/plibsys", "supports": "!uwp" diff --git a/external_imported/vcpkg/ports/pmdk/portfile.cmake b/external_imported/vcpkg/ports/pmdk/portfile.cmake index 60d53e11a..dcda72d8c 100644 --- a/external_imported/vcpkg/ports/pmdk/portfile.cmake +++ b/external_imported/vcpkg/ports/pmdk/portfile.cmake @@ -1,7 +1,5 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) -vcpkg_fail_port_install(ON_ARCH "arm" "x86") - set(PMDK_VERSION "1.11.0") vcpkg_from_github( diff --git a/external_imported/vcpkg/ports/pmdk/vcpkg.json b/external_imported/vcpkg/ports/pmdk/vcpkg.json index b51a613f0..75c6148da 100644 --- a/external_imported/vcpkg/ports/pmdk/vcpkg.json +++ b/external_imported/vcpkg/ports/pmdk/vcpkg.json @@ -1,6 +1,7 @@ { "name": "pmdk", "version": "1.11.0", + "port-version": 1, "description": "Persistent Memory Development Kit", "homepage": "https://github.com/pmem/pmdk", "supports": "!(arm | x86)" diff --git a/external_imported/vcpkg/ports/poco/portfile.cmake b/external_imported/vcpkg/ports/poco/portfile.cmake index 9eb5926dd..e4ceb12b4 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 f81a38057f1d240fe7b7a069612776f788bc88ea # poco-1.11.0-release - SHA512 c5f39aca8b5464959b9337b0cbd8ee86d81f195f5a5ba864692c71b2bdbffdecef0537b6e6a2d9f41829bcd58f78825b10565d0c4ee7b3c856a4886a9e328118 + REF de61f0049175a941cc83c2615c3bdc5e947b89f9 # poco-1.11.1-release + SHA512 0290eeeca8a85286efe8f583224062ea97668c2730f8f7db4e075ce75e997b0a0c969159d4034c27fbb2e8d4b9c6504888d8ffa001193f7eb0e450bca2d5d7a2 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 7301351dc..98519295d 100644 --- a/external_imported/vcpkg/ports/poco/vcpkg.json +++ b/external_imported/vcpkg/ports/poco/vcpkg.json @@ -1,9 +1,9 @@ { "name": "poco", - "version-semver": "1.11.0", - "port-version": 2, + "version": "1.11.1", "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", "supports": "!uwp", "dependencies": [ "expat", diff --git a/external_imported/vcpkg/ports/polyhook2/portfile.cmake b/external_imported/vcpkg/ports/polyhook2/portfile.cmake index 5d638eb9a..25ae59786 100644 --- a/external_imported/vcpkg/ports/polyhook2/portfile.cmake +++ b/external_imported/vcpkg/ports/polyhook2/portfile.cmake @@ -1,28 +1,23 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "Linux" "OSX" "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stevemk14ebr/PolyHook_2_0 - REF 01ec7c7ddee1d0da9cc49c4adf930eb5d6a86ba1 - SHA512 9d482cd4ec9161b437ee976130b4e64b3acb5f1eb4c47291074110d86ca1ca7479b5c6d0af5be2c7628f702dc858e6a9ef10cd8dcf915b9f022f158e0e4ad0ba + REF 750e78f8d7ebfc291e1c0dce3a0763c3a4b86737 + SHA512 c542288cfde258bcb54960593f2b596b6a967cf128a691e4b8ad699127567c58dc55ce2bbf21f4d3ccbaa2d794bcacd3540503b039ee58c614a854f13d51d30e HEAD_REF master ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - capstone POLYHOOK_DISASM_CAPSTONE - zydis POLYHOOK_DISASM_ZYDIS - exception POLYHOOK_FEATURE_EXCEPTION - detours POLYHOOK_FEATURE_DETOURS - inlinentd POLYHOOK_FEATURE_INLINENTD - pe POLYHOOK_FEATURE_PE - virtuals POLYHOOK_FEATURE_VIRTUALS + FEATURES + capstone POLYHOOK_DISASM_CAPSTONE + zydis POLYHOOK_DISASM_ZYDIS + exception POLYHOOK_FEATURE_EXCEPTION + detours POLYHOOK_FEATURE_DETOURS + inlinentd POLYHOOK_FEATURE_INLINENTD + pe POLYHOOK_FEATURE_PE + virtuals POLYHOOK_FEATURE_VIRTUALS ) -if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(BUILD_SHARED_LIB OFF) -else() - set(BUILD_SHARED_LIB ON) -endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIB) if (VCPKG_CRT_LINKAGE STREQUAL "static") set(BUILD_STATIC_RUNTIME ON) @@ -30,9 +25,8 @@ else() set(BUILD_STATIC_RUNTIME OFF) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DPOLYHOOK_BUILD_SHARED_LIB=${BUILD_SHARED_LIB} -DPOLYHOOK_BUILD_STATIC_RUNTIME=${BUILD_STATIC_RUNTIME} @@ -41,12 +35,12 @@ vcpkg_configure_cmake( -DPOLYHOOK_USE_EXTERNAL_ZYDIS=ON ) -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_cmake_targets(CONFIG_PATH lib/PolyHook_2 TARGET_PATH share/PolyHook_2) +vcpkg_cmake_config_fixup(PACKAGE_NAME PolyHook_2 CONFIG_PATH lib/PolyHook_2) # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/polyhook2/vcpkg.json b/external_imported/vcpkg/ports/polyhook2/vcpkg.json index 252fb1a87..3e1c552d8 100644 --- a/external_imported/vcpkg/ports/polyhook2/vcpkg.json +++ b/external_imported/vcpkg/ports/polyhook2/vcpkg.json @@ -1,10 +1,20 @@ { "name": "polyhook2", - "version-string": "2021-05-09", - "port-version": 1, + "version-date": "2022-03-01", "description": "C++17, x86/x64 Hooking Library v2.0", "homepage": "https://github.com/stevemk14ebr/PolyHook_2_0", + "license": "MIT", "supports": "!(arm | uwp | linux | osx)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "default-features": [ "capstone", "detours", diff --git a/external_imported/vcpkg/ports/poppler/0002-remove-test-subdirectory.patch b/external_imported/vcpkg/ports/poppler/0002-remove-test-subdirectory.patch deleted file mode 100644 index 80dd5b53f..000000000 --- a/external_imported/vcpkg/ports/poppler/0002-remove-test-subdirectory.patch +++ /dev/null @@ -1,24 +0,0 @@ -From aa0fa5f737b8ea3d2dfb396243be79af49274b6e Mon Sep 17 00:00:00 2001 -From: abc -Date: Fri, 18 Dec 2020 14:32:31 +0800 -Subject: [PATCH 2/2] remove test subdirectory - ---- - CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ec66b515..cce875a0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -749,7 +749,6 @@ endif() - if(ENABLE_GLIB) - add_subdirectory(glib) - endif() --add_subdirectory(test) - if(ENABLE_QT5) - add_subdirectory(qt5) - endif() --- -2.29.2.windows.2 - diff --git a/external_imported/vcpkg/ports/poppler/0003-fix-gperf-not-recognized.patch b/external_imported/vcpkg/ports/poppler/0003-fix-gperf-not-recognized.patch deleted file mode 100644 index e6edf39e7..000000000 --- a/external_imported/vcpkg/ports/poppler/0003-fix-gperf-not-recognized.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cce875a..0b04be7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -530,8 +530,8 @@ endif() - if (GPERF AND RUN_GPERF_IF_PRESENT) - macro(ADD_GPERF_FILE input) - add_custom_command(OUTPUT poppler/${input}.c -- COMMAND gperf poppler/${input}.gperf > ${CMAKE_CURRENT_BINARY_DIR}/poppler/${input}.c -- COMMAND gperf poppler/${input}.gperf > ${CMAKE_CURRENT_SOURCE_DIR}/poppler/${input}.pregenerated.c -+ COMMAND ${GPERF} poppler/${input}.gperf > ${CMAKE_CURRENT_BINARY_DIR}/poppler/${input}.c -+ COMMAND ${GPERF} poppler/${input}.gperf > ${CMAKE_CURRENT_SOURCE_DIR}/poppler/${input}.pregenerated.c - COMMAND clang-format -i ${CMAKE_CURRENT_SOURCE_DIR}/poppler/${input}.pregenerated.c || true - DEPENDS poppler/${input}.gperf - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/external_imported/vcpkg/ports/poppler/0004-disable-clang-format.patch b/external_imported/vcpkg/ports/poppler/0004-disable-clang-format.patch deleted file mode 100644 index 43a48da78..000000000 --- a/external_imported/vcpkg/ports/poppler/0004-disable-clang-format.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0b04be7..947d5be 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -532,7 +532,6 @@ if (GPERF AND RUN_GPERF_IF_PRESENT) - add_custom_command(OUTPUT poppler/${input}.c - COMMAND ${GPERF} poppler/${input}.gperf > ${CMAKE_CURRENT_BINARY_DIR}/poppler/${input}.c - COMMAND ${GPERF} poppler/${input}.gperf > ${CMAKE_CURRENT_SOURCE_DIR}/poppler/${input}.pregenerated.c -- COMMAND clang-format -i ${CMAKE_CURRENT_SOURCE_DIR}/poppler/${input}.pregenerated.c || true - DEPENDS poppler/${input}.gperf - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - diff --git a/external_imported/vcpkg/ports/poppler/cmake-project-include.cmake b/external_imported/vcpkg/ports/poppler/cmake-project-include.cmake new file mode 100644 index 000000000..8e9d1db25 --- /dev/null +++ b/external_imported/vcpkg/ports/poppler/cmake-project-include.cmake @@ -0,0 +1,29 @@ +if("${FONT_CONFIGURATION}" STREQUAL "fontconfig") + # Poppler uses different variable names than CMake. + find_package(Fontconfig REQUIRED) + set(FONTCONFIG_DEFINITIONS "") + set(FONTCONFIG_INCLUDE_DIR "${Fontconfig_INCLUDE_DIRS}") + set(FONTCONFIG_LIBRARIES "Fontconfig::Fontconfig") +endif() + +# Poppler uses different variable names than CMake, +# plus ICONV_SECOND_ARGUMENT_IS_CONST +find_package(Iconv REQUIRED) +set(ICONV_INCLUDE_DIR "${Iconv_INCLUDE_DIR}") +set(ICONV_LIBRARIES "${Iconv_LIBRARIES}") + +# Create helper file for iconv usage requirement +set(poppler_iconv [[ +Name: poppler-vcpkg-iconv +Description: iconv linking requirements for poppler +Version: 0 +Libs:]]) +string(TOLOWER "${Iconv_LIBRARIES}" iconv_libraries) +if(iconv_libraries MATCHES "iconv") + string(APPEND poppler_iconv " -liconv") +endif() +if(iconv_libraries MATCHES "charset") + string(APPEND poppler_iconv " -lcharset") +endif() +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/poppler-vcpkg-iconv.pc" "${poppler_iconv}") +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/poppler-vcpkg-iconv.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") diff --git a/external_imported/vcpkg/ports/poppler/export-unofficial-poppler.patch b/external_imported/vcpkg/ports/poppler/export-unofficial-poppler.patch new file mode 100644 index 000000000..c818e8ff2 --- /dev/null +++ b/external_imported/vcpkg/ports/poppler/export-unofficial-poppler.patch @@ -0,0 +1,36 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9a0dcb1..c1f2f02 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -585,9 +585,16 @@ if(MINGW AND BUILD_SHARED_LIBS) + set_target_properties(poppler PROPERTIES SUFFIX "-${POPPLER_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") + endif() + target_link_libraries(poppler LINK_PRIVATE ${poppler_LIBS}) +-install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++target_include_directories(poppler PUBLIC $) ++set_target_properties(poppler PROPERTIES EXPORT_NAME poppler-private) ++install(TARGETS poppler EXPORT unofficial-poppler-targets RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(EXPORT unofficial-poppler-targets NAMESPACE unofficial::poppler:: DESTINATION share/unofficial-poppler) + + if(ENABLE_UNSTABLE_API_ABI_HEADERS) ++ target_include_directories(poppler PUBLIC ++ $ ++ $ ++ ) + install(FILES + poppler/Annot.h + poppler/AnnotStampImageHelper.h +diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt +index c37936b..344933c 100644 +--- a/cpp/CMakeLists.txt ++++ b/cpp/CMakeLists.txt +@@ -32,7 +32,8 @@ if(MINGW AND BUILD_SHARED_LIBS) + set_target_properties(poppler-cpp PROPERTIES SUFFIX "-${POPPLER_CPP_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") + endif() + target_link_libraries(poppler-cpp poppler ${ICONV_LIBRARIES}) +-install(TARGETS poppler-cpp RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(TARGETS poppler-cpp EXPORT unofficial-poppler-cpp-targets RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(EXPORT unofficial-poppler-cpp-targets NAMESPACE unofficial::poppler:: DESTINATION share/unofficial-poppler) + + install(FILES + poppler-destination.h diff --git a/external_imported/vcpkg/ports/poppler/portfile.cmake b/external_imported/vcpkg/ports/poppler/portfile.cmake index fcb96f6c6..3ae105866 100644 --- a/external_imported/vcpkg/ports/poppler/portfile.cmake +++ b/external_imported/vcpkg/ports/poppler/portfile.cmake @@ -1,45 +1,76 @@ -vcpkg_from_github( +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org OUT_SOURCE_PATH SOURCE_PATH - REPO freedesktop/poppler - REF poppler-20.12.1 - SHA512 f692682689c0b0fcc3953a1cc157b6e1d2ce3ccab185189d6dc0807f1dd3ea2d1a9773d0b805079a30b3c8a3b0cf3ee83239ed48d7b08dc7762eba29c2033674 + REPO poppler/poppler + REF poppler-22.03.0 + SHA512 0229e50bbf21154f398480730649fd15ca37c7edae5abd63ed41ab722852d09e4dc2b9df66b13b1cfe3e7a0da945916e1bd39c75c4879ded2759eb465f69424a HEAD_REF master PATCHES - 0002-remove-test-subdirectory.patch - 0003-fix-gperf-not-recognized.patch - 0004-disable-clang-format.patch + export-unofficial-poppler.patch ) +file(REMOVE "${SOURCE_PATH}/cmake/Modules/FindFontconfig.cmake") -vcpkg_find_acquire_program(GPERF) -get_filename_component(GPERF_PATH ${GPERF} DIRECTORY) -vcpkg_add_to_path(${GPERF_PATH}) +set(POPPLER_PC_REQUIRES "freetype2 libjpeg libopenjp2 libpng libtiff-4 poppler-vcpkg-iconv") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - curl ENABLE_CURL - zlib ENABLE_ZLIB - splash ENABLE_SPLASH + FEATURES + cairo WITH_Cairo + curl ENABLE_LIBCURL + private-api ENABLE_UNSTABLE_API_ABI_HEADERS + zlib ENABLE_ZLIB ) +if("fontconfig" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS "-DFONT_CONFIGURATION=fontconfig") + string(APPEND POPPLER_PC_REQUIRES " fontconfig") +elseif(VCPKG_TARGET_IS_WINDOWS) + list(APPEND FEATURE_OPTIONS "-DFONT_CONFIGURATION=win32") +else() + list(APPEND FEATURE_OPTIONS "-DFONT_CONFIGURATION=generic") +endif() +if("cairo" IN_LIST FEATURES) + string(APPEND POPPLER_PC_REQUIRES " cairo") +endif() +if("curl" IN_LIST FEATURES) + string(APPEND POPPLER_PC_REQUIRES " libcurl") +endif() +if("zlib" IN_LIST FEATURES) + string(APPEND POPPLER_PC_REQUIRES " zlib") +endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_find_acquire_program(PKGCONFIG) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS + "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake" + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" -DBUILD_GTK_TESTS=OFF -DBUILD_QT5_TESTS=OFF -DBUILD_QT6_TESTS=OFF -DBUILD_CPP_TESTS=OFF - -DENABLE_LIBCURL=${ENABLE_CURL} + -DBUILD_MANUAL_TESTS=OFF -DENABLE_UTILS=OFF -DENABLE_GLIB=OFF - -DENABLE_GLOBJECT_INTROSPECTION=OFF + -DENABLE_GOBJECT_INTROSPECTION=OFF -DENABLE_QT5=OFF -DENABLE_QT6=OFF + -DENABLE_CMS=none + -DRUN_GPERF_IF_PRESENT=OFF + -DENABLE_RELOCATABLE=OFF # https://gitlab.freedesktop.org/poppler/poppler/-/issues/1209 + -DWITH_NSS3=OFF ${FEATURE_OPTIONS} ) +vcpkg_cmake_install() + +configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-poppler-config.cmake" "${CURRENT_PACKAGES_DIR}/share/unofficial-poppler/unofficial-poppler-config.cmake" @ONLY) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-poppler) -vcpkg_install_cmake() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/poppler.pc" "Libs:" "Requires.private: ${POPPLER_PC_REQUIRES}\nLibs:") +if(NOT DEFINED VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/poppler.pc" "Libs:" "Requires.private: ${POPPLER_PC_REQUIRES}\nLibs:") +endif() +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -vcpkg_fixup_pkgconfig() +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/poppler/unofficial-poppler-config.cmake b/external_imported/vcpkg/ports/poppler/unofficial-poppler-config.cmake new file mode 100644 index 000000000..ccbef6a08 --- /dev/null +++ b/external_imported/vcpkg/ports/poppler/unofficial-poppler-config.cmake @@ -0,0 +1,22 @@ +include(CMakeFindDependencyMacro) +cmake_policy(SET CMP0012 NEW) +cmake_policy(SET CMP0057 NEW) +set(features "@FEATURES@") +find_dependency(Boost) +if("fontconfig" IN_LIST features) + find_dependency(Fontconfig) # CMake 3.14 +endif() +find_dependency(Freetype) +find_dependency(JPEG) +find_dependency(PNG) +find_dependency(TIFF) +find_dependency(OpenJPEG CONFIG) +if("curl" IN_LIST features) + find_dependency(CURL) +endif() +if("zlib" IN_LIST features) + find_dependency(ZLIB) +endif() +find_dependency(Iconv) # CMake 3.11 +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-poppler-targets.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-poppler-cpp-targets.cmake") diff --git a/external_imported/vcpkg/ports/poppler/usage b/external_imported/vcpkg/ports/poppler/usage new file mode 100644 index 000000000..1c3ed1b2d --- /dev/null +++ b/external_imported/vcpkg/ports/poppler/usage @@ -0,0 +1,6 @@ +The package poppler can be imported via CMake FindPkgConfig module: + + find_package(PkgConfig) + pkg_check_modules(POPPLER_CPP REQUIRED IMPORTED_TARGET poppler-cpp) + + target_link_libraries(main PRIVATE PkgConfig::POPPLER_CPP) diff --git a/external_imported/vcpkg/ports/poppler/vcpkg.json b/external_imported/vcpkg/ports/poppler/vcpkg.json index 2ae9cae77..f1a3be54c 100644 --- a/external_imported/vcpkg/ports/poppler/vcpkg.json +++ b/external_imported/vcpkg/ports/poppler/vcpkg.json @@ -1,41 +1,78 @@ { "name": "poppler", - "version": "20.12.1", - "port-version": 6, - "description": "a PDF rendering library", + "version": "22.3.0", + "port-version": 1, + "description": "A PDF rendering library", "homepage": "https://poppler.freedesktop.org/", + "license": "GPL-2.0-or-later", + "supports": "!uwp", "dependencies": [ + "boost-container", + "boost-move", + "freetype", + "libiconv", + "libjpeg-turbo", + "libpng", + "openjpeg", + "tiff", { - "name": "cairo", - "platform": "osx" + "name": "vcpkg-cmake", + "host": true }, { - "name": "devil", - "platform": "(windows | linux) & !arm" - }, - "fontconfig", - "freetype", - "libiconv", - "openjpeg" + "name": "vcpkg-cmake-config", + "host": true + } ], "default-features": [ - "splash", + "font-configuration", "zlib" ], "features": { + "cairo": { + "description": "Enable the Cairo graphics backend", + "dependencies": [ + { + "name": "cairo", + "default-features": false + } + ] + }, "curl": { "description": "curl for poppler", "dependencies": [ - "curl" + { + "name": "curl", + "default-features": false + } ] }, - "splash": { - "description": "Build the Splash graphics backend", + "font-configuration": { + "description": "Defaut font configuration backend", + "dependencies": [ + { + "name": "poppler", + "default-features": false, + "features": [ + "fontconfig" + ], + "platform": "!windows & !android" + } + ] + }, + "fontconfig": { + "description": "Use fontconfig", + "supports": "!windows, mingw", "dependencies": [ - "boost-container", - "boost-move" + "fontconfig" ] }, + "private-api": { + "description": "Install headers for private API (aka unstable API/ABI headers)" + }, + "splash": { + "description": "The splash backend is always enabled. This option is kept for compatibility." + }, "zlib": { "description": "zlib for poppler", "dependencies": [ diff --git a/external_imported/vcpkg/ports/popsift/fix_missing_thrust_include.patch b/external_imported/vcpkg/ports/popsift/fix_missing_thrust_include.patch new file mode 100644 index 000000000..69138afb5 --- /dev/null +++ b/external_imported/vcpkg/ports/popsift/fix_missing_thrust_include.patch @@ -0,0 +1,21 @@ +From 273adb1c375b12f285694488280e04efd251a76a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20Sch=C3=B6ps?= +Date: Sat, 28 Aug 2021 16:52:25 +0200 +Subject: [PATCH] Add missing thrust include + +--- + src/popsift/s_filtergrid.cu | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/popsift/s_filtergrid.cu b/src/popsift/s_filtergrid.cu +index 078eb114..301c6a96 100644 +--- a/src/popsift/s_filtergrid.cu ++++ b/src/popsift/s_filtergrid.cu +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/external_imported/vcpkg/ports/popsift/portfile.cmake b/external_imported/vcpkg/ports/popsift/portfile.cmake index a0269235f..5bd1c9f45 100644 --- a/external_imported/vcpkg/ports/popsift/portfile.cmake +++ b/external_imported/vcpkg/ports/popsift/portfile.cmake @@ -1,16 +1,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO alicevision/popsift + REPO alicevision/popsift REF v0.9 SHA512 56789520872203eea86e07e8210e00c0b67d85486af16df9d620b1aff10f8d9ef5d910cf1dda6c68af7ca2ed11658ab5414ac79117b543f91a7d8d6a96a17ce0 HEAD_REF develop + PATCHES + fix_missing_thrust_include.patch ) -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}") - vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES apps PopSift_BUILD_EXAMPLES @@ -29,11 +29,11 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/PopSift) 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") - # copy the apps in tools directory - if ("apps" IN_LIST FEATURES) - vcpkg_copy_tools(TOOL_NAMES popsift-demo AUTO_CLEAN) - endif() +# copy the apps in tools directory +if ("apps" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES popsift-demo AUTO_CLEAN) +endif() -file(INSTALL ${SOURCE_PATH}/COPYING.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} 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/popsift/vcpkg.json b/external_imported/vcpkg/ports/popsift/vcpkg.json index aed5386b8..ddff79339 100644 --- a/external_imported/vcpkg/ports/popsift/vcpkg.json +++ b/external_imported/vcpkg/ports/popsift/vcpkg.json @@ -1,7 +1,7 @@ { "name": "popsift", - "version-string": "0.9", - "port-version": 2, + "version": "0.9", + "port-version": 3, "description": "PopSift is an implementation of the SIFT algorithm in CUDA.", "homepage": "https://github.com/alicevision/popsift", "supports": "!(uwp | arm | arm64 | android | x86)", diff --git a/external_imported/vcpkg/ports/portaudio/portfile.cmake b/external_imported/vcpkg/ports/portaudio/portfile.cmake index 30e9adfa0..f80cace79 100644 --- a/external_imported/vcpkg/ports/portaudio/portfile.cmake +++ b/external_imported/vcpkg/ports/portaudio/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PortAudio/portaudio diff --git a/external_imported/vcpkg/ports/portaudio/vcpkg.json b/external_imported/vcpkg/ports/portaudio/vcpkg.json index cbf20bfc6..581b35543 100644 --- a/external_imported/vcpkg/ports/portaudio/vcpkg.json +++ b/external_imported/vcpkg/ports/portaudio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "portaudio", "version": "19.7", - "port-version": 2, + "port-version": 3, "description": "PortAudio Portable Cross-platform Audio I/O API PortAudio is a free, cross-platform, open-source, audio I/O library. It lets you write simple audio programs in 'C' or C++ that will compile and run on many platforms including Windows, Macintosh OS X, and Unix (OSS/ALSA). It is intended to promote the exchange of audio software between developers on different platforms. Many applications use PortAudio for Audio I/O.", "homepage": "http://www.portaudio.com", "supports": "!uwp" diff --git a/external_imported/vcpkg/ports/portmidi/portfile.cmake b/external_imported/vcpkg/ports/portmidi/portfile.cmake index 61ebbba17..c6dd12b1c 100644 --- a/external_imported/vcpkg/ports/portmidi/portfile.cmake +++ b/external_imported/vcpkg/ports/portmidi/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PortMidi/portmidi diff --git a/external_imported/vcpkg/ports/portmidi/vcpkg.json b/external_imported/vcpkg/ports/portmidi/vcpkg.json index b24e07f97..4b2da518b 100644 --- a/external_imported/vcpkg/ports/portmidi/vcpkg.json +++ b/external_imported/vcpkg/ports/portmidi/vcpkg.json @@ -1,6 +1,7 @@ { "name": "portmidi", "version": "2.0.2", + "port-version": 1, "description": "PortMidi is a cross platform (Windows, macOS, Linux, and BSDs which support alsalib) library for interfacing with operating systems' MIDI I/O APIs.", "homepage": "https://github.com/PortMidi/portmidi", "license": "MIT", diff --git a/external_imported/vcpkg/ports/portsmf/portfile.cmake b/external_imported/vcpkg/ports/portsmf/portfile.cmake index 158094ee7..01370f7c2 100644 --- a/external_imported/vcpkg/ports/portsmf/portfile.cmake +++ b/external_imported/vcpkg/ports/portsmf/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tenacityteam/portsmf diff --git a/external_imported/vcpkg/ports/portsmf/vcpkg.json b/external_imported/vcpkg/ports/portsmf/vcpkg.json index c97b7711d..f3105391a 100644 --- a/external_imported/vcpkg/ports/portsmf/vcpkg.json +++ b/external_imported/vcpkg/ports/portsmf/vcpkg.json @@ -1,6 +1,7 @@ { "name": "portsmf", "version": "0.238", + "port-version": 1, "description": "Portsmf is 'Port Standard MIDI File', a cross-platform, C++ library for reading and writing Standard MIDI Files.", "homepage": "https://github.com/tenacityteam/portsmf", "license": "MIT", diff --git a/external_imported/vcpkg/ports/presentmon/portfile.cmake b/external_imported/vcpkg/ports/presentmon/portfile.cmake index b6a00824b..a2c5dc041 100644 --- a/external_imported/vcpkg/ports/presentmon/portfile.cmake +++ b/external_imported/vcpkg/ports/presentmon/portfile.cmake @@ -1,8 +1,6 @@ # The upstream doesn't export any symbols vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_fail_port_install(ON_TARGET "linux" "osx" "uwp" "ios" "android" "freebsd") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GameTechDev/PresentMon diff --git a/external_imported/vcpkg/ports/presentmon/vcpkg.json b/external_imported/vcpkg/ports/presentmon/vcpkg.json index b4e05670c..daa764fdd 100644 --- a/external_imported/vcpkg/ports/presentmon/vcpkg.json +++ b/external_imported/vcpkg/ports/presentmon/vcpkg.json @@ -1,6 +1,7 @@ { "name": "presentmon", "version-semver": "1.7.0", + "port-version": 1, "description": "PresentMon is a tool to capture and analyze ETW events related to swap chain presentation on Windows.", "supports": "windows & !uwp", "features": { diff --git a/external_imported/vcpkg/ports/proj4/fix-proj4-targets-cmake.patch b/external_imported/vcpkg/ports/proj/fix-proj4-targets-cmake.patch similarity index 100% rename from external_imported/vcpkg/ports/proj4/fix-proj4-targets-cmake.patch rename to external_imported/vcpkg/ports/proj/fix-proj4-targets-cmake.patch diff --git a/external_imported/vcpkg/ports/proj4/fix-win-output-name.patch b/external_imported/vcpkg/ports/proj/fix-win-output-name.patch similarity index 100% rename from external_imported/vcpkg/ports/proj4/fix-win-output-name.patch rename to external_imported/vcpkg/ports/proj/fix-win-output-name.patch diff --git a/external_imported/vcpkg/ports/proj/portfile.cmake b/external_imported/vcpkg/ports/proj/portfile.cmake index cc6e26fcb..63a50506c 100644 --- a/external_imported/vcpkg/ports/proj/portfile.cmake +++ b/external_imported/vcpkg/ports/proj/portfile.cmake @@ -1 +1,69 @@ -SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO OSGeo/PROJ + REF 9.0.0 + SHA512 f11a20e9f9615c513755f54ac400cc2e144e40caa91f616c8f640aef9caf779487dc94927b3a4b57b15a595c17b70636b872d9a77d7baaf912b1a507004e6520 + HEAD_REF master + PATCHES + fix-win-output-name.patch + fix-proj4-targets-cmake.patch + tools-cmake.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + net ENABLE_CURL + tiff ENABLE_TIFF + tools BUILD_APPS +) + +vcpkg_list(SET TOOL_NAMES cct cs2cs geod gie invgeod invproj proj projinfo projsync) +if("tools" IN_LIST FEATURES AND NOT "net" IN_LIST FEATURES) + set(BUILD_PROJSYNC OFF) + vcpkg_list(APPEND FEATURE_OPTIONS -DBUILD_PROJSYNC=${BUILD_PROJSYNC}) + vcpkg_list(REMOVE_ITEM TOOL_NAMES projsync) +endif() + +find_program(EXE_SQLITE3 NAMES "sqlite3" PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools" NO_DEFAULT_PATH REQUIRED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DNLOHMANN_JSON=external + -DPROJ_LIB_SUBDIR=lib + -DPROJ_INCLUDE_SUBDIR=include + -DPROJ_DATA_SUBDIR=share/${PORT}/data + -DBUILD_TESTING=OFF + "-DEXE_SQLITE3=${EXE_SQLITE3}" +) + +vcpkg_cmake_install() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + # Enforce consistency with src/lib_proj.cmake build time configuration. + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/proj.h" + "#ifndef PROJ_DLL" + "#ifndef PROJ_DLL\n# define PROJ_DLL\n#elif 0" + ) +endif() + +vcpkg_cmake_config_fixup(PACKAGE_NAME proj4 CONFIG_PATH lib/cmake/proj4 DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/proj) + +if ("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN) +endif () + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() +if(NOT DEFINED VCPKG_BUILD_TYPE AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/proj.pc" " -lproj" " -lproj_d") +endif() + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/proj4/tools-cmake.patch b/external_imported/vcpkg/ports/proj/tools-cmake.patch similarity index 54% rename from external_imported/vcpkg/ports/proj4/tools-cmake.patch rename to external_imported/vcpkg/ports/proj/tools-cmake.patch index 514a15ad1..cc76be215 100644 --- a/external_imported/vcpkg/ports/proj4/tools-cmake.patch +++ b/external_imported/vcpkg/ports/proj/tools-cmake.patch @@ -1,14 +1,14 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +diff --git a/src/apps/CMakeLists.txt b/src/apps/CMakeLists.txt index 534bc311b..f9fb0f1bb 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt +--- a/src/apps/CMakeLists.txt ++++ b/src/apps/CMakeLists.txt @@ -83,10 +83,3 @@ if(BUILD_PROJSYNC) - endif() + # global configurations for all apps -if(MSVC OR CMAKE_CONFIGURATION_TYPES) - if(BIN_TARGETS) -- # Add _d suffix for your debug versions of the tools +- # Add _d suffix for debug versions of the apps - set_target_properties(${BIN_TARGETS} PROPERTIES - DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX}) - endif() diff --git a/external_imported/vcpkg/ports/proj4/usage b/external_imported/vcpkg/ports/proj/usage similarity index 68% rename from external_imported/vcpkg/ports/proj4/usage rename to external_imported/vcpkg/ports/proj/usage index ebf9f6c8d..a1236dde6 100644 --- a/external_imported/vcpkg/ports/proj4/usage +++ b/external_imported/vcpkg/ports/proj/usage @@ -1,4 +1,4 @@ -The package proj4 provides CMake targets: +The package proj provides CMake targets: find_package(PROJ CONFIG REQUIRED) target_link_libraries(main PRIVATE PROJ::proj) diff --git a/external_imported/vcpkg/ports/proj/vcpkg.json b/external_imported/vcpkg/ports/proj/vcpkg.json index 50beaca9b..a17d5a8aa 100644 --- a/external_imported/vcpkg/ports/proj/vcpkg.json +++ b/external_imported/vcpkg/ports/proj/vcpkg.json @@ -1,9 +1,57 @@ { "name": "proj", - "version-string": "0", - "port-version": 1, - "description": "a stub package that pulls in proj4. Do not depend on this package.", + "version": "9.0.0", + "description": "PROJ library for cartographic projections", + "homepage": "https://proj.org/", + "license": "MIT", "dependencies": [ - "proj4" - ] + "nlohmann-json", + { + "name": "sqlite3", + "default-features": false + }, + { + "name": "sqlite3", + "host": true, + "features": [ + "tool" + ] + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "net", + "tiff" + ], + "features": { + "net": { + "description": "Enable network support", + "dependencies": [ + "curl" + ] + }, + "tiff": { + "description": "Enable TIFF support to read some grids", + "dependencies": [ + { + "name": "tiff", + "default-features": false, + "features": [ + "lzma", + "zip" + ] + } + ] + }, + "tools": { + "description": "Build tools" + } + } } diff --git a/external_imported/vcpkg/ports/proj4/pkgconfig.patch b/external_imported/vcpkg/ports/proj4/pkgconfig.patch deleted file mode 100644 index 89cf782e4..000000000 --- a/external_imported/vcpkg/ports/proj4/pkgconfig.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 89763d7..f648296 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -342,7 +342,7 @@ install(FILES ${docfiles} - ################################################################################ - # pkg-config support - ################################################################################ --if(UNIX OR MINGW) -+if(1) - configure_proj_pc() - - install(FILES -diff --git a/cmake/ProjUtilities.cmake b/cmake/ProjUtilities.cmake -index 2e0db05..46e5de1 100644 ---- a/cmake/ProjUtilities.cmake -+++ b/cmake/ProjUtilities.cmake -@@ -78,15 +78,21 @@ function(configure_proj_pc) - set(VERSION ${PROJ_VERSION}) - # Build list for Libs.private - set(EXTRA_LIBS -- -lstdc++ -- -lsqlite3 - ${CMAKE_THREAD_LIBS_INIT} - ) -+ set(REQUIRES_PRIVATE "sqlite3") - if(TIFF_ENABLED) -- list(APPEND EXTRA_LIBS -ltiff) -+ string(APPEND REQUIRES_PRIVATE " libtiff-4") - endif() - if(CURL_ENABLED) -- list(APPEND EXTRA_LIBS -lcurl) -+ string(APPEND REQUIRES_PRIVATE " libcurl") -+ endif() -+ if(WIN32 AND NOT MINGW) -+ string(APPEND EXTRA_LIBS " -lole32 -lshell32") -+ elseif(NOT APPLE OR CMAKE_ANDROID_STL_TYPE MATCHES "^gnu") -+ string(APPEND EXTRA_LIBS " -lstdc++") -+ else() -+ string(APPEND EXTRA_LIBS " -lc++") - endif() - if(HAVE_LIBM) - list(APPEND EXTRA_LIBS -lm) -diff --git a/proj.pc.in b/proj.pc.in -index 846310d..3feac38 100644 ---- a/proj.pc.in -+++ b/proj.pc.in -@@ -11,4 +11,5 @@ Requires: - Version: @VERSION@ - Libs: -L${libdir} -lproj - Libs.private: @EXTRA_LIBS@ -+Requires.private: @REQUIRES_PRIVATE@ - Cflags: -I${includedir} diff --git a/external_imported/vcpkg/ports/proj4/portfile.cmake b/external_imported/vcpkg/ports/proj4/portfile.cmake index ec14da721..cc6e26fcb 100644 --- a/external_imported/vcpkg/ports/proj4/portfile.cmake +++ b/external_imported/vcpkg/ports/proj4/portfile.cmake @@ -1,70 +1 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO OSGeo/PROJ - REF 8.2.1 - SHA512 8af4c41320e3fd60af3bfa89a89fd1bb22461786a4288a5873d82f90c51eaef021f539b6a6bcc8e393f786a84ea3747a75d80d95e620f20ef2a353f1a90b74bc - HEAD_REF master - PATCHES - fix-win-output-name.patch - fix-proj4-targets-cmake.patch - tools-cmake.patch - pkgconfig.patch -) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - net ENABLE_CURL - tiff ENABLE_TIFF - tools BUILD_APPS -) - -vcpkg_list(SET TOOL_NAMES cct cs2cs geod gie invgeod invproj proj projinfo projsync) -if("tools" IN_LIST FEATURES AND NOT "net" IN_LIST FEATURES) - set(BUILD_PROJSYNC OFF) - vcpkg_list(APPEND FEATURE_OPTIONS -DBUILD_PROJSYNC=${BUILD_PROJSYNC}) - vcpkg_list(REMOVE_ITEM TOOL_NAMES projsync) -endif() - -find_program(EXE_SQLITE3 NAMES "sqlite3" PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools" NO_DEFAULT_PATH REQUIRED) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - ${FEATURE_OPTIONS} - -DNLOHMANN_JSON=external - -DPROJ_LIB_SUBDIR=lib - -DPROJ_INCLUDE_SUBDIR=include - -DPROJ_DATA_SUBDIR=share/${PORT} - -DBUILD_TESTING=OFF - "-DEXE_SQLITE3=${EXE_SQLITE3}" -) - -vcpkg_cmake_install() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - # Enforce consistency with src/lib_proj.cmake build time configuration. - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/proj.h" - "#ifndef PROJ_DLL" - "#ifndef PROJ_DLL\n# define PROJ_DLL\n#elif 0" - ) -endif() - -vcpkg_cmake_config_fixup(PACKAGE_NAME PROJ CONFIG_PATH lib/cmake/proj DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_cmake_config_fixup(PACKAGE_NAME PROJ4 CONFIG_PATH lib/cmake/proj4) - -if ("tools" IN_LIST FEATURES) - vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN) -endif () - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -vcpkg_copy_pdbs() - -vcpkg_fixup_pkgconfig() -if(NOT DEFINED VCPKG_BUILD_TYPE AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/proj.pc" " -lproj" " -lproj_d") -endif() - -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/external_imported/vcpkg/ports/proj4/vcpkg.json b/external_imported/vcpkg/ports/proj4/vcpkg.json index cce6dbd6b..a66974102 100644 --- a/external_imported/vcpkg/ports/proj4/vcpkg.json +++ b/external_imported/vcpkg/ports/proj4/vcpkg.json @@ -1,28 +1,14 @@ { "name": "proj4", - "version-semver": "8.2.1", - "description": "PROJ library for cartographic projections", - "homepage": "https://proj.org/", + "version-semver": "8.9.9", + "port-version": 1, + "description": "A stub package that pulls in proj. Do not depend on this package.", + "license": "MIT", "dependencies": [ - "nlohmann-json", { - "name": "sqlite3", - "default-features": false - }, - { - "name": "sqlite3", - "host": true, - "features": [ - "tool" - ] - }, - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true + "name": "proj", + "default-features": false, + "version>=": "9.0.0" } ], "default-features": [ @@ -33,17 +19,38 @@ "net": { "description": "Enable network support", "dependencies": [ - "curl" + { + "name": "proj", + "default-features": false, + "features": [ + "net" + ] + } ] }, "tiff": { "description": "Enable TIFF support to read some grids", "dependencies": [ - "tiff" + { + "name": "proj", + "default-features": false, + "features": [ + "tiff" + ] + } ] }, "tools": { - "description": "Build tools" + "description": "Build tools", + "dependencies": [ + { + "name": "proj", + "default-features": false, + "features": [ + "tools" + ] + } + ] } } } diff --git a/external_imported/vcpkg/ports/protobuf/fix-static-build.patch b/external_imported/vcpkg/ports/protobuf/fix-static-build.patch index fec980a93..d0e3ae010 100644 --- a/external_imported/vcpkg/ports/protobuf/fix-static-build.patch +++ b/external_imported/vcpkg/ports/protobuf/fix-static-build.patch @@ -1,13 +1,26 @@ -diff --git a/cmake/install.cmake b/cmake/install.cmake -index ef5bb13..e2d4acb 100644 ---- a/cmake/install.cmake -+++ b/cmake/install.cmake -@@ -33,7 +33,7 @@ if (protobuf_BUILD_PROTOC_BINARIES) - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - 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/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/external_imported/vcpkg/ports/protobuf/fix-uwp-build.patch b/external_imported/vcpkg/ports/protobuf/fix-uwp-build.patch deleted file mode 100644 index ca806ebd1..000000000 --- a/external_imported/vcpkg/ports/protobuf/fix-uwp-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/google/protobuf/descriptor.cc b/src/google/protobuf/descriptor.cc -index b6c31fd..8b77c3d 100644 ---- a/src/google/protobuf/descriptor.cc -+++ b/src/google/protobuf/descriptor.cc -@@ -794,7 +794,7 @@ class TableArena { - size = RoundUp(size); - - Block* to_relocate = nullptr; -- Block* to_use; -+ Block* to_use = nullptr; - - for (size_t i = 0; i < kSmallSizes.size(); ++i) { - if (small_size_blocks_[i] != nullptr && size <= kSmallSizes[i]) { diff --git a/external_imported/vcpkg/ports/protobuf/portfile.cmake b/external_imported/vcpkg/ports/protobuf/portfile.cmake index 8395eeae5..205cf7cd7 100644 --- a/external_imported/vcpkg/ports/protobuf/portfile.cmake +++ b/external_imported/vcpkg/ports/protobuf/portfile.cmake @@ -1,13 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO protocolbuffers/protobuf - REF v3.18.0 - SHA512 2c8ff451b54120e4670f7ea8c92c0c7d70f4bb781979f74f59ddcb7c9cc74fe3e8910fc579d2686fb0e1aafa35fb9548ccab667accf2358c71cfd17ba38d7826 + REF v3.19.4 + SHA512 2653b9852e5ac69f1de9b6ac02887c366aa0a9efd2b29e53135f61a9a10f5a1b5853a8c4cbb3658f519dfdbde9f32c547c39751ab417f123162b08be9e76c9e1 HEAD_REF master PATCHES fix-static-build.patch fix-default-proto-file-path.patch - fix-uwp-build.patch ) string(COMPARE EQUAL "${TARGET_TRIPLET}" "${HOST_TRIPLET}" protobuf_BUILD_PROTOC_BINARIES) @@ -27,13 +26,12 @@ endif() if (VCPKG_DOWNLOAD_MODE) # download PKGCONFIG in download mode which is used in `vcpkg_fixup_pkgconfig()` at the end of this script. - # download it here because `vcpkg_configure_cmake()` halts execution in download mode when running configure process. + # download it here because `vcpkg_cmake_configure()` halts execution in download mode when running configure process. vcpkg_find_acquire_program(PKGCONFIG) endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH}/cmake - PREFER_NINJA OPTIONS -Dprotobuf_BUILD_SHARED_LIBS=${protobuf_BUILD_SHARED_LIBS} -Dprotobuf_MSVC_STATIC_RUNTIME=${protobuf_MSVC_STATIC_RUNTIME} @@ -44,7 +42,7 @@ vcpkg_configure_cmake( ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() # It appears that at this point the build hasn't actually finished. There is probably # a process spawned by the build, therefore we need to wait a bit. @@ -57,52 +55,52 @@ function(protobuf_try_remove_recurse_wait PATH_TO_REMOVE) endif() endfunction() -protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/include) +protobuf_try_remove_recurse_wait("${CURRENT_PACKAGES_DIR}/debug/include") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/protobuf/protobuf-targets-release.cmake + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/protobuf/protobuf-targets-release.cmake" "\${_IMPORT_PREFIX}/bin/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}" "\${_IMPORT_PREFIX}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}" ) endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(READ ${CURRENT_PACKAGES_DIR}/debug/share/protobuf/protobuf-targets-debug.cmake DEBUG_MODULE) + file(READ "${CURRENT_PACKAGES_DIR}/debug/share/protobuf/protobuf-targets-debug.cmake" DEBUG_MODULE) string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" DEBUG_MODULE "${DEBUG_MODULE}") string(REPLACE "\${_IMPORT_PREFIX}/debug/bin/protoc${EXECUTABLE_SUFFIX}" "\${_IMPORT_PREFIX}/tools/protobuf/protoc${EXECUTABLE_SUFFIX}" DEBUG_MODULE "${DEBUG_MODULE}") - file(WRITE ${CURRENT_PACKAGES_DIR}/share/protobuf/protobuf-targets-debug.cmake "${DEBUG_MODULE}") + file(WRITE "${CURRENT_PACKAGES_DIR}/share/protobuf/protobuf-targets-debug.cmake" "${DEBUG_MODULE}") endif() -protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/share) +protobuf_try_remove_recurse_wait("${CURRENT_PACKAGES_DIR}/debug/share") 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.18.0.0 AUTO_CLEAN) + vcpkg_copy_tools(TOOL_NAMES protoc protoc-3.19.4.0 AUTO_CLEAN) endif() else() - file(COPY ${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT} DESTINATION ${CURRENT_PACKAGES_DIR}/tools) + file(COPY "${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools") endif() -vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/${PORT}/protobuf-config.cmake +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/protobuf-config.cmake" "if(protobuf_MODULE_COMPATIBLE)" "if(ON)" ) if(NOT protobuf_BUILD_LIBPROTOC) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/${PORT}/protobuf-module.cmake + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/protobuf-module.cmake" "_protobuf_find_libraries(Protobuf_PROTOC protoc)" "" ) endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/bin) - protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/bin) + protobuf_try_remove_recurse_wait("${CURRENT_PACKAGES_DIR}/bin") + protobuf_try_remove_recurse_wait("${CURRENT_PACKAGES_DIR}/debug/bin") endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/google/protobuf/stubs/platform_macros.h + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/google/protobuf/stubs/platform_macros.h" "\#endif // GOOGLE_PROTOBUF_PLATFORM_MACROS_H_" "\#ifndef PROTOBUF_USE_DLLS\n\#define PROTOBUF_USE_DLLS\n\#endif // PROTOBUF_USE_DLLS\n\n\#endif // GOOGLE_PROTOBUF_PLATFORM_MACROS_H_" ) @@ -111,7 +109,7 @@ endif() vcpkg_copy_pdbs() set(packages protobuf protobuf-lite) foreach(_package IN LISTS packages) - set(_file ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${_package}.pc) + set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${_package}.pc") if(EXISTS "${_file}") vcpkg_replace_string(${_file} "-l${_package}" "-l${_package}d") endif() @@ -120,8 +118,8 @@ endforeach() vcpkg_fixup_pkgconfig() if(NOT protobuf_BUILD_PROTOC_BINARIES) - configure_file(${CMAKE_CURRENT_LIST_DIR}/protobuf-targets-vcpkg-protoc.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/protobuf-targets-vcpkg-protoc.cmake COPYONLY) + configure_file("${CMAKE_CURRENT_LIST_DIR}/protobuf-targets-vcpkg-protoc.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/protobuf-targets-vcpkg-protoc.cmake" COPYONLY) endif() -configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake @ONLY) -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) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/protobuf/vcpkg.json b/external_imported/vcpkg/ports/protobuf/vcpkg.json index c75206275..3eaa26fc5 100644 --- a/external_imported/vcpkg/ports/protobuf/vcpkg.json +++ b/external_imported/vcpkg/ports/protobuf/vcpkg.json @@ -1,12 +1,21 @@ { "name": "protobuf", - "version-semver": "3.18.0", + "version-semver": "3.19.4", "description": "Protocol Buffers - Google's data interchange format", "homepage": "https://github.com/protocolbuffers/protobuf", + "license": "BSD-3-Clause", "dependencies": [ { "name": "protobuf", "host": true + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ], "features": { diff --git a/external_imported/vcpkg/ports/protozero/fix-builderror.patch b/external_imported/vcpkg/ports/protozero/fix-builderror.patch new file mode 100644 index 000000000..74ae39800 --- /dev/null +++ b/external_imported/vcpkg/ports/protozero/fix-builderror.patch @@ -0,0 +1,13 @@ +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/portfile.cmake b/external_imported/vcpkg/ports/protozero/portfile.cmake index fda45303c..abfe4956b 100644 --- a/external_imported/vcpkg/ports/protozero/portfile.cmake +++ b/external_imported/vcpkg/ports/protozero/portfile.cmake @@ -5,17 +5,17 @@ vcpkg_from_github( SHA512 d09a34865c535264c52f9c605ccb6f453c357f5e3a7b0dc72b097de288eabc6985a5b81ddbe79c47d0af2d8f74e33bd380fefce47acb15d8d51d5c151d71786b REF v1.7.0 HEAD_REF master + PATCHES fix-builderror.patch ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DBUILD_TESTING=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/protozero/vcpkg.json b/external_imported/vcpkg/ports/protozero/vcpkg.json index aae619a1e..3d4ba85b9 100644 --- a/external_imported/vcpkg/ports/protozero/vcpkg.json +++ b/external_imported/vcpkg/ports/protozero/vcpkg.json @@ -1,9 +1,19 @@ { "name": "protozero", "version-semver": "1.7.0", + "port-version": 1, "description": "Minimalist protocol buffer decoder and encoder in C++", "homepage": "https://github.com/mapbox/protozero", + "license": "BSD-2-Clause", "dependencies": [ - "protobuf" + "protobuf", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/proxygen/fix-duplicated-target.patch b/external_imported/vcpkg/ports/proxygen/fix-duplicated-target.patch deleted file mode 100644 index 89d32e53d..000000000 --- a/external_imported/vcpkg/ports/proxygen/fix-duplicated-target.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/build/fbcode_builder/CMake/FindSodium.cmake b/build/fbcode_builder/CMake/FindSodium.cmake -index c664ccbe3..3c3f1245c 100644 ---- a/build/fbcode_builder/CMake/FindSodium.cmake -+++ b/build/fbcode_builder/CMake/FindSodium.cmake -@@ -254,7 +254,10 @@ if(sodium_USE_STATIC_LIBS) - else() - set(_LIB_TYPE SHARED) - endif() --add_library(sodium ${_LIB_TYPE} IMPORTED) -+ -+if(NOT TARGET sodium) -+ add_library(sodium ${_LIB_TYPE} IMPORTED) -+endif() - - set_target_properties(sodium PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${sodium_INCLUDE_DIR}" diff --git a/external_imported/vcpkg/ports/proxygen/fix-zstd-zlib-dependency.patch b/external_imported/vcpkg/ports/proxygen/fix-zstd-zlib-dependency.patch new file mode 100644 index 000000000..a56485e87 --- /dev/null +++ b/external_imported/vcpkg/ports/proxygen/fix-zstd-zlib-dependency.patch @@ -0,0 +1,30 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ea22eab..6bf0f17 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -74,7 +74,7 @@ if (BUILD_QUIC) + else() + find_package(Fizz REQUIRED) + endif() +-find_package(Zstd REQUIRED) ++find_package(zstd CONFIG REQUIRED) + find_package(ZLIB REQUIRED) + find_package(OpenSSL REQUIRED) + find_package(Threads) +diff --git a/proxygen/lib/CMakeLists.txt b/proxygen/lib/CMakeLists.txt +index b3fa2d1..5c50ee1 100644 +--- a/proxygen/lib/CMakeLists.txt ++++ b/proxygen/lib/CMakeLists.txt +@@ -235,10 +235,10 @@ target_link_libraries( + Folly::folly + fizz::fizz + wangle::wangle +- zstd ++ $,zstd::libzstd_shared,zstd::libzstd_static> + Boost::boost + Boost::iostreams +- -lz ++ ZLIB::ZLIB + ${HTTP3_DEPEND_LIBS} + ) + diff --git a/external_imported/vcpkg/ports/proxygen/portfile.cmake b/external_imported/vcpkg/ports/proxygen/portfile.cmake index d2789572d..524f98d40 100644 --- a/external_imported/vcpkg/ports/proxygen/portfile.cmake +++ b/external_imported/vcpkg/ports/proxygen/portfile.cmake @@ -1,18 +1,16 @@ -vcpkg_fail_port_install(ON_TARGET "Windows") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/proxygen - REF v2021.06.14.00 - SHA512 f5ab54514575f86897438f40a481796c34031101775b61a01581338c91686159995e4f822909e42eed4c006b2c6a6351887d469cc9df1df80711dba10cc15a19 + REF v2022.03.21.00 + SHA512 66dfd40e45b884d64be9c06b110caaa9333116c402312ee8eb0c21f0ab569ea31b9e4fb676c68b96730abbff0b74d139f5e39e702cd958c24ce0fe76f353fbe9 HEAD_REF master PATCHES remove-register.patch - fix-duplicated-target.patch # fixed in master + fix-zstd-zlib-dependency.patch ) vcpkg_find_acquire_program(PYTHON3) -get_filename_component(PYTHON3_PATH ${PYTHON3} DIRECTORY) +get_filename_component(PYTHON3_PATH "${PYTHON3}" DIRECTORY) vcpkg_add_to_path(${PYTHON3_PATH}) if (VCPKG_TARGET_IS_WINDOWS) @@ -26,18 +24,17 @@ else() endif() endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_tools(TOOL_NAMES proxygen_curl proxygen_echo proxygen_proxy proxygen_push proxygen_static AUTO_CLEAN) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/proxygen) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/proxygen) 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/proxygen/vcpkg.json b/external_imported/vcpkg/ports/proxygen/vcpkg.json index 2e8dd6606..a0f89963a 100644 --- a/external_imported/vcpkg/ports/proxygen/vcpkg.json +++ b/external_imported/vcpkg/ports/proxygen/vcpkg.json @@ -1,6 +1,7 @@ { "name": "proxygen", - "version-string": "2021.06.14.00", + "version-string": "2022.03.21.00", + "port-version": 1, "description": "It comprises the core C++ HTTP abstractions used at Facebook.", "homepage": "https://github.com/facebook/proxygen", "supports": "!windows", @@ -16,6 +17,14 @@ "fizz", "folly", "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "wangle", "zlib", "zstd" diff --git a/external_imported/vcpkg/ports/ptex/portfile.cmake b/external_imported/vcpkg/ports/ptex/portfile.cmake index 6fe24666b..057dfc089 100644 --- a/external_imported/vcpkg/ports/ptex/portfile.cmake +++ b/external_imported/vcpkg/ports/ptex/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - set(PTEX_VER 2.3.2) vcpkg_from_github( @@ -8,7 +6,7 @@ vcpkg_from_github( REF 1b8bc985a71143317ae9e4969fa08e164da7c2e5 SHA512 37f2df9ec195f3d69d9526d0dea6a93ef49d69287bfae6ccd9671477491502ea760ed14e3b206b4f488831ab728dc749847b7d176c9b8439fb58b0a0466fe6c5 HEAD_REF master - PATCHES + PATCHES fix-build.patch fix-config.cmake.patch ) diff --git a/external_imported/vcpkg/ports/ptex/vcpkg.json b/external_imported/vcpkg/ports/ptex/vcpkg.json index 355a40596..636cea519 100644 --- a/external_imported/vcpkg/ports/ptex/vcpkg.json +++ b/external_imported/vcpkg/ports/ptex/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ptex", "version": "2.3.2", - "port-version": 3, + "port-version": 4, "description": "Per-Face Texture Mapping for Production Rendering.", "homepage": "https://github.com/wdas/ptex", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/pybind11/portfile.cmake b/external_imported/vcpkg/ports/pybind11/portfile.cmake index 6277348ad..113a679c9 100644 --- a/external_imported/vcpkg/ports/pybind11/portfile.cmake +++ b/external_imported/vcpkg/ports/pybind11/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pybind/pybind11 - REF v2.8.1 - SHA512 6738b4551a1ca2fdf6676be78216b9056cecf8b4d125f0d1aaae9929614bcbf4a9b233fc3c52b8f9dfd19a9ca1496515e6748c1afd8968b9c52c9a1e8b28da10 + REF v2.9.2 + SHA512 c6c18e5f59873adb3692640ade26472abd257607e7bb9fd48cfd1949878811e83d6ac6eb8c8dd926622d52ca4f13e5e6a58e0abaaaa1fa814ee831ea2b515272 HEAD_REF master ) @@ -22,5 +22,9 @@ vcpkg_cmake_config_fixup(CONFIG_PATH "share/cmake/pybind11") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/pybind11/pybind11Tools.cmake" + [=[find_package(PythonLibsNew ${PYBIND11_PYTHON_VERSION} MODULE REQUIRED ${_pybind11_quiet})]=] + [=[find_package(PythonLibs ${PYBIND11_PYTHON_VERSION} MODULE REQUIRED ${_pybind11_quiet})]=]) # CMake's PythonLibs works better with vcpkg + # copy license file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/pybind11/vcpkg.json b/external_imported/vcpkg/ports/pybind11/vcpkg.json index e8dbe7275..6c9dcf63d 100644 --- a/external_imported/vcpkg/ports/pybind11/vcpkg.json +++ b/external_imported/vcpkg/ports/pybind11/vcpkg.json @@ -1,9 +1,9 @@ { "name": "pybind11", - "version-semver": "2.8.1", - "port-version": 1, + "version": "2.9.2", "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", "supports": "!(arm & windows)", "dependencies": [ "python3", diff --git a/external_imported/vcpkg/ports/python2/008-bz2d.patch b/external_imported/vcpkg/ports/python2/008-bz2d.patch new file mode 100644 index 000000000..88ec7405e --- /dev/null +++ b/external_imported/vcpkg/ports/python2/008-bz2d.patch @@ -0,0 +1,19 @@ +diff --git a/setup.py b/setup.py +index f764223..d6a58e4 100644 +--- a/setup.py ++++ b/setup.py +@@ -1506,6 +1506,14 @@ class PyBuildExt(build_ext): + exts.append( Extension('bz2', ['bz2module.c'], + libraries = ['bz2'], + extra_link_args = bz2_extra_link_args) ) ++ elif (self.compiler.find_library_file(lib_dirs, 'bz2d')): ++ if host_platform == "darwin": ++ bz2_extra_link_args = ('-Wl,-search_paths_first',) ++ else: ++ bz2_extra_link_args = () ++ exts.append( Extension('bz2', ['bz2module.c'], ++ libraries=['bz2d'], ++ extra_link_args = bz2_extra_link_args) ) + else: + missing.append('bz2') + diff --git a/external_imported/vcpkg/ports/python2/portfile.cmake b/external_imported/vcpkg/ports/python2/portfile.cmake index fdbf8f415..227ffed41 100644 --- a/external_imported/vcpkg/ports/python2/portfile.cmake +++ b/external_imported/vcpkg/ports/python2/portfile.cmake @@ -35,6 +35,10 @@ if (VCPKG_TARGET_IS_WINDOWS) list(APPEND _PYTHON_PATCHES ${CMAKE_CURRENT_LIST_DIR}/007-fix-build-path.patch ) +else() + list(APPEND _PYTHON_PATCHES + ${CMAKE_CURRENT_LIST_DIR}/008-bz2d.patch + ) endif() @@ -50,6 +54,8 @@ vcpkg_extract_source_archive_ex( PATCHES ${_PYTHON_PATCHES} ) +vcpkg_replace_string("${SOURCE_PATH}/Makefile.pre.in" "$(INSTALL) -d -m $(DIRMODE)" "$(MKDIR_P)") + if (VCPKG_TARGET_IS_WINDOWS) if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86") set(BUILD_ARCH "Win32") @@ -85,10 +91,62 @@ else() ) vcpkg_install_make() + vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") endif() +if (NOT VCPKG_TARGET_IS_WINDOWS) + foreach(lib_suffix IN ITEMS "" "/debug") + set(python_config_file "${CURRENT_PACKAGES_DIR}${lib_suffix}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/_sysconfigdata.py") + if(NOT EXISTS "${python_config_file}") + continue() + endif() + + file(READ "${python_config_file}" contents) + + string(PREPEND contents "import os\n_base = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))\n") + # make contents a list of lines + string(REPLACE ";" "\\;" old_contents "${contents}") + string(REGEX REPLACE "\r?\n" ";" old_contents "${contents}") + + set(new_contents "") + foreach(line IN LISTS old_contents) + if(line MATCHES "\"") + string(REGEX REPLACE + "${CURRENT_PACKAGES_DIR}|${CURRENT_INSTALLED_DIR}" + "\" + _base + \"" + line + "${line}" + ) + string(REGEX REPLACE + "\"[^\"]*${CURRENT_BUILDTREES_DIR}[^\"]*\"" + "''" + line + "${line}" + ) + else() + string(REGEX REPLACE + "${CURRENT_PACKAGES_DIR}|${CURRENT_INSTALLED_DIR}" + "' + _base + '" + line + "${line}" + ) + string(REGEX REPLACE + "'[^']*${CURRENT_BUILDTREES_DIR}[^']*'" + "''" + line + "${line}" + ) + endif() + list(APPEND new_contents "${line}") + endforeach() + + list(JOIN new_contents "\n" contents) + file(WRITE "${python_config_file}" "${contents}") + endforeach() +endif() + # Handle copyright file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/python${PYTHON_VERSION_MAJOR}) file(RENAME ${CURRENT_PACKAGES_DIR}/share/python${PYTHON_VERSION_MAJOR}/LICENSE ${CURRENT_PACKAGES_DIR}/share/python${PYTHON_VERSION_MAJOR}/copyright) diff --git a/external_imported/vcpkg/ports/python2/vcpkg.json b/external_imported/vcpkg/ports/python2/vcpkg.json index 9780104ac..abe470eb5 100644 --- a/external_imported/vcpkg/ports/python2/vcpkg.json +++ b/external_imported/vcpkg/ports/python2/vcpkg.json @@ -1,7 +1,8 @@ { "name": "python2", "version": "2.7.18", - "port-version": 1, + "port-version": 4, "description": "The Python programming language as an embeddable library", - "homepage": "https://www.python.org" + "homepage": "https://www.python.org", + "license": "Python-2.0" } diff --git a/external_imported/vcpkg/ports/python3/0008-fix-parallel-install.patch b/external_imported/vcpkg/ports/python3/0008-fix-parallel-install.patch deleted file mode 100644 index 26554644c..000000000 --- a/external_imported/vcpkg/ports/python3/0008-fix-parallel-install.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 790d974..88fc444 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -2019,6 +2019,10 @@ Python/thread.o: @THREADHEADERS@ $(srcdir)/Python/condvar.h - .PHONY: build_all_generate_profile build_all_merge_profile - .PHONY: gdbhooks - -+# Serialize targets which may create /lib -+libinstall: altbininstall -+libainstall: altbininstall -+ - # IF YOU PUT ANYTHING HERE IT WILL GO AWAY - # Local Variables: - # mode: makefile diff --git a/external_imported/vcpkg/ports/python3/0009-python-embed.pc.patch b/external_imported/vcpkg/ports/python3/0009-python-embed.pc.patch deleted file mode 100644 index a2aeb24c2..000000000 --- a/external_imported/vcpkg/ports/python3/0009-python-embed.pc.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/Misc/python-embed.pc.in b/Misc/python-embed.pc.in -index 2be9df8..a2e5ff7 100644 ---- a/Misc/python-embed.pc.in -+++ b/Misc/python-embed.pc.in -@@ -9,5 +9,5 @@ Description: Embed Python into an application - Requires: - Version: @VERSION@ - Libs.private: @LIBS@ --Libs: -L${libdir} -lpython@VERSION@@ABIFLAGS@ -+Libs: -L${libdir} -lpython@ABIVERSION@@ABIFLAGS@@ABISUFFIX@ - Cflags: -I${includedir}/python@VERSION@@ABIFLAGS@ diff --git a/external_imported/vcpkg/ports/python3/0009-python.pc.patch b/external_imported/vcpkg/ports/python3/0009-python.pc.patch new file mode 100644 index 000000000..173be389d --- /dev/null +++ b/external_imported/vcpkg/ports/python3/0009-python.pc.patch @@ -0,0 +1,16 @@ +--- a/Misc/python.pc.in 2022-01-14 05:23:10.299912709 +0000 ++++ b/Misc/python.pc.in 2022-01-14 05:23:15.908022446 +0000 +@@ -10,4 +10,4 @@ + Version: @VERSION@ + Libs.private: @LIBS@ + Libs: +-Cflags: -I${includedir}/python@VERSION@@ABIFLAGS@ ++Cflags: -I${includedir}/python@VERSION@ +--- a/Misc/python-embed.pc.in 2022-01-14 05:22:57.043653570 +0000 ++++ b/Misc/python-embed.pc.in 2022-01-14 05:23:04.603801315 +0000 +@@ -10,4 +10,4 @@ + Version: @VERSION@ + Libs.private: @LIBS@ + Libs: -L${libdir} -lpython@VERSION@@ABIFLAGS@ +-Cflags: -I${includedir}/python@VERSION@@ABIFLAGS@ ++Cflags: -I${includedir}/python@VERSION@ diff --git a/external_imported/vcpkg/ports/python3/0010-bz2d.patch b/external_imported/vcpkg/ports/python3/0010-bz2d.patch new file mode 100644 index 000000000..162cc7cab --- /dev/null +++ b/external_imported/vcpkg/ports/python3/0010-bz2d.patch @@ -0,0 +1,19 @@ +diff --git a/setup.py b/setup.py +index 43e807f20..df4d43d3d 100644 +--- a/setup.py ++++ b/setup.py +@@ -1741,6 +1741,14 @@ def detect_compress_exts(self): + self.add(Extension('_bz2', ['_bz2module.c'], + libraries=['bz2'], + extra_link_args=bz2_extra_link_args)) ++ elif (self.compiler.find_library_file(self.lib_dirs, 'bz2d')): ++ if MACOS: ++ bz2_extra_link_args = ('-Wl,-search_paths_first',) ++ else: ++ bz2_extra_link_args = () ++ self.add(Extension('_bz2', ['_bz2module.c'], ++ libraries=['bz2d'], ++ extra_link_args=bz2_extra_link_args)) + else: + self.missing.append('_bz2') + diff --git a/external_imported/vcpkg/ports/python3/portfile.cmake b/external_imported/vcpkg/ports/python3/portfile.cmake index fccf619a5..d99a0fd67 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 1) +set(PYTHON_VERSION_PATCH 2) set(PYTHON_VERSION ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.${PYTHON_VERSION_PATCH}) set(PATCHES @@ -13,7 +13,8 @@ set(PATCHES 0003-devendor-external-dependencies.patch 0004-dont-copy-vcruntime.patch 0005-only-build-required-projects.patch - 0008-fix-parallel-install.patch + 0009-python.pc.patch + 0010-bz2d.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") list(PREPEND PATCHES 0001-static-library.patch) @@ -34,18 +35,38 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) if("${WINSDK_VERSION}" VERSION_GREATER_EQUAL "10.0.22000") list(APPEND PATCHES "0007-workaround-windows-11-sdk-rc-compiler-error.patch") endif() - list(APPEND PATCHES "0009-python-embed.pc.patch") endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO python/cpython REF v${PYTHON_VERSION} - SHA512 23f99b77c7978282d43a6e442811de1d6e8cc9597c6d1143ec65ae986f64805c36a0a033632a4d1a89053a55854904bcf11415d91e2a3b4a5308c4a21de80098 + SHA512 14f0d1847d4361fa075adbe4dbf7339fb62be91d5419cf506abdf46b36dc5273564792d35e5a5e0608a8fa877a870152a593743c3b70a98c739d5bd028be9e18 HEAD_REF master PATCHES ${PATCHES} ) +vcpkg_replace_string("${SOURCE_PATH}/Makefile.pre.in" "$(INSTALL) -d -m $(DIRMODE)" "$(MKDIR_P)") + +function(make_python_pkgconfig) + cmake_parse_arguments(PARSE_ARGV 0 arg "" "FILE;INSTALL_ROOT;EXEC_PREFIX;INCLUDEDIR;ABIFLAGS" "") + + set(prefix "${CURRENT_PACKAGES_DIR}") + set(libdir [[${prefix}/lib]]) + set(exec_prefix ${arg_EXEC_PREFIX}) + set(includedir ${arg_INCLUDEDIR}) + set(VERSION "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}") + set(ABIFLAGS ${arg_ABIFLAGS}) + + string(REPLACE "python" "python-${VERSION}" out_file ${arg_FILE}) + set(out_full_path "${arg_INSTALL_ROOT}/lib/pkgconfig/${out_file}") + configure_file("${SOURCE_PATH}/Misc/${arg_FILE}.in" ${out_full_path} @ONLY) + + file(READ ${out_full_path} pkgconfig_file) + string(REPLACE "-lpython${VERSION}" "-lpython${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}" pkgconfig_file "${pkgconfig_file}") + file(WRITE ${out_full_path} "${pkgconfig_file}") +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. @@ -60,7 +81,7 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) find_library(FFI_RELEASE NAMES libffi PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(FFI_DEBUG NAMES libffi PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(LZMA_RELEASE NAMES lzma PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) - find_library(LZMA_DEBUG NAMES lzmad PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + find_library(LZMA_DEBUG NAMES lzma PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(SQLITE_RELEASE NAMES sqlite3 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(SQLITE_DEBUG NAMES sqlite3 PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(SSL_RELEASE NAMES libssl PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) @@ -160,36 +181,45 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) endif() # pkg-config files - set(prefix "${CURRENT_PACKAGES_DIR}") - set(libdir [[${prefix}/lib]]) - set(ABIVERSION "${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") - set(VERSION "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}") - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - set(exec_prefix "${CURRENT_PACKAGES_DIR}/tools/${PORT}") - set(includedir [[${prefix}/include]]) - set(ABISUFFIX "") - configure_file("${SOURCE_PATH}/Misc/python.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/python-${VERSION}.pc" @ONLY) - configure_file("${SOURCE_PATH}/Misc/python-embed.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/python-${VERSION}-embed.pc" @ONLY) + make_python_pkgconfig(FILE python.pc INSTALL_ROOT ${CURRENT_PACKAGES_DIR} + EXEC_PREFIX "\${prefix}/tools/${PORT}" INCLUDEDIR [[${prefix}/include]] ABIFLAGS "") + make_python_pkgconfig(FILE python-embed.pc INSTALL_ROOT ${CURRENT_PACKAGES_DIR} + EXEC_PREFIX "\${prefix}/tools/${PORT}" INCLUDEDIR [[${prefix}/include]] ABIFLAGS "") endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - set(exec_prefix "\${prefix}/../tools/${PORT}") - set(includedir [[${prefix}/../include]]) - set(ABISUFFIX "_d") - configure_file("${SOURCE_PATH}/Misc/python.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/python-${VERSION}.pc" @ONLY) - configure_file("${SOURCE_PATH}/Misc/python-embed.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/python-${VERSION}-embed.pc" @ONLY) + make_python_pkgconfig(FILE python.pc INSTALL_ROOT "${CURRENT_PACKAGES_DIR}/debug" + EXEC_PREFIX "\${prefix}/../tools/${PORT}" INCLUDEDIR [[${prefix}/../include]] ABIFLAGS "_d") + make_python_pkgconfig(FILE python-embed.pc INSTALL_ROOT "${CURRENT_PACKAGES_DIR}/debug" + EXEC_PREFIX "\${prefix}/../tools/${PORT}" INCLUDEDIR [[${prefix}/../include]] ABIFLAGS "_d") endif() vcpkg_fixup_pkgconfig() vcpkg_clean_msbuild() + + # Remove static library belonging to executable + if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + if (EXISTS "${CURRENT_PACKAGES_DIR}/lib/python.lib") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/manual-link") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/python.lib" + "${CURRENT_PACKAGES_DIR}/lib/manual-link/python.lib") + endif() + if (EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/python_d.lib") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/python_d.lib" + "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/python_d.lib") + endif() + endif() else() set(OPTIONS "--with-openssl=${CURRENT_INSTALLED_DIR}" "--with-ensurepip" "--with-suffix=" "--with-system-expat" + "--without-readline" + "--disable-test-modules" ) if(VCPKG_TARGET_IS_OSX) list(APPEND OPTIONS "LIBS=-liconv -lintl") diff --git a/external_imported/vcpkg/ports/python3/vcpkg.json b/external_imported/vcpkg/ports/python3/vcpkg.json index aaa4b69fc..1a2ec9110 100644 --- a/external_imported/vcpkg/ports/python3/vcpkg.json +++ b/external_imported/vcpkg/ports/python3/vcpkg.json @@ -1,9 +1,10 @@ { "name": "python3", - "version-semver": "3.10.1", - "port-version": 4, + "version": "3.10.2", + "port-version": 1, "description": "The Python programming language", "homepage": "https://github.com/python/cpython", + "license": "Python-2.0", "supports": "!uwp", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/qhttpengine/portfile.cmake b/external_imported/vcpkg/ports/qhttpengine/portfile.cmake index 5a59f0ce8..3d744bc17 100644 --- a/external_imported/vcpkg/ports/qhttpengine/portfile.cmake +++ b/external_imported/vcpkg/ports/qhttpengine/portfile.cmake @@ -17,6 +17,11 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) +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(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/qhttpengine/vcpkg.json b/external_imported/vcpkg/ports/qhttpengine/vcpkg.json index 9e554e1e5..f1762479d 100644 --- a/external_imported/vcpkg/ports/qhttpengine/vcpkg.json +++ b/external_imported/vcpkg/ports/qhttpengine/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qhttpengine", "version": "1.0.2", + "port-version": 1, "description": "HTTP server for Qt applications", "supports": "!uwp", "dependencies": [ diff --git a/external_imported/vcpkg/ports/qhull/portfile.cmake b/external_imported/vcpkg/ports/qhull/portfile.cmake index 5584c7b19..6aa76096c 100644 --- a/external_imported/vcpkg/ports/qhull/portfile.cmake +++ b/external_imported/vcpkg/ports/qhull/portfile.cmake @@ -11,38 +11,45 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/share/man - ${CURRENT_PACKAGES_DIR}/share/doc - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share/man - ${CURRENT_PACKAGES_DIR}/debug/share/doc + "${CURRENT_PACKAGES_DIR}/share/man" + "${CURRENT_PACKAGES_DIR}/share/doc" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share/man" + "${CURRENT_PACKAGES_DIR}/debug/share/doc" ) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Qhull) -file(REMOVE - ${CURRENT_PACKAGES_DIR}/lib/pkgconfig/qhullstatic.pc - ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/qhullstatic_d.pc -) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Qhull) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE - ${CURRENT_PACKAGES_DIR}/lib/pkgconfig/qhull_r.pc - ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/qhull_rd.pc - ) + file(WRITE "${CURRENT_PACKAGES_DIR}/share/qhull/QhullTargets-interface.cmake" [[ + add_library(Qhull::qhull_r IMPORTED INTERFACE) + set_target_properties(Qhull::qhull_r PROPERTIES INTERFACE_LINK_LIBRARIES Qhull::qhullstatic_r) +]]) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(active_basename "qhullstatic") + set(inactive_basename "qhull") else() - file(REMOVE - ${CURRENT_PACKAGES_DIR}/lib/pkgconfig/qhullstatic_r.pc - ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/qhullstatic_rd.pc - ) + set(active_basename "qhull") + set(inactive_basename "qhullstatic") +endif() +file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${inactive_basename}_r.pc") +file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${inactive_basename}.pc") # qhullstatic.pc in dynamic build +if(NOT DEFINED VCPKG_BUILD_TYPE) + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${inactive_basename}_rd.pc") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${active_basename}_rd.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${active_basename}_r.pc") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/qhullstatic_d.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/qhullstatic.pc") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${inactive_basename}.pc") # qhullstatic.pc in dynamic build + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/qhullcpp_d.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/qhullcpp.pc") endif() vcpkg_fixup_pkgconfig() @@ -56,4 +63,5 @@ vcpkg_copy_tools(TOOL_NAMES AUTO_CLEAN ) -file(INSTALL ${SOURCE_PATH}/README.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME usage) +file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/qhull/usage b/external_imported/vcpkg/ports/qhull/usage new file mode 100644 index 000000000..94dbcafa6 --- /dev/null +++ b/external_imported/vcpkg/ports/qhull/usage @@ -0,0 +1,9 @@ +The package qhull provides CMake targets: + + # Reentrant C API + find_package(Qhull CONFIG REQUIRED) + target_link_libraries(main PRIVATE Qhull::qhull_r) + + # C++ API + find_package(Qhull CONFIG REQUIRED) + target_link_libraries(main PRIVATE Qhull::qhullcpp) diff --git a/external_imported/vcpkg/ports/qhull/vcpkg.json b/external_imported/vcpkg/ports/qhull/vcpkg.json index b115f1331..7f6e7e32f 100644 --- a/external_imported/vcpkg/ports/qhull/vcpkg.json +++ b/external_imported/vcpkg/ports/qhull/vcpkg.json @@ -1,7 +1,18 @@ { "name": "qhull", - "version-string": "8.0.2", - "port-version": 2, + "version": "8.0.2", + "port-version": 3, "description": "computes the convex hull, Delaunay triangulation, Voronoi diagram", - "homepage": "https://github.com/qhull/qhull" + "homepage": "https://github.com/qhull/qhull", + "license": null, + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/qnnpack/portfile.cmake b/external_imported/vcpkg/ports/qnnpack/portfile.cmake index 271bd11ca..673307bc4 100644 --- a/external_imported/vcpkg/ports/qnnpack/portfile.cmake +++ b/external_imported/vcpkg/ports/qnnpack/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "Windows") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pytorch/QNNPACK diff --git a/external_imported/vcpkg/ports/qnnpack/use-packages.patch b/external_imported/vcpkg/ports/qnnpack/use-packages.patch index 334565162..2591e1331 100644 --- a/external_imported/vcpkg/ports/qnnpack/use-packages.patch +++ b/external_imported/vcpkg/ports/qnnpack/use-packages.patch @@ -123,8 +123,8 @@ index a5ddc49..05e1279 100644 ENDIF() -TARGET_LINK_LIBRARIES(qnnpack PRIVATE cpuinfo) + -+find_package(unofficial-cpuinfo CONFIG REQUIRED) -+target_link_libraries(qnnpack PUBLIC unofficial::cpuinfo::clog unofficial::cpuinfo::cpuinfo) ++find_package(cpuinfo CONFIG REQUIRED) ++target_link_libraries(qnnpack PUBLIC cpuinfo::clog cpuinfo::cpuinfo) # ---[ Configure pthreadpool -IF(NOT TARGET pthreadpool) diff --git a/external_imported/vcpkg/ports/qnnpack/vcpkg.json b/external_imported/vcpkg/ports/qnnpack/vcpkg.json index 20b4aa0e3..ea8b98f7a 100644 --- a/external_imported/vcpkg/ports/qnnpack/vcpkg.json +++ b/external_imported/vcpkg/ports/qnnpack/vcpkg.json @@ -1,8 +1,10 @@ { "name": "qnnpack", "version-date": "2021-02-26", + "port-version": 2, "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", "dependencies": [ "cpuinfo", diff --git a/external_imported/vcpkg/ports/qpid-proton/fix-openssl3.patch b/external_imported/vcpkg/ports/qpid-proton/fix-openssl3.patch new file mode 100644 index 000000000..bf33ee53d --- /dev/null +++ b/external_imported/vcpkg/ports/qpid-proton/fix-openssl3.patch @@ -0,0 +1,22 @@ +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 2d206def1..4df813a93 100644 --- a/external_imported/vcpkg/ports/qpid-proton/portfile.cmake +++ b/external_imported/vcpkg/ports/qpid-proton/portfile.cmake @@ -8,6 +8,8 @@ vcpkg_from_github( REF dc244b1f7e886883a2bb416407f42ba55d0f5f42 # 0.32.0 SHA512 19f191dd206fd43a8f5b8db95f6ada57bd60b93eb907cf32f463c23cfe8c5f4914c6f4750ebde50c970387fb62baf4451279803eeb000bc8bb5c200692e5d1d7 HEAD_REF next + PATCHES + fix-openssl3.patch ) vcpkg_cmake_configure( @@ -16,8 +18,6 @@ vcpkg_cmake_configure( -DPYTHON_EXECUTABLE=${PYTHON3} -DLIB_SUFFIX= -DBUILD_GO=no - -DBUILD_RUBY=no - -DBUILD_PYTHON=no -DENABLE_JSONCPP=ON -DCMAKE_DISABLE_FIND_PACKAGE_CyrusSASL=ON ) @@ -26,8 +26,24 @@ vcpkg_cmake_install() 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" +) +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") diff --git a/external_imported/vcpkg/ports/qpid-proton/qpid-protonConfig.cmake b/external_imported/vcpkg/ports/qpid-proton/qpid-protonConfig.cmake new file mode 100644 index 000000000..3ad039bd6 --- /dev/null +++ b/external_imported/vcpkg/ports/qpid-proton/qpid-protonConfig.cmake @@ -0,0 +1,4 @@ +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 cbdd7e4ec..3dd0dcff0 100644 --- a/external_imported/vcpkg/ports/qpid-proton/vcpkg.json +++ b/external_imported/vcpkg/ports/qpid-proton/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qpid-proton", "version": "0.32.0", - "port-version": 2, + "port-version": 4, "description": "Qpid Proton is a high-performance, lightweight messaging library.", "homepage": "https://github.com/apache/qpid-proton", "dependencies": [ diff --git a/external_imported/vcpkg/ports/qt/vcpkg.json b/external_imported/vcpkg/ports/qt/vcpkg.json index cabac8ad5..4e51339de 100644 --- a/external_imported/vcpkg/ports/qt/vcpkg.json +++ b/external_imported/vcpkg/ports/qt/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qt", - "version-semver": "6.2.2", + "version": "6.2.4", "description": "Qt", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qt5compat", diff --git a/external_imported/vcpkg/ports/qt5-3d/portfile.cmake b/external_imported/vcpkg/ports/qt5-3d/portfile.cmake index 62a01e4de..5e37676c5 100644 --- a/external_imported/vcpkg/ports/qt5-3d/portfile.cmake +++ b/external_imported/vcpkg/ports/qt5-3d/portfile.cmake @@ -3,7 +3,7 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) set(OPTIONS -system-assimp) 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) diff --git a/external_imported/vcpkg/ports/qt5-3d/vcpkg.json b/external_imported/vcpkg/ports/qt5-3d/vcpkg.json index ea4f27ee8..282d07e0e 100644 --- a/external_imported/vcpkg/ports/qt5-3d/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-3d/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-3d", - "version-string": "5.15.2", - "port-version": 2, + "version": "5.15.3", "description": "Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering", + "license": null, "dependencies": [ "assimp", { diff --git a/external_imported/vcpkg/ports/qt5-activeqt/vcpkg.json b/external_imported/vcpkg/ports/qt5-activeqt/vcpkg.json index 05dd52842..8935f1e5e 100644 --- a/external_imported/vcpkg/ports/qt5-activeqt/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-activeqt/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-activeqt", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 ActiveQt Module - ActiveX components", + "license": null, "supports": "windows", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/qt5-androidextras/vcpkg.json b/external_imported/vcpkg/ports/qt5-androidextras/vcpkg.json index 12024cbd2..15e043cd5 100644 --- a/external_imported/vcpkg/ports/qt5-androidextras/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-androidextras/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-androidextras", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 androidextras Module;", + "license": null, "supports": "android", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/qt5-base/cmake/qt_build_submodule.cmake b/external_imported/vcpkg/ports/qt5-base/cmake/qt_build_submodule.cmake index 52f9c6c1b..e2e390cec 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 @@ -3,9 +3,11 @@ 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") - vcpkg_find_acquire_program(PYTHON2) - get_filename_component(PYTHON2_EXE_PATH ${PYTHON2} DIRECTORY) - vcpkg_add_to_path("${PYTHON2_EXE_PATH}") + if(NOT PORT STREQUAL "qt5-webengine") + vcpkg_find_acquire_program(PYTHON3) + get_filename_component(PYTHON3_EXE_PATH ${PYTHON3} DIRECTORY) + vcpkg_add_to_path("${PYTHON3_EXE_PATH}") + endif() vcpkg_configure_qmake(SOURCE_PATH ${SOURCE_PATH} ${ARGV}) diff --git a/external_imported/vcpkg/ports/qt5-base/cmake/qt_download_submodule.cmake b/external_imported/vcpkg/ports/qt5-base/cmake/qt_download_submodule.cmake index 63850a4ef..5c8aff033 100644 --- a/external_imported/vcpkg/ports/qt5-base/cmake/qt_download_submodule.cmake +++ b/external_imported/vcpkg/ports/qt5-base/cmake/qt_download_submodule.cmake @@ -14,7 +14,7 @@ function(qt_download_submodule) qt_get_submodule_name(NAME) set(FULL_VERSION "${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}") - set(ARCHIVE_NAME "${NAME}-everywhere-src-${FULL_VERSION}.tar.xz") + set(ARCHIVE_NAME "${NAME}-everywhere-opensource-src-${FULL_VERSION}.tar.xz") set(URLS "https://download.qt.io/official_releases/qt/${QT_MAJOR_MINOR_VER}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}" "https://mirrors.ocf.berkeley.edu/qt/official_releases/qt/${QT_MAJOR_MINOR_VER}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}" ) diff --git a/external_imported/vcpkg/ports/qt5-base/cmake/qt_port_hashes.cmake b/external_imported/vcpkg/ports/qt5-base/cmake/qt_port_hashes.cmake index c52196078..c7d0cba8c 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,67 +1,68 @@ -#Every update requires an update of these hashes and the version within the control file of each of the 32 ports. +#Every update requires an update of these hashes and the version within the control file of each of the 32 ports. #So it is probably better to have a central location for these hashes and let the ports update via a script set(QT_MAJOR_MINOR_VER 5.15) -set(QT_PATCH_VER 2) +set(QT_PATCH_VER 3) set(QT_UPDATE_VERSION 0) # Switch to update qt and not build qt. Creates a file cmake/qt_new_hashes.cmake in qt5-base with the new hashes. set(QT_PORT_LIST base 3d activeqt charts connectivity datavis3d declarative gamepad graphicaleffects imageformats location macextras mqtt multimedia networkauth purchasing quickcontrols quickcontrols2 remoteobjects script scxml sensors serialport speech svg tools virtualkeyboard webchannel websockets webview winextras xmlpatterns doc x11extras androidextras translations serialbus webengine webglplugin wayland) -set(QT_HASH_qt5-base a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9) -set(QT_HASH_qt5-3d 38da6886b887f6d315dcb17192322efe184950716fdd0030df6c7d7c454ea43dc0250a201285da27683ce29768da6be41d4168e4f63c20adb0b5f26ae0934c1b) -set(QT_HASH_qt5-activeqt a2286a6736d14cf9b0dbf20af5ee8c23f94f57b6d4c0be41853e67109d87fd78dbf8f14eef2ce4b8d9ff2244af7ef139829ad7674d9ec9669434028961e65ec7) -set(QT_HASH_qt5-charts d16fc085a7e98078cf616cde07d57c5f04cd41e9687a26d42edf9042b4c95a837371b6b9616e7176c536d742aa9b5fc15bf3393f9f2e814ce942189ac151e65f) -set(QT_HASH_qt5-connectivity a934dcdd28645ba23dd429215643694d9a14449a4c3e1a6154a9a19cb3210f3d80978b46aefff2b110db533fa1816450f2f73a27d80df5330a92799e4cca1b9c) -set(QT_HASH_qt5-datavis3d 340b5ce1b1c2d8849b665e7bc84430fdf48e443fc149530ee132f325067f57d35594a23e3a8b920e1928ca5c429dcacfa098dadcbde63d4993f748c436af4cc3) -set(QT_HASH_qt5-declarative a084e4ace0d6868668c95f1b62598a7dd0f455bfb0943ac8956802d7041436686f20c7ccdde7d6fd6c4b8173c936dd8600cf3b87bf8575f55514edfbb51111d3) -set(QT_HASH_qt5-gamepad 67f299d36f70ac3205a136117bec7f983f889b6a1f7d0ff97eb03925f4789d9d90a7197f5e186a6d04aa486880c60f0f623ab56a8bd78e4682e84c7ff6cc9fe1) -set(QT_HASH_qt5-graphicaleffects 1620a4daa6f2afc13b84752fa92f6d603aea1f7c796a239691b271a455d6887bba87a9a07edbfe008045f051c3e71fc6e22fc337d146c1793e923cfeb20e897d) -set(QT_HASH_qt5-imageformats 3c821fac83b8d6177af256dc1d68aca14ae6d5cbdedb8d8665158ebcec0f6e6fb790b5d210a1aa8b0679ecff60fafd4e5d1387c6954498b41409ea44177e0d7e) -set(QT_HASH_qt5-location 6192922506b3ea354e85431df83c19d7cc9aebb17549c6a1de48f625bf8365ff3db3161080dde254a5fb9199d99c3c5dc8e1533429150be55df96ddb7d6ce16f) -set(QT_HASH_qt5-macextras 21e807a587da716615a447207abda2c3eb409111a0eb6f844c8f1281ccc842a7c2e8759c1d7ce62cc3bad3325b4570a0bae1fbe4e5592e905788dde8898c6cb0) -set(QT_HASH_qt5-mqtt 91efd3b1ebef3c95473c018bcacd0772e613b38c) # Git commit ID -set(QT_HASH_qt5-multimedia be58e6934976b04707399f8525dd5d50f73e0539efd1a76c2f9868e35e6f136e0991652df5d46350a9ac39d24313353e4aa826131f268a95e458e57279f448bd) -set(QT_HASH_qt5-networkauth 94843a74ae188eb0eff9559be6b246f61f87104479f6f52fe943b31a9263461a7051d967072d9061124b2bd056d7265645892104653c93dfcf68b11521f1c33d) -set(QT_HASH_qt5-purchasing 1a40fd3ca149f9c8fc98a45562b37fc97c7addc513d40f50997576648d441d379179370c6491a003982feafe96736047a8faf09caf36eaeea5a97553f75d1255) -set(QT_HASH_qt5-quickcontrols 52839e7442f4b6b5cbbb741d29ce28e9d2d9f5573499363d17252b166c1f318f37a19ecf1bf17f5cf6940bc29cc2987180b740ce036d924ff329dee9c37823a2) # deprecated -set(QT_HASH_qt5-quickcontrols2 5af506fd5842c505ae5fbd04fdd2a467c5b6a9547b4cea80c9cf051e9dea49bbf17843d8bc12e69e95810e70119c2843c24171c84e0f5df62dd2f59a39903c8f) -set(QT_HASH_qt5-remoteobjects 1cce1b6128f283fe8930e1e58b9620459c50b203a39607e9bcde8423930da08e5c70e7effaf64d2690f463cc7b37cfc67fb6c0ac89e27df3a57007aee1d5233d) -set(QT_HASH_qt5-script 71c70b34f7d4a0742df64d20d7e9a685cc640b9cc6a3d22847c04f45a437b3f5537f40225a522ed82787c2744d9a4949dea5b43c2ee81961d5ed175cf10deb32) # deprecated -set(QT_HASH_qt5-scxml 2a4719af94baefe7f0ca5a23239d07a05285a1698b052d17bb87bc221bbbc8bc25a70ff06d70d41ed7ac6a7e6646be9c516d8187c9098da1158c08e27a4b0bb8) -set(QT_HASH_qt5-sensors d0a34e0718cc727b1256601bc5f9a2975532d728fdf0cb7678824c7d36aa5049d9c2886053821ec93a238120441c980027306ac633677617867c7aee40bb560b) -set(QT_HASH_qt5-serialport 353cc5f708367d646bd312f7d675b417bad4df44356f1dfc8b6ce846a86fd6d5955ec4d26f943e50f4a7b94cc6389fe658959e90bbb5ab3cdaefed0efe6ae72b) -set(QT_HASH_qt5-speech 78a13218a639276c9b253566a1df52e2363847eac76df3962ba2a7178800206beb57859d22c7c99fa1579cb3aa7ab94baed1a6319ba946d4a64cba9e3bf52b05) -set(QT_HASH_qt5-svg 101e9c8fc05b1bb9c4e869564bff8e5723dd35f0ef557185e56e9dc12fdce74c531522c9642cdff639900eccf7ed0e04bfa48142741259697dded990fb481730) -set(QT_HASH_qt5-tools 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b) -set(QT_HASH_qt5-virtualkeyboard 3ba04d171756a5434424833c5198a23e0df53eeebe9ea542047e094f83f38492d93f901cac67cf7e55aca6a71289ce3c6f5d8ac10a8d051b291155ebb8432016) -set(QT_HASH_qt5-webchannel 7ac5e372695616863d247c5a61e5763a3934b58165e35c43da5ef1797d80005aa3d6eb258931ae7ee2b1f6a6fa743635ac4678c9cfe375cefa76e74cc81d095b) -set(QT_HASH_qt5-websockets 1b23b79bff4289e785daf51441daaecf6de66ca5a3febfdd8fdb8ce871471bca4faf7663d68b23aaf562b1ebd6e9c8c27b3074f4b93bc9fcd3a0c54f7f79a9c4) -set(QT_HASH_qt5-webview 11502597d5e3a9b8a3a90025b56c086a3412743019384558617c397a8ad4a0f646b406a4fbeb31ca45e6e573d1fb06cd5b22b8c0179695d06cc3d492289a1c85) -set(QT_HASH_qt5-winextras 6555a42d4bbeb46b394f573b6ed7926ec21cf6024de3c5f43000373bf0a2f4544f19866e2c9469da2d60b5dd99fb046765be5d3f8d5025169e319795bbf66d9e) -set(QT_HASH_qt5-xmlpatterns 5cdf51878f8bb42db57110acc0c3985a95af098da44e5dda505e0716fef5afc780419058158f7a8f9a0fe3fed83fd64abd856b4dbcdca20efa5e985fa85cc348) # deprecated -##TODO -set(QT_HASH_qt5-doc ce2c003b37829da102f243ca271548cff0597b4b667109ca9533971a490b8b20eb3183af6e0b209ad58964f2be2e757f83933a3f8c484dd0814750e24d1a244e) -set(QT_HASH_qt5-x11extras beaefc865299f4e7c637baa96eb3a69adbe1a41fc7735b46cfec0768c9243391600e69078630fffb4aceba106b7512fd802e745abc38ddab5253233301c93ed9) -set(QT_HASH_qt5-androidextras cacd9252f313595d21eb6a94ffabbd5fff476af82aa619b4edfc77a9f405f52bd1b89da97c8f7dadf8c403035a243205a25a2f85250ebc0590bf68f914cdbf3a) -#set(QT_HASH_qt5-canvas3d 0) deprecated -set(QT_HASH_qt5-translations 483b5d919f43c96a032e610cf6316989e7b859ab177cb2f7cb9bb10ebcddf8c9be8e04ff12db38a317c618d13f88455a4d434c7a1133f453882da4e026dd8cbe) -set(QT_HASH_qt5-serialbus c4793f5425ca0191435d75a8fd95a623cc847d41b8722421c0bf0fdfddda1a158fd2a00f5d997f00de4fcb271a158f3273d636ef2553ccd6b90b4d072b1eb55b) -set(QT_HASH_qt5-webengine de64c30819f5e2f8620c853ff22b2f9717641477aef4432a552a72d1d67ed62ed61572afee6de3f2c9f32dee28f4f786ffd63fc465aa42c0ae1e87ea28341756) -set(QT_HASH_qt5-webglplugin 14b9a0c08472121165eba82f3c81518be7b19484b7bee7887df9751edc6e2e7e76d06f961b180427014beb71c725d343e9f196f37690e2d207511f7639bd2627) -set(QT_HASH_qt5-wayland e8657ed676873da7b949e6a1605d025918a03336af9c68f32741945ec3c71a604def55bb00737ba4d97b91c00d0e2df1a83cdcedcf5795c6b2a1ef2caa21c91c) +set(QT_HASH_qt5-base 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079) +set(QT_HASH_qt5-3d 1fa644ef53923b194efd2296c1505e2193897057774411b1bc50651c2fc4e781e427de13cdc4c1c770294a39d06f8e7360353361c75222c0eb457b560943d97c) +set(QT_HASH_qt5-activeqt 5a5fc0a98c4928e6cd27105e47288fe62713c0097a0c4fc555b3607b24f22eb0b9e5546944c7c8e6279d2a241a2935f9b7c64a2e2b5c635f0f35061227fee37a) +set(QT_HASH_qt5-androidextras 45957b9afccf147dfe75c210e77e7b12cd3d1c34855052773a8ccce62020acd06e9e8f5b848f32f1fdbdb8fa614877909b9a1517530aad643b8954200ec030ca) +set(QT_HASH_qt5-charts 5f03db6d8c99f696aba0528812924c4d6d1a6b1331449c5e23fb094f9166ed1f35cd3bb98e3f17daf4a9b3e7b00b8cdc569ac0200343cd47b5de04468acf1d48) +set(QT_HASH_qt5-connectivity 23e515e36da9fb75c280cd8edaf29f3ce7e669ba294d6c1768ccd9c9967ede02dae161a6736a7dac4aa7d8087a309d67b06ba68532684c72ca9964e6ce229534) +set(QT_HASH_qt5-datavis3d d38150d80ca700ab33f10b50faa412d930aabda157e5c671a9aeb00e7b257573f5cf77de363e8885bf507f00ce16aa14f5a7885dd308c47c2eaad08910c44ff3) +set(QT_HASH_qt5-declarative c0f8dba5ba9e211071d64ec9de7395925d97424be899292a83fe961091c6695bfe68395fed4b34a746a69293765122a5ee53c119053f01b5fc511f0dbf577597) +set(QT_HASH_qt5-doc bb23d6d65a7c39ed9119e0bf30810a94ad937cc3f9ab0004d0c3fda712a6fbe009fdef74f5fe1212bc68ad0851ada37592c11f6ef754b81eff2d9c453b3a995b) +set(QT_HASH_qt5-gamepad 6a95ed24452d4df07ce0cb6ee482a333b74559935867e32467b6eb66b3c9e6f45a09d0d2bf41f549e85400523e1bea2dc5e571ef58016544aa1f1b056b2accaa) +set(QT_HASH_qt5-graphicaleffects 500f22c3845a0aeb5900dce2664b931c177b9b8357eac51594e84bcd55949292d9001467ea317cc8bc020560cb17b56fa16e1d6fdfc8e11a869aaef8d54b6b98) +set(QT_HASH_qt5-imageformats f4ee52dc8c48bb3e558802be2f7209bd90c35b89af366836615342b2c6981c4389ddf8651b00970c49ee472e9c663434646228c24659d9e2e5591e4c8f1ff26e) +set(QT_HASH_qt5-location 755434db4cdea1c98159a2891c3efcda03fd03b144c37e7a71f57cb5d5dbc5ea1b35d1dcafa7301fc904ede910b4a9f7cfc834b7722cc06fcc360ad3be7b2886) +set(QT_HASH_qt5-macextras 26ff64206d6b491271a2db8a6932b30fc8df6ff121ef272edca5e2ec61d98668e326102d529f9335eab98bb3e5e3261cb50db2b2f78f751226bb9d4aa84e499b) +set(QT_HASH_qt5-mqtt df91daf1accdf93d05bad33b9abb4a69f2b3fcd91f6dbcd71d6c74c21b0f0b2aeabc83f64aa5c149321b1a700cde3d81a4cbfc8fad7cdd8b0d8c0cc073299f82) +set(QT_HASH_qt5-multimedia 8206df23a84ce77d234a97cd4847f7185d7b5ca2c6bf1cd48dc19c833a302f92f85c53d8bccd4bcfbfb6cdc82c2246b2fb62400eefd5d4b152e95e378dded668) +set(QT_HASH_qt5-networkauth 0d155fe4b50a412153a4da8423714aabaf24bdafa0dbe789a33c18b4111b0641c93dd0d5f31774c8ff5ccc0737cfde7992d8181a69d12c93ccebc7c65c5a1654) +set(QT_HASH_qt5-purchasing 33ce166c6f4e626fef4cc17e902a5117225fa87799687e6c0956898bf80e04df4f3fa447b466e43c9fac58e879a7c9fd0e8c18006e8aa69f0e8762b258c81674) +set(QT_HASH_qt5-quickcontrols 756bffb68ad3bd7b6f6c91dbf544e19ff897f8b97ef25bd5da7f9acf8edb903376776ab90cc1b4cf3a0a73e7be37bfbf06e3bfc9afd698aab83e27945c3a5b9e) +set(QT_HASH_qt5-quickcontrols2 c7127ed4b74c4d4d91ab7d167fffde0f20acbf75065be5e85adda19cd033afe4862430689e58a43719cab523864d615aa8befa004ae13e5337596dac1be0fddb) +set(QT_HASH_qt5-remoteobjects a20699353269dd1d61ea9a45191aa6c438d597783c7461ee41c1bbde0d6043f2be138dd0f46744c1a3081c4098e66e78543f0397eb18b72aab99808de7855bd9) +set(QT_HASH_qt5-script ce35799a5625226fd62b394ecdc9d6826ef386a4b2d1a085a3def927ff3cf4808542a7e06be313baf12838fa0d2c1dbe6496a4e34818e3d035734305e60c24d9) +set(QT_HASH_qt5-scxml 59b4f2f5bf86a6528cbcffa64a1f3d300fde8509f94c95956558f8643d8f4d093609f4f6d4c095a58e5ea639619f7fd0da6046b2cb72c3cf505859de83aa05d1) +set(QT_HASH_qt5-sensors c9e69e78cbb3624cb1130c172a46d4916dbe5fc93f0f844262483468c2f53503844158e72b25692625f588452350bc2f125f583ef7244c62b2ea788ac72e32e2) +set(QT_HASH_qt5-serialbus af04a26d31d627592e5d91b163fd7e968a0ff42812b6f7a9f0e73ae5da32cea9e3d49c4abb93d7badd61f0d63a976572a5b42ceb140c761807b31496a9f1af87) +set(QT_HASH_qt5-serialport 1fb4dbb5d41c3280b07119d625030489566be29a1b8a7c555f9d484a7dd8c812a7e831147a8017d9026a77fdd57d48985a96f4e6c7887d90342005cf496b7b3a) +set(QT_HASH_qt5-speech 43790477887f533df9a1cfeb60194e171cbdbb79bce0f7d90228750219a67baa4b94a7f9d3833958bf7f9553f3f6302f980f269ce52c3756c116a61eae632a2a) +set(QT_HASH_qt5-svg 288ce98bb6dd746564c7ffbd0d8221d0816c62b7e33424cd21d945b40308292ec9a0b1e2b9cca6ce91d606c06813f05068cad590d827810383175bebfa8ab527) +set(QT_HASH_qt5-tools 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47) +set(QT_HASH_qt5-translations d2939a93a328aa1a8011a0e61970d9ce6a99b918aa35dac9fe10d8b65662ea5086207708157751573431aa24973a1a07e05c25fb90a254861a40d85a845bb1dc) +set(QT_HASH_qt5-virtualkeyboard f6033438d9a847d3592bcdbc9c525a2bac730621b2279b36157f8eb11c6f49fa27b5155835c3cc1fa412a0509ca387c5a7063d20b6ae0ff7aedaba786d3c75f2) +set(QT_HASH_qt5-webchannel 77ec10187601c826d15dad9a5112553bc1f954d11f54a40d38a2e1a1cf7412fe2c74e0b100c91befd8be06274dc537dbed4c6f858856a3b38974a363ff380415) +set(QT_HASH_qt5-webengine d4d10f2f95437042dfc67cc9826e8e27d390f986a1202f1bd5a765ea1b985e93158bde3068410f0a84b268de50c3e6fc9f67c4419224caa6b87b940d70d0869c) +set(QT_HASH_qt5-webglplugin 01860ca3ce27630ca1a92eb6deb933959a3679fb579d4cb8a06884f51a672c355f6929355aa6d45f4c5d8ac026b4cecdc7a26d5b2e897ca75bb7a9331e2d3e0d) +set(QT_HASH_qt5-websockets a4d1442028e842f5e97bb5d9142d2be768193a0807e51a72adc36bf9bf554fd3ae86373d3de841dc6e0c8bd8312d7bc23b2e46fdf90fce59ab5e35e4462ce4ea) +set(QT_HASH_qt5-webview 3a2a7c06df79a6ac4bfd3a45c2ad9e06dc1c2c71ca6a14f9006e031b0679549a9f1d09a9c82439c700e1c0c0785cf7baa402ea2d230a4ebd122dc4e5d2b07030) +set(QT_HASH_qt5-x11extras eaf5e639c68cc4e1a35f82a877f461f8023b92dede3819808fdb7334364f4428400a94e7d8cff30985410bf7754258c6376504fd068ba3d792683fd23f586133) +set(QT_HASH_qt5-xmlpatterns 4a5f7d68db6f950caedbb94291ab6aad77e7c52cc8adea2e41ddf600106c8d75b4eef83bc716bb1aa3696042c48c34979d8d216a16ccec3a539118b46691c5a4) +set(QT_HASH_qt5-wayland 0a9768282170709050490fb1b9daef59c21c8b5c4785f56a452d7954ffb6f016ec836022693941c99c5c10b2c3c55c75ba37fdad09dd1e0cde627f8b87b90c89) +set(QT_HASH_qt5-winextras d0707f865552645e82a493265b142171f14c126bd99325471b5d94593c95763d606be89fcc72f74f3192446e024c9be904c7d95816b2dd8e8cc7cf9f34a02f77) + if(QT_UPDATE_VERSION) message(STATUS "Running Qt in automatic version port update mode!") set(_VCPKG_INTERNAL_NO_HASH_CHECK 1) if("${PORT}" MATCHES "qt5-base") foreach(_current_qt_port ${QT_PORT_LIST}) - set(_current_control "${VCPKG_ROOT_DIR}/ports/qt5-${_current_qt_port}/CONTROL") + set(_current_control "${VCPKG_ROOT_DIR}/ports/qt5-${_current_qt_port}/vcpkg.json") file(READ ${_current_control} _control_contents) #message(STATUS "Before: \n${_control_contents}") - string(REGEX REPLACE "Version:[^0-9]+[0-9]\.[0-9]+\.[0-9]+[^\n]*\n" "Version: ${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}\n" _control_contents "${_control_contents}") + string(REGEX REPLACE "\"version.*\": \"[0-9]+\.[0-9]+\.[0-9]+\",\n" "\"version\": \"${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}\",\n" _control_contents "${_control_contents}") + string(REGEX REPLACE "\n \"port-version\": [0-9]+," "" _control_contents "${_control_contents}") #message(STATUS "After: \n${_control_contents}") file(WRITE ${_current_control} "${_control_contents}") + configure_file("${_current_control}" "${_current_control}" @ONLY NEWLINE_STYLE LF) endforeach() endif() -endif() \ No newline at end of file +endif() diff --git a/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 index c52196078..61d8e0ac8 100644 --- 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 @@ -1,67 +1,67 @@ #Every update requires an update of these hashes and the version within the control file of each of the 32 ports. #So it is probably better to have a central location for these hashes and let the ports update via a script set(QT_MAJOR_MINOR_VER 5.15) -set(QT_PATCH_VER 2) +set(QT_PATCH_VER 3) set(QT_UPDATE_VERSION 0) # Switch to update qt and not build qt. Creates a file cmake/qt_new_hashes.cmake in qt5-base with the new hashes. set(QT_PORT_LIST base 3d activeqt charts connectivity datavis3d declarative gamepad graphicaleffects imageformats location macextras mqtt multimedia networkauth purchasing quickcontrols quickcontrols2 remoteobjects script scxml sensors serialport speech svg tools virtualkeyboard webchannel websockets webview winextras xmlpatterns doc x11extras androidextras translations serialbus webengine webglplugin wayland) -set(QT_HASH_qt5-base a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9) -set(QT_HASH_qt5-3d 38da6886b887f6d315dcb17192322efe184950716fdd0030df6c7d7c454ea43dc0250a201285da27683ce29768da6be41d4168e4f63c20adb0b5f26ae0934c1b) -set(QT_HASH_qt5-activeqt a2286a6736d14cf9b0dbf20af5ee8c23f94f57b6d4c0be41853e67109d87fd78dbf8f14eef2ce4b8d9ff2244af7ef139829ad7674d9ec9669434028961e65ec7) -set(QT_HASH_qt5-charts d16fc085a7e98078cf616cde07d57c5f04cd41e9687a26d42edf9042b4c95a837371b6b9616e7176c536d742aa9b5fc15bf3393f9f2e814ce942189ac151e65f) -set(QT_HASH_qt5-connectivity a934dcdd28645ba23dd429215643694d9a14449a4c3e1a6154a9a19cb3210f3d80978b46aefff2b110db533fa1816450f2f73a27d80df5330a92799e4cca1b9c) -set(QT_HASH_qt5-datavis3d 340b5ce1b1c2d8849b665e7bc84430fdf48e443fc149530ee132f325067f57d35594a23e3a8b920e1928ca5c429dcacfa098dadcbde63d4993f748c436af4cc3) -set(QT_HASH_qt5-declarative a084e4ace0d6868668c95f1b62598a7dd0f455bfb0943ac8956802d7041436686f20c7ccdde7d6fd6c4b8173c936dd8600cf3b87bf8575f55514edfbb51111d3) -set(QT_HASH_qt5-gamepad 67f299d36f70ac3205a136117bec7f983f889b6a1f7d0ff97eb03925f4789d9d90a7197f5e186a6d04aa486880c60f0f623ab56a8bd78e4682e84c7ff6cc9fe1) -set(QT_HASH_qt5-graphicaleffects 1620a4daa6f2afc13b84752fa92f6d603aea1f7c796a239691b271a455d6887bba87a9a07edbfe008045f051c3e71fc6e22fc337d146c1793e923cfeb20e897d) -set(QT_HASH_qt5-imageformats 3c821fac83b8d6177af256dc1d68aca14ae6d5cbdedb8d8665158ebcec0f6e6fb790b5d210a1aa8b0679ecff60fafd4e5d1387c6954498b41409ea44177e0d7e) -set(QT_HASH_qt5-location 6192922506b3ea354e85431df83c19d7cc9aebb17549c6a1de48f625bf8365ff3db3161080dde254a5fb9199d99c3c5dc8e1533429150be55df96ddb7d6ce16f) -set(QT_HASH_qt5-macextras 21e807a587da716615a447207abda2c3eb409111a0eb6f844c8f1281ccc842a7c2e8759c1d7ce62cc3bad3325b4570a0bae1fbe4e5592e905788dde8898c6cb0) -set(QT_HASH_qt5-mqtt 91efd3b1ebef3c95473c018bcacd0772e613b38c) # Git commit ID -set(QT_HASH_qt5-multimedia be58e6934976b04707399f8525dd5d50f73e0539efd1a76c2f9868e35e6f136e0991652df5d46350a9ac39d24313353e4aa826131f268a95e458e57279f448bd) -set(QT_HASH_qt5-networkauth 94843a74ae188eb0eff9559be6b246f61f87104479f6f52fe943b31a9263461a7051d967072d9061124b2bd056d7265645892104653c93dfcf68b11521f1c33d) -set(QT_HASH_qt5-purchasing 1a40fd3ca149f9c8fc98a45562b37fc97c7addc513d40f50997576648d441d379179370c6491a003982feafe96736047a8faf09caf36eaeea5a97553f75d1255) -set(QT_HASH_qt5-quickcontrols 52839e7442f4b6b5cbbb741d29ce28e9d2d9f5573499363d17252b166c1f318f37a19ecf1bf17f5cf6940bc29cc2987180b740ce036d924ff329dee9c37823a2) # deprecated -set(QT_HASH_qt5-quickcontrols2 5af506fd5842c505ae5fbd04fdd2a467c5b6a9547b4cea80c9cf051e9dea49bbf17843d8bc12e69e95810e70119c2843c24171c84e0f5df62dd2f59a39903c8f) -set(QT_HASH_qt5-remoteobjects 1cce1b6128f283fe8930e1e58b9620459c50b203a39607e9bcde8423930da08e5c70e7effaf64d2690f463cc7b37cfc67fb6c0ac89e27df3a57007aee1d5233d) -set(QT_HASH_qt5-script 71c70b34f7d4a0742df64d20d7e9a685cc640b9cc6a3d22847c04f45a437b3f5537f40225a522ed82787c2744d9a4949dea5b43c2ee81961d5ed175cf10deb32) # deprecated -set(QT_HASH_qt5-scxml 2a4719af94baefe7f0ca5a23239d07a05285a1698b052d17bb87bc221bbbc8bc25a70ff06d70d41ed7ac6a7e6646be9c516d8187c9098da1158c08e27a4b0bb8) -set(QT_HASH_qt5-sensors d0a34e0718cc727b1256601bc5f9a2975532d728fdf0cb7678824c7d36aa5049d9c2886053821ec93a238120441c980027306ac633677617867c7aee40bb560b) -set(QT_HASH_qt5-serialport 353cc5f708367d646bd312f7d675b417bad4df44356f1dfc8b6ce846a86fd6d5955ec4d26f943e50f4a7b94cc6389fe658959e90bbb5ab3cdaefed0efe6ae72b) -set(QT_HASH_qt5-speech 78a13218a639276c9b253566a1df52e2363847eac76df3962ba2a7178800206beb57859d22c7c99fa1579cb3aa7ab94baed1a6319ba946d4a64cba9e3bf52b05) -set(QT_HASH_qt5-svg 101e9c8fc05b1bb9c4e869564bff8e5723dd35f0ef557185e56e9dc12fdce74c531522c9642cdff639900eccf7ed0e04bfa48142741259697dded990fb481730) -set(QT_HASH_qt5-tools 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b) -set(QT_HASH_qt5-virtualkeyboard 3ba04d171756a5434424833c5198a23e0df53eeebe9ea542047e094f83f38492d93f901cac67cf7e55aca6a71289ce3c6f5d8ac10a8d051b291155ebb8432016) -set(QT_HASH_qt5-webchannel 7ac5e372695616863d247c5a61e5763a3934b58165e35c43da5ef1797d80005aa3d6eb258931ae7ee2b1f6a6fa743635ac4678c9cfe375cefa76e74cc81d095b) -set(QT_HASH_qt5-websockets 1b23b79bff4289e785daf51441daaecf6de66ca5a3febfdd8fdb8ce871471bca4faf7663d68b23aaf562b1ebd6e9c8c27b3074f4b93bc9fcd3a0c54f7f79a9c4) -set(QT_HASH_qt5-webview 11502597d5e3a9b8a3a90025b56c086a3412743019384558617c397a8ad4a0f646b406a4fbeb31ca45e6e573d1fb06cd5b22b8c0179695d06cc3d492289a1c85) -set(QT_HASH_qt5-winextras 6555a42d4bbeb46b394f573b6ed7926ec21cf6024de3c5f43000373bf0a2f4544f19866e2c9469da2d60b5dd99fb046765be5d3f8d5025169e319795bbf66d9e) -set(QT_HASH_qt5-xmlpatterns 5cdf51878f8bb42db57110acc0c3985a95af098da44e5dda505e0716fef5afc780419058158f7a8f9a0fe3fed83fd64abd856b4dbcdca20efa5e985fa85cc348) # deprecated -##TODO -set(QT_HASH_qt5-doc ce2c003b37829da102f243ca271548cff0597b4b667109ca9533971a490b8b20eb3183af6e0b209ad58964f2be2e757f83933a3f8c484dd0814750e24d1a244e) -set(QT_HASH_qt5-x11extras beaefc865299f4e7c637baa96eb3a69adbe1a41fc7735b46cfec0768c9243391600e69078630fffb4aceba106b7512fd802e745abc38ddab5253233301c93ed9) -set(QT_HASH_qt5-androidextras cacd9252f313595d21eb6a94ffabbd5fff476af82aa619b4edfc77a9f405f52bd1b89da97c8f7dadf8c403035a243205a25a2f85250ebc0590bf68f914cdbf3a) -#set(QT_HASH_qt5-canvas3d 0) deprecated -set(QT_HASH_qt5-translations 483b5d919f43c96a032e610cf6316989e7b859ab177cb2f7cb9bb10ebcddf8c9be8e04ff12db38a317c618d13f88455a4d434c7a1133f453882da4e026dd8cbe) -set(QT_HASH_qt5-serialbus c4793f5425ca0191435d75a8fd95a623cc847d41b8722421c0bf0fdfddda1a158fd2a00f5d997f00de4fcb271a158f3273d636ef2553ccd6b90b4d072b1eb55b) -set(QT_HASH_qt5-webengine de64c30819f5e2f8620c853ff22b2f9717641477aef4432a552a72d1d67ed62ed61572afee6de3f2c9f32dee28f4f786ffd63fc465aa42c0ae1e87ea28341756) -set(QT_HASH_qt5-webglplugin 14b9a0c08472121165eba82f3c81518be7b19484b7bee7887df9751edc6e2e7e76d06f961b180427014beb71c725d343e9f196f37690e2d207511f7639bd2627) -set(QT_HASH_qt5-wayland e8657ed676873da7b949e6a1605d025918a03336af9c68f32741945ec3c71a604def55bb00737ba4d97b91c00d0e2df1a83cdcedcf5795c6b2a1ef2caa21c91c) +set(QT_HASH_qt5-base 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079) +set(QT_HASH_qt5-3d 1fa644ef53923b194efd2296c1505e2193897057774411b1bc50651c2fc4e781e427de13cdc4c1c770294a39d06f8e7360353361c75222c0eb457b560943d97c) +set(QT_HASH_qt5-activeqt 5a5fc0a98c4928e6cd27105e47288fe62713c0097a0c4fc555b3607b24f22eb0b9e5546944c7c8e6279d2a241a2935f9b7c64a2e2b5c635f0f35061227fee37a) +set(QT_HASH_qt5-androidextras 45957b9afccf147dfe75c210e77e7b12cd3d1c34855052773a8ccce62020acd06e9e8f5b848f32f1fdbdb8fa614877909b9a1517530aad643b8954200ec030ca) +set(QT_HASH_qt5-charts 5f03db6d8c99f696aba0528812924c4d6d1a6b1331449c5e23fb094f9166ed1f35cd3bb98e3f17daf4a9b3e7b00b8cdc569ac0200343cd47b5de04468acf1d48) +set(QT_HASH_qt5-connectivity 23e515e36da9fb75c280cd8edaf29f3ce7e669ba294d6c1768ccd9c9967ede02dae161a6736a7dac4aa7d8087a309d67b06ba68532684c72ca9964e6ce229534) +set(QT_HASH_qt5-datavis3d d38150d80ca700ab33f10b50faa412d930aabda157e5c671a9aeb00e7b257573f5cf77de363e8885bf507f00ce16aa14f5a7885dd308c47c2eaad08910c44ff3) +set(QT_HASH_qt5-declarative c0f8dba5ba9e211071d64ec9de7395925d97424be899292a83fe961091c6695bfe68395fed4b34a746a69293765122a5ee53c119053f01b5fc511f0dbf577597) +set(QT_HASH_qt5-doc bb23d6d65a7c39ed9119e0bf30810a94ad937cc3f9ab0004d0c3fda712a6fbe009fdef74f5fe1212bc68ad0851ada37592c11f6ef754b81eff2d9c453b3a995b) +set(QT_HASH_qt5-gamepad 6a95ed24452d4df07ce0cb6ee482a333b74559935867e32467b6eb66b3c9e6f45a09d0d2bf41f549e85400523e1bea2dc5e571ef58016544aa1f1b056b2accaa) +set(QT_HASH_qt5-graphicaleffects 500f22c3845a0aeb5900dce2664b931c177b9b8357eac51594e84bcd55949292d9001467ea317cc8bc020560cb17b56fa16e1d6fdfc8e11a869aaef8d54b6b98) +set(QT_HASH_qt5-imageformats f4ee52dc8c48bb3e558802be2f7209bd90c35b89af366836615342b2c6981c4389ddf8651b00970c49ee472e9c663434646228c24659d9e2e5591e4c8f1ff26e) +set(QT_HASH_qt5-location 755434db4cdea1c98159a2891c3efcda03fd03b144c37e7a71f57cb5d5dbc5ea1b35d1dcafa7301fc904ede910b4a9f7cfc834b7722cc06fcc360ad3be7b2886) +set(QT_HASH_qt5-macextras 26ff64206d6b491271a2db8a6932b30fc8df6ff121ef272edca5e2ec61d98668e326102d529f9335eab98bb3e5e3261cb50db2b2f78f751226bb9d4aa84e499b) +set(QT_HASH_qt5-mqtt df91daf1accdf93d05bad33b9abb4a69f2b3fcd91f6dbcd71d6c74c21b0f0b2aeabc83f64aa5c149321b1a700cde3d81a4cbfc8fad7cdd8b0d8c0cc073299f82) +set(QT_HASH_qt5-multimedia 8206df23a84ce77d234a97cd4847f7185d7b5ca2c6bf1cd48dc19c833a302f92f85c53d8bccd4bcfbfb6cdc82c2246b2fb62400eefd5d4b152e95e378dded668) +set(QT_HASH_qt5-networkauth 0d155fe4b50a412153a4da8423714aabaf24bdafa0dbe789a33c18b4111b0641c93dd0d5f31774c8ff5ccc0737cfde7992d8181a69d12c93ccebc7c65c5a1654) +set(QT_HASH_qt5-purchasing 33ce166c6f4e626fef4cc17e902a5117225fa87799687e6c0956898bf80e04df4f3fa447b466e43c9fac58e879a7c9fd0e8c18006e8aa69f0e8762b258c81674) +set(QT_HASH_qt5-quickcontrols 756bffb68ad3bd7b6f6c91dbf544e19ff897f8b97ef25bd5da7f9acf8edb903376776ab90cc1b4cf3a0a73e7be37bfbf06e3bfc9afd698aab83e27945c3a5b9e) +set(QT_HASH_qt5-quickcontrols2 c7127ed4b74c4d4d91ab7d167fffde0f20acbf75065be5e85adda19cd033afe4862430689e58a43719cab523864d615aa8befa004ae13e5337596dac1be0fddb) +set(QT_HASH_qt5-remoteobjects a20699353269dd1d61ea9a45191aa6c438d597783c7461ee41c1bbde0d6043f2be138dd0f46744c1a3081c4098e66e78543f0397eb18b72aab99808de7855bd9) +set(QT_HASH_qt5-script ce35799a5625226fd62b394ecdc9d6826ef386a4b2d1a085a3def927ff3cf4808542a7e06be313baf12838fa0d2c1dbe6496a4e34818e3d035734305e60c24d9) +set(QT_HASH_qt5-scxml 59b4f2f5bf86a6528cbcffa64a1f3d300fde8509f94c95956558f8643d8f4d093609f4f6d4c095a58e5ea639619f7fd0da6046b2cb72c3cf505859de83aa05d1) +set(QT_HASH_qt5-sensors c9e69e78cbb3624cb1130c172a46d4916dbe5fc93f0f844262483468c2f53503844158e72b25692625f588452350bc2f125f583ef7244c62b2ea788ac72e32e2) +set(QT_HASH_qt5-serialbus af04a26d31d627592e5d91b163fd7e968a0ff42812b6f7a9f0e73ae5da32cea9e3d49c4abb93d7badd61f0d63a976572a5b42ceb140c761807b31496a9f1af87) +set(QT_HASH_qt5-serialport 1fb4dbb5d41c3280b07119d625030489566be29a1b8a7c555f9d484a7dd8c812a7e831147a8017d9026a77fdd57d48985a96f4e6c7887d90342005cf496b7b3a) +set(QT_HASH_qt5-speech 43790477887f533df9a1cfeb60194e171cbdbb79bce0f7d90228750219a67baa4b94a7f9d3833958bf7f9553f3f6302f980f269ce52c3756c116a61eae632a2a) +set(QT_HASH_qt5-svg 288ce98bb6dd746564c7ffbd0d8221d0816c62b7e33424cd21d945b40308292ec9a0b1e2b9cca6ce91d606c06813f05068cad590d827810383175bebfa8ab527) +set(QT_HASH_qt5-tools 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47) +set(QT_HASH_qt5-translations d2939a93a328aa1a8011a0e61970d9ce6a99b918aa35dac9fe10d8b65662ea5086207708157751573431aa24973a1a07e05c25fb90a254861a40d85a845bb1dc) +set(QT_HASH_qt5-virtualkeyboard f6033438d9a847d3592bcdbc9c525a2bac730621b2279b36157f8eb11c6f49fa27b5155835c3cc1fa412a0509ca387c5a7063d20b6ae0ff7aedaba786d3c75f2) +set(QT_HASH_qt5-webchannel 77ec10187601c826d15dad9a5112553bc1f954d11f54a40d38a2e1a1cf7412fe2c74e0b100c91befd8be06274dc537dbed4c6f858856a3b38974a363ff380415) +set(QT_HASH_qt5-webengine d4d10f2f95437042dfc67cc9826e8e27d390f986a1202f1bd5a765ea1b985e93158bde3068410f0a84b268de50c3e6fc9f67c4419224caa6b87b940d70d0869c) +set(QT_HASH_qt5-webglplugin 01860ca3ce27630ca1a92eb6deb933959a3679fb579d4cb8a06884f51a672c355f6929355aa6d45f4c5d8ac026b4cecdc7a26d5b2e897ca75bb7a9331e2d3e0d) +set(QT_HASH_qt5-websockets a4d1442028e842f5e97bb5d9142d2be768193a0807e51a72adc36bf9bf554fd3ae86373d3de841dc6e0c8bd8312d7bc23b2e46fdf90fce59ab5e35e4462ce4ea) +set(QT_HASH_qt5-webview 3a2a7c06df79a6ac4bfd3a45c2ad9e06dc1c2c71ca6a14f9006e031b0679549a9f1d09a9c82439c700e1c0c0785cf7baa402ea2d230a4ebd122dc4e5d2b07030) +set(QT_HASH_qt5-x11extras eaf5e639c68cc4e1a35f82a877f461f8023b92dede3819808fdb7334364f4428400a94e7d8cff30985410bf7754258c6376504fd068ba3d792683fd23f586133) +set(QT_HASH_qt5-xmlpatterns 4a5f7d68db6f950caedbb94291ab6aad77e7c52cc8adea2e41ddf600106c8d75b4eef83bc716bb1aa3696042c48c34979d8d216a16ccec3a539118b46691c5a4) +set(QT_HASH_qt5-wayland 0a9768282170709050490fb1b9daef59c21c8b5c4785f56a452d7954ffb6f016ec836022693941c99c5c10b2c3c55c75ba37fdad09dd1e0cde627f8b87b90c89) +set(QT_HASH_qt5-winextras d0707f865552645e82a493265b142171f14c126bd99325471b5d94593c95763d606be89fcc72f74f3192446e024c9be904c7d95816b2dd8e8cc7cf9f34a02f77) if(QT_UPDATE_VERSION) message(STATUS "Running Qt in automatic version port update mode!") set(_VCPKG_INTERNAL_NO_HASH_CHECK 1) if("${PORT}" MATCHES "qt5-base") foreach(_current_qt_port ${QT_PORT_LIST}) - set(_current_control "${VCPKG_ROOT_DIR}/ports/qt5-${_current_qt_port}/CONTROL") + set(_current_control "${VCPKG_ROOT_DIR}/ports/qt5-${_current_qt_port}/vcpkg.json") file(READ ${_current_control} _control_contents) #message(STATUS "Before: \n${_control_contents}") - string(REGEX REPLACE "Version:[^0-9]+[0-9]\.[0-9]+\.[0-9]+[^\n]*\n" "Version: ${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}\n" _control_contents "${_control_contents}") + string(REGEX REPLACE "\"version.*\": \"[0-9]+\.[0-9]+\.[0-9]+\",\n" "\"version\": \"${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}\",\n" _control_contents "${_control_contents}") + string(REGEX REPLACE "\n \"port-version\": [0-9]+," "" _control_contents "${_control_contents}") #message(STATUS "After: \n${_control_contents}") file(WRITE ${_current_control} "${_control_contents}") + configure_file("${_current_control}" "${_current_control}" @ONLY NEWLINE_STYLE LF) endforeach() endif() -endif() \ No newline at end of file +endif() diff --git a/external_imported/vcpkg/ports/qt5-base/patches/limits_include.patch b/external_imported/vcpkg/ports/qt5-base/patches/limits_include.patch index 0ed514b76..4fe495281 100644 --- a/external_imported/vcpkg/ports/qt5-base/patches/limits_include.patch +++ b/external_imported/vcpkg/ports/qt5-base/patches/limits_include.patch @@ -1,38 +1,3 @@ -From 61325e4547225b8b2ecefda4ca328a38c075c909 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella -Date: Wed, 11 Aug 2021 15:35:05 +0200 -Subject: [PATCH] Add missing limits include - ---- - src/corelib/global/qendian.h | 1 + - src/corelib/global/qfloat16.h | 1 + - src/corelib/text/qbytearraymatcher.h | 2 ++ - 3 files changed, 4 insertions(+) - -diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h -index 257efbbdbe..05f11d6f81 100644 ---- a/src/corelib/global/qendian.h -+++ b/src/corelib/global/qendian.h -@@ -47,6 +47,7 @@ - // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems - #include - #include -+#include - - #ifdef min // MSVC - #undef min -diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h -index c7a9c87af3..3287d7cbf2 100644 ---- a/src/corelib/global/qfloat16.h -+++ b/src/corelib/global/qfloat16.h -@@ -44,6 +44,7 @@ - #include - #include - #include -+#include - - #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) - // All processors that support AVX2 do support F16C too. That doesn't mean diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h index 0eedfc1d20..f5f9bef7b8 100644 --- a/src/corelib/text/qbytearraymatcher.h @@ -46,6 +11,3 @@ index 0eedfc1d20..f5f9bef7b8 100644 QT_BEGIN_NAMESPACE --- -2.32.0 - diff --git a/external_imported/vcpkg/ports/qt5-base/patches/zstdd.patch b/external_imported/vcpkg/ports/qt5-base/patches/zstdd.patch deleted file mode 100644 index 9d10890c0..000000000 --- a/external_imported/vcpkg/ports/qt5-base/patches/zstdd.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/configure.json b/configure.json -index 50d69b740..7149e6803 100644 ---- a/configure.json -+++ b/configure.json -@@ -182,7 +182,10 @@ - }, - "sources": [ - { "type": "pkgConfig", "args": "libzstd >= 1.3" }, -- "-lzstd" -+ "-lzstd", -+ "-lzstdd", -+ "-lzstd -pthread", -+ "-lzstdd -pthread" - ] - }, - "dbus": { diff --git a/external_imported/vcpkg/ports/qt5-base/portfile.cmake b/external_imported/vcpkg/ports/qt5-base/portfile.cmake index dac4d876b..80c5996e5 100644 --- a/external_imported/vcpkg/ports/qt5-base/portfile.cmake +++ b/external_imported/vcpkg/ports/qt5-base/portfile.cmake @@ -78,7 +78,6 @@ qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH patches/icu.patch #Help configure find static icu builds in vcpkg on windows patches/xlib.patch #Patches Xlib check to actually use Pkgconfig instead of makeSpec only patches/egl.patch #Fix egl detection logic. - patches/zstdd.patch #Fix detection of zstd in debug builds patches/mysql_plugin_include.patch #Fix include path of mysql plugin patches/mysql-configure.patch #Fix mysql project patches/cocoa.patch #Fix missing include on macOS Monterrey, https://code.qt.io/cgit/qt/qtbase.git/commit/src/plugins/platforms/cocoa?id=dece6f5840463ae2ddf927d65eb1b3680e34a547 @@ -128,7 +127,6 @@ list(APPEND CORE_OPTIONS -system-sqlite -system-harfbuzz -icu - -no-vulkan -no-angle # Qt does not need to build angle. VCPKG will build angle! -no-glib ) @@ -216,8 +214,8 @@ find_library(EXPAT_RELEASE NAMES expat PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_D find_library(EXPAT_DEBUG NAMES expat PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) #Dependent libraries -find_library(ZSTD_RELEASE NAMES zstd zstd_static PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(ZSTD_DEBUG NAMES zstdd zstd_staticd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(ZSTD_RELEASE NAMES zstd PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(ZSTD_DEBUG NAMES zstd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(BZ2_RELEASE bz2 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(BZ2_DEBUG bz2 bz2d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(SSL_RELEASE ssl ssleay32 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) diff --git a/external_imported/vcpkg/ports/qt5-base/vcpkg.json b/external_imported/vcpkg/ports/qt5-base/vcpkg.json index 072ee42b0..c4b5d854b 100644 --- a/external_imported/vcpkg/ports/qt5-base/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-base/vcpkg.json @@ -1,9 +1,10 @@ { "name": "qt5-base", - "version-semver": "5.15.2", - "port-version": 19, + "version": "5.15.3", + "port-version": 2, "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "angle", diff --git a/external_imported/vcpkg/ports/qt5-charts/vcpkg.json b/external_imported/vcpkg/ports/qt5-charts/vcpkg.json index 9d0a9b981..adbd87010 100644 --- a/external_imported/vcpkg/ports/qt5-charts/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-charts/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-charts", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Charts Module - UI components for displaying charts, driven by static or dynamic data models", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/external_imported/vcpkg/ports/qt5-connectivity/vcpkg.json b/external_imported/vcpkg/ports/qt5-connectivity/vcpkg.json index a88732979..79a85b47a 100644 --- a/external_imported/vcpkg/ports/qt5-connectivity/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-connectivity/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-connectivity", - "version-string": "5.15.2", - "port-version": 2, + "version": "5.15.3", "description": "Qt5 Connectivity module - Provides access to Bluetooth and NFC hardware", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/external_imported/vcpkg/ports/qt5-datavis3d/vcpkg.json b/external_imported/vcpkg/ports/qt5-datavis3d/vcpkg.json index ddb155c33..1d551e375 100644 --- a/external_imported/vcpkg/ports/qt5-datavis3d/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-datavis3d/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-datavis3d", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Data Visualization 3d Module - UI Components for creating 3D data visualizations", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/external_imported/vcpkg/ports/qt5-declarative/portfile.cmake b/external_imported/vcpkg/ports/qt5-declarative/portfile.cmake index a528d7f3e..7432d0f28 100644 --- a/external_imported/vcpkg/ports/qt5-declarative/portfile.cmake +++ b/external_imported/vcpkg/ports/qt5-declarative/portfile.cmake @@ -1,3 +1,6 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) qt_submodule_installation(OUT_SOURCE_PATH SOURCE_PATH PATCHES limits_include.patch) -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/qt5/QtQml/5.15.2/QtQml/private/qqmljsparser_p.h" "${SOURCE_PATH}" "") \ No newline at end of file + +if(NOT QT_UPDATE_VERSION) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/qt5/QtQml/5.15.3/QtQml/private/qqmljsparser_p.h" "${SOURCE_PATH}" "") +endif() diff --git a/external_imported/vcpkg/ports/qt5-declarative/vcpkg.json b/external_imported/vcpkg/ports/qt5-declarative/vcpkg.json index 3a5477c4a..2b0b4abcd 100644 --- a/external_imported/vcpkg/ports/qt5-declarative/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-declarative/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-declarative", - "version": "5.15.2", - "port-version": 3, + "version": "5.15.3", "description": "Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol.", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/external_imported/vcpkg/ports/qt5-doc/vcpkg.json b/external_imported/vcpkg/ports/qt5-doc/vcpkg.json index d311b5ada..a4f655ca1 100644 --- a/external_imported/vcpkg/ports/qt5-doc/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-doc/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-doc", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 doc Module;", + "license": null, "supports": "linux", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/qt5-gamepad/vcpkg.json b/external_imported/vcpkg/ports/qt5-gamepad/vcpkg.json index 4bd3fb05f..a1de0a3dd 100644 --- a/external_imported/vcpkg/ports/qt5-gamepad/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-gamepad/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-gamepad", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Gamepad Module - Enables Qt applications to support the use of gamepad hardware", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/external_imported/vcpkg/ports/qt5-graphicaleffects/vcpkg.json b/external_imported/vcpkg/ports/qt5-graphicaleffects/vcpkg.json index 83055ba6e..8f6bc2d3f 100644 --- a/external_imported/vcpkg/ports/qt5-graphicaleffects/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-graphicaleffects/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-graphicaleffects", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 GraphicalEffects Module.", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/external_imported/vcpkg/ports/qt5-imageformats/portfile.cmake b/external_imported/vcpkg/ports/qt5-imageformats/portfile.cmake index abd88a60c..a3cd9f92a 100644 --- a/external_imported/vcpkg/ports/qt5-imageformats/portfile.cmake +++ b/external_imported/vcpkg/ports/qt5-imageformats/portfile.cmake @@ -36,7 +36,7 @@ find_library(WEBPDECODER_DEBUG NAMES webpdecoder libwebpdecoder webpdecoderd lib #Dependent libraries find_library(LZMA_RELEASE lzma PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(LZMA_DEBUG lzmad lzma PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(LZMA_DEBUG lzma PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) if(NOT VCPKG_TARGET_IS_WINDOWS) string(APPEND WEBP_RELEASE " -pthread") diff --git a/external_imported/vcpkg/ports/qt5-imageformats/vcpkg.json b/external_imported/vcpkg/ports/qt5-imageformats/vcpkg.json index 9c4d0e0f4..da6422d1e 100644 --- a/external_imported/vcpkg/ports/qt5-imageformats/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-imageformats/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-imageformats", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP", + "license": null, "dependencies": [ "jasper", "libwebp", diff --git a/external_imported/vcpkg/ports/qt5-location/vcpkg.json b/external_imported/vcpkg/ports/qt5-location/vcpkg.json index 8abfa73c8..fd0b1e891 100644 --- a/external_imported/vcpkg/ports/qt5-location/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-location/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-location", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Location Module - Displays map, navigation, and place content in a QML application.", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/external_imported/vcpkg/ports/qt5-macextras/vcpkg.json b/external_imported/vcpkg/ports/qt5-macextras/vcpkg.json index 3ac6b3fc7..fd4552617 100644 --- a/external_imported/vcpkg/ports/qt5-macextras/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-macextras/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-macextras", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Mac Extras Module. Provides platform-specific APIs for mac.", + "license": null, "supports": "osx", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/qt5-mqtt/portfile.cmake b/external_imported/vcpkg/ports/qt5-mqtt/portfile.cmake index ca6e25d0d..f0462af13 100644 --- a/external_imported/vcpkg/ports/qt5-mqtt/portfile.cmake +++ b/external_imported/vcpkg/ports/qt5-mqtt/portfile.cmake @@ -1,28 +1,2 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -#qt_submodule_installation() No binary package for this port. -if(QT_UPDATE_VERSION) - set(VCPKG_USE_HEAD_VERSION ON) -endif() - -vcpkg_from_git( - OUT_SOURCE_PATH SOURCE_PATH - URL git://code.qt.io/qt/qtmqtt.git - REF ${QT_HASH_${PORT}} - HEAD_REF "v${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}" - PATCHES ${_qis_PATCHES} -) - -if(QT_UPDATE_VERSION) - message(STATUS "New qtmqtt ref: ${VCPKG_HEAD_VERSION}") -endif() - -# qt module builds from a git repository require a .git entry to invoke syncqt -file(WRITE "${SOURCE_PATH}/.git" "repocontent") - -# syncqt is a perl script -vcpkg_find_acquire_program(PERL) -get_filename_component(perl_exe_path ${PERL} DIRECTORY) -vcpkg_add_to_path("${perl_exe_path}") - -qt_build_submodule(${SOURCE_PATH}) -qt_install_copyright(${SOURCE_PATH}) +qt_submodule_installation(PATCHES ${_qis_PATCHES}) diff --git a/external_imported/vcpkg/ports/qt5-mqtt/vcpkg.json b/external_imported/vcpkg/ports/qt5-mqtt/vcpkg.json index c4dac430a..438929f9b 100644 --- a/external_imported/vcpkg/ports/qt5-mqtt/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-mqtt/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-mqtt", - "version": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 MQTT module.", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/external_imported/vcpkg/ports/qt5-multimedia/vcpkg.json b/external_imported/vcpkg/ports/qt5-multimedia/vcpkg.json index bc35ddac7..6b2e45a2c 100644 --- a/external_imported/vcpkg/ports/qt5-multimedia/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-multimedia/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-multimedia", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Multimedia Module - Classes and widgets for audio, video, radio and camera functionality", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/external_imported/vcpkg/ports/qt5-networkauth/vcpkg.json b/external_imported/vcpkg/ports/qt5-networkauth/vcpkg.json index 5aa743b19..4ecdeb150 100644 --- a/external_imported/vcpkg/ports/qt5-networkauth/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-networkauth/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-networkauth", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Network Authorization Module", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/external_imported/vcpkg/ports/qt5-purchasing/vcpkg.json b/external_imported/vcpkg/ports/qt5-purchasing/vcpkg.json index b1b52cd67..f2e59ed21 100644 --- a/external_imported/vcpkg/ports/qt5-purchasing/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-purchasing/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-purchasing", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Purchasing Module - Enables in-app purchase of products in Qt applications.", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/external_imported/vcpkg/ports/qt5-quickcontrols/vcpkg.json b/external_imported/vcpkg/ports/qt5-quickcontrols/vcpkg.json index ca2bd6405..711c17785 100644 --- a/external_imported/vcpkg/ports/qt5-quickcontrols/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-quickcontrols/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-quickcontrols", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 QuickControls Module.", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/external_imported/vcpkg/ports/qt5-quickcontrols2/vcpkg.json b/external_imported/vcpkg/ports/qt5-quickcontrols2/vcpkg.json index bf9665c89..a87e806c9 100644 --- a/external_imported/vcpkg/ports/qt5-quickcontrols2/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-quickcontrols2/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-quickcontrols2", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 QuickControls2 Module.", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/external_imported/vcpkg/ports/qt5-remoteobjects/vcpkg.json b/external_imported/vcpkg/ports/qt5-remoteobjects/vcpkg.json index 38f4f5a8f..6b8738ff0 100644 --- a/external_imported/vcpkg/ports/qt5-remoteobjects/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-remoteobjects/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-remoteobjects", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Remoteobjects module - Provides an easy to use mechanism for sharing a QObject's API (Properties/Signals/Slots) between processes or devices.", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/external_imported/vcpkg/ports/qt5-script/vcpkg.json b/external_imported/vcpkg/ports/qt5-script/vcpkg.json index 874be0e27..260a2c152 100644 --- a/external_imported/vcpkg/ports/qt5-script/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-script/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-script", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Script Module.", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/external_imported/vcpkg/ports/qt5-scxml/vcpkg.json b/external_imported/vcpkg/ports/qt5-scxml/vcpkg.json index b32ce7883..5c7c53072 100644 --- a/external_imported/vcpkg/ports/qt5-scxml/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-scxml/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-scxml", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 SCXML Module - Provides classes and tools for creating state machines from SCXML files and embedding them in applications", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/external_imported/vcpkg/ports/qt5-sensors/vcpkg.json b/external_imported/vcpkg/ports/qt5-sensors/vcpkg.json index 2fe0948ed..1c7ef5d77 100644 --- a/external_imported/vcpkg/ports/qt5-sensors/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-sensors/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-sensors", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Sensors module - Provides access to sensor hardware and motion gesture recognition.", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/external_imported/vcpkg/ports/qt5-serialbus/vcpkg.json b/external_imported/vcpkg/ports/qt5-serialbus/vcpkg.json index 3e34dd716..9d0d3f388 100644 --- a/external_imported/vcpkg/ports/qt5-serialbus/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-serialbus/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-serialbus", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Serialbus Module;", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/external_imported/vcpkg/ports/qt5-serialport/vcpkg.json b/external_imported/vcpkg/ports/qt5-serialport/vcpkg.json index 8d9e79ccf..5d9108573 100644 --- a/external_imported/vcpkg/ports/qt5-serialport/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-serialport/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-serialport", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Serial Port - provides access to hardware and virtual serial ports", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/external_imported/vcpkg/ports/qt5-speech/vcpkg.json b/external_imported/vcpkg/ports/qt5-speech/vcpkg.json index 387b650a3..f9898c0f6 100644 --- a/external_imported/vcpkg/ports/qt5-speech/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-speech/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-speech", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Speech Module", + "license": null, "dependencies": [ { "name": "atlmfc", diff --git a/external_imported/vcpkg/ports/qt5-svg/vcpkg.json b/external_imported/vcpkg/ports/qt5-svg/vcpkg.json index 125ae9503..f32761483 100644 --- a/external_imported/vcpkg/ports/qt5-svg/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-svg/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-svg", - "version-string": "5.15.2", - "port-version": 2, + "version": "5.15.3", "description": "Qt5 SVG Module - provides classes for displaying the contents of SVG files", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/external_imported/vcpkg/ports/qt5-tools/vcpkg.json b/external_imported/vcpkg/ports/qt5-tools/vcpkg.json index 5c8111139..df212fc04 100644 --- a/external_imported/vcpkg/ports/qt5-tools/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-tools/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-tools", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications", + "license": null, "dependencies": [ { "name": "qt5-activeqt", diff --git a/external_imported/vcpkg/ports/qt5-translations/vcpkg.json b/external_imported/vcpkg/ports/qt5-translations/vcpkg.json index c85cd0149..cfc49dc2c 100644 --- a/external_imported/vcpkg/ports/qt5-translations/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-translations/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-translations", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 translations module", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/external_imported/vcpkg/ports/qt5-virtualkeyboard/vcpkg.json b/external_imported/vcpkg/ports/qt5-virtualkeyboard/vcpkg.json index c53720d04..07cd620af 100644 --- a/external_imported/vcpkg/ports/qt5-virtualkeyboard/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-virtualkeyboard/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-virtualkeyboard", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Virtual Keyboard Module - A framework for implementing different input methods. Supports localized keyboard layouts and custom visual themes", + "license": null, "dependencies": [ "qt5-multimedia", "qt5-quickcontrols", diff --git a/external_imported/vcpkg/ports/qt5-wayland/vcpkg.json b/external_imported/vcpkg/ports/qt5-wayland/vcpkg.json index 7ccb51624..76eb17309 100644 --- a/external_imported/vcpkg/ports/qt5-wayland/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-wayland/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-wayland", - "version-string": "5.15.2", - "port-version": 2, + "version": "5.15.3", "description": "Qt5 wayland Module;", + "license": null, "supports": "linux", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/qt5-webchannel/vcpkg.json b/external_imported/vcpkg/ports/qt5-webchannel/vcpkg.json index a50e4f1a4..1ba421639 100644 --- a/external_imported/vcpkg/ports/qt5-webchannel/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-webchannel/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-webchannel", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Web Channel module - Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients.", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/external_imported/vcpkg/ports/qt5-webengine/build_1.patch b/external_imported/vcpkg/ports/qt5-webengine/build_1.patch index dfa3ea721..4bef9ebd4 100644 --- a/external_imported/vcpkg/ports/qt5-webengine/build_1.patch +++ b/external_imported/vcpkg/ports/qt5-webengine/build_1.patch @@ -1,12 +1,12 @@ diff --git a/src/3rdparty/chromium/third_party/angle/BUILD.gn b/src/3rdparty/chromium/third_party/angle/BUILD.gn -index ad7675f4e..4a43479d9 100644 +index fb57176..fa84cc5 100644 --- a/src/3rdparty/chromium/third_party/angle/BUILD.gn +++ b/src/3rdparty/chromium/third_party/angle/BUILD.gn -@@ -126,7 +126,6 @@ config("extra_warnings") { +@@ -131,7 +131,6 @@ config("extra_warnings") { # Enable more default warnings on Windows. if (is_win) { cflags += [ - "/we4244", # Conversion: possible loss of data. + "/we4312", # Conversion: greater size. "/we4456", # Variable shadowing. "/we4458", # declaration hides class member. - "/we4715", # not all control paths return a value diff --git a/external_imported/vcpkg/ports/qt5-webengine/build_2.patch b/external_imported/vcpkg/ports/qt5-webengine/build_2.patch index 7a4622516..77d7cbe0d 100644 --- a/external_imported/vcpkg/ports/qt5-webengine/build_2.patch +++ b/external_imported/vcpkg/ports/qt5-webengine/build_2.patch @@ -1,29 +1,24 @@ diff --git a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h -index 59dbfad04..134357395 100644 +index 18ca770..5585a67 100644 --- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h +++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h -@@ -74,7 +74,7 @@ class CircularQueue { +@@ -74,16 +74,16 @@ class CircularQueue { return queue_->Get(pos_); } - const T* operator->() const { + T* operator->() const { - #if PERFETTO_DCHECK_IS_ON() - PERFETTO_DCHECK(generation_ == queue_->generation()); - #endif -@@ -82,13 +82,13 @@ class CircularQueue { + return const_cast::Iterator*>(this)->operator->(); } T& operator*() { return *(operator->()); } - const T& operator*() const { return *(operator->()); } + T& operator*() const { return *(operator->()); } - value_type& operator[](difference_type i) { - return *(*this + i); - } + value_type& operator[](difference_type i) { return *(*this + i); } - const value_type& operator[](difference_type i) const { + value_type& operator[](difference_type i) const { - return *(*this + i); + return const_cast::Iterator&>(*this)[i]; } diff --git a/external_imported/vcpkg/ports/qt5-webengine/build_3.patch b/external_imported/vcpkg/ports/qt5-webengine/build_3.patch deleted file mode 100644 index a86c5dec4..000000000 --- a/external_imported/vcpkg/ports/qt5-webengine/build_3.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h -index 78c316e04..fdb0312e0 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h -+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h -@@ -138,9 +138,9 @@ class LABColorSpace { - clamp(lab.Z(), -128.0f, 128.0f)}; - - return { -- invf((v.X() + 16.0f) / 116.0f + (v.Y() * 0.002f)) * kIlluminantD50.X(), -- invf((v.X() + 16.0f) / 116.0f) * kIlluminantD50.Y(), -- invf((v.X() + 16.0f) / 116.0f - (v.Z() * 0.005f)) * kIlluminantD50.Z()}; -+ (float)(invf((v.X() + 16.0f) / 116.0f + (v.Y() * 0.002f)) * kIlluminantD50.X()), -+ (float)(invf((v.X() + 16.0f) / 116.0f) * kIlluminantD50.Y()), -+ (float)(invf((v.X() + 16.0f) / 116.0f - (v.Z() * 0.005f)) * kIlluminantD50.Z())}; - } - - private: diff --git a/external_imported/vcpkg/ports/qt5-webengine/portfile.cmake b/external_imported/vcpkg/ports/qt5-webengine/portfile.cmake index 60020c83f..080b21b3c 100644 --- a/external_imported/vcpkg/ports/qt5-webengine/portfile.cmake +++ b/external_imported/vcpkg/ports/qt5-webengine/portfile.cmake @@ -44,8 +44,7 @@ vcpkg_add_to_path(PREPEND "${NINJA_DIR}") set(PATCHES common.pri.patch gl.patch build_1.patch - build_2.patch - build_3.patch) + build_2.patch) set(OPTIONS) if("proprietary-codecs" IN_LIST FEATURES) diff --git a/external_imported/vcpkg/ports/qt5-webengine/vcpkg.json b/external_imported/vcpkg/ports/qt5-webengine/vcpkg.json index 83a599f65..f6349b28b 100644 --- a/external_imported/vcpkg/ports/qt5-webengine/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-webengine/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qt5-webengine", - "version-string": "5.15.2", - "port-version": 3, + "version": "5.15.3", + "port-version": 1, "description": "Qt5 webengine Module;", + "license": null, "supports": "!static", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/qt5-webglplugin/vcpkg.json b/external_imported/vcpkg/ports/qt5-webglplugin/vcpkg.json index 596fb42c8..518136852 100644 --- a/external_imported/vcpkg/ports/qt5-webglplugin/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-webglplugin/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-webglplugin", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 webglplugin Module;", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/external_imported/vcpkg/ports/qt5-websockets/vcpkg.json b/external_imported/vcpkg/ports/qt5-websockets/vcpkg.json index 173b65271..69e6af408 100644 --- a/external_imported/vcpkg/ports/qt5-websockets/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-websockets/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-websockets", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 Web Sockets Module - provides WebSocket communication compliant with RFC 6455", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/external_imported/vcpkg/ports/qt5-webview/vcpkg.json b/external_imported/vcpkg/ports/qt5-webview/vcpkg.json index c033a0465..8b8c4dbd4 100644 --- a/external_imported/vcpkg/ports/qt5-webview/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-webview/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-webview", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 WebView module - Provides a way to display web content in a QML application without necessarily including a full web browser stack by using native APIs where it makes sense.", + "license": null, "dependencies": [ "qt5-declarative" ] diff --git a/external_imported/vcpkg/ports/qt5-winextras/patches/require_quick.patch b/external_imported/vcpkg/ports/qt5-winextras/patches/require_quick.patch new file mode 100644 index 000000000..471fa5a17 --- /dev/null +++ b/external_imported/vcpkg/ports/qt5-winextras/patches/require_quick.patch @@ -0,0 +1,12 @@ +diff --git a/src/src.pro b/src/src.pro +index fceeb21..8a242d0 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -2,6 +2,7 @@ win32 { + TEMPLATE = subdirs + CONFIG += ordered + SUBDIRS += winextras ++ SUBDIRS += imports + } else { + # fake project for creating the documentation + TEMPLATE = aux diff --git a/external_imported/vcpkg/ports/qt5-winextras/patches/unrequire_quick.patch b/external_imported/vcpkg/ports/qt5-winextras/patches/unrequire_quick.patch new file mode 100644 index 000000000..98f652da1 --- /dev/null +++ b/external_imported/vcpkg/ports/qt5-winextras/patches/unrequire_quick.patch @@ -0,0 +1,12 @@ +diff --git a/src/src.pro b/src/src.pro +index fceeb21..7e4835b 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -2,7 +2,6 @@ win32 { + TEMPLATE = subdirs + CONFIG += ordered + SUBDIRS += winextras +- qtHaveModule(quick): SUBDIRS += imports + } else { + # fake project for creating the documentation + TEMPLATE = aux diff --git a/external_imported/vcpkg/ports/qt5-winextras/portfile.cmake b/external_imported/vcpkg/ports/qt5-winextras/portfile.cmake index 69c3adbb2..3f9ff8cc7 100644 --- a/external_imported/vcpkg/ports/qt5-winextras/portfile.cmake +++ b/external_imported/vcpkg/ports/qt5-winextras/portfile.cmake @@ -1,5 +1,12 @@ -if (NOT VCPKG_TARGET_IS_WINDOWS) - message(FATAL_ERROR "qt5-winextras only support Windows.") +include("${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake") + +vcpkg_list(SET _patches + "patches/unrequire_quick.patch" +) +if("declarative" IN_LIST FEATURES) + list(APPEND _patches + "patches/require_quick.patch" + ) endif() -include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -qt_submodule_installation() + +qt_submodule_installation(PATCHES ${_patches}) diff --git a/external_imported/vcpkg/ports/qt5-winextras/vcpkg.json b/external_imported/vcpkg/ports/qt5-winextras/vcpkg.json index 64434f24e..3ed0e5fdf 100644 --- a/external_imported/vcpkg/ports/qt5-winextras/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-winextras/vcpkg.json @@ -1,19 +1,23 @@ { "name": "qt5-winextras", - "version-string": "5.15.2", + "version": "5.15.3", "port-version": 1, "description": "Qt5 Windows Extras Module. Provides platform-specific APIs for Windows.", + "license": null, "supports": "windows", "dependencies": [ - { - "name": "atlmfc", - "platform": "windows" - }, + "atlmfc", { "name": "qt5-base", "default-features": false - }, - "qt5-declarative", - "qt5-multimedia" - ] + } + ], + "features": { + "declarative": { + "description": "Build Qt.Quick imports", + "dependencies": [ + "qt5-declarative" + ] + } + } } diff --git a/external_imported/vcpkg/ports/qt5-x11extras/vcpkg.json b/external_imported/vcpkg/ports/qt5-x11extras/vcpkg.json index 032093137..7660c0c15 100644 --- a/external_imported/vcpkg/ports/qt5-x11extras/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-x11extras/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-x11extras", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 x11extras Module;", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/external_imported/vcpkg/ports/qt5-xmlpatterns/vcpkg.json b/external_imported/vcpkg/ports/qt5-xmlpatterns/vcpkg.json index efe86ebc5..2ceb26459 100644 --- a/external_imported/vcpkg/ports/qt5-xmlpatterns/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-xmlpatterns/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-xmlpatterns", - "version-string": "5.15.2", - "port-version": 1, + "version": "5.15.3", "description": "Qt5 XML Patterns Module - Support for XPath, XQuery, XSLT and XML schema validation", + "license": null, "dependencies": [ { "name": "qt5-base", diff --git a/external_imported/vcpkg/ports/qt5/vcpkg.json b/external_imported/vcpkg/ports/qt5/vcpkg.json index bbf4197fd..fdffcde2e 100644 --- a/external_imported/vcpkg/ports/qt5/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5/vcpkg.json @@ -1,9 +1,10 @@ { "name": "qt5", - "version-string": "5.15.2", + "version": "5.15.3", "port-version": 1, "description": "Qt5 Application Framework", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qt5-base", @@ -75,7 +76,6 @@ "name": "qt5", "default-features": false, "features": [ - "mysqlplugin", "webengine" ], "platform": "!static" @@ -87,6 +87,14 @@ "wayland" ], "platform": "!windows" + }, + { + "name": "qt5-base", + "default-features": false, + "features": [ + "mysqlplugin", + "postgresqlplugin" + ] } ] }, @@ -117,7 +125,10 @@ "doc": { "description": [], "dependencies": [ - "qt5-doc" + { + "name": "qt5-doc", + "platform": "!windows" + } ] }, "essentials": { @@ -152,6 +163,9 @@ }, { "name": "qt5-winextras", + "features": [ + "declarative" + ], "platform": "windows" }, { diff --git a/external_imported/vcpkg/ports/qt5compat/portfile.cmake b/external_imported/vcpkg/ports/qt5compat/portfile.cmake index d597b464e..452cf48be 100644 --- a/external_imported/vcpkg/ports/qt5compat/portfile.cmake +++ b/external_imported/vcpkg/ports/qt5compat/portfile.cmake @@ -10,6 +10,8 @@ FEATURES "big-codecs" FEATURE_big_codecs "iconv" FEATURE_iconv "iconv" CMAKE_DISABLE_FIND_PACKAGE_ICU + #"iconv" CMAKE_REQUIRE_FIND_PACKAGE_WrapIconv + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick INVERTED_FEATURES "iconv" CMAKE_DISABLE_FIND_PACKAGE_WrapIconv "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick diff --git a/external_imported/vcpkg/ports/qt5compat/vcpkg.json b/external_imported/vcpkg/ports/qt5compat/vcpkg.json index 9fb7dd896..43291a052 100644 --- a/external_imported/vcpkg/ports/qt5compat/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5compat/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qt5compat", - "version-semver": "6.2.2", + "version": "6.2.4", "description": "The module contains unsupported Qt 5 APIs", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/external_imported/vcpkg/ports/qtactiveqt/portfile.cmake b/external_imported/vcpkg/ports/qtactiveqt/portfile.cmake index 5092d7d85..32b1aa7b1 100644 --- a/external_imported/vcpkg/ports/qtactiveqt/portfile.cmake +++ b/external_imported/vcpkg/ports/qtactiveqt/portfile.cmake @@ -19,6 +19,7 @@ endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick INVERTED_FEATURES "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick ) diff --git a/external_imported/vcpkg/ports/qtactiveqt/vcpkg.json b/external_imported/vcpkg/ports/qtactiveqt/vcpkg.json index d87b4228f..bd9b6055c 100644 --- a/external_imported/vcpkg/ports/qtactiveqt/vcpkg.json +++ b/external_imported/vcpkg/ports/qtactiveqt/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtactiveqt", - "version-semver": "6.2.2", + "version": "6.2.4", "description": "ActiveQt", "homepage": "https://www.qt.io/", + "license": null, "supports": "windows", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/qtapplicationmanager/portfile.cmake b/external_imported/vcpkg/ports/qtapplicationmanager/portfile.cmake index b5641e696..8e190a55e 100644 --- a/external_imported/vcpkg/ports/qtapplicationmanager/portfile.cmake +++ b/external_imported/vcpkg/ports/qtapplicationmanager/portfile.cmake @@ -39,7 +39,7 @@ if(VCPKG_TARGET_IS_WINDOWS) vcpkg_replace_string("${scriptfile}" "${CURRENT_INSTALLED_DIR_NATIVE}\\bin" "${CURRENT_INSTALLED_DIR_NATIVE}\\debug\\bin") endif() endif() -vcpkg_install_cmake(ADD_BIN_TO_PATH) +vcpkg_cmake_install(ADD_BIN_TO_PATH) qt_fixup_and_cleanup(TOOL_NAMES ${TOOL_NAMES}) diff --git a/external_imported/vcpkg/ports/qtapplicationmanager/vcpkg.json b/external_imported/vcpkg/ports/qtapplicationmanager/vcpkg.json index c167968da..4727a1328 100644 --- a/external_imported/vcpkg/ports/qtapplicationmanager/vcpkg.json +++ b/external_imported/vcpkg/ports/qtapplicationmanager/vcpkg.json @@ -1,9 +1,9 @@ { "name": "qtapplicationmanager", - "version-semver": "6.2.2", - "port-version": 1, + "version": "6.2.4", "description": "Qt component for application lifecycle management", "homepage": "https://www.qt.io/", + "license": null, "supports": "!(windows & arm)", "dependencies": [ "libarchive", 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 6598117f6..f235d367e 100644 --- a/external_imported/vcpkg/ports/qtbase/cmake/qt_install_submodule.cmake +++ b/external_imported/vcpkg/ports/qtbase/cmake/qt_install_submodule.cmake @@ -1,3 +1,5 @@ +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") @@ -48,9 +50,9 @@ endfunction() function(qt_cmake_configure) - cmake_parse_arguments(PARSE_ARGV 0 "_qarg" "DISABLE_NINJA" + cmake_parse_arguments(PARSE_ARGV 0 "_qarg" "DISABLE_NINJA;DISABLE_PARALLEL_CONFIGURE" "" - "TOOL_NAMES;OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE") + "TOOL_NAMES;OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;OPTIONS_MAYBE_UNUSED") vcpkg_find_acquire_program(PERL) # Perl is probably required by all qt ports for syncqt get_filename_component(PERL_PATH ${PERL} DIRECTORY) @@ -61,40 +63,55 @@ function(qt_cmake_configure) vcpkg_add_to_path(${PYTHON3_PATH}) endif() - if(CMAKE_HOST_WIN32) - if(NOT ${PORT} MATCHES "qtbase") - list(APPEND _qarg_OPTIONS -DQT_SYNCQT:PATH="${CURRENT_HOST_INSTALLED_DIR}/tools/Qt6/bin/syncqt.pl") - endif() - set(PERL_OPTION -DHOST_PERL:PATH="${PERL}") - else() - if(NOT ${PORT} MATCHES "qtbase") - list(APPEND _qarg_OPTIONS -DQT_SYNCQT:PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/Qt6/bin/syncqt.pl) - endif() - set(PERL_OPTION -DHOST_PERL:PATH=${PERL}) + if(NOT PORT MATCHES "^qtbase") + list(APPEND _qarg_OPTIONS "-DQT_SYNCQT:PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/Qt6/bin/syncqt.pl") endif() + set(PERL_OPTION "-DHOST_PERL:PATH=${PERL}") - if(NOT _qarg_DISABLE_NINJA) - set(NINJA_OPTION PREFER_NINJA) + set(ninja_option "") + if(_qarg_DISABLE_NINJA) + set(ninja_option WINDOWS_USE_MSBUILD) + endif() + + set(disable_parallel "") + if(_qarg_DISABLE_PARALLEL_CONFIGURE) + set(disable_parallel DISABLE_PARALLEL_CONFIGURE) endif() 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) + 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() - vcpkg_configure_cmake( + # Disable warning for CMAKE_(REQUIRE|DISABLE)_FIND_PACKAGE_ + string(REGEX MATCHALL "CMAKE_DISABLE_FIND_PACKAGE_[^:=]+" disabled_find_package "${_qarg_OPTIONS}") + list(APPEND _qarg_OPTIONS_MAYBE_UNUSED ${disabled_find_package}) + + string(REGEX MATCHALL "CMAKE_REQUIRE_FIND_PACKAGE_[^:=]+(:BOOL)?=OFF" require_find_package "${_qarg_OPTIONS}") + list(TRANSFORM require_find_package REPLACE "(:BOOL)?=OFF" "") + list(APPEND _qarg_OPTIONS_MAYBE_UNUSED ${require_find_package}) + + # Disable unused warnings for disabled features. Qt might decide to not emit the feature variables if other features are deactivated. + string(REGEX MATCHALL "(QT_)?FEATURE_[^:=]+(:BOOL)?=OFF" disabled_features "${_qarg_OPTIONS}") + list(TRANSFORM disabled_features REPLACE "(:BOOL)?=OFF" "") + list(APPEND _qarg_OPTIONS_MAYBE_UNUSED ${disabled_features}) + + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - ${NINJA_OPTION} + ${ninja_option} + ${disable_parallel} OPTIONS + -DQT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS:BOOL=ON # We don't want Qt to screw with users toolchain settings. #-DQT_HOST_PATH= # For crosscompiling #-DQT_PLATFORM_DEFINITION_DIR=mkspecs/win32-msvc #-DQT_QMAKE_TARGET_MKSPEC=win32-msvc #-DQT_USE_CCACHE - -DQT_NO_MAKE_EXAMPLES:BOOL=TRUE - -DQT_NO_MAKE_TESTS:BOOL=TRUE + -DQT_BUILD_EXAMPLES:BOOL=OFF + -DQT_BUILD_TESTS:BOOL=OFF + -DQT_BUILD_BENCHMARKS:BOOL=OFF ${PERL_OPTION} -DINSTALL_BINDIR:STRING=bin -DINSTALL_LIBEXECDIR:STRING=bin @@ -109,13 +126,25 @@ function(qt_cmake_configure) -DINSTALL_MKSPECSDIR:STRING=share/Qt6/mkspecs -DINSTALL_TRANSLATIONSDIR:STRING=translations/${QT6_DIRECTORY_PREFIX} OPTIONS_DEBUG - -DINPUT_debug:BOOL=ON + # -DFEATURE_debug:BOOL=ON only needed by qtbase and auto detected? -DINSTALL_DOCDIR:STRING=../doc/${QT6_DIRECTORY_PREFIX} -DINSTALL_INCLUDEDIR:STRING=../include/${QT6_DIRECTORY_PREFIX} -DINSTALL_TRANSLATIONSDIR:STRING=../translations/${QT6_DIRECTORY_PREFIX} -DINSTALL_DESCRIPTIONSDIR:STRING=../share/Qt6/modules -DINSTALL_MKSPECSDIR:STRING=../share/Qt6/mkspecs - ${_qis_CONFIGURE_OPTIONS_DEBUG} + ${_qarg_OPTIONS_DEBUG} + MAYBE_UNUSED_VARIABLES + INSTALL_BINDIR + INSTALL_DOCDIR + INSTALL_LIBEXECDIR + INSTALL_QMLDIR # No qml files + INSTALL_TRANSLATIONSDIR # No translations + INSTALL_PLUGINSDIR # No plugins + INSTALL_DESCRIPTIONSDIR + INSTALL_INCLUDEDIR + HOST_PERL + QT_SYNCQT + ${_qarg_OPTIONS_MAYBE_UNUSED} ) set(Z_VCPKG_CMAKE_GENERATOR "${Z_VCPKG_CMAKE_GENERATOR}" PARENT_SCOPE) endfunction() @@ -132,6 +161,7 @@ function(qt_fix_prl_files) string(REPLACE "${include_path}" "\$\$[QT_INSTALL_HEADERS]" _contents "${_contents}") string(REPLACE "${install_prefix}" "\$\$[QT_INSTALL_PREFIX]" _contents "${_contents}") string(REPLACE "[QT_INSTALL_PREFIX]/lib/objects-Debug" "[QT_INSTALL_LIBS]/objects-Debug" _contents "${_contents}") + string(REPLACE "[QT_INSTALL_PREFIX]/Qt6/qml" "[QT_INSTALL_QML]" _contents "${_contents}") #Note: This only works without an extra if case since QT_INSTALL_PREFIX is the same for debug and release file(WRITE "${prl_file}" "${_contents}") endforeach() @@ -160,13 +190,13 @@ function(qt_fixup_and_cleanup) foreach(_comp IN LISTS COMPONENTS) if(EXISTS "${CURRENT_PACKAGES_DIR}/share/Qt6${_comp}") - vcpkg_fixup_cmake_targets(CONFIG_PATH share/Qt6${_comp} TARGET_PATH share/Qt6${_comp} TOOLS_PATH "tools/Qt6/bin") - # Would rather put it into share/cmake as before but the import_prefix correction in vcpkg_fixup_cmake_targets is working against that. + vcpkg_cmake_config_fixup(PACKAGE_NAME "Qt6${_comp}" CONFIG_PATH "share/Qt6${_comp}" TOOLS_PATH "tools/Qt6/bin") + # Would rather put it into share/cmake as before but the import_prefix correction in vcpkg_cmake_config_fixup is working against that. else() message(STATUS "WARNING: Qt component ${_comp} not found/built!") endif() endforeach() - #fix debug plugin paths (should probably be fixed in vcpkg_fixup_pkgconfig) + #fix debug plugin paths (should probably be fixed in vcpkg_cmake_config_fixup) file(GLOB_RECURSE DEBUG_CMAKE_TARGETS "${CURRENT_PACKAGES_DIR}/share/**/*Targets-debug.cmake") debug_message("DEBUG_CMAKE_TARGETS:${DEBUG_CMAKE_TARGETS}") foreach(_debug_target IN LISTS DEBUG_CMAKE_TARGETS) @@ -177,7 +207,7 @@ function(qt_fixup_and_cleanup) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(GLOB_RECURSE STATIC_CMAKE_TARGETS "${CURRENT_PACKAGES_DIR}/share/Qt6Qml/QmlPlugins/*.cmake") foreach(_plugin_target IN LISTS STATIC_CMAKE_TARGETS) - # restore a single get_filename_component which was remove by vcpkg_fixup_pkgconfig + # restore a single get_filename_component which was remove by vcpkg_cmake_config_fixup vcpkg_replace_string("${_plugin_target}" [[get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)]] "get_filename_component(_IMPORT_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)") @@ -241,7 +271,7 @@ endfunction() function(qt_install_submodule) cmake_parse_arguments(PARSE_ARGV 0 "_qis" "DISABLE_NINJA" "" - "PATCHES;TOOL_NAMES;CONFIGURE_OPTIONS;CONFIGURE_OPTIONS_DEBUG;CONFIGURE_OPTIONS_RELEASE") + "PATCHES;TOOL_NAMES;CONFIGURE_OPTIONS;CONFIGURE_OPTIONS_DEBUG;CONFIGURE_OPTIONS_RELEASE;CONFIGURE_OPTIONS_MAYBE_UNUSED") set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins) set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml) @@ -257,9 +287,11 @@ function(qt_install_submodule) qt_cmake_configure(${_opt} OPTIONS ${_qis_CONFIGURE_OPTIONS} OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG} - OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE}) + OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE} + OPTIONS_MAYBE_UNUSED ${_qis_CONFIGURE_OPTIONS_MAYBE_UNUSED} + ) - vcpkg_install_cmake(ADD_BIN_TO_PATH) + vcpkg_cmake_install(ADD_BIN_TO_PATH) qt_fixup_and_cleanup(TOOL_NAMES ${_qis_TOOL_NAMES}) 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 ec0610ab3..a33f93b4a 100644 --- a/external_imported/vcpkg/ports/qtbase/cmake/qt_port_details.cmake +++ b/external_imported/vcpkg/ports/qtbase/cmake/qt_port_details.cmake @@ -1,4 +1,4 @@ -set(QT_VERSION 6.2.2) +set(QT_VERSION 6.2.4) if(PORT MATCHES "qtquickcontrols2") set(VCPKG_POLICY_EMPTY_PACKAGE enabled) @@ -68,47 +68,52 @@ set(QT_PORTS qt foreach(_port IN LISTS QT_PORTS) set(${_port}_TAG ${QT_GIT_TAG}) endforeach() -set(qtbase_REF 61fbf7596beda0178e213a7ba945bc0314153366) -set(qtshadertools_REF 3ce1b25b413aef98a68c0b05305a6849bb558889) -set(qtdeclarative_REF f4cbbe999d912b2c66fffc8b7bf11b59fd92a178) -set(qt5compat_REF e38a2b4653780317feed0d0f7c0adb2964ed674c) -set(qttools_REF f779b0439e3984f592320c0e5b3ba52f3627c07b) # Additional refs in portfile due to submodule -set(qtcoap_REF fe7ea10937ece3b19fc7d909790e1bfec23c363f) -set(qtdoc_REF aeb34a71d6f93b3ddb438e52c3f4d963e8c51ab9) -set(qtimageformats_REF 02a3365745ceb3cdcc27b2dd6f80300f5c03f6f4) -set(qtmqtt_REF deff6a3853c9a09e18fa05ae9aa6c5868ba2d1b7) -set(qtnetworkauth_REF 470a295fcb61e37640e00c75be1870a3b1cb227e) -set(qtopcua_REF b8e9b695c71d73e21ac489136fca1c2991ebea78) -set(qtquicktimeline_REF 7c74c9025c8c5f390f5a19ec9bd1d0d4fc36cee2) -set(qtquick3d_REF 8a06b1c9e69c2b83fff313bab4cdc463b6c55b8c) -set(qtsvg_REF 414fe3bc0f77704c9184ee1039ffea82de8b6c0b) -set(qttranslations_REF a8b48341570242a700fd61abf16ef106b4b4d8b2) -set(qtwayland_REF b6d7b9d5dea396b1454b4e204f37a66e3da39150) +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 9d373846d2f0073f530b1e714afeb76cf039df94) -set(qtcharts_REF b74fa4205af2f6be69ec1a233aaee28f1eb6b838) -set(qtdatavis3d_REF e5ee7c79d3e6845267691c0074ae3aa286cbe904) -set(qtdeviceutilities_REF df77ef89d3b1cbeda9996702e0a26a9a58c9f467) #missing tag -set(qtlottie_REF 6c16cfae5f39bf1047f73ae99bbe7d99c79f5179) -set(qtscxml_REF 6dd18cdf4d24d159f7114b8b31a81d95a24f3ca2) -set(qtvirtualkeyboard_REF 7473762116f3c0bdfc5d8e4d55137013ea082eaf) +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 a723287f639e81a3253f6c0923475da5294a3342) -set(qtserialport_REF 6a92ae54a27d6fc40e5f44332a7d7d49999a8643) -set(qtmultimedia_REF 6a55ffc411f6ea73d45a7109d54c5cca1a482930) -set(qtremoteobjects_REF cc1fd1722180b8a46994c7c751ea4b3b7ab30c58) -set(qtsensors_REF ba5da0a367fa2f11b577ba226bea488eda7dd499) -set(qtserialbus_REF 125631af95d958d55b7b0789dfe64e0d1f7d0122) -set(qtlocation_REF 6db775f6d9d72cf8ee9d66333b8424e74be1e352) -set(qtwebchannel_REF e55fa2e085466238e24d53abf4fc9ede7a7590e4) -set(qtwebengine_REF ad19d22d3aa5d692b4988f2ffb88868232e6fc0c) # Additional refs in portfile due to submodule -set(qtwebsockets_REF 18c452968b3c3ad6c1e1b6512ebd96e9f895c571) -set(qtwebview_REF eb5a94f20e77a9639b07ae3d59c9d67529ffed66) -set(qtpositioning_REF 1294c29be50fa5cdf2d78afffac0451f7b4bc16a) +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 1009f73d1f5c07947cdc2318150279ad43fc4b04) -set(qtinterfaceframework_REF 118fa138186144cf2d802405255f08662ed76d43) +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!") @@ -118,7 +123,7 @@ if(QT_UPDATE_VERSION) 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 "\"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 diff --git a/external_imported/vcpkg/ports/qtbase/dont_force_cmakecache.patch b/external_imported/vcpkg/ports/qtbase/dont_force_cmakecache.patch index f8e90f3a1..fc5423425 100644 --- a/external_imported/vcpkg/ports/qtbase/dont_force_cmakecache.patch +++ b/external_imported/vcpkg/ports/qtbase/dont_force_cmakecache.patch @@ -2,22 +2,16 @@ 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) +@@ -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") ++ string(APPEND content "set(${var} \"${${var}}\" CACHE STRING \"${docstring}\" )\n") endforeach() set(${out_var} "${content}" PARENT_SCOPE) -@@ -465,12 +465,12 @@ function(qt_generate_build_internals_extra_cmake_code) - # at the start of project configuration (with an empty value), - # so we need to force override it. - string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS -- "set(CMAKE_BUILD_TYPE \"${CMAKE_BUILD_TYPE}\" CACHE STRING \"Choose the type of build.\" FORCE)\n") -+ "set(CMAKE_BUILD_TYPE \"${CMAKE_BUILD_TYPE}\" CACHE STRING \"Choose the type of build.\")\n") - +@@ -528,7 +528,7 @@ qt_internal_force_set_cmake_build_type_conditionally( endif() if(CMAKE_CONFIGURATION_TYPES) string(APPEND multi_config_specific @@ -26,21 +20,39 @@ index 4f8106dfa..bec5c402e 100644 endif() if(CMAKE_TRY_COMPILE_CONFIGURATION) string(APPEND multi_config_specific -@@ -492,7 +492,7 @@ function(qt_generate_build_internals_extra_cmake_code) - if(multi_config_specific) - string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS " - if(QT_BUILD_STANDALONE_TESTS) -- set(CMAKE_BUILD_TYPE \"\${QT_MULTI_CONFIG_FIRST_CONFIG}\" CACHE STRING \"Choose the type of build.\" FORCE) -+ set(CMAKE_BUILD_TYPE \"\${QT_MULTI_CONFIG_FIRST_CONFIG}\" CACHE STRING \"Choose the type of build.\") +@@ -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") - endif() -@@ -583,7 +583,7 @@ endif()\n") - if(\"$\{CMAKE_STAGING_PREFIX}\" STREQUAL \"\" - AND NOT QT_BUILD_INTERNALS_NO_FORCE_SET_STAGING_PREFIX) - set(CMAKE_STAGING_PREFIX \"${CMAKE_STAGING_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.\" ) - endif() - ") - endif() + # 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/env.patch b/external_imported/vcpkg/ports/qtbase/env.patch new file mode 100644 index 000000000..6a3716759 --- /dev/null +++ b/external_imported/vcpkg/ports/qtbase/env.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/QtTestHelpers.cmake b/cmake/QtTestHelpers.cmake +index 279ab07dd..951fd3d36 100644 +--- a/cmake/QtTestHelpers.cmake ++++ b/cmake/QtTestHelpers.cmake +@@ -653,9 +653,9 @@ function(qt_internal_collect_command_environment out_path out_plugin_path) + # The regular CMAKE_INSTALL_PREFIX can be different for example when building standalone tests. + # Any given CMAKE_INSTALL_PREFIX takes priority over qt_relocatable_install_prefix for the + # PATH environment variable. +- set(install_prefixes "${CMAKE_INSTALL_PREFIX}") ++ set(install_prefixes "${CMAKE_INSTALL_PREFIX}$<$:/debug>") + if(QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX) +- list(APPEND install_prefixes "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}") ++ list(APPEND install_prefixes "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}$<$:/debug>") + endif() + + file(TO_NATIVE_PATH "${CMAKE_CURRENT_BINARY_DIR}" test_env_path) diff --git a/external_imported/vcpkg/ports/qtbase/portfile.cmake b/external_imported/vcpkg/ports/qtbase/portfile.cmake index 1f059cdce..9d90b9233 100644 --- a/external_imported/vcpkg/ports/qtbase/portfile.cmake +++ b/external_imported/vcpkg/ports/qtbase/portfile.cmake @@ -1,7 +1,7 @@ # Reminder for myself and everybody else: -# Qt cross module dependency information within the Qt respository is wrong and/or incomplete. +# Qt cross module dependency information within the Qt respository is wrong and/or incomplete. # 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. +# 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) @@ -9,8 +9,8 @@ ## All above goes into the qt_port_hashes in the future include("${CMAKE_CURRENT_LIST_DIR}/cmake/qt_install_submodule.cmake") -set(${PORT}_PATCHES - allow_outside_prefix.patch +set(${PORT}_PATCHES + allow_outside_prefix.patch clang-cl_source_location.patch config_install.patch dont_force_cmakecache.patch @@ -19,6 +19,10 @@ set(${PORT}_PATCHES fix_egl.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 ) @@ -28,9 +32,9 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT "doubleconversion" IN_LIST FEATURES) message(FATAL_ERROR "${PORT} requires feature doubleconversion on windows!" ) endif() -# Features can be found via searching for qt_feature in all configure.cmake files in the source: +# Features can be found via searching for qt_feature in all configure.cmake files in the source: # The files also contain information about the Platform for which it is searched -# Always use FEATURE_ in vcpkg_configure_cmake +# Always use FEATURE_ in vcpkg_cmake_configure # (using QT_FEATURE_X overrides Qts condition check for the feature.) # Theoretically there is a feature for every widget to enable/disable it but that is way to much for vcpkg @@ -39,8 +43,7 @@ set(INPUT_OPTIONS) foreach(_input IN LISTS input_vars) if(_input MATCHES "(png|jpeg)" ) list(APPEND INPUT_OPTIONS -DINPUT_lib${_input}:STRING=) - elseif(_input MATCHES "(sql-sqlite)") - list(APPEND INPUT_OPTIONS -DINPUT_sqlite:STRING=) # Not yet used be the cmake build + elseif(_input MATCHES "(sql-sqlite)") # Not yet used by the cmake build else() list(APPEND INPUT_OPTIONS -DINPUT_${_input}:STRING=) endif() @@ -56,9 +59,10 @@ foreach(_input IN LISTS input_vars) endforeach() # General features: + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - "appstore-compliant" FEATURE_appstore-compliant + "appstore-compliant" FEATURE_appstore_compliant "zstd" FEATURE_zstd "framework" FEATURE_framework "concurrent" FEATURE_concurrent @@ -71,6 +75,8 @@ FEATURES "widgets" FEATURE_widgets #"xml" FEATURE_xml # Required to build moc "testlib" FEATURE_testlib + "zstd" CMAKE_REQUIRE_FIND_PACKAGE_zstd + ${require_features} INVERTED_FEATURES "zstd" CMAKE_DISABLE_FIND_PACKAGE_ZSTD "dbus" CMAKE_DISABLE_FIND_PACKAGE_WrapDBus1 @@ -79,6 +85,10 @@ INVERTED_FEATURES list(APPEND FEATURE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libudev:BOOL=ON) list(APPEND FEATURE_OPTIONS -DFEATURE_xml:BOOL=ON) +if(VCPKG_QT_NAMESPACE) + list(APPEND FEATURE_OPTIONS "-DQT_NAMESPACE:STRING=${VCPKG_QT_NAMESPACE}") +endif() + # Corelib features: vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_CORE_OPTIONS FEATURES @@ -86,10 +96,12 @@ FEATURES "glib" FEATURE_glib "icu" FEATURE_icu "pcre2" FEATURE_pcre2 + #"icu" CMAKE_REQUIRE_FIND_PACKAGE_ICU + "glib" CMAKE_REQUIRE_FIND_PACKAGE_GLIB2 INVERTED_FEATURES #"doubleconversion" CMAKE_DISABLE_FIND_PACKAGE_WrapDoubleConversion # Required - "icu" CMAKE_DISABLE_FIND_PACKAGE_ICU #"pcre2" CMAKE_DISABLE_FIND_PACKAGE_WrapSystemPCRE2 # Bug in qt cannot be deactivated + "icu" CMAKE_DISABLE_FIND_PACKAGE_ICU "glib" CMAKE_DISABLE_FIND_PACKAGE_GLIB2 ) @@ -103,6 +115,8 @@ list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libsystemd:BOOL=ON FEATURES "openssl" FEATURE_openssl "brotli" FEATURE_brotli + #"brotli" CMAKE_REQUIRE_FIND_PACKAGE_WrapBrotli + #"openssl" CMAKE_REQUIRE_FIND_PACKAGE_WrapOpenSSL INVERTED_FEATURES "brotli" CMAKE_DISABLE_FIND_PACKAGE_WrapBrotli "openssl" CMAKE_DISABLE_FIND_PACKAGE_WrapOpenSSL @@ -126,6 +140,25 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_GUI_OPTIONS "jpeg" FEATURE_jpeg "png" FEATURE_png #"opengl" INPUT_opengl=something + "xlib" FEATURE_xlib + "xkb" FEATURE_xkbcommon + "xcb" FEATURE_xcb + "xcb-xlib" FEATURE_xcb_xlib + "xkbcommon-x11" FEATURE_xkbcommon_x11 + "xrender" FEATURE_xrender # requires FEATURE_xcb_native_painting; otherwise disabled. + "xrender" FEATURE_xcb_native_painting # experimental + #"vulkan" CMAKE_REQUIRE_FIND_PACKAGE_Vulkan + #"egl" CMAKE_REQUIRE_FIND_PACKAGE_EGL + #"fontconfig" CMAKE_REQUIRE_FIND_PACKAGE_Fontconfig + #"harfbuzz" CMAKE_REQUIRE_FIND_PACKAGE_WrapSystemHarfbuzz + #"jpeg" CMAKE_REQUIRE_FIND_PACKAGE_JPEG + #"png" CMAKE_REQUIRE_FIND_PACKAGE_PNG + #"xlib" CMAKE_REQUIRE_FIND_PACKAGE_X11 + #"xkb" CMAKE_REQUIRE_FIND_PACKAGE_XKB + #"xcb" CMAKE_REQUIRE_FIND_PACKAGE_XCB + #"xcb-xlib" CMAKE_REQUIRE_FIND_PACKAGE_X11_XCB + #"xkbcommon-x11" CMAKE_REQUIRE_FIND_PACKAGE_XKB_COMMON_X11 + #"xrender" CMAKE_REQUIRE_FIND_PACKAGE_XRender INVERTED_FEATURES "vulkan" CMAKE_DISABLE_FIND_PACKAGE_Vulkan "egl" CMAKE_DISABLE_FIND_PACKAGE_EGL @@ -168,6 +201,8 @@ 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-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 @@ -191,23 +226,23 @@ list(APPEND FEATURE_PRINTSUPPORT_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_CUPS:BOOL= # widgets features: # vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_WIDGETS_OPTIONS # "gtk3" FEATURE_gtk3 - # There are a lot of additional features here to deactivate parts of widgets. + # There are a lot of additional features here to deactivate parts of widgets. # ) list(APPEND FEATURE_WIDGETS_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_GTK3:BOOL=ON) -set(TOOL_NAMES - androiddeployqt - androidtestrunner - cmake_automoc_parser - moc - qdbuscpp2xml - qdbusxml2cpp - qlalr - qmake - qmake6 - qvkgen - rcc - tracegen +set(TOOL_NAMES + androiddeployqt + androidtestrunner + cmake_automoc_parser + moc + qdbuscpp2xml + qdbusxml2cpp + qlalr + qmake + qmake6 + qvkgen + rcc + tracegen uic qtpaths qtpaths6 @@ -234,15 +269,16 @@ qt_install_submodule(PATCHES ${${PORT}_PATCHES} -DFEATURE_relocatable:BOOL=ON CONFIGURE_OPTIONS_RELEASE CONFIGURE_OPTIONS_DEBUG - -DQT_NO_MAKE_TOOLS:BOOL=ON -DFEATURE_debug:BOOL=ON + CONFIGURE_OPTIONS_MAYBE_UNUSED + FEATURE_appstore_compliant # only used for android/ios ) # Install CMake helper scripts if(QT_IS_LATEST) - set(port_details "${CMAKE_CURRENT_LIST_DIR}/cmake/qt_port_details-latest.cmake") + 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") + set(port_details "${CMAKE_CURRENT_LIST_DIR}/cmake/qt_port_details.cmake") endif() file(INSTALL "${port_details}" @@ -266,9 +302,9 @@ if(CMAKE_HOST_WIN32) else() set(script_suffix) endif() -set(other_files +set(other_files target_qt.conf - qt-cmake-private-install.cmake + qt-cmake-private-install.cmake syncqt.pl android_cmakelist_patcher.sh android_emulator_launcher.sh @@ -309,7 +345,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") 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. + 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/") endif() endif() @@ -321,7 +357,7 @@ if(NOT VCPKG_TARGET_IS_OSX) endif() if(NOT VCPKG_TARGET_IS_IOS) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/Qt6/ios") -endif() +endif() file(RELATIVE_PATH installed_to_host "${CURRENT_INSTALLED_DIR}" "${CURRENT_HOST_INSTALLED_DIR}") file(RELATIVE_PATH host_to_installed "${CURRENT_HOST_INSTALLED_DIR}" "${CURRENT_INSTALLED_DIR}") @@ -331,7 +367,7 @@ if(installed_to_host) endif() set(_file "${CMAKE_CURRENT_LIST_DIR}/qt.conf.in") set(REL_PATH "") -set(REL_HOST_TO_DATA "\${CURRENT_INSTALLED_DIR}") +set(REL_HOST_TO_DATA "\${CURRENT_INSTALLED_DIR}/") configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/qt_release.conf" @ONLY) # For vcpkg-qmake set(BACKUP_CURRENT_INSTALLED_DIR "${CURRENT_INSTALLED_DIR}") set(BACKUP_CURRENT_HOST_INSTALLED_DIR "${CURRENT_HOST_INSTALLED_DIR}") @@ -346,7 +382,7 @@ configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/qt.debug.conf") set(CURRENT_INSTALLED_DIR "${BACKUP_CURRENT_INSTALLED_DIR}") set(CURRENT_HOST_INSTALLED_DIR "${BACKUP_CURRENT_HOST_INSTALLED_DIR}") -set(REL_HOST_TO_DATA "\${CURRENT_INSTALLED_DIR}") +set(REL_HOST_TO_DATA "\${CURRENT_INSTALLED_DIR}/") configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/qt_debug.conf" @ONLY) # For vcpkg-qmake if(VCPKG_TARGET_IS_WINDOWS) diff --git a/external_imported/vcpkg/ports/qtbase/vcpkg.json b/external_imported/vcpkg/ports/qtbase/vcpkg.json index b9116901a..df7b84068 100644 --- a/external_imported/vcpkg/ports/qtbase/vcpkg.json +++ b/external_imported/vcpkg/ports/qtbase/vcpkg.json @@ -1,9 +1,9 @@ { "name": "qtbase", - "version-semver": "6.2.2", - "port-version": 2, + "version": "6.2.4", "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, "dependencies": [ "freetype", { @@ -16,6 +16,30 @@ "host": true, "default-features": false }, + { + "name": "qtbase", + "default-features": false, + "features": [ + "doubleconversion" + ], + "platform": "windows" + }, + { + "name": "qtbase", + "default-features": false, + "features": [ + "pcre2" + ], + "platform": "windows & static" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "default-features": [ @@ -274,6 +298,7 @@ "name": "qtbase", "default-features": false, "features": [ + "concurrent", "xkbcommon-x11", "xlib" ] diff --git a/external_imported/vcpkg/ports/qtcharts/portfile.cmake b/external_imported/vcpkg/ports/qtcharts/portfile.cmake index d6a3b2fd0..0f5be8a03 100644 --- a/external_imported/vcpkg/ports/qtcharts/portfile.cmake +++ b/external_imported/vcpkg/ports/qtcharts/portfile.cmake @@ -5,6 +5,7 @@ set(${PORT}_PATCHES) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick INVERTED_FEATURES "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick ) diff --git a/external_imported/vcpkg/ports/qtcharts/vcpkg.json b/external_imported/vcpkg/ports/qtcharts/vcpkg.json index 656af8d7b..5b5bba705 100644 --- a/external_imported/vcpkg/ports/qtcharts/vcpkg.json +++ b/external_imported/vcpkg/ports/qtcharts/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtcharts", - "version-semver": "6.2.2", + "version": "6.2.4", "description": "QtCharts module", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/external_imported/vcpkg/ports/qtcoap/vcpkg.json b/external_imported/vcpkg/ports/qtcoap/vcpkg.json index bfc5a5e67..933dd17eb 100644 --- a/external_imported/vcpkg/ports/qtcoap/vcpkg.json +++ b/external_imported/vcpkg/ports/qtcoap/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtcoap", - "version-semver": "6.2.2", + "version": "6.2.4", "description": "Qt CoAP client module", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/external_imported/vcpkg/ports/qtconnectivity/vcpkg.json b/external_imported/vcpkg/ports/qtconnectivity/vcpkg.json index 6000fb93a..9939d0560 100644 --- a/external_imported/vcpkg/ports/qtconnectivity/vcpkg.json +++ b/external_imported/vcpkg/ports/qtconnectivity/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtconnectivity", - "version-semver": "6.2.2", + "version": "6.2.4", "description": "Qt Connectivity", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/external_imported/vcpkg/ports/qtdatavis3d/vcpkg.json b/external_imported/vcpkg/ports/qtdatavis3d/vcpkg.json index 58676c730..7c6ef9986 100644 --- a/external_imported/vcpkg/ports/qtdatavis3d/vcpkg.json +++ b/external_imported/vcpkg/ports/qtdatavis3d/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtdatavis3d", - "version-semver": "6.2.2", + "version": "6.2.4", "description": "Qt 3D data visualization framework", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/external_imported/vcpkg/ports/qtdeclarative/portfile.cmake b/external_imported/vcpkg/ports/qtdeclarative/portfile.cmake index f3f29a1a1..bf1d42cf3 100644 --- a/external_imported/vcpkg/ports/qtdeclarative/portfile.cmake +++ b/external_imported/vcpkg/ports/qtdeclarative/portfile.cmake @@ -26,4 +26,6 @@ qt_install_submodule(PATCHES ${${PORT}_PATCHES} ) # remove `${SOURCE_PATH}` from the front of `#line` directives -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/Qt6/QtQml/6.2.2/QtQml/private/qqmljsparser_p.h" "${SOURCE_PATH}" "") +if(NOT QT_UPDATE_VERSION) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/Qt6/QtQml/${QT_VERSION}/QtQml/private/qqmljsparser_p.h" "${SOURCE_PATH}" "") +endif() diff --git a/external_imported/vcpkg/ports/qtdeclarative/vcpkg.json b/external_imported/vcpkg/ports/qtdeclarative/vcpkg.json index 46ea17798..a28b939d9 100644 --- a/external_imported/vcpkg/ports/qtdeclarative/vcpkg.json +++ b/external_imported/vcpkg/ports/qtdeclarative/vcpkg.json @@ -1,9 +1,9 @@ { "name": "qtdeclarative", - "version-semver": "6.2.2", - "port-version": 1, + "version": "6.2.4", "description": "Qt Declarative (Quick 2)", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/external_imported/vcpkg/ports/qtdeviceutilities/vcpkg.json b/external_imported/vcpkg/ports/qtdeviceutilities/vcpkg.json index 4f0cc8ea1..40887e480 100644 --- a/external_imported/vcpkg/ports/qtdeviceutilities/vcpkg.json +++ b/external_imported/vcpkg/ports/qtdeviceutilities/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtdeviceutilities", - "version-semver": "6.2.2", + "version": "6.2.4", "description": "Utils for Boot2Qt", "homepage": "https://www.qt.io/", + "license": null, "supports": "linux", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/qtdoc/vcpkg.json b/external_imported/vcpkg/ports/qtdoc/vcpkg.json index 9d34e178d..9ed06dbe9 100644 --- a/external_imported/vcpkg/ports/qtdoc/vcpkg.json +++ b/external_imported/vcpkg/ports/qtdoc/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtdoc", - "version-semver": "6.2.2", + "version": "6.2.4", "description": "Qt Documentation", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/external_imported/vcpkg/ports/qtimageformats/portfile.cmake b/external_imported/vcpkg/ports/qtimageformats/portfile.cmake index c72184818..275b927af 100644 --- a/external_imported/vcpkg/ports/qtimageformats/portfile.cmake +++ b/external_imported/vcpkg/ports/qtimageformats/portfile.cmake @@ -5,6 +5,10 @@ include("${SCRIPT_PATH}/qt_install_submodule.cmake") set(${PORT}_PATCHES no_target_promotion.patch) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + #"jasper" CMAKE_REQUIRE_FIND_PACKAGE_WrapJasper + #"webp" CMAKE_REQUIRE_FIND_PACKAGE_WrapWebP + #"tiff" CMAKE_REQUIRE_FIND_PACKAGE_TIFF INVERTED_FEATURES "jasper" CMAKE_DISABLE_FIND_PACKAGE_WrapJasper "webp" CMAKE_DISABLE_FIND_PACKAGE_WrapWebP diff --git a/external_imported/vcpkg/ports/qtimageformats/vcpkg.json b/external_imported/vcpkg/ports/qtimageformats/vcpkg.json index 9cd632955..8d0bca44a 100644 --- a/external_imported/vcpkg/ports/qtimageformats/vcpkg.json +++ b/external_imported/vcpkg/ports/qtimageformats/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtimageformats", - "version-semver": "6.2.2", + "version": "6.2.4", "description": "Additional Image Format plugins for Qt", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/external_imported/vcpkg/ports/qtinterfaceframework/portfile.cmake b/external_imported/vcpkg/ports/qtinterfaceframework/portfile.cmake index ce2fdc2e3..ff9ca6ccb 100644 --- a/external_imported/vcpkg/ports/qtinterfaceframework/portfile.cmake +++ b/external_imported/vcpkg/ports/qtinterfaceframework/portfile.cmake @@ -75,6 +75,10 @@ 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) +if(VCPKG_CROSSCOMPILING) + list(APPEND FEATURE_OPTIONS "-DVCPKG_HOST_TRIPLET=${_HOST_TRIPLET}") +endif() + set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins) set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml) qt_cmake_configure(${_opt} @@ -83,7 +87,7 @@ qt_cmake_configure(${_opt} OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG} OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE}) -vcpkg_install_cmake(ADD_BIN_TO_PATH) +vcpkg_cmake_install(ADD_BIN_TO_PATH) qt_fixup_and_cleanup(TOOL_NAMES ${TOOL_NAMES}) diff --git a/external_imported/vcpkg/ports/qtinterfaceframework/vcpkg.json b/external_imported/vcpkg/ports/qtinterfaceframework/vcpkg.json index 89d42b18d..302b085e3 100644 --- a/external_imported/vcpkg/ports/qtinterfaceframework/vcpkg.json +++ b/external_imported/vcpkg/ports/qtinterfaceframework/vcpkg.json @@ -1,9 +1,14 @@ { "name": "qtinterfaceframework", - "version-semver": "6.2.2", + "version": "6.2.4", "description": "Qt Interface Framework", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ + { + "name": "pkgconf", + "host": true + }, { "name": "qtdeclarative", "default-features": false diff --git a/external_imported/vcpkg/ports/qtlocation/vcpkg.json b/external_imported/vcpkg/ports/qtlocation/vcpkg.json index 0f68cb54b..9fde64ebe 100644 --- a/external_imported/vcpkg/ports/qtlocation/vcpkg.json +++ b/external_imported/vcpkg/ports/qtlocation/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtlocation", - "version-semver": "6.2.2", + "version": "6.2.4", "description": "Qt Location", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/external_imported/vcpkg/ports/qtlottie/portfile.cmake b/external_imported/vcpkg/ports/qtlottie/portfile.cmake index 9ad5b29e3..f07e0c6e2 100644 --- a/external_imported/vcpkg/ports/qtlottie/portfile.cmake +++ b/external_imported/vcpkg/ports/qtlottie/portfile.cmake @@ -6,6 +6,7 @@ set(${PORT}_PATCHES) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick INVERTED_FEATURES "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick ) diff --git a/external_imported/vcpkg/ports/qtlottie/vcpkg.json b/external_imported/vcpkg/ports/qtlottie/vcpkg.json index 48439d76a..f5b37860e 100644 --- a/external_imported/vcpkg/ports/qtlottie/vcpkg.json +++ b/external_imported/vcpkg/ports/qtlottie/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtlottie", - "version-semver": "6.2.2", + "version": "6.2.4", "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, "dependencies": [ { "name": "qtbase", diff --git a/external_imported/vcpkg/ports/qtmqtt/vcpkg.json b/external_imported/vcpkg/ports/qtmqtt/vcpkg.json index 3d23d35f6..1457f1ebf 100644 --- a/external_imported/vcpkg/ports/qtmqtt/vcpkg.json +++ b/external_imported/vcpkg/ports/qtmqtt/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtmqtt", - "version-semver": "6.2.2", + "version": "6.2.4", "description": "Qt Module to implement MQTT protocol version 3.1 and 3.1.1 http://mqtt.org/", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/external_imported/vcpkg/ports/qtmultimedia/portfile.cmake b/external_imported/vcpkg/ports/qtmultimedia/portfile.cmake index feceb6353..67a771a9b 100644 --- a/external_imported/vcpkg/ports/qtmultimedia/portfile.cmake +++ b/external_imported/vcpkg/ports/qtmultimedia/portfile.cmake @@ -23,6 +23,9 @@ set(${PORT}_PATCHES fix_windows_header_include.patch vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick + "widgets" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Widgets + #"gstreamer" CMAKE_REQUIRE_FIND_PACKAGE_GStreamer INVERTED_FEATURES "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick "widgets" CMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets @@ -37,6 +40,7 @@ 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() diff --git a/external_imported/vcpkg/ports/qtmultimedia/vcpkg.json b/external_imported/vcpkg/ports/qtmultimedia/vcpkg.json index 105b978db..b93a864ba 100644 --- a/external_imported/vcpkg/ports/qtmultimedia/vcpkg.json +++ b/external_imported/vcpkg/ports/qtmultimedia/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtmultimedia", - "version-semver": "6.2.2", + "version": "6.2.4", "description": "Qt Multimedia", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "alsa", diff --git a/external_imported/vcpkg/ports/qtnetworkauth/vcpkg.json b/external_imported/vcpkg/ports/qtnetworkauth/vcpkg.json index 71dec2b1a..03ab652c4 100644 --- a/external_imported/vcpkg/ports/qtnetworkauth/vcpkg.json +++ b/external_imported/vcpkg/ports/qtnetworkauth/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtnetworkauth", - "version-semver": "6.2.2", + "version": "6.2.4", "description": "Qt Network Authenticators; QtOAuth in particular", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/external_imported/vcpkg/ports/qtopcua/portfile.cmake b/external_imported/vcpkg/ports/qtopcua/portfile.cmake index 024052484..80738f36b 100644 --- a/external_imported/vcpkg/ports/qtopcua/portfile.cmake +++ b/external_imported/vcpkg/ports/qtopcua/portfile.cmake @@ -5,10 +5,11 @@ include("${SCRIPT_PATH}/qt_install_submodule.cmake") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES "open62541" FEATURE_open62541 - "open62541" FEATURE_open62541-security +# "open62541" FEATURE_open62541_security # requires vendored open62541 "uacpp" FEATURE_uacpp "ns0idnames" FEATURE_ns0idnames "ns0idgenerator" FEATURE_ns0idgenerator + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick INVERTED_FEATURES "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick ) diff --git a/external_imported/vcpkg/ports/qtopcua/vcpkg.json b/external_imported/vcpkg/ports/qtopcua/vcpkg.json index 5bc808ba0..87038f227 100644 --- a/external_imported/vcpkg/ports/qtopcua/vcpkg.json +++ b/external_imported/vcpkg/ports/qtopcua/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtopcua", - "version-semver": "6.2.2", + "version": "6.2.4", "description": "Qt wrapper for existing OPC UA stacks", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/external_imported/vcpkg/ports/qtpositioning/portfile.cmake b/external_imported/vcpkg/ports/qtpositioning/portfile.cmake index 01c76c935..005fe5f33 100644 --- a/external_imported/vcpkg/ports/qtpositioning/portfile.cmake +++ b/external_imported/vcpkg/ports/qtpositioning/portfile.cmake @@ -3,6 +3,7 @@ include("${SCRIPT_PATH}/qt_install_submodule.cmake") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick INVERTED_FEATURES "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick ) diff --git a/external_imported/vcpkg/ports/qtpositioning/vcpkg.json b/external_imported/vcpkg/ports/qtpositioning/vcpkg.json index f477ef118..7858af023 100644 --- a/external_imported/vcpkg/ports/qtpositioning/vcpkg.json +++ b/external_imported/vcpkg/ports/qtpositioning/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtpositioning", - "version-semver": "6.2.2", + "version": "6.2.4", "description": "Qt Positioning", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/external_imported/vcpkg/ports/qtquick3d/portfile.cmake b/external_imported/vcpkg/ports/qtquick3d/portfile.cmake index f7c6c761a..af7915a09 100644 --- a/external_imported/vcpkg/ports/qtquick3d/portfile.cmake +++ b/external_imported/vcpkg/ports/qtquick3d/portfile.cmake @@ -5,6 +5,7 @@ include("${SCRIPT_PATH}/qt_install_submodule.cmake") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES "assimp" FEATURE_quick3d_assimp + #"assimp" CMAKE_REQUIRE_FIND_PACKAGE_WrapQuick3DAssimp INVERTED_FEATURES "assimp" CMAKE_DISABLE_FIND_PACKAGE_WrapQuick3DAssimp ) diff --git a/external_imported/vcpkg/ports/qtquick3d/vcpkg.json b/external_imported/vcpkg/ports/qtquick3d/vcpkg.json index bee045845..26d691f98 100644 --- a/external_imported/vcpkg/ports/qtquick3d/vcpkg.json +++ b/external_imported/vcpkg/ports/qtquick3d/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtquick3d", - "version-semver": "6.2.2", + "version": "6.2.4", "description": "A new module and API for defining 3D content in Qt Quick.", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/external_imported/vcpkg/ports/qtquicktimeline/vcpkg.json b/external_imported/vcpkg/ports/qtquicktimeline/vcpkg.json index dfe29bf4b..2bcaea990 100644 --- a/external_imported/vcpkg/ports/qtquicktimeline/vcpkg.json +++ b/external_imported/vcpkg/ports/qtquicktimeline/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtquicktimeline", - "version-semver": "6.2.2", + "version": "6.2.4", "description": "Module for keyframe-based timeline construction.", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/external_imported/vcpkg/ports/qtremoteobjects/portfile.cmake b/external_imported/vcpkg/ports/qtremoteobjects/portfile.cmake index 9969bd4ee..f2b31ed8e 100644 --- a/external_imported/vcpkg/ports/qtremoteobjects/portfile.cmake +++ b/external_imported/vcpkg/ports/qtremoteobjects/portfile.cmake @@ -6,6 +6,7 @@ set(TOOL_NAMES repc) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick INVERTED_FEATURES "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick ) diff --git a/external_imported/vcpkg/ports/qtremoteobjects/vcpkg.json b/external_imported/vcpkg/ports/qtremoteobjects/vcpkg.json index 403c2f0cd..b9f5c19b1 100644 --- a/external_imported/vcpkg/ports/qtremoteobjects/vcpkg.json +++ b/external_imported/vcpkg/ports/qtremoteobjects/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtremoteobjects", - "version-semver": "6.2.2", + "version": "6.2.4", "description": "Qt distributed object system", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/external_imported/vcpkg/ports/qtscxml/portfile.cmake b/external_imported/vcpkg/ports/qtscxml/portfile.cmake index 1215ca019..74fa2ed04 100644 --- a/external_imported/vcpkg/ports/qtscxml/portfile.cmake +++ b/external_imported/vcpkg/ports/qtscxml/portfile.cmake @@ -7,6 +7,7 @@ set(TOOL_NAMES qscxmlc) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Qml INVERTED_FEATURES "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Qml ) diff --git a/external_imported/vcpkg/ports/qtscxml/vcpkg.json b/external_imported/vcpkg/ports/qtscxml/vcpkg.json index 5adabc0a2..b32abdee6 100644 --- a/external_imported/vcpkg/ports/qtscxml/vcpkg.json +++ b/external_imported/vcpkg/ports/qtscxml/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtscxml", - "version-semver": "6.2.2", + "version": "6.2.4", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/external_imported/vcpkg/ports/qtsensors/portfile.cmake b/external_imported/vcpkg/ports/qtsensors/portfile.cmake index d6a3b2fd0..0f5be8a03 100644 --- a/external_imported/vcpkg/ports/qtsensors/portfile.cmake +++ b/external_imported/vcpkg/ports/qtsensors/portfile.cmake @@ -5,6 +5,7 @@ set(${PORT}_PATCHES) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick INVERTED_FEATURES "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick ) diff --git a/external_imported/vcpkg/ports/qtsensors/vcpkg.json b/external_imported/vcpkg/ports/qtsensors/vcpkg.json index 385c16625..558c07d25 100644 --- a/external_imported/vcpkg/ports/qtsensors/vcpkg.json +++ b/external_imported/vcpkg/ports/qtsensors/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtsensors", - "version-semver": "6.2.2", + "version": "6.2.4", "description": "Qt Sensors", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/external_imported/vcpkg/ports/qtserialbus/vcpkg.json b/external_imported/vcpkg/ports/qtserialbus/vcpkg.json index 1e7f7117e..060fe04e8 100644 --- a/external_imported/vcpkg/ports/qtserialbus/vcpkg.json +++ b/external_imported/vcpkg/ports/qtserialbus/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtserialbus", - "version-semver": "6.2.2", + "version": "6.2.4", "description": "Support for CAN and potentially other serial buses.", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/external_imported/vcpkg/ports/qtserialport/vcpkg.json b/external_imported/vcpkg/ports/qtserialport/vcpkg.json index 9fbdfecfa..af1875ab8 100644 --- a/external_imported/vcpkg/ports/qtserialport/vcpkg.json +++ b/external_imported/vcpkg/ports/qtserialport/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtserialport", - "version-semver": "6.2.2", + "version": "6.2.4", "description": "Qt Serial Port support", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/external_imported/vcpkg/ports/qtshadertools/vcpkg.json b/external_imported/vcpkg/ports/qtshadertools/vcpkg.json index 7457fed6c..c66a073f4 100644 --- a/external_imported/vcpkg/ports/qtshadertools/vcpkg.json +++ b/external_imported/vcpkg/ports/qtshadertools/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtshadertools", - "version-semver": "6.2.2", + "version": "6.2.4", "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, "dependencies": [ { "name": "qtbase", diff --git a/external_imported/vcpkg/ports/qtsvg/vcpkg.json b/external_imported/vcpkg/ports/qtsvg/vcpkg.json index dd82567a7..f540f8038 100644 --- a/external_imported/vcpkg/ports/qtsvg/vcpkg.json +++ b/external_imported/vcpkg/ports/qtsvg/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtsvg", - "version-semver": "6.2.2", + "version": "6.2.4", "description": "Qt SVG", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/external_imported/vcpkg/ports/qttools/no_src_changes.patch b/external_imported/vcpkg/ports/qttools/no_src_changes.patch new file mode 100644 index 000000000..8b948c26a --- /dev/null +++ b/external_imported/vcpkg/ports/qttools/no_src_changes.patch @@ -0,0 +1,41 @@ +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 999f2552b..d0bf4c9de 100644 --- a/external_imported/vcpkg/ports/qttools/portfile.cmake +++ b/external_imported/vcpkg/ports/qttools/portfile.cmake @@ -37,6 +37,10 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "assistant" FEATURE_assistant "designer" FEATURE_designer "linguist" FEATURE_linguist + "qdoc" CMAKE_REQUIRE_FIND_PACKAGE_Clang + #"qdoc" CMAKE_REQUIRE_FIND_PACKAGE_WrapLibClang + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6QuickWidgets INVERTED_FEATURES "qdoc" CMAKE_DISABLE_FIND_PACKAGE_Clang "qdoc" CMAKE_DISABLE_FIND_PACKAGE_WrapLibClang @@ -77,7 +81,7 @@ endif() 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 4931b7aa30f256c20573d283561aa432fecf8f38 + REF "${${PORT}_qlitehtml_REF}" FETCH_REF master HEAD_REF master ) @@ -85,9 +89,10 @@ vcpkg_from_git( vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH_LITEHTML REPO litehtml/litehtml - REF 6236113734bb0a28467e5999e86fdd2834be8e01 - SHA512 38effe92aaebd7113ad3bf3b70c1b3564d6226a766aa968c80ab35fa90ae78d601486226f97d16fa5bd3abf314db19f9f0c90e31de91e87bda82cde27f0a57dc + REF "${${PORT}_litehtml_REF}" + SHA512 "${${PORT}_litehtml_HASH}" HEAD_REF master + PATCHES no_src_changes.patch ) ##### qt_install_submodule @@ -111,7 +116,7 @@ qt_cmake_configure(${_opt} OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG} OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE}) -vcpkg_install_cmake(ADD_BIN_TO_PATH) +vcpkg_cmake_install(ADD_BIN_TO_PATH) qt_fixup_and_cleanup(TOOL_NAMES ${TOOL_NAMES}) diff --git a/external_imported/vcpkg/ports/qttools/vcpkg.json b/external_imported/vcpkg/ports/qttools/vcpkg.json index ddccd4ccc..3532d7259 100644 --- a/external_imported/vcpkg/ports/qttools/vcpkg.json +++ b/external_imported/vcpkg/ports/qttools/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qttools", - "version-semver": "6.2.2", + "version": "6.2.4", "description": "Qt Tools", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/external_imported/vcpkg/ports/qttranslations/portfile.cmake b/external_imported/vcpkg/ports/qttranslations/portfile.cmake index 30a09d599..f151f0a5b 100644 --- a/external_imported/vcpkg/ports/qttranslations/portfile.cmake +++ b/external_imported/vcpkg/ports/qttranslations/portfile.cmake @@ -6,10 +6,10 @@ set(TOOL_NAMES) qt_install_submodule(PATCHES ${${PORT}_PATCHES} TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG + CONFIGURE_OPTIONS_MAYBE_UNUSED + QT_BUILD_EXAMPLES + QT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS ) - + set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) # only translation files. file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") diff --git a/external_imported/vcpkg/ports/qttranslations/vcpkg.json b/external_imported/vcpkg/ports/qttranslations/vcpkg.json index b4c528fda..c6fa365d6 100644 --- a/external_imported/vcpkg/ports/qttranslations/vcpkg.json +++ b/external_imported/vcpkg/ports/qttranslations/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qttranslations", - "version-semver": "6.2.2", + "version": "6.2.4", "description": "Qt Translations", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/external_imported/vcpkg/ports/qtvirtualkeyboard/vcpkg.json b/external_imported/vcpkg/ports/qtvirtualkeyboard/vcpkg.json index 79e635460..db0a9deb3 100644 --- a/external_imported/vcpkg/ports/qtvirtualkeyboard/vcpkg.json +++ b/external_imported/vcpkg/ports/qtvirtualkeyboard/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtvirtualkeyboard", - "version-semver": "6.2.2", + "version": "6.2.4", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/external_imported/vcpkg/ports/qtwayland/portfile.cmake b/external_imported/vcpkg/ports/qtwayland/portfile.cmake index d88463846..54d9d9390 100644 --- a/external_imported/vcpkg/ports/qtwayland/portfile.cmake +++ b/external_imported/vcpkg/ports/qtwayland/portfile.cmake @@ -12,6 +12,7 @@ set(TOOL_NAMES qtwaylandscanner) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick INVERTED_FEATURES "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick ) diff --git a/external_imported/vcpkg/ports/qtwayland/vcpkg.json b/external_imported/vcpkg/ports/qtwayland/vcpkg.json index 320d78ea9..d201b62b7 100644 --- a/external_imported/vcpkg/ports/qtwayland/vcpkg.json +++ b/external_imported/vcpkg/ports/qtwayland/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtwayland", - "version-semver": "6.2.2", + "version": "6.2.4", "description": "A toolbox for making Qt based Wayland compositors", "homepage": "https://www.qt.io/", + "license": null, "supports": "!windows", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/qtwebchannel/portfile.cmake b/external_imported/vcpkg/ports/qtwebchannel/portfile.cmake index 9ad5b29e3..f07e0c6e2 100644 --- a/external_imported/vcpkg/ports/qtwebchannel/portfile.cmake +++ b/external_imported/vcpkg/ports/qtwebchannel/portfile.cmake @@ -6,6 +6,7 @@ set(${PORT}_PATCHES) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick INVERTED_FEATURES "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick ) diff --git a/external_imported/vcpkg/ports/qtwebchannel/vcpkg.json b/external_imported/vcpkg/ports/qtwebchannel/vcpkg.json index 1c710aaec..3dbef769a 100644 --- a/external_imported/vcpkg/ports/qtwebchannel/vcpkg.json +++ b/external_imported/vcpkg/ports/qtwebchannel/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtwebchannel", - "version-semver": "6.2.2", + "version": "6.2.4", "description": "Qt WebChannel", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/external_imported/vcpkg/ports/qtwebengine/portfile.cmake b/external_imported/vcpkg/ports/qtwebengine/portfile.cmake index d5f71158c..8b44f726a 100644 --- a/external_imported/vcpkg/ports/qtwebengine/portfile.cmake +++ b/external_imported/vcpkg/ports/qtwebengine/portfile.cmake @@ -5,26 +5,32 @@ set(TOOL_NAMES gn QtWebEngineProcess qwebengine_convert_dict) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - "proprietary-codecs" FEATURE_webengine-proprietary-codecs - "spellchecker" FEATURE_webengine-spellchecker - "geolocation" FEATURE_webengine-geolocation - "webchannel" FEATURE_webengine-webchannel + "proprietary-codecs" FEATURE_webengine_proprietary_codecs + "spellchecker" FEATURE_webengine_spellchecker + "geolocation" FEATURE_webengine_geolocation + "webchannel" FEATURE_webengine_webchannel + "geolocation" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Positioning + "webchannel" CMAKE_REQUIRE_FIND_PACKAGE_Qt6WebChannel INVERTED_FEATURES "geolocation" CMAKE_DISABLE_FIND_PACKAGE_Qt6Positioning "webchannel" CMAKE_DISABLE_FIND_PACKAGE_Qt6WebChannel ) if(VCPKG_TARGET_IS_OSX AND "spellchecker" IN_LIST FEATRUES) - list(APPEND FEATURE_OPTIONS "-DFEATURE_webengine-native-spellchecker=ON") + list(APPEND FEATURE_OPTIONS "-DFEATURE_webengine_native_spellchecker=ON") endif() # webengine-extensions # webengine-printing-and-pdf # webengine-pepper-plugins -set(deactivated_features webengine-webrtc webengine-webrtc-pipewire webengine-v8-snapshot-support) +set(deactivated_features webengine_webrtc_pipewire) foreach(_feat IN LISTS deactivated_features) list(APPEND FEATURE_OPTIONS "-DFEATURE_${_feat}=OFF") endforeach() +set(enabled_features webengine_webrtc webengine_v8_snapshot_support) +foreach(_feat IN LISTS enabled_features) + list(APPEND FEATURE_OPTIONS "-DFEATURE_${_feat}=ON") +endforeach() if(VCPKG_TARGET_IS_LINUX) # qt_configure_add_summary_entry(ARGS "webengine-system-lcms2") @@ -32,7 +38,7 @@ if(VCPKG_TARGET_IS_LINUX) # + ALSA and PULSEAUDIO set(system_libs re2 icu libwebp opus ffmpeg libvpx snappy glib zlib minizip libevent protobuf libxml libpng libjpeg harfbuzz freetype) foreach(_sys_lib IN LISTS system_libs) - list(APPEND FEATURE_OPTIONS "-DFEATURE_webengine-system-${_sys_lib}=ON") + list(APPEND FEATURE_OPTIONS "-DFEATURE_webengine_system_${_sys_lib}=ON") endforeach() endif() @@ -73,7 +79,7 @@ endif() vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH_WEBENGINE URL git://code.qt.io/qt/qtwebengine-chromium.git - REF 39aa0ea99a30c9c15fb3640fe9a2638982548c0b + REF "${${PORT}_chromium_REF}" ) ##### qt_install_submodule @@ -91,7 +97,8 @@ if(NOT EXISTS "${SOURCE_PATH}/src/3rdparty/gn") file(RENAME "${SOURCE_PATH_WEBENGINE}/gn" "${SOURCE_PATH}/src/3rdparty/gn") endif() -qt_cmake_configure(OPTIONS ${FEATURE_OPTIONS} +qt_cmake_configure( DISABLE_PARALLEL_CONFIGURE # due to in source changes. + OPTIONS ${FEATURE_OPTIONS} -DGPerf_EXECUTABLE=${GPERF} -DBISON_EXECUTABLE=${BISON} -DFLEX_EXECUTABLE=${FLEX} @@ -101,7 +108,7 @@ qt_cmake_configure(OPTIONS ${FEATURE_OPTIONS} OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG} OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE}) -vcpkg_install_cmake(ADD_BIN_TO_PATH) +vcpkg_cmake_install(ADD_BIN_TO_PATH) qt_fixup_and_cleanup(TOOL_NAMES ${TOOL_NAMES}) diff --git a/external_imported/vcpkg/ports/qtwebengine/vcpkg.json b/external_imported/vcpkg/ports/qtwebengine/vcpkg.json index e0280bec3..6365ebc0f 100644 --- a/external_imported/vcpkg/ports/qtwebengine/vcpkg.json +++ b/external_imported/vcpkg/ports/qtwebengine/vcpkg.json @@ -1,9 +1,10 @@ { "$comment": "x86-windows is not within the upstream support matrix of Qt6", "name": "qtwebengine", - "version-semver": "6.2.2", + "version": "6.2.4", "description": "Qt WebEngine", "homepage": "https://www.qt.io/", + "license": null, "supports": "!static & !((arm | x86) & windows)", "dependencies": [ { @@ -106,6 +107,10 @@ "name": "vcpkg-tool-nodejs", "host": true }, + { + "name": "vcpkg-tool-python2", + "host": true + }, { "name": "zlib", "platform": "!windows" diff --git a/external_imported/vcpkg/ports/qtwebsockets/portfile.cmake b/external_imported/vcpkg/ports/qtwebsockets/portfile.cmake index 9ad5b29e3..f07e0c6e2 100644 --- a/external_imported/vcpkg/ports/qtwebsockets/portfile.cmake +++ b/external_imported/vcpkg/ports/qtwebsockets/portfile.cmake @@ -6,6 +6,7 @@ set(${PORT}_PATCHES) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick INVERTED_FEATURES "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick ) diff --git a/external_imported/vcpkg/ports/qtwebsockets/vcpkg.json b/external_imported/vcpkg/ports/qtwebsockets/vcpkg.json index 89ac9917a..953e5ebf4 100644 --- a/external_imported/vcpkg/ports/qtwebsockets/vcpkg.json +++ b/external_imported/vcpkg/ports/qtwebsockets/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtwebsockets", - "version-semver": "6.2.2", + "version": "6.2.4", "description": "Qt WebSockets", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/external_imported/vcpkg/ports/qtwebview/portfile.cmake b/external_imported/vcpkg/ports/qtwebview/portfile.cmake index 7385e5bf2..8a3f752c5 100644 --- a/external_imported/vcpkg/ports/qtwebview/portfile.cmake +++ b/external_imported/vcpkg/ports/qtwebview/portfile.cmake @@ -6,6 +6,9 @@ set(${PORT}_PATCHES) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6WebEngineQuick + "webengine" CMAKE_REQUIRE_FIND_PACKAGE_WebEngineCore INVERTED_FEATURES "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineQuick diff --git a/external_imported/vcpkg/ports/qtwebview/vcpkg.json b/external_imported/vcpkg/ports/qtwebview/vcpkg.json index 47ccd0006..bc94b7435 100644 --- a/external_imported/vcpkg/ports/qtwebview/vcpkg.json +++ b/external_imported/vcpkg/ports/qtwebview/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtwebview", - "version-semver": "6.2.2", + "version": "6.2.4", "description": "Qt Web View", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ { "name": "qtbase", diff --git a/external_imported/vcpkg/ports/quantlib/portfile.cmake b/external_imported/vcpkg/ports/quantlib/portfile.cmake index 5f110915c..158dd4813 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.24 - SHA512 1a63d90363cda69e20e40a60a2d6357f632fac997df520b949e73feb256dac8a999395d0ebe94734ac630e9104e512b0a545f6a2111b287a41e9128127aa5bb0 + REF QuantLib-v1.25 + SHA512 9a08c3d825f85c93e7db74b31dc93d03d7ec487b7a09f86b6f3efb0404791e1b3e1ea19e06cea19fd04ab190d2e8eb7bad889660d47eb9988c36609967646aa3 HEAD_REF master ) @@ -11,20 +11,20 @@ if (VCPKG_TARGET_IS_WINDOWS) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DQL_BUILD_BENCHMARK=OFF -DQL_BUILD_EXAMPLES=OFF -DQL_BUILD_TEST_SUITE=OFF ) -vcpkg_install_cmake() - +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME QuantLib CONFIG_PATH lib/cmake/QuantLib) vcpkg_copy_pdbs() - -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) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE.TXT ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE.TXT" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/external_imported/vcpkg/ports/quantlib/usage b/external_imported/vcpkg/ports/quantlib/usage new file mode 100644 index 000000000..e121873e2 --- /dev/null +++ b/external_imported/vcpkg/ports/quantlib/usage @@ -0,0 +1,4 @@ +The package quantlib provides CMake targets: + + find_package(QuantLib CONFIG REQUIRED) + target_link_libraries(main PRIVATE QuantLib::QuantLib) diff --git a/external_imported/vcpkg/ports/quantlib/vcpkg.json b/external_imported/vcpkg/ports/quantlib/vcpkg.json index e4d37e944..b30208740 100644 --- a/external_imported/vcpkg/ports/quantlib/vcpkg.json +++ b/external_imported/vcpkg/ports/quantlib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "quantlib", - "version": "1.24", + "version": "1.25", "description": "The QuantLib C++ library", "homepage": "https://www.quantlib.org/", "supports": "!(windows & !static)", @@ -31,12 +31,19 @@ "boost-serialization", "boost-signals2", "boost-smart-ptr", - "boost-test", "boost-thread", "boost-tuple", "boost-type-traits", "boost-ublas", "boost-unordered", - "boost-utility" + "boost-utility", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/quickfix/00001-fix-build.patch b/external_imported/vcpkg/ports/quickfix/00001-fix-build.patch index aa14d7b5c..ddbd6186f 100644 --- a/external_imported/vcpkg/ports/quickfix/00001-fix-build.patch +++ b/external_imported/vcpkg/ports/quickfix/00001-fix-build.patch @@ -1,8 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 48908ead..5022a019 100644 +index 48908ead..90c17759 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -96,9 +96,12 @@ add_subdirectory(UnitTest++) +@@ -92,13 +92,13 @@ include_directories(${PYTHON_INCLUDE_DIRS}) + endif () + + if( WIN32 OR ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" ) +-add_subdirectory(UnitTest++) ++#add_subdirectory(UnitTest++) endif() add_subdirectory(src) @@ -11,12 +16,21 @@ index 48908ead..5022a019 100644 if( WIN32) -add_subdirectory(test) +#add_subdirectory(test) -+target_compile_definitions(TestUnitTest++ PRIVATE _CRT_SECURE_NO_WARNINGS) -+target_compile_definitions(UnitTest++ PRIVATE _CRT_SECURE_NO_WARNINGS) -+target_compile_definitions(ut PRIVATE _WINSOCK_DEPRECATED_NO_WARNINGS) endif() install(DIRECTORY ${CMAKE_SOURCE_DIR}/spec/ DESTINATION share/quickfix +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index cb4a60c6..d21fa995 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1,6 +1,6 @@ + add_subdirectory(C++) + +-if( WIN32 OR ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" ) ++if(0) + + add_executable(at at.cpp getopt.c) + diff --git a/src/C++/CMakeLists.txt b/src/C++/CMakeLists.txt index 07774c97..27692631 100644 --- a/src/C++/CMakeLists.txt diff --git a/external_imported/vcpkg/ports/quickfix/portfile.cmake b/external_imported/vcpkg/ports/quickfix/portfile.cmake index d41a13c7c..6ae5f2991 100644 --- a/external_imported/vcpkg/ports/quickfix/portfile.cmake +++ b/external_imported/vcpkg/ports/quickfix/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_from_github( fix_wsl_symlink_error.patch ) -file(GLOB_RECURSE SRC_FILES RELATIVE ${SOURCE_PATH} +file(GLOB_RECURSE SRC_FILES RELATIVE "${SOURCE_PATH}" "${SOURCE_PATH}/src/*.cpp" "${SOURCE_PATH}/src/*.h" ) @@ -26,8 +26,8 @@ foreach(SRC_FILE IN LISTS SRC_FILES) file(WRITE "${SOURCE_PATH}/${SRC_FILE}" "${_contents}") endforeach() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DHAVE_EMX=OFF -DHAVE_MYSQL=OFF @@ -36,15 +36,14 @@ vcpkg_configure_cmake( -DHAVE_PYTHON2=OFF -DHAVE_PYTHON3=OFF -DHAVE_SSL=ON - PREFER_NINJA ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/quickfix) +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/quickfix) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) -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/quickfix/vcpkg.json b/external_imported/vcpkg/ports/quickfix/vcpkg.json index 5a6e940a3..7ad5fb2a3 100644 --- a/external_imported/vcpkg/ports/quickfix/vcpkg.json +++ b/external_imported/vcpkg/ports/quickfix/vcpkg.json @@ -1,10 +1,19 @@ { "name": "quickfix", - "version-string": "1.15.1", - "port-version": 5, + "version": "1.15.1", + "port-version": 7, "description": "QuickFIX is a free and open source implementation of the FIX protocol.", "homepage": "https://github.com/quickfix/quickfix", + "supports": "!uwp", "dependencies": [ - "openssl" + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/quill/portfile.cmake b/external_imported/vcpkg/ports/quill/portfile.cmake index 6bc0398c4..3c5470d48 100644 --- a/external_imported/vcpkg/ports/quill/portfile.cmake +++ b/external_imported/vcpkg/ports/quill/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( @@ -32,4 +30,4 @@ vcpkg_fixup_pkgconfig() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quill/TweakMe.h" "// #define QUILL_FMT_EXTERNAL" "#define QUILL_FMT_EXTERNAL") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -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/quill/vcpkg.json b/external_imported/vcpkg/ports/quill/vcpkg.json index 9057a3ec8..350321f5c 100644 --- a/external_imported/vcpkg/ports/quill/vcpkg.json +++ b/external_imported/vcpkg/ports/quill/vcpkg.json @@ -1,7 +1,7 @@ { "name": "quill", "version-semver": "1.6.3", - "port-version": 3, + "port-version": 4, "description": "C++14 Asynchronous Low Latency Logging Library", "homepage": "https://github.com/odygrd/quill/", "supports": "!(uwp | android)", diff --git a/external_imported/vcpkg/ports/qwtw/portfile.cmake b/external_imported/vcpkg/ports/qwtw/portfile.cmake index 27dd91786..5799b3d6f 100644 --- a/external_imported/vcpkg/ports/qwtw/portfile.cmake +++ b/external_imported/vcpkg/ports/qwtw/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "LINUX" "OSX" "UWP" "ANDROID" ON_ARCH "arm" "x86" ON_LIBRARY_LINKAGE "static") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ig-or/qwtw @@ -7,7 +5,7 @@ vcpkg_from_github( SHA512 de5abf26d0975b9f0ed88e10cd4d5b4d12e25cce8c87ab6a18d8e7064697de6fc8da83e118b5a4e2819c09e2dbbfd20daeecc6a42748c019c6699666276d075a HEAD_REF master ) - + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA diff --git a/external_imported/vcpkg/ports/qwtw/vcpkg.json b/external_imported/vcpkg/ports/qwtw/vcpkg.json index 2fa18ec80..486530564 100644 --- a/external_imported/vcpkg/ports/qwtw/vcpkg.json +++ b/external_imported/vcpkg/ports/qwtw/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qwtw", - "version-string": "3.1.0", - "port-version": 1, + "version": "3.1.0", + "port-version": 2, "description": "qwt-based 2D plotting library", "homepage": "https://github.com/ig-or/qwtw", "supports": "windows & x64 & !static", diff --git a/external_imported/vcpkg/ports/randomstr/portfile.cmake b/external_imported/vcpkg/ports/randomstr/portfile.cmake new file mode 100644 index 000000000..20b7425fe --- /dev/null +++ b/external_imported/vcpkg/ports/randomstr/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO offscale/c89randomstr + REF 9d577c4343913a330ef32b93ed12b8942808bbbc + SHA512 7adfac8000d9057b9ca230f794bff82e1628864140e08d393e3faff890848606fff72c3dd2b296a20bf3003ed035e9e4273a0599764f515b7a6ac7091e9d2949 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DBUILD_TESTING=OFF" +) +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/randomstr/vcpkg.json b/external_imported/vcpkg/ports/randomstr/vcpkg.json new file mode 100644 index 000000000..29ea9f92a --- /dev/null +++ b/external_imported/vcpkg/ports/randomstr/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "randomstr", + "version-date": "2022-02-03", + "description": "Simple randomstr function in a header-only C89 library", + "license": "0BSD", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/raylib/fix-linkGlfw.patch b/external_imported/vcpkg/ports/raylib/fix-linkGlfw.patch new file mode 100644 index 000000000..d495e2814 --- /dev/null +++ b/external_imported/vcpkg/ports/raylib/fix-linkGlfw.patch @@ -0,0 +1,29 @@ +diff --git a/cmake/GlfwImport.cmake b/cmake/GlfwImport.cmake +index 1b94cdf..4cc8f8f 100644 +--- a/cmake/GlfwImport.cmake ++++ b/cmake/GlfwImport.cmake +@@ -5,7 +5,7 @@ elseif(USE_EXTERNAL_GLFW STREQUAL "IF_POSSIBLE") + find_package(glfw3 3.3.3 QUIET) + endif() + if (glfw3_FOUND) +- set(LIBS_PRIVATE ${LIBS_PRIVATE} glfw) ++ set(LIBS_PRIVATE ${LIBS_PRIVATE} glfw3) + endif() + + # Explicitly check against "ON", because USE_EXTERNAL_GLFW is a tristate option +@@ -32,3 +32,4 @@ else() + MESSAGE(STATUS "Using external GLFW") + set(GLFW_PKG_DEPS glfw3) + endif() ++set(GLFW_PKG_DEPS glfw3) +diff --git a/cmake/LibraryConfigurations.cmake b/cmake/LibraryConfigurations.cmake +index c156d6b..55c5bca 100644 +--- a/cmake/LibraryConfigurations.cmake ++++ b/cmake/LibraryConfigurations.cmake +@@ -104,5 +104,5 @@ endif () + set(LIBS_PRIVATE ${LIBS_PRIVATE} ${OPENAL_LIBRARY}) + + if (${PLATFORM} MATCHES "Desktop") +- set(LIBS_PRIVATE ${LIBS_PRIVATE} glfw) ++ set(LIBS_PRIVATE ${LIBS_PRIVATE} glfw3) + endif () diff --git a/external_imported/vcpkg/ports/raylib/portfile.cmake b/external_imported/vcpkg/ports/raylib/portfile.cmake index a1a3ab0d9..96a0298d4 100644 --- a/external_imported/vcpkg/ports/raylib/portfile.cmake +++ b/external_imported/vcpkg/ports/raylib/portfile.cmake @@ -1,6 +1,3 @@ -# https://github.com/raysan5/raylib/issues/388 -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") - if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_LINUX) message( "raylib currently requires the following libraries from the system package manager: @@ -13,12 +10,17 @@ These can be installed on Ubuntu systems via sudo apt install libgl1-mesa-dev li ) endif() +if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_LINUX) + set(patches fix-linkGlfw.patch) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO raysan5/raylib REF 4.0.0 SHA512 e9ffab14ab902e3327202e68ca139209ff24100dab62eb03fef50adf363f81e2705d81e709c58cf1514e68e6061c8963555bd2d00744daacc3eb693825fc3417 HEAD_REF master + PATCHES ${patches} ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED) @@ -37,8 +39,7 @@ else() endif() vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_EXAMPLES=OFF -DBUILD_GAMES=OFF @@ -61,12 +62,7 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) - -configure_file( - ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake - ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake - @ONLY -) +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include @@ -81,7 +77,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) ) endif() -configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY) -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) - -vcpkg_fixup_pkgconfig() +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/raylib/usage b/external_imported/vcpkg/ports/raylib/usage deleted file mode 100644 index 94ce10978..000000000 --- a/external_imported/vcpkg/ports/raylib/usage +++ /dev/null @@ -1,5 +0,0 @@ -The package @PORT@:@TARGET_TRIPLET@ provides CMake targets: - - find_package(@PORT@ CONFIG REQUIRED) - target_include_directories(main PRIVATE ${RAYLIB_INCLUDE_DIRS}) - target_link_libraries(main PRIVATE ${RAYLIB_LIBRARIES}) diff --git a/external_imported/vcpkg/ports/raylib/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/raylib/vcpkg-cmake-wrapper.cmake deleted file mode 100644 index 2d7560eb0..000000000 --- a/external_imported/vcpkg/ports/raylib/vcpkg-cmake-wrapper.cmake +++ /dev/null @@ -1,11 +0,0 @@ -include(SelectLibraryConfigurations) - -find_path(RAYLIB_INCLUDE_DIR raylib.h) - -find_library(RAYLIB_LIBRARY_DEBUG NAMES raylib libraylib raylib_static NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH REQUIRED) -find_library(RAYLIB_LIBRARY_RELEASE NAMES raylib libraylib raylib_static NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH REQUIRED) - -select_library_configurations(RAYLIB) - -set(RAYLIB_INCLUDE_DIRS ${RAYLIB_INCLUDE_DIR}) -set(RAYLIB_LIBRARIES ${RAYLIB_LIBRARY}) diff --git a/external_imported/vcpkg/ports/raylib/vcpkg.json b/external_imported/vcpkg/ports/raylib/vcpkg.json index 4a27c41bf..348eb943e 100644 --- a/external_imported/vcpkg/ports/raylib/vcpkg.json +++ b/external_imported/vcpkg/ports/raylib/vcpkg.json @@ -1,10 +1,16 @@ { "name": "raylib", "version-semver": "4.0.0", + "port-version": 3, "description": "A simple and easy-to-use library to enjoy videogames programming", "homepage": "https://github.com/raysan5/raylib", + "license": "Zlib", "supports": "!(arm | uwp)", "dependencies": [ + { + "name": "glfw3", + "platform": "!windows" + }, { "name": "vcpkg-cmake", "host": true diff --git a/external_imported/vcpkg/ports/readline-unix/portfile.cmake b/external_imported/vcpkg/ports/readline-unix/portfile.cmake index 4e7db6535..b7422e53a 100644 --- a/external_imported/vcpkg/ports/readline-unix/portfile.cmake +++ b/external_imported/vcpkg/ports/readline-unix/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_extract_source_archive(SOURCE_PATH ARCHIVE "${ARCHIVE}") vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" - OPTIOS + OPTIONS --with-curses=yes ) @@ -17,4 +17,6 @@ vcpkg_install_make() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_fixup_pkgconfig() + file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/readline-unix/vcpkg.json b/external_imported/vcpkg/ports/readline-unix/vcpkg.json index 19866ea71..6d3b9382b 100644 --- a/external_imported/vcpkg/ports/readline-unix/vcpkg.json +++ b/external_imported/vcpkg/ports/readline-unix/vcpkg.json @@ -1,6 +1,10 @@ { "name": "readline-unix", "version": "8.1", + "port-version": 1, "description": "Implementation of readline for unix", - "supports": "!windows" + "supports": "!windows", + "dependencies": [ + "ncurses" + ] } diff --git a/external_imported/vcpkg/ports/readline-win32/vcpkg.json b/external_imported/vcpkg/ports/readline-win32/vcpkg.json index 86c8d7304..79e3a7f7d 100644 --- a/external_imported/vcpkg/ports/readline-win32/vcpkg.json +++ b/external_imported/vcpkg/ports/readline-win32/vcpkg.json @@ -1,7 +1,8 @@ { "name": "readline-win32", - "version-string": "5.0", - "port-version": 3, + "version": "5.0", + "port-version": 4, "description": "Implementation of readline for Windows Desktop", - "homepage": "https://github.com/lltcggie" + "homepage": "https://github.com/lltcggie", + "supports": "windows & !uwp" } diff --git a/external_imported/vcpkg/ports/realsense2/fix-dependency-glfw3.patch b/external_imported/vcpkg/ports/realsense2/fix-dependency-glfw3.patch deleted file mode 100644 index c11a5cdd1..000000000 --- a/external_imported/vcpkg/ports/realsense2/fix-dependency-glfw3.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 16ced1b..ef1b158 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -69,7 +69,7 @@ include(CMake/install_config.cmake) - add_subdirectory(wrappers) - - if (BUILD_EXAMPLES AND BUILD_GLSL_EXTENSIONS) -- find_package(glfw3 3.3 QUIET) -+ find_package(glfw3 CONFIG REQUIRED) - if(NOT TARGET glfw) - message(STATUS "GLFW 3.3 not found; using internal version") - set(GLFW_INSTALL ON CACHE BOOL "" FORCE) diff --git a/external_imported/vcpkg/ports/realsense2/portfile.cmake b/external_imported/vcpkg/ports/realsense2/portfile.cmake index 6bc748fdd..e9ab6c89b 100644 --- a/external_imported/vcpkg/ports/realsense2/portfile.cmake +++ b/external_imported/vcpkg/ports/realsense2/portfile.cmake @@ -1,12 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO IntelRealSense/librealsense - REF e9f05c55f88f6876633bd59fd1cb3848da64b699 #v2.49.0 - SHA512 dfd7012eb96f7d4a8054c8cc1141cd2c743255b7783d16565e02b2c688ea9d81cd61f3824f999c2c9d4ed1f44b3866b5bd399fab376ba8f16369989bda4bda85 + REF v2.50.0 + SHA512 ede964a5d5d7c70ff69b9d19e72ed2572f6d28c922cccae6d805ce72115b9d09d3b57d83163192aacc45856fe145d745472df4ca0053a41c65c175434709e3f0 HEAD_REF master PATCHES fix_openni2.patch - fix-dependency-glfw3.patch fix_config_osx.patch ) @@ -50,6 +49,7 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/realsense2) if(VCPKG_TARGET_IS_WINDOWS) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/realsense2/realsense2Targets.cmake" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" "\${_IMPORT_PREFIX}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/realsense2/realsense2Targets.cmake" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" "\${_IMPORT_PREFIX}") endif() vcpkg_copy_pdbs() @@ -57,8 +57,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") if(BUILD_TOOLS) - set(TOOL_NAMES) - list(APPEND TOOL_NAMES rs-convert rs-enumerate-devices rs-fw-logger rs-fw-update rs-record rs-terminal) + set(TOOL_NAMES rs-convert rs-embed rs-enumerate-devices rs-fw-logger rs-fw-update rs-record rs-terminal) vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN) endif() diff --git a/external_imported/vcpkg/ports/realsense2/vcpkg.json b/external_imported/vcpkg/ports/realsense2/vcpkg.json index 89a822b44..4414ef1af 100644 --- a/external_imported/vcpkg/ports/realsense2/vcpkg.json +++ b/external_imported/vcpkg/ports/realsense2/vcpkg.json @@ -1,9 +1,10 @@ { "name": "realsense2", - "version": "2.49.0", - "port-version": 3, + "version": "2.50.0", + "port-version": 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", "dependencies": [ { "name": "libusb", @@ -29,11 +30,7 @@ "description": "Build Intel® RealSense™ T265 device" }, "tools": { - "description": "Build Intel® RealSense™ tools", - "dependencies": [ - "glfw3", - "opengl" - ] + "description": "Build Intel® RealSense™ tools" } } } diff --git a/external_imported/vcpkg/ports/redis-plus-plus/portfile.cmake b/external_imported/vcpkg/ports/redis-plus-plus/portfile.cmake index eb5b6b644..93ee71b58 100644 --- a/external_imported/vcpkg/ports/redis-plus-plus/portfile.cmake +++ b/external_imported/vcpkg/ports/redis-plus-plus/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sewenew/redis-plus-plus - REF cff6ab8d8557a113ad97dfb779eb46647f7c92c7 # 1.3.1 - SHA512 2bd179f47b13d05d58358ddf1aeef93fbc9e748a12f07fa5bd59fd75adcf7f3261d5f871d8fd33628d2d9df04e341ed24314fc2e817887ba0079e2711b5da317 + REF e29c63db54653a660d7a0f556f670b7a6fce0a78 # 1.3.2 + SHA512 47b18f41cfaf5e11d6eba1201a3da3a1ed355583cde0772de68e5f0f25953e1467c83249848b25b16c9db9e3f6c5df5e1dd832f4b3dd41289c69111867e48d8c HEAD_REF master PATCHES fix-ws2-linking-windows.patch diff --git a/external_imported/vcpkg/ports/redis-plus-plus/vcpkg.json b/external_imported/vcpkg/ports/redis-plus-plus/vcpkg.json index a789d9c27..769edb78d 100644 --- a/external_imported/vcpkg/ports/redis-plus-plus/vcpkg.json +++ b/external_imported/vcpkg/ports/redis-plus-plus/vcpkg.json @@ -1,7 +1,6 @@ { "name": "redis-plus-plus", - "version-semver": "1.3.1", - "port-version": 1, + "version-semver": "1.3.2", "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", "dependencies": [ diff --git a/external_imported/vcpkg/ports/rendergraph/portfile.cmake b/external_imported/vcpkg/ports/rendergraph/portfile.cmake new file mode 100644 index 000000000..c94a69591 --- /dev/null +++ b/external_imported/vcpkg/ports/rendergraph/portfile.cmake @@ -0,0 +1,37 @@ +vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH + REPO DragonJoker/RenderGraph + REF 602d8b6f1f027cea2173be16de6ff30d5d8f79e5 + HEAD_REF master + SHA512 4c57983febad7188a69c8fd214e185e62fbab04b926f3efee97bbf3e70387ab6f742b6f62b0a8bf3dde63c174415ab5a793abf775cd4eee37864efd6f1e06d2b +) + +vcpkg_from_github(OUT_SOURCE_PATH CMAKE_SOURCE_PATH + REPO DragonJoker/CMakeUtils + REF e2a9d422a02dab0e04f54b3e1bc515eba652a9d1 + HEAD_REF master + SHA512 4ebd6141b9e5aa5283f31892da7108aa09fbd59292f0e98f2c9fe67577856f0af253184d41fdc16bb11094c4635401f181ea2e3abfa560adcf5c029f0d663b24 +) + +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}) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DPROJECTS_USE_PRECOMPILED_HEADERS=ON + -DCRG_UNITY_BUILD=ON + -DCRG_BUILD_STATIC=${BUILD_STATIC} + -DVULKAN_HEADERS_INCLUDE_DIRS=${CURRENT_INSTALLED_DIR}/include +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/RenderGraph) + +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/rendergraph/vcpkg.json b/external_imported/vcpkg/ports/rendergraph/vcpkg.json new file mode 100644 index 000000000..8a6094b01 --- /dev/null +++ b/external_imported/vcpkg/ports/rendergraph/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "rendergraph", + "version": "1.0.0", + "description": "Vulkan render graph implementation.", + "homepage": "https://github.com/DragonJoker/RenderGraph", + "license": "MIT", + "supports": "!x86 & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "vulkan-headers" + ] +} diff --git a/external_imported/vcpkg/ports/replxx/portfile.cmake b/external_imported/vcpkg/ports/replxx/portfile.cmake index e9fc79846..140d7425e 100644 --- a/external_imported/vcpkg/ports/replxx/portfile.cmake +++ b/external_imported/vcpkg/ports/replxx/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AmokHuginnsson/replxx diff --git a/external_imported/vcpkg/ports/replxx/vcpkg.json b/external_imported/vcpkg/ports/replxx/vcpkg.json index 58c74968d..e82e01326 100644 --- a/external_imported/vcpkg/ports/replxx/vcpkg.json +++ b/external_imported/vcpkg/ports/replxx/vcpkg.json @@ -1,6 +1,7 @@ { "name": "replxx", "version": "0.0.4", + "port-version": 1, "description": "A small, portable GNU readline replacement for Linux, Windows and MacOS which is capable of handling UTF-8 characters.", "homepage": "https://github.com/AmokHuginnsson/replxx", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/reproc/portfile.cmake b/external_imported/vcpkg/ports/reproc/portfile.cmake index ec99b5112..572cce5fb 100644 --- a/external_imported/vcpkg/ports/reproc/portfile.cmake +++ b/external_imported/vcpkg/ports/reproc/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DaanDeMeyer/reproc diff --git a/external_imported/vcpkg/ports/reproc/vcpkg.json b/external_imported/vcpkg/ports/reproc/vcpkg.json index a4f70dc79..7c4999355 100644 --- a/external_imported/vcpkg/ports/reproc/vcpkg.json +++ b/external_imported/vcpkg/ports/reproc/vcpkg.json @@ -1,6 +1,7 @@ { "name": "reproc", "version": "14.2.4", + "port-version": 1, "description": "Cross-platform (C99/C++11) process library", "homepage": "https://github.com/DaanDeMeyer/reproc", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/restclient-cpp/portfile.cmake b/external_imported/vcpkg/ports/restclient-cpp/portfile.cmake index c2ea8fa25..508a0ffc1 100644 --- a/external_imported/vcpkg/ports/restclient-cpp/portfile.cmake +++ b/external_imported/vcpkg/ports/restclient-cpp/portfile.cmake @@ -5,27 +5,26 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mrtazz/restclient-cpp - REF 0.5.2 - SHA512 f6acc6a3d5cb852d6e507463d94d2f6192a941f0c26fef7c674e9ff7753cf5474522052a2065774050d01af5c6d2a3b86398f43cd2e4f5d03abcaac9a21ef4b7 + REF b782bd26539a3d1a8edcb6d8a3493b111f8fac66 #v2022-02-009 + SHA512 992b2c067c7b672432a202fea6b5263ff51ca77facace5078077e77e57390d3ddcb99e0e20ad1a1595612efbb625d34f4d2cd8c4a2ac4bb33e3f9d5d28c2c579 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_GTest=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_jsoncpp=TRUE ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/restclient-cpp) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/restclient-cpp) vcpkg_copy_pdbs() # Remove includes in debug -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/restclient-cpp/vcpkg.json b/external_imported/vcpkg/ports/restclient-cpp/vcpkg.json index fcef3266a..d7dad2896 100644 --- a/external_imported/vcpkg/ports/restclient-cpp/vcpkg.json +++ b/external_imported/vcpkg/ports/restclient-cpp/vcpkg.json @@ -1,10 +1,18 @@ { "name": "restclient-cpp", - "version-string": "0.5.2", - "port-version": 1, + "version-date": "2022-02-09", "description": "Simple REST client for C++. It wraps libcurl for HTTP requests.", "homepage": "https://code.mrtazz.com/restclient-cpp/", + "license": "MIT", "dependencies": [ - "curl" + "curl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/rhash/portfile.cmake b/external_imported/vcpkg/ports/rhash/portfile.cmake index 76c03c58c..d80f7fce6 100644 --- a/external_imported/vcpkg/ports/rhash/portfile.cmake +++ b/external_imported/vcpkg/ports/rhash/portfile.cmake @@ -1,6 +1,4 @@ set(RHASH_XVERSION 1.4.0) -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rhash/RHash diff --git a/external_imported/vcpkg/ports/rhash/vcpkg.json b/external_imported/vcpkg/ports/rhash/vcpkg.json index 1cdb5fef0..252e0b0cf 100644 --- a/external_imported/vcpkg/ports/rhash/vcpkg.json +++ b/external_imported/vcpkg/ports/rhash/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rhash", - "version-string": "1.4.0", - "port-version": 1, + "version": "1.4.0", + "port-version": 2, "description": "C library for computing a wide variety of hash sums", "homepage": "https://github.com/rhash/RHash", "supports": "!uwp" diff --git a/external_imported/vcpkg/ports/rhasheq/portfile.cmake b/external_imported/vcpkg/ports/rhasheq/portfile.cmake new file mode 100644 index 000000000..fed79c5cd --- /dev/null +++ b/external_imported/vcpkg/ports/rhasheq/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO offscale/rhasheq + REF c42b672daf9bb1525cb94645244a09344c2a7363 + SHA512 55947069a67e7de8561b92bad753481402dd353aa40b06719346fa1247d8d0a5073a8a3e38419e7d9028684c091eb23b11b254fea836383a24ce8dcfe0cffefc + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DBUILD_TESTING=OFF" +) +vcpkg_cmake_install() +file(INSTALL "${SOURCE_PATH}/COPYING" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/rhasheq" + RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") diff --git a/external_imported/vcpkg/ports/rhasheq/vcpkg.json b/external_imported/vcpkg/ports/rhasheq/vcpkg.json new file mode 100644 index 000000000..2ada70aec --- /dev/null +++ b/external_imported/vcpkg/ports/rhasheq/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "rhasheq", + "version": "0.0.1", + "description": "Simple header-only librhash wrapper for verifying hashes from a file to a given `const char *`.", + "license": "0BSD", + "supports": "!uwp", + "dependencies": [ + "c89stringutils", + "rhash", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/robin-hood-hashing/portfile.cmake b/external_imported/vcpkg/ports/robin-hood-hashing/portfile.cmake index 4a56c8c9d..8cc9746eb 100644 --- a/external_imported/vcpkg/ports/robin-hood-hashing/portfile.cmake +++ b/external_imported/vcpkg/ports/robin-hood-hashing/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO martinus/robin-hood-hashing - REF 3.11.4 - SHA512 9276fa2b397710c6687e094aa2c427e3de64037fe2a065381f3ae25c6b99555a65a3a3719095c4fcdae9ea5da3fbf3cf44adeb7b293fea8c0ef36d0eb705b9eb + REF 3.11.5 + SHA512 5f73e089b1e8ec41a9bedded22bc64a789d3a3d04873a2ad9f8cc2970797a473b0f4d3436c2324b3ced85a0d983998a75b1dfaf2b7f3b77235b29806ff2fd489 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/robin-hood-hashing/vcpkg.json b/external_imported/vcpkg/ports/robin-hood-hashing/vcpkg.json index d2f17f5cf..6a8b86b97 100644 --- a/external_imported/vcpkg/ports/robin-hood-hashing/vcpkg.json +++ b/external_imported/vcpkg/ports/robin-hood-hashing/vcpkg.json @@ -1,6 +1,6 @@ { "name": "robin-hood-hashing", - "version": "3.11.4", + "version": "3.11.5", "description": "Fast & memory efficient hashtable based on robin hood hashing for C++11/14/17/20", "homepage": "https://github.com/martinus/robin-hood-hashing", "dependencies": [ diff --git a/external_imported/vcpkg/ports/rs-core-lib/portfile.cmake b/external_imported/vcpkg/ports/rs-core-lib/portfile.cmake deleted file mode 100644 index 3c56fd94b..000000000 --- a/external_imported/vcpkg/ports/rs-core-lib/portfile.cmake +++ /dev/null @@ -1,12 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO CaptainCrowbar/rs-core-lib - REF 9eac3469ac13b2f1e9e4608a0710a76af68d1983 # accessed on 2020-09-14 - SHA512 ef3cb291efefff0ef13b683d70b99777cb403f5211a6f0e3099a91806cf3d7dd33d6e2e793ccbd836dcb145dc19cde99c4f4eb0bd49be3482d87d4e1a04ee2aa - HEAD_REF master -) - -file(INSTALL ${SOURCE_PATH}/rs-core DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN "*.hpp") - -# Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/rs-core-lib RENAME copyright) \ No newline at end of file diff --git a/external_imported/vcpkg/ports/rs-core-lib/vcpkg.json b/external_imported/vcpkg/ports/rs-core-lib/vcpkg.json deleted file mode 100644 index 8ee5959e0..000000000 --- a/external_imported/vcpkg/ports/rs-core-lib/vcpkg.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "rs-core-lib", - "version-string": "2020-09-14", - "port-version": 1, - "description": "Minimal common utilities by Ross Smith", - "homepage": "https://github.com/CaptainCrowbar/rs-core-lib" -} diff --git a/external_imported/vcpkg/ports/rsasynccpp/portfile.cmake b/external_imported/vcpkg/ports/rsasynccpp/portfile.cmake index 438f2cd8c..4fa5cbb81 100644 --- a/external_imported/vcpkg/ports/rsasynccpp/portfile.cmake +++ b/external_imported/vcpkg/ports/rsasynccpp/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "Linux" "OSX" "ANDROID" "FREEBSD" "OPENBSD") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( @@ -37,12 +36,12 @@ endif() vcpkg_install_msbuild( SOURCE_PATH ${SOURCE_PATH} PROJECT_SUBPATH RStein.AsyncCppLib.sln - LICENSE_SUBPATH LICENSE + LICENSE_SUBPATH LICENSE PLATFORM ${MSBUILD_PLATFORM} DEBUG_CONFIGURATION ${DEBUG_CONFIGURATION} - RELEASE_CONFIGURATION ${RELEASE_CONFIGURATION} + RELEASE_CONFIGURATION ${RELEASE_CONFIGURATION} ) file(COPY "${SOURCE_PATH}/RStein.AsyncCpp/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/asynccpp" - FILES_MATCHING PATTERN "*.h") \ No newline at end of file + FILES_MATCHING PATTERN "*.h") diff --git a/external_imported/vcpkg/ports/rsasynccpp/vcpkg.json b/external_imported/vcpkg/ports/rsasynccpp/vcpkg.json index f29d9388b..b74ead250 100644 --- a/external_imported/vcpkg/ports/rsasynccpp/vcpkg.json +++ b/external_imported/vcpkg/ports/rsasynccpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "rsasynccpp", "version": "0.0.7", + "port-version": 1, "maintainers": "Rene Stein ", "description": "Task Parallel Library (TPL)/dataflow/actors/async primitives for C++ based on C++ 20 coroutines.", "homepage": "https://github.com/renestein/Rstein.AsyncCpp", diff --git a/external_imported/vcpkg/ports/rsm-binary-io/portfile.cmake b/external_imported/vcpkg/ports/rsm-binary-io/portfile.cmake index 28c00b72e..bb14909ce 100644 --- a/external_imported/vcpkg/ports/rsm-binary-io/portfile.cmake +++ b/external_imported/vcpkg/ports/rsm-binary-io/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "OSX" "UWP") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/external_imported/vcpkg/ports/rsm-binary-io/vcpkg.json b/external_imported/vcpkg/ports/rsm-binary-io/vcpkg.json index c353ba650..0c5c77eb6 100644 --- a/external_imported/vcpkg/ports/rsm-binary-io/vcpkg.json +++ b/external_imported/vcpkg/ports/rsm-binary-io/vcpkg.json @@ -1,6 +1,7 @@ { "name": "rsm-binary-io", "version-semver": "2.0.4", + "port-version": 1, "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/", diff --git a/external_imported/vcpkg/ports/rsm-bsa/portfile.cmake b/external_imported/vcpkg/ports/rsm-bsa/portfile.cmake index 9b457b083..03b46262b 100644 --- a/external_imported/vcpkg/ports/rsm-bsa/portfile.cmake +++ b/external_imported/vcpkg/ports/rsm-bsa/portfile.cmake @@ -1,10 +1,9 @@ -vcpkg_fail_port_install(ON_TARGET "OSX" "UWP" ON_ARCH "x86") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Ryan-rsm-McKenzie/bsa - REF 4.0.0 - SHA512 9be077349cea3f4c6f2298c6286fd306f370c560d9e474516dfd7ab8dcd2313032581f86f9b4f5afb5ccd2dbb4e57663e16997253421033e00186167db15576a + REF 4.0.3 + SHA512 ec8a2aff1c833d7bffd6345ab989bc57137eee3fb2c5b7509027f068783d42d61bcc4b694b53a7961c1c69ee52834efadef9b3c82e1a739c0c5491af75e8dde7 HEAD_REF master ) @@ -18,13 +17,6 @@ vcpkg_check_features( xmem BSA_SUPPORT_XMEM ) -if (BSA_SUPPORT_XMEM) - vcpkg_fail_port_install( - ON_TARGET "LINUX" - MESSAGE "XMem support is only available for windows" - ) -endif() - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS diff --git a/external_imported/vcpkg/ports/rsm-bsa/vcpkg.json b/external_imported/vcpkg/ports/rsm-bsa/vcpkg.json index fc331bb0b..354a0f17d 100644 --- a/external_imported/vcpkg/ports/rsm-bsa/vcpkg.json +++ b/external_imported/vcpkg/ports/rsm-bsa/vcpkg.json @@ -1,9 +1,10 @@ { "name": "rsm-bsa", - "version-semver": "4.0.0", + "version-semver": "4.0.3", "description": "A C++ library for working with the Bethesda archive file format", "homepage": "https://github.com/Ryan-rsm-McKenzie/bsa", "documentation": "https://ryan-rsm-mckenzie.github.io/bsa/", + "license": "MIT", "supports": "!x86 & !osx & !uwp", "dependencies": [ { @@ -26,6 +27,7 @@ "features": { "xmem": { "description": "Compression support for the xmem codec", + "supports": "windows", "dependencies": [ "reproc" ] diff --git a/external_imported/vcpkg/ports/rsm-mmio/portfile.cmake b/external_imported/vcpkg/ports/rsm-mmio/portfile.cmake index a55ed8760..cec066167 100644 --- a/external_imported/vcpkg/ports/rsm-mmio/portfile.cmake +++ b/external_imported/vcpkg/ports/rsm-mmio/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "OSX" "UWP") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/external_imported/vcpkg/ports/rsm-mmio/vcpkg.json b/external_imported/vcpkg/ports/rsm-mmio/vcpkg.json index fa7d4f7da..b88664f9c 100644 --- a/external_imported/vcpkg/ports/rsm-mmio/vcpkg.json +++ b/external_imported/vcpkg/ports/rsm-mmio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rsm-mmio", "version-semver": "1.1.0", - "port-version": 1, + "port-version": 2, "description": "A cross-platform memory-mapped io library for C++ ", "homepage": "https://github.com/Ryan-rsm-McKenzie/mmio", "supports": "!osx & !uwp", diff --git a/external_imported/vcpkg/ports/rsocket/fix-folly.patch b/external_imported/vcpkg/ports/rsocket/fix-folly.patch new file mode 100644 index 000000000..05d003126 --- /dev/null +++ b/external_imported/vcpkg/ports/rsocket/fix-folly.patch @@ -0,0 +1,13 @@ +diff --git a/rsocket/transports/tcp/TcpConnectionAcceptor.cpp b/rsocket/transports/tcp/TcpConnectionAcceptor.cpp +index 12ac289f..c37f621a 100644 +--- a/rsocket/transports/tcp/TcpConnectionAcceptor.cpp ++++ b/rsocket/transports/tcp/TcpConnectionAcceptor.cpp +@@ -31,7 +31,7 @@ class TcpConnectionAcceptor::SocketCallback + + void connectionAccepted( + folly::NetworkSocket fdNetworkSocket, +- const folly::SocketAddress& address) noexcept override { ++ const folly::SocketAddress& address, AcceptInfo info) noexcept override { + int fd = fdNetworkSocket.toFd(); + + VLOG(2) << "Accepting TCP connection from " << address << " on FD " << fd; diff --git a/external_imported/vcpkg/ports/rsocket/portfile.cmake b/external_imported/vcpkg/ports/rsocket/portfile.cmake index 2aec29da9..f6ec73c4a 100644 --- a/external_imported/vcpkg/ports/rsocket/portfile.cmake +++ b/external_imported/vcpkg/ports/rsocket/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( fix-cmake-config.patch fix-find-dependencies.patch use-cpp-17.patch + fix-folly.patch ) vcpkg_cmake_configure( diff --git a/external_imported/vcpkg/ports/rsocket/vcpkg.json b/external_imported/vcpkg/ports/rsocket/vcpkg.json index 4695eea35..018579f0b 100644 --- a/external_imported/vcpkg/ports/rsocket/vcpkg.json +++ b/external_imported/vcpkg/ports/rsocket/vcpkg.json @@ -1,6 +1,7 @@ { "name": "rsocket", "version-string": "2021.08.30.00", + "port-version": 1, "description": "C++ implementation of RSocket http://rsocket.io", "homepage": "https://github.com/rsocket/rsocket-cpp", "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 new file mode 100644 index 000000000..ea6c73b84 --- /dev/null +++ b/external_imported/vcpkg/ports/rtabmap/0001-add-bigobj-for-msvc.patch @@ -0,0 +1,24 @@ +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) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP${N}") + endif() + endif() ++ add_compile_options("/bigobj") + endif() + + # [Eclipse] Automatic Discovery of Include directories (Optional, but handy) +-- +2.35.1.windows.2 + diff --git a/external_imported/vcpkg/ports/rtabmap/portfile.cmake b/external_imported/vcpkg/ports/rtabmap/portfile.cmake index 548f5e3bc..1cd6d123f 100644 --- a/external_imported/vcpkg/ports/rtabmap/portfile.cmake +++ b/external_imported/vcpkg/ports/rtabmap/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-qt.patch + 0001-add-bigobj-for-msvc.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -23,8 +24,11 @@ vcpkg_cmake_configure( -DBUILD_APP=OFF -DBUILD_EXAMPLES=OFF -DWITH_QT=OFF - -DWITH_SUPERPOINT_TORCH=OFF - -DWITH_PYMATCHER=OFF + -DWITH_ORB_OCTREE=OFF + -DWITH_TORCH=OFF + -DWITH_PYTHON=OFF + -DWITH_PYTHON_THREADING=OFF + -DWITH_PDAL=OFF -DWITH_FREENECT=OFF -DWITH_FREENECT2=OFF -DWITH_K4W2=OFF @@ -37,13 +41,16 @@ vcpkg_cmake_configure( -DWITH_VERTIGO=OFF -DWITH_CVSBA=OFF -DWITH_POINTMATCHER=OFF + -DWITH_CCCORELIB=OFF -DWITH_LOAM=OFF -DWITH_FLYCAPTURE2=OFF -DWITH_ZED=OFF + -DWITH_ZEDOC=OFF -DWITH_REALSENSE=OFF -DWITH_REALSENSE_SLAM=OFF -DWITH_REALSENSE2=OFF -DWITH_MYNTEYE=OFF + -DWITH_DEPTHAI=OFF -DWITH_OCTOMAP=OFF -DWITH_CPUTSDF=OFF -DWITH_OPENCHISEL=OFF @@ -51,10 +58,11 @@ vcpkg_cmake_configure( -DWITH_FOVIS=OFF -DWITH_VISO2=OFF -DWITH_DVO=OFF - -DWITH_ORB_SLAM2=OFF -DWITH_OKVIS=OFF -DWITH_MSCKF_VIO=OFF -DWITH_VINS=OFF + -DWITH_OPENVINS=OFF + -DWITH_MADGWICK=OFF -DWITH_FASTCV=OFF ) diff --git a/external_imported/vcpkg/ports/rtabmap/vcpkg.json b/external_imported/vcpkg/ports/rtabmap/vcpkg.json index d0e2fc7fc..f92769710 100644 --- a/external_imported/vcpkg/ports/rtabmap/vcpkg.json +++ b/external_imported/vcpkg/ports/rtabmap/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rtabmap", - "version-string": "0.20.13", - "port-version": 1, + "version": "0.20.13", + "port-version": 3, "description": "Real-Time Appearance-Based Mapping", "homepage": "https://introlab.github.io/rtabmap/", "supports": "windows & !static", diff --git a/external_imported/vcpkg/ports/rtlsdr/portfile.cmake b/external_imported/vcpkg/ports/rtlsdr/portfile.cmake index fdf484290..472dbe098 100644 --- a/external_imported/vcpkg/ports/rtlsdr/portfile.cmake +++ b/external_imported/vcpkg/ports/rtlsdr/portfile.cmake @@ -1,8 +1,3 @@ -vcpkg_fail_port_install( - ON_TARGET "uwp" "linux" "osx" "android" "freebsd" - ON_ARCH "arm" "arm64" -) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO osmocom/rtl-sdr diff --git a/external_imported/vcpkg/ports/rtlsdr/vcpkg.json b/external_imported/vcpkg/ports/rtlsdr/vcpkg.json index 1dbd2b0da..3680d3128 100644 --- a/external_imported/vcpkg/ports/rtlsdr/vcpkg.json +++ b/external_imported/vcpkg/ports/rtlsdr/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rtlsdr", - "version-string": "2020-04-16", - "port-version": 2, + "version-date": "2020-04-16", + "port-version": 3, "description": "rtl-sdr is a library that turns your Realtek RTL2832 based DVB dongle into a SDR receiver", "homepage": "https://osmocom.org/projects/rtl-sdr", "supports": "windows & (x86 | x64)", diff --git a/external_imported/vcpkg/ports/rtmidi/portfile.cmake b/external_imported/vcpkg/ports/rtmidi/portfile.cmake index 8d1316ff6..9b57212c4 100644 --- a/external_imported/vcpkg/ports/rtmidi/portfile.cmake +++ b/external_imported/vcpkg/ports/rtmidi/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - # Upstream uses CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS, which causes issues # https://github.com/thestk/rtmidi/blob/4.0.0/CMakeLists.txt#L20 vcpkg_check_linkage(ONLY_STATIC_LIBRARY) diff --git a/external_imported/vcpkg/ports/rtmidi/vcpkg.json b/external_imported/vcpkg/ports/rtmidi/vcpkg.json index 82d6c482c..73280aa86 100644 --- a/external_imported/vcpkg/ports/rtmidi/vcpkg.json +++ b/external_imported/vcpkg/ports/rtmidi/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rtmidi", "version-semver": "4.0.0", - "port-version": 3, + "port-version": 4, "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" diff --git a/external_imported/vcpkg/ports/rxspencer/portfile.cmake b/external_imported/vcpkg/ports/rxspencer/portfile.cmake index 92e4fd31f..b4ce794d0 100644 --- a/external_imported/vcpkg/ports/rxspencer/portfile.cmake +++ b/external_imported/vcpkg/ports/rxspencer/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO garyhouston/rxspencer @@ -12,7 +10,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - OPTIONS + OPTIONS -DCMAKE_CONFIG_DEST=share/rxspencer -Drxshared=${BUILD_SHARED} ) diff --git a/external_imported/vcpkg/ports/rxspencer/vcpkg.json b/external_imported/vcpkg/ports/rxspencer/vcpkg.json index a4fef35be..41b863e25 100644 --- a/external_imported/vcpkg/ports/rxspencer/vcpkg.json +++ b/external_imported/vcpkg/ports/rxspencer/vcpkg.json @@ -1,6 +1,7 @@ { "name": "rxspencer", "version": "3.9.0", + "port-version": 1, "description": "Henry Spencer's BSD regular expression library.", "homepage": "https://garyhouston.github.io/regex/", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/ryu/portfile.cmake b/external_imported/vcpkg/ports/ryu/portfile.cmake index 332de8d31..c37850966 100644 --- a/external_imported/vcpkg/ports/ryu/portfile.cmake +++ b/external_imported/vcpkg/ports/ryu/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "x86" "arm" ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ulfjack/ryu @@ -26,9 +24,9 @@ vcpkg_execute_build_process( if (CMAKE_HOST_WIN32) file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/ryu.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) - file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/ryu.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) + file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/ryu.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/ryu_printf.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) - file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/ryu_printf.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) + file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/ryu_printf.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) else() file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/libryu.a DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/libryu.a DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) diff --git a/external_imported/vcpkg/ports/ryu/vcpkg.json b/external_imported/vcpkg/ports/ryu/vcpkg.json index 52d1ea6d7..19096019b 100644 --- a/external_imported/vcpkg/ports/ryu/vcpkg.json +++ b/external_imported/vcpkg/ports/ryu/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ryu", - "version-string": "2.0", - "port-version": 5, + "version": "2.0", + "port-version": 6, "description": "Ryu generates the shortest decimal representation of a floating point number that maintains round-trip safety.", "homepage": "https://github.com/ulfjack/ryu", "supports": "!(uwp | arm | x86)" diff --git a/external_imported/vcpkg/ports/s2geometry/portfile.cmake b/external_imported/vcpkg/ports/s2geometry/portfile.cmake index f15e3bcb5..8eeeccaf1 100644 --- a/external_imported/vcpkg/ports/s2geometry/portfile.cmake +++ b/external_imported/vcpkg/ports/s2geometry/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "Windows") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/s2geometry diff --git a/external_imported/vcpkg/ports/s2geometry/vcpkg.json b/external_imported/vcpkg/ports/s2geometry/vcpkg.json index 2f2a949b2..e6f274b11 100644 --- a/external_imported/vcpkg/ports/s2geometry/vcpkg.json +++ b/external_imported/vcpkg/ports/s2geometry/vcpkg.json @@ -1,6 +1,7 @@ { "name": "s2geometry", "version": "0.9.0", + "port-version": 1, "description": "S2 is a library for spherical geometry that aims to have the same robustness, flexibility, and performance as the very best planar geometry libraries.", "homepage": "https://s2geometry.io", "supports": "!windows", diff --git a/external_imported/vcpkg/ports/s2n/portfile.cmake b/external_imported/vcpkg/ports/s2n/portfile.cmake index e90c64802..4ad9e76ce 100644 --- a/external_imported/vcpkg/ports/s2n/portfile.cmake +++ b/external_imported/vcpkg/ports/s2n/portfile.cmake @@ -1,21 +1,30 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aws/s2n-tls - REF ab9a3be5a8abcbc5bd7bdba662497a717737c838 # v1.3.0 - SHA512 0150cba56f7940253ffa5af0c27fdc8db08961d4c8a80377d25f588fa8a56249eb02723304969d0fdebe570388545527ee826a3070c21e50e63c4f021d425728 + REF 36c3dc72ab1359cf721294e1258dfdc2962f3ffc # v1.3.5 + SHA512 2c9eed12e90e5fc987758635fec4a7418c20d25c724cfa391090b06bfcc4eb5925b4011d51a99e7c7ab80f535684ee3934ba4734b7966edd323bf88bc5953d7c PATCHES fix-cmake-target-path.patch use-openssl-crypto.patch + remove-trycompile.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES tests BUILD_TESTING ) + +set(EXTRA_ARGS) +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32") + set(EXTRA_ARGS "-DS2N_NO_PQ=TRUE") +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + ${EXTRA_ARGS} ${FEATURE_OPTIONS} + -DUNSAFE_TREAT_WARNINGS_AS_ERRORS=OFF ) vcpkg_cmake_install() diff --git a/external_imported/vcpkg/ports/s2n/remove-trycompile.patch b/external_imported/vcpkg/ports/s2n/remove-trycompile.patch new file mode 100644 index 000000000..bf5582e39 --- /dev/null +++ b/external_imported/vcpkg/ports/s2n/remove-trycompile.patch @@ -0,0 +1,36 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt (revision 86c857094a2d94fafce15a3d32abb4052e664c5c) ++++ b/CMakeLists.txt (date 1643340236796) +@@ -409,32 +409,6 @@ + endif() + endif() + +-# Determine if EVP_md5_sha1 is available in libcrypto +-try_compile( +- LIBCRYPTO_SUPPORTS_EVP_MD5_SHA1_HASH +- ${CMAKE_BINARY_DIR} +- SOURCES "${CMAKE_CURRENT_LIST_DIR}/tests/features/evp_md5_sha1.c" +- LINK_LIBRARIES crypto ${OS_LIBS} +- CMAKE_FLAGS +- "-DINCLUDE_DIRECTORIES=$" +-) +-if (LIBCRYPTO_SUPPORTS_EVP_MD5_SHA1_HASH) +- target_compile_options(${PROJECT_NAME} PUBLIC -DS2N_LIBCRYPTO_SUPPORTS_EVP_MD5_SHA1_HASH) +-endif() +- +-# Determine if EVP_MD_CTX_set_pkey_ctx is available in libcrypto +-try_compile( +- LIBCRYPTO_SUPPORTS_EVP_MD_CTX_SET_PKEY_CTX +- ${CMAKE_BINARY_DIR} +- SOURCES "${CMAKE_CURRENT_LIST_DIR}/tests/features/evp_md_ctx_set_pkey_ctx.c" +- LINK_LIBRARIES crypto ${OS_LIBS} +- CMAKE_FLAGS +- "-DINCLUDE_DIRECTORIES=$" +-) +-if (LIBCRYPTO_SUPPORTS_EVP_MD_CTX_SET_PKEY_CTX) +- target_compile_options(${PROJECT_NAME} PUBLIC -DS2N_LIBCRYPTO_SUPPORTS_EVP_MD_CTX_SET_PKEY_CTX) +-endif() +- + if (S2N_INTERN_LIBCRYPTO) + if (NOT LibCrypto_STATIC_LIBRARY) + message(FATAL_ERROR "libcrypto interning requires a static build of libcrypto.a to be available") diff --git a/external_imported/vcpkg/ports/s2n/vcpkg.json b/external_imported/vcpkg/ports/s2n/vcpkg.json index d4c3a1960..826420429 100644 --- a/external_imported/vcpkg/ports/s2n/vcpkg.json +++ b/external_imported/vcpkg/ports/s2n/vcpkg.json @@ -1,6 +1,6 @@ { "name": "s2n", - "version": "1.3.0", + "version": "1.3.5", "description": "C99 implementation of the TLS/SSL protocols.", "homepage": "https://github.com/aws/s2n-tls", "supports": "!uwp & !windows", diff --git a/external_imported/vcpkg/ports/sail/portfile.cmake b/external_imported/vcpkg/ports/sail/portfile.cmake index 671587d0b..8d7c58689 100644 --- a/external_imported/vcpkg/ports/sail/portfile.cmake +++ b/external_imported/vcpkg/ports/sail/portfile.cmake @@ -1,18 +1,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO HappySeaFox/sail - REF v0.9.0-pre19 - SHA512 6b85ac668b478c6b3430120127cc53e8f5d8f5ba7b30ccaf0cb2f1aa48d03e7c5b1618ca1112c593fbc8fa65e425ed5ef39b21deb37165189cd7d6f243111850 + REF v0.9.0-pre21 + SHA512 51c23792d18b28520d04d7a097a6d46521d12107919ff76a7ff270a518beb862e4a1df89f3effb945ff908c39336bd60c5f118d6db80baf50005c05f55d2d96f HEAD_REF master ) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SAIL_STATIC) - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DSAIL_STATIC=${SAIL_STATIC} -DSAIL_COMBINE_CODECS=ON -DSAIL_BUILD_APPS=OFF -DSAIL_BUILD_EXAMPLES=OFF diff --git a/external_imported/vcpkg/ports/sail/vcpkg.json b/external_imported/vcpkg/ports/sail/vcpkg.json index 2373c565e..fade1e924 100644 --- a/external_imported/vcpkg/ports/sail/vcpkg.json +++ b/external_imported/vcpkg/ports/sail/vcpkg.json @@ -1,9 +1,9 @@ { "name": "sail", - "version-semver": "0.9.0-pre19", - "port-version": 1, + "version-semver": "0.9.0-pre21", "description": "The missing small and fast image decoding library for humans (not for machines)", "homepage": "https://github.com/HappySeaFox/sail", + "license": "MIT", "supports": "!uwp", "dependencies": [ "giflib", diff --git a/external_imported/vcpkg/ports/sbp/portfile.cmake b/external_imported/vcpkg/ports/sbp/portfile.cmake index 219a54879..d345735fc 100644 --- a/external_imported/vcpkg/ports/sbp/portfile.cmake +++ b/external_imported/vcpkg/ports/sbp/portfile.cmake @@ -1,7 +1,5 @@ # Windows shared libraries are not supported yet # See https://github.com/swift-nav/libsbp/issues/1062 -vcpkg_fail_port_install(ON_TARGET "uwp") - if(VCPKG_TARGET_IS_WINDOWS) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) endif() diff --git a/external_imported/vcpkg/ports/sbp/vcpkg.json b/external_imported/vcpkg/ports/sbp/vcpkg.json index 248dc3139..ca94345d4 100644 --- a/external_imported/vcpkg/ports/sbp/vcpkg.json +++ b/external_imported/vcpkg/ports/sbp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sbp", "version-semver": "3.4.10", + "port-version": 1, "description": "Swift Navigation Binary Protocol (SBP) is a binary protocol for communicating GNSS data used by Piksi devices.", "homepage": "https://github.com/swift-nav/libsbp", "documentation": "https://support.swiftnav.com/support/solutions/articles/44001850782-swift-binary-protocol", diff --git a/external_imported/vcpkg/ports/scintilla/portfile.cmake b/external_imported/vcpkg/ports/scintilla/portfile.cmake index d1e1f1b77..50d61e642 100644 --- a/external_imported/vcpkg/ports/scintilla/portfile.cmake +++ b/external_imported/vcpkg/ports/scintilla/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "Linux" "OSX" "UWP") - vcpkg_download_distfile(ARCHIVE URLS "https://www.scintilla.org/scintilla446.zip" FILENAME "scintilla446.zip" diff --git a/external_imported/vcpkg/ports/scintilla/vcpkg.json b/external_imported/vcpkg/ports/scintilla/vcpkg.json index c223db6a0..2a934dc63 100644 --- a/external_imported/vcpkg/ports/scintilla/vcpkg.json +++ b/external_imported/vcpkg/ports/scintilla/vcpkg.json @@ -1,6 +1,7 @@ { "name": "scintilla", "version": "4.4.6", + "port-version": 1, "description": "A free source code editing component for Win32, GTK+, and OS X", "homepage": "https://www.scintilla.org/", "supports": "!(uwp | linux | osx)" diff --git a/external_imported/vcpkg/ports/sciter-js/portfile.cmake b/external_imported/vcpkg/ports/sciter-js/portfile.cmake index b9f438d5b..82759029e 100644 --- a/external_imported/vcpkg/ports/sciter-js/portfile.cmake +++ b/external_imported/vcpkg/ports/sciter-js/portfile.cmake @@ -6,8 +6,8 @@ endif() set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) -set(SCITER_REVISION d5a13ff197fed3af46d4bc931c158828eb61e357) -set(SCITER_SHA 5be2db9d2e5caa19be158020a084a246acd6dad2047062f603b3af4f3cdbdd7f7750b263ad6dfaa6c3667de6c51084fc2df75cd3cb8cd60501550377dded1928) +set(SCITER_REVISION 52bfe183983118c884294c864ee7b3d0dd199de6) +set(SCITER_SHA d31ef2a07525bf1c91b9f36ee434db6227bead732f5779cb4ee28ab6d92957bfb3d4656a960d3c47e64f3efc207f78be64853a56b1e1a14f56fd3c829b022155) if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) set(SCITER_ARCH x64) @@ -94,8 +94,8 @@ elseif(VCPKG_TARGET_IS_WINDOWS) file(INSTALL ${SCITER_BIN}/scapp.exe DESTINATION ${SCITER_TOOLS}) file(INSTALL ${SCITER_BIN}/usciter.exe DESTINATION ${SCITER_TOOLS}) file(INSTALL ${SCITER_BIN}/inspector.exe DESTINATION ${SCITER_TOOLS}) + file(INSTALL ${SCITER_BIN}/window-mixin.exe DESTINATION ${SCITER_TOOLS}) file(INSTALL ${SCITER_BIN}/sciter.dll DESTINATION ${SCITER_TOOLS}) - file(INSTALL ${SCITER_BIN}/sciter-sqlite.dll DESTINATION ${SCITER_TOOLS}) if ("windowless" IN_LIST FEATURES) set(SCITER_BIN ${SOURCE_PATH}/bin.lite/windows/${SCITER_ARCH}) @@ -104,8 +104,6 @@ elseif(VCPKG_TARGET_IS_WINDOWS) file(INSTALL ${SCITER_BIN}/sciter.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) file(INSTALL ${SCITER_BIN}/sciter.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - file(INSTALL ${SCITER_BIN}/sciter-sqlite.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - file(INSTALL ${SCITER_BIN}/sciter-sqlite.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - message(WARNING "Sciter requires manual deployment of the correct DLL files.") + endif() diff --git a/external_imported/vcpkg/ports/sciter-js/vcpkg.json b/external_imported/vcpkg/ports/sciter-js/vcpkg.json index 46e012108..6e5606aab 100644 --- a/external_imported/vcpkg/ports/sciter-js/vcpkg.json +++ b/external_imported/vcpkg/ports/sciter-js/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sciter-js", - "version-string": "4.4.8.16", + "version": "4.4.8.31", "description": "Sciter.JS - Sciter but with QuickJS on board instead of TIScript. Sciter is an embeddable HTML/CSS/scripting engine.", "homepage": "https://github.com/c-smile/sciter-js-sdk", "supports": "!uwp & !arm & !static", diff --git a/external_imported/vcpkg/ports/sciter/portfile.cmake b/external_imported/vcpkg/ports/sciter/portfile.cmake index 8c8fe9f83..781259cb6 100644 --- a/external_imported/vcpkg/ports/sciter/portfile.cmake +++ b/external_imported/vcpkg/ports/sciter/portfile.cmake @@ -6,7 +6,7 @@ Upstream has stopped active development of sciter and instead encourage users to Options for existing users are: 1. Depend upon `sciter-js` and change your code to work with the new library -2. Use `"overrides"` in manifest mode to pin to `"version-string": "4.4.8.3#1"` +2. Use `\"overrides\"` in manifest mode to pin to `\"version-string\": \"4.4.8.3#1\"` 3. Copy the last available `sciter` version into an overlay port (commit 756f1845537a916ba706f6af544b2f490c30fbb1 at subpath `ports/sciter`) 4. Use the community registry `https://github.com/VuYeK/vcpkg-registry` which may have newer versions of `sciter` available (not affiliated with Microsoft) ") diff --git a/external_imported/vcpkg/ports/sciter/vcpkg.json b/external_imported/vcpkg/ports/sciter/vcpkg.json index f0af85560..fb5784988 100644 --- a/external_imported/vcpkg/ports/sciter/vcpkg.json +++ b/external_imported/vcpkg/ports/sciter/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sciter", - "version-string": "deprecated", + "version": "0", + "port-version": 1, "description": "Sciter is an embeddable HTML/CSS/scripting engine.", "homepage": "https://github.com/c-smile/sciter-sdk" } diff --git a/external_imported/vcpkg/ports/scnlib/portfile.cmake b/external_imported/vcpkg/ports/scnlib/portfile.cmake index 8f2bd2995..0595fa487 100644 --- a/external_imported/vcpkg/ports/scnlib/portfile.cmake +++ b/external_imported/vcpkg/ports/scnlib/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eliaskosunen/scnlib - REF v0.4 - SHA512 a7059e70326e7d5af463b4ae09308644f8035092776f44001c1a4abf78421f55084e2fc30c6a9778eda62014354dba7c31b3f2f2d333bad04a2ec48b1f812ca0 + REF v1.0 + SHA512 0d34b5a710a472618df5d8202bbd647f488aa0ac2ad593c4a212e42b8aee5c35882f6e0ab7a7241c766ed17c9273d5e6704b012ef7f23a1b329b2a2f28ec60c6 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/scnlib/vcpkg.json b/external_imported/vcpkg/ports/scnlib/vcpkg.json index 04f4bd5e0..755442087 100644 --- a/external_imported/vcpkg/ports/scnlib/vcpkg.json +++ b/external_imported/vcpkg/ports/scnlib/vcpkg.json @@ -1,7 +1,6 @@ { "name": "scnlib", - "version-string": "0.4", - "port-version": 1, + "version": "1.0", "description": "scnlib is a modern C++ library for replacing scanf and std::istream", "homepage": "https://scnlib.dev/" } diff --git a/external_imported/vcpkg/ports/scylla-wrapper/portfile.cmake b/external_imported/vcpkg/ports/scylla-wrapper/portfile.cmake index 03dfbb6f9..f883451b5 100644 --- a/external_imported/vcpkg/ports/scylla-wrapper/portfile.cmake +++ b/external_imported/vcpkg/ports/scylla-wrapper/portfile.cmake @@ -9,21 +9,20 @@ vcpkg_from_bitbucket( 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}") file(REMOVE - ${SOURCE_PATH}/scylla_wrapper_dll/distorm.h - ${SOURCE_PATH}/scylla_wrapper_dll/distorm_x64.lib - ${SOURCE_PATH}/scylla_wrapper_dll/distorm_x86.lib + "${SOURCE_PATH}/scylla_wrapper_dll/distorm.h" + "${SOURCE_PATH}/scylla_wrapper_dll/distorm_x64.lib" + "${SOURCE_PATH}/scylla_wrapper_dll/distorm_x86.lib" ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/scylla-wrapper RENAME copyright) +file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/scylla-wrapper/vcpkg.json b/external_imported/vcpkg/ports/scylla-wrapper/vcpkg.json index 6bceab9f7..79d6d09a5 100644 --- a/external_imported/vcpkg/ports/scylla-wrapper/vcpkg.json +++ b/external_imported/vcpkg/ports/scylla-wrapper/vcpkg.json @@ -1,9 +1,14 @@ { "name": "scylla-wrapper", "version-string": "2018-08-26-16e6f435", - "port-version": 1, + "port-version": 2, "description": "This is a wrapper around Scylla. It exports functions for IAT fixing, dumping and PE rebuilding. based on https://github.com/NtQuery/Scylla commit 0f6b7198be (v0.9.6b).", + "supports": "windows & !uwp & !arm & !static", "dependencies": [ - "distorm" + "distorm", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/sdformat10/fix-quote.patch b/external_imported/vcpkg/ports/sdformat10/fix-quote.patch new file mode 100644 index 000000000..6a8495c17 --- /dev/null +++ b/external_imported/vcpkg/ports/sdformat10/fix-quote.patch @@ -0,0 +1,85 @@ +diff --git a/cmake/FindSSE.cmake b/cmake/FindSSE.cmake +index cdbcfcc..0339a17 100644 +--- a/cmake/FindSSE.cmake ++++ b/cmake/FindSSE.cmake +@@ -5,7 +5,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + IF(CMAKE_SYSTEM_NAME MATCHES "Linux") + EXEC_PROGRAM(cat ARGS "/proc/cpuinfo" OUTPUT_VARIABLE CPUINFO) + +- STRING(REGEX REPLACE "^.*(sse2).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(sse2).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "sse2" "${SSE_THERE}" SSE2_TRUE) + IF (SSE2_TRUE) + set(SSE2_FOUND true CACHE BOOL "SSE2 available on host") +@@ -14,14 +14,14 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + ENDIF (SSE2_TRUE) + + # /proc/cpuinfo apparently omits sse3 :( +- STRING(REGEX REPLACE "^.*[^s](sse3).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*[^s](sse3).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "sse3" "${SSE_THERE}" SSE3_TRUE) + IF (NOT SSE3_TRUE) +- STRING(REGEX REPLACE "^.*(T2300).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(T2300).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "T2300" "${SSE_THERE}" SSE3_TRUE) + ENDIF (NOT SSE3_TRUE) + +- STRING(REGEX REPLACE "^.*(ssse3).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(ssse3).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "ssse3" "${SSE_THERE}" SSSE3_TRUE) + IF (SSE3_TRUE OR SSSE3_TRUE) + set(SSE3_FOUND true CACHE BOOL "SSE3 available on host") +@@ -34,7 +34,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + set(SSSE3_FOUND false CACHE BOOL "SSSE3 available on host") + ENDIF (SSSE3_TRUE) + +- STRING(REGEX REPLACE "^.*(sse4_1).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(sse4_1).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "sse4_1" "${SSE_THERE}" SSE41_TRUE) + IF (SSE41_TRUE) + set(SSE4_1_FOUND true CACHE BOOL "SSE4.1 available on host") +@@ -42,7 +42,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + set(SSE4_1_FOUND false CACHE BOOL "SSE4.1 available on host") + ENDIF (SSE41_TRUE) + +- STRING(REGEX REPLACE "^.*(sse4_2).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(sse4_2).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "sse4_2" "${SSE_THERE}" SSE42_TRUE) + IF (SSE42_TRUE) + set(SSE4_2_FOUND true CACHE BOOL "SSE4.2 available on host") +@@ -54,7 +54,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + EXEC_PROGRAM("/usr/sbin/sysctl -n machdep.cpu.features" OUTPUT_VARIABLE + CPUINFO) + +- STRING(REGEX REPLACE "^.*[^S](SSE2).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*[^S](SSE2).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "SSE2" "${SSE_THERE}" SSE2_TRUE) + IF (SSE2_TRUE) + set(SSE2_FOUND true CACHE BOOL "SSE2 available on host") +@@ -62,7 +62,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + set(SSE2_FOUND false CACHE BOOL "SSE2 available on host") + ENDIF (SSE2_TRUE) + +- STRING(REGEX REPLACE "^.*[^S](SSE3).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*[^S](SSE3).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "SSE3" "${SSE_THERE}" SSE3_TRUE) + IF (SSE3_TRUE) + set(SSE3_FOUND true CACHE BOOL "SSE3 available on host") +@@ -70,7 +70,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + set(SSE3_FOUND false CACHE BOOL "SSE3 available on host") + ENDIF (SSE3_TRUE) + +- STRING(REGEX REPLACE "^.*(SSSE3).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(SSSE3).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "SSSE3" "${SSE_THERE}" SSSE3_TRUE) + IF (SSSE3_TRUE) + set(SSSE3_FOUND true CACHE BOOL "SSSE3 available on host") +@@ -78,7 +78,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + set(SSSE3_FOUND false CACHE BOOL "SSSE3 available on host") + ENDIF (SSSE3_TRUE) + +- STRING(REGEX REPLACE "^.*(SSE4.1).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(SSE4.1).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "SSE4.1" "${SSE_THERE}" SSE41_TRUE) + IF (SSE41_TRUE) + set(SSE4_1_FOUND true CACHE BOOL "SSE4.1 available on host") diff --git a/external_imported/vcpkg/ports/sdformat10/no-absolute.patch b/external_imported/vcpkg/ports/sdformat10/no-absolute.patch new file mode 100644 index 000000000..4b5315365 --- /dev/null +++ b/external_imported/vcpkg/ports/sdformat10/no-absolute.patch @@ -0,0 +1,38 @@ +diff --git a/cmake/sdf_config.h.in b/cmake/sdf_config.h.in +index 52408866..bd541701 100644 +--- a/cmake/sdf_config.h.in ++++ b/cmake/sdf_config.h.in +@@ -32,6 +32,3 @@ + #cmakedefine HAVE_URDFDOM 1 + #cmakedefine USE_INTERNAL_URDF 1 + #cmakedefine SDFORMAT_DISABLE_CONSOLE_LOGFILE 1 +- +-#define SDF_SHARE_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/" +-#define SDF_VERSION_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/sdformat${SDF_MAJOR_VERSION}/${SDF_PKG_VERSION}" +diff --git a/src/SDF.cc b/src/SDF.cc +index 20dcd4c6..802cbde3 100644 +--- a/src/SDF.cc ++++ b/src/SDF.cc +@@ -98,22 +98,6 @@ std::string findFile(const std::string &_filename, bool _searchLocalPath, + filename = filename.substr(idx + sep.length()); + } + +- // Next check the install path. +- path = sdf::filesystem::append(SDF_SHARE_PATH, filename); +- if (sdf::filesystem::exists(path)) +- { +- return path; +- } +- +- // Next check the versioned install path. +- path = sdf::filesystem::append(SDF_SHARE_PATH, +- "sdformat" SDF_MAJOR_VERSION_STR, +- sdf::SDF::Version(), filename); +- if (sdf::filesystem::exists(path)) +- { +- return path; +- } +- + // Next check to see if the given file exists. + path = filename; + if (sdf::filesystem::exists(path)) diff --git a/external_imported/vcpkg/ports/sdformat10/portfile.cmake b/external_imported/vcpkg/ports/sdformat10/portfile.cmake index d4166962f..0d4c0f623 100644 --- a/external_imported/vcpkg/ports/sdformat10/portfile.cmake +++ b/external_imported/vcpkg/ports/sdformat10/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -6,6 +5,9 @@ vcpkg_from_github( REF sdformat10_10.0.0 SHA512 1caf98427d25e7c17bfacaab20382c573fac0c965b40ad0c5e0efd32ddfdaa20250d8c79ecf574989ba10b1feb884a9df3927b18ec2cd88f7c66b4d8194bc731 HEAD_REF sdf10 + PATCHES + fix-quote.patch + no-absolute.patch ) # Ruby is required by the sdformat build process @@ -14,28 +16,27 @@ get_filename_component(RUBY_PATH ${RUBY} DIRECTORY) set(_path $ENV{PATH}) vcpkg_add_to_path(${RUBY_PATH}) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF -DUSE_EXTERNAL_URDF=ON -DUSE_EXTERNAL_TINYXML=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Restore original path set(ENV{PATH} ${_path}) # Fix cmake targets and pkg-config file location -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/sdformat10") +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/sdformat10") vcpkg_fixup_pkgconfig() # Remove debug files -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/lib/cmake - ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" + "${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/sdformat10/vcpkg.json b/external_imported/vcpkg/ports/sdformat10/vcpkg.json index d7d3d8f24..13c81a93b 100644 --- a/external_imported/vcpkg/ports/sdformat10/vcpkg.json +++ b/external_imported/vcpkg/ports/sdformat10/vcpkg.json @@ -1,13 +1,21 @@ { "name": "sdformat10", - "version-string": "10.0.0", - "port-version": 1, + "version": "10.0.0", + "port-version": 2, "description": "Simulation Description Format (SDF) parser and description files.", "homepage": "http://sdformat.org/", "supports": "!uwp", "dependencies": [ "ignition-math6", "tinyxml2", - "urdfdom" + "urdfdom", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/sdformat6/disable-test.patch b/external_imported/vcpkg/ports/sdformat6/disable-test.patch new file mode 100644 index 000000000..6861e3448 --- /dev/null +++ b/external_imported/vcpkg/ports/sdformat6/disable-test.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 78e72e6..8f97304 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -252,7 +252,9 @@ else (buid_errors) + + link_directories(${PROJECT_BINARY_DIR}/src) + ++ if (BUILD_TESTING) + add_subdirectory(test) ++ endif() + add_subdirectory(src) + add_subdirectory(include/sdf) + add_subdirectory(sdf) +diff --git a/cmake/SDFUtils.cmake b/cmake/SDFUtils.cmake +index acd57f8..3626e68 100644 +--- a/cmake/SDFUtils.cmake ++++ b/cmake/SDFUtils.cmake +@@ -119,6 +119,7 @@ endmacro() + include_directories(${PROJECT_SOURCE_DIR}/test/gtest/include) + macro (sdf_build_tests) + # Build all the tests ++ if (BUILD_TESTING) + foreach(GTEST_SOURCE_file ${ARGN}) + string(REGEX REPLACE ".cc" "" BINARY_NAME ${GTEST_SOURCE_file}) + set(BINARY_NAME ${TEST_TYPE}_${BINARY_NAME}) +@@ -205,6 +206,7 @@ macro (sdf_build_tests) + --error-exitcode=1 --show-leak-kinds=all ${CMAKE_CURRENT_BINARY_DIR}/${BINARY_NAME}) + endif() + endforeach() ++ endif() + endmacro() + + ################################################# diff --git a/external_imported/vcpkg/ports/sdformat6/fix-dependency-urdfdom.patch b/external_imported/vcpkg/ports/sdformat6/fix-dependency-urdfdom.patch new file mode 100644 index 000000000..dad6fc106 --- /dev/null +++ b/external_imported/vcpkg/ports/sdformat6/fix-dependency-urdfdom.patch @@ -0,0 +1,34 @@ +diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake +index 2735a07..6721de4 100644 +--- a/cmake/SearchForStuff.cmake ++++ b/cmake/SearchForStuff.cmake +@@ -62,16 +62,16 @@ if (NOT PKG_CONFIG_FOUND) + if (NOT DEFINED USE_INTERNAL_URDF) + BUILD_WARNING("Couldn't find pkg-config for urdfdom, using internal copy") + set(USE_INTERNAL_URDF true) +- elseif(NOT USE_INTERNAL_URDF) ++ elseif(0) + BUILD_ERROR("Couldn't find pkg-config for urdfdom") + endif() + endif() + + if (NOT DEFINED USE_INTERNAL_URDF OR NOT USE_INTERNAL_URDF) + # check for urdfdom with pkg-config +- pkg_check_modules(URDF urdfdom>=1.0) ++ find_package(urdfdom CONFIG REQUIRED) + +- if (NOT URDF_FOUND) ++ if (NOT urdfdom_FOUND) + if (NOT DEFINED USE_INTERNAL_URDF) + message(STATUS "Couldn't find urdfdom >= 1.0, using internal copy") + set(USE_INTERNAL_URDF true) +@@ -80,8 +80,7 @@ if (NOT DEFINED USE_INTERNAL_URDF OR NOT USE_INTERNAL_URDF) + endif() + else() + # what am I doing here? pkg-config and cmake +- set(URDF_INCLUDE_DIRS ${URDF_INCLUDEDIR}) +- set(URDF_LIBRARY_DIRS ${URDF_LIBDIR}) ++ set(URDF_LIBRARIES urdfdom::urdfdom_model urdfdom::urdfdom_world urdfdom::urdfdom_sensor urdfdom::urdfdom_model_state) + endif() + endif() + diff --git a/external_imported/vcpkg/ports/sdformat6/portfile.cmake b/external_imported/vcpkg/ports/sdformat6/portfile.cmake index 8818b2be8..ef7c774c5 100644 --- a/external_imported/vcpkg/ports/sdformat6/portfile.cmake +++ b/external_imported/vcpkg/ports/sdformat6/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO osrf/sdformat @@ -8,6 +6,8 @@ vcpkg_from_github( HEAD_REF sdf6 PATCHES disable-unneeded-include-findboost.patch + fix-dependency-urdfdom.patch + disable-test.patch ) # Ruby is required by the sdformat build process @@ -18,9 +18,10 @@ vcpkg_add_to_path(${RUBY_PATH}) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS -DBUILD_TESTING=OFF - -DUSE_EXTERNAL_URDF=ON - -DUSE_EXTERNAL_TINYXML=ON + OPTIONS + -DBUILD_TESTING=OFF + -DUSE_INTERNAL_URDF=OFF + -DUSE_EXTERNAL_TINYXML=ON ) vcpkg_cmake_install() diff --git a/external_imported/vcpkg/ports/sdformat6/vcpkg.json b/external_imported/vcpkg/ports/sdformat6/vcpkg.json index f1ee8fccb..c66f66a3c 100644 --- a/external_imported/vcpkg/ports/sdformat6/vcpkg.json +++ b/external_imported/vcpkg/ports/sdformat6/vcpkg.json @@ -1,9 +1,10 @@ { "name": "sdformat6", "version": "6.2.0", - "port-version": 4, + "port-version": 6, "description": "Simulation Description Format (SDF) parser and description files.", "homepage": "http://sdformat.org/", + "license": "Apache-2.0", "supports": "!(arm | uwp)", "dependencies": [ "boost-any", diff --git a/external_imported/vcpkg/ports/sdformat9/fix-quote.patch b/external_imported/vcpkg/ports/sdformat9/fix-quote.patch new file mode 100644 index 000000000..6a8495c17 --- /dev/null +++ b/external_imported/vcpkg/ports/sdformat9/fix-quote.patch @@ -0,0 +1,85 @@ +diff --git a/cmake/FindSSE.cmake b/cmake/FindSSE.cmake +index cdbcfcc..0339a17 100644 +--- a/cmake/FindSSE.cmake ++++ b/cmake/FindSSE.cmake +@@ -5,7 +5,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + IF(CMAKE_SYSTEM_NAME MATCHES "Linux") + EXEC_PROGRAM(cat ARGS "/proc/cpuinfo" OUTPUT_VARIABLE CPUINFO) + +- STRING(REGEX REPLACE "^.*(sse2).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(sse2).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "sse2" "${SSE_THERE}" SSE2_TRUE) + IF (SSE2_TRUE) + set(SSE2_FOUND true CACHE BOOL "SSE2 available on host") +@@ -14,14 +14,14 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + ENDIF (SSE2_TRUE) + + # /proc/cpuinfo apparently omits sse3 :( +- STRING(REGEX REPLACE "^.*[^s](sse3).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*[^s](sse3).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "sse3" "${SSE_THERE}" SSE3_TRUE) + IF (NOT SSE3_TRUE) +- STRING(REGEX REPLACE "^.*(T2300).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(T2300).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "T2300" "${SSE_THERE}" SSE3_TRUE) + ENDIF (NOT SSE3_TRUE) + +- STRING(REGEX REPLACE "^.*(ssse3).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(ssse3).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "ssse3" "${SSE_THERE}" SSSE3_TRUE) + IF (SSE3_TRUE OR SSSE3_TRUE) + set(SSE3_FOUND true CACHE BOOL "SSE3 available on host") +@@ -34,7 +34,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + set(SSSE3_FOUND false CACHE BOOL "SSSE3 available on host") + ENDIF (SSSE3_TRUE) + +- STRING(REGEX REPLACE "^.*(sse4_1).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(sse4_1).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "sse4_1" "${SSE_THERE}" SSE41_TRUE) + IF (SSE41_TRUE) + set(SSE4_1_FOUND true CACHE BOOL "SSE4.1 available on host") +@@ -42,7 +42,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + set(SSE4_1_FOUND false CACHE BOOL "SSE4.1 available on host") + ENDIF (SSE41_TRUE) + +- STRING(REGEX REPLACE "^.*(sse4_2).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(sse4_2).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "sse4_2" "${SSE_THERE}" SSE42_TRUE) + IF (SSE42_TRUE) + set(SSE4_2_FOUND true CACHE BOOL "SSE4.2 available on host") +@@ -54,7 +54,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + EXEC_PROGRAM("/usr/sbin/sysctl -n machdep.cpu.features" OUTPUT_VARIABLE + CPUINFO) + +- STRING(REGEX REPLACE "^.*[^S](SSE2).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*[^S](SSE2).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "SSE2" "${SSE_THERE}" SSE2_TRUE) + IF (SSE2_TRUE) + set(SSE2_FOUND true CACHE BOOL "SSE2 available on host") +@@ -62,7 +62,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + set(SSE2_FOUND false CACHE BOOL "SSE2 available on host") + ENDIF (SSE2_TRUE) + +- STRING(REGEX REPLACE "^.*[^S](SSE3).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*[^S](SSE3).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "SSE3" "${SSE_THERE}" SSE3_TRUE) + IF (SSE3_TRUE) + set(SSE3_FOUND true CACHE BOOL "SSE3 available on host") +@@ -70,7 +70,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + set(SSE3_FOUND false CACHE BOOL "SSE3 available on host") + ENDIF (SSE3_TRUE) + +- STRING(REGEX REPLACE "^.*(SSSE3).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(SSSE3).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "SSSE3" "${SSE_THERE}" SSSE3_TRUE) + IF (SSSE3_TRUE) + set(SSSE3_FOUND true CACHE BOOL "SSSE3 available on host") +@@ -78,7 +78,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") + set(SSSE3_FOUND false CACHE BOOL "SSSE3 available on host") + ENDIF (SSSE3_TRUE) + +- STRING(REGEX REPLACE "^.*(SSE4.1).*$" "\\1" SSE_THERE ${CPUINFO}) ++ STRING(REGEX REPLACE "^.*(SSE4.1).*$" "\\1" SSE_THERE "${CPUINFO}") + STRING(COMPARE EQUAL "SSE4.1" "${SSE_THERE}" SSE41_TRUE) + IF (SSE41_TRUE) + set(SSE4_1_FOUND true CACHE BOOL "SSE4.1 available on host") diff --git a/external_imported/vcpkg/ports/sdformat9/no-absolute.patch b/external_imported/vcpkg/ports/sdformat9/no-absolute.patch new file mode 100644 index 000000000..40c99f26e --- /dev/null +++ b/external_imported/vcpkg/ports/sdformat9/no-absolute.patch @@ -0,0 +1,38 @@ +diff --git a/cmake/sdf_config.h.in b/cmake/sdf_config.h.in +index c3ce2336..64ac9f5f 100644 +--- a/cmake/sdf_config.h.in ++++ b/cmake/sdf_config.h.in +@@ -31,6 +31,3 @@ + #cmakedefine BUILD_TYPE_RELEASE 1 + #cmakedefine HAVE_URDFDOM 1 + #cmakedefine USE_INTERNAL_URDF 1 +- +-#define SDF_SHARE_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/" +-#define SDF_VERSION_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/sdformat${SDF_MAJOR_VERSION}/${SDF_PKG_VERSION}" +diff --git a/src/SDF.cc b/src/SDF.cc +index 48c1943b..bd2c5b31 100644 +--- a/src/SDF.cc ++++ b/src/SDF.cc +@@ -100,22 +100,6 @@ std::string findFile(const std::string &_filename, bool _searchLocalPath, + filename = filename.substr(idx + sep.length()); + } + +- // Next check the install path. +- path = sdf::filesystem::append(SDF_SHARE_PATH, filename); +- if (sdf::filesystem::exists(path)) +- { +- return path; +- } +- +- // Next check the versioned install path. +- path = sdf::filesystem::append(SDF_SHARE_PATH, +- "sdformat" SDF_MAJOR_VERSION_STR, +- sdf::SDF::Version(), filename); +- if (sdf::filesystem::exists(path)) +- { +- return path; +- } +- + // Next check to see if the given file exists. + path = filename; + if (sdf::filesystem::exists(path)) diff --git a/external_imported/vcpkg/ports/sdformat9/portfile.cmake b/external_imported/vcpkg/ports/sdformat9/portfile.cmake index c31b757da..058988450 100644 --- a/external_imported/vcpkg/ports/sdformat9/portfile.cmake +++ b/external_imported/vcpkg/ports/sdformat9/portfile.cmake @@ -6,6 +6,9 @@ vcpkg_from_github( HEAD_REF sdf9 PATCHES fix-dependency-urdfdom.patch + fix-quote.patch + no-absolute.patch + use-external-tinyxml-windows.patch ) # Ruby is required by the sdformat build process @@ -19,7 +22,6 @@ vcpkg_cmake_configure( OPTIONS -DBUILD_TESTING=OFF -DUSE_INTERNAL_URDF=OFF - -DUSE_EXTERNAL_TINYXML=ON ) vcpkg_cmake_install() diff --git a/external_imported/vcpkg/ports/sdformat9/use-external-tinyxml-windows.patch b/external_imported/vcpkg/ports/sdformat9/use-external-tinyxml-windows.patch new file mode 100644 index 000000000..1f48617bc --- /dev/null +++ b/external_imported/vcpkg/ports/sdformat9/use-external-tinyxml-windows.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3dad12e5..e290a3be 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -113,7 +113,7 @@ include (${sdf_cmake_dir}/SDFUtils.cmake) + + message (STATUS "\n\n====== Finding 3rd Party Packages ======") + # Use of tinyxml. System installation on UNIX. Internal copy on WIN +-if (UNIX) ++if (true) + message (STATUS "Using system tinyxml") + set (USE_EXTERNAL_TINYXML True) + elseif(WIN32) +diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake +index 427e5e7a..655fafc0 100644 +--- a/cmake/SearchForStuff.cmake ++++ b/cmake/SearchForStuff.cmake +@@ -9,7 +9,7 @@ if (USE_EXTERNAL_TINYXML) + ################################################# + # Find tinyxml. Only debian distributions package tinyxml with a pkg-config + # Use pkg_check_modules and fallback to manual detection (needed, at least, for MacOS) +- pkg_check_modules(tinyxml tinyxml) ++ find_package(tinyxml CONFIG REQUIRED) + if (NOT tinyxml_FOUND) + find_path (tinyxml_INCLUDE_DIRS tinyxml.h ${tinyxml_INCLUDE_DIRS} ENV CPATH) + find_library(tinyxml_LIBRARIES NAMES tinyxml) diff --git a/external_imported/vcpkg/ports/sdformat9/vcpkg.json b/external_imported/vcpkg/ports/sdformat9/vcpkg.json index 71a89b157..c4f2a7dcc 100644 --- a/external_imported/vcpkg/ports/sdformat9/vcpkg.json +++ b/external_imported/vcpkg/ports/sdformat9/vcpkg.json @@ -1,9 +1,10 @@ { "name": "sdformat9", "version": "9.4.0", - "port-version": 3, + "port-version": 5, "description": "Simulation Description Format (SDF) parser and description files.", "homepage": "http://sdformat.org/", + "license": "Apache-2.0", "supports": "!(linux | uwp)", "dependencies": [ "ignition-math6", diff --git a/external_imported/vcpkg/ports/sdl1/portfile.cmake b/external_imported/vcpkg/ports/sdl1/portfile.cmake index 47f1b0730..d870cffe9 100644 --- a/external_imported/vcpkg/ports/sdl1/portfile.cmake +++ b/external_imported/vcpkg/ports/sdl1/portfile.cmake @@ -16,7 +16,7 @@ if (VCPKG_TARGET_IS_WINDOWS) file(COPY ${CMAKE_CURRENT_LIST_DIR}/SDL1_2017.sln DESTINATION ${SOURCE_PATH}/VisualC/ ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(LIB_TYPE StaticLibrary) + set(LIB_TYPE StaticLibrary) else() set(LIB_TYPE DynamicLibrary) endif() @@ -80,4 +80,11 @@ else() file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + + 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 diff --git a/external_imported/vcpkg/ports/sdl1/vcpkg.json b/external_imported/vcpkg/ports/sdl1/vcpkg.json index e75f7a217..299c16461 100644 --- a/external_imported/vcpkg/ports/sdl1/vcpkg.json +++ b/external_imported/vcpkg/ports/sdl1/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdl1", - "version-string": "1.2.15", - "port-version": 14, + "version": "1.2.15", + "port-version": 15, "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" } diff --git a/external_imported/vcpkg/ports/sdl2-image/0001-sdl2-image-potentially-uninitialized_local-pointer-variable-start.patch b/external_imported/vcpkg/ports/sdl2-image/0001-sdl2-image-potentially-uninitialized_local-pointer-variable-start.patch new file mode 100644 index 000000000..897c0aac7 --- /dev/null +++ b/external_imported/vcpkg/ports/sdl2-image/0001-sdl2-image-potentially-uninitialized_local-pointer-variable-start.patch @@ -0,0 +1,12 @@ +--- a/nanosvg.h ++++ b/nanosvg.h +@@ -2778,7 +2778,7 @@ static void nsvg__content(void* ud, const char* s) + if (p->styleFlag) { + + int state = 0; +- const char* start; ++ const char* start = 0; + while (*s) { + char c = *s; + if (nsvg__isspace(c) || c == '{') { + diff --git a/external_imported/vcpkg/ports/sdl2-image/portfile.cmake b/external_imported/vcpkg/ports/sdl2-image/portfile.cmake index 148412bac..4f82650ce 100644 --- a/external_imported/vcpkg/ports/sdl2-image/portfile.cmake +++ b/external_imported/vcpkg/ports/sdl2-image/portfile.cmake @@ -10,9 +10,11 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} REF ${SDL2_IMAGE_VERSION} + PATCHES + 0001-sdl2-image-potentially-uninitialized_local-pointer-variable-start.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") set(USE_JPEG OFF) if("libjpeg-turbo" IN_LIST FEATURES) @@ -29,9 +31,8 @@ if("libwebp" IN_LIST FEATURES) set(USE_WEBP ON) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS "-DCURRENT_INSTALLED_DIR=${CURRENT_INSTALLED_DIR}" -DUSE_PNG=ON @@ -40,14 +41,13 @@ vcpkg_configure_cmake( -DUSE_WEBP=${USE_WEBP} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup() vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -file(COPY ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/sdl2-image) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/sdl2-image/COPYING.txt ${CURRENT_PACKAGES_DIR}/share/sdl2-image/copyright) - -vcpkg_copy_pdbs() +file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/sdl2-image/vcpkg.json b/external_imported/vcpkg/ports/sdl2-image/vcpkg.json index f81cd5c1b..a57f93672 100644 --- a/external_imported/vcpkg/ports/sdl2-image/vcpkg.json +++ b/external_imported/vcpkg/ports/sdl2-image/vcpkg.json @@ -1,12 +1,20 @@ { "name": "sdl2-image", "version-string": "2.0.5", - "port-version": 3, + "port-version": 4, "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", "dependencies": [ "libpng", - "sdl2" + "sdl2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "libjpeg-turbo": { 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 e69568b23..269f8f5ef 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,14 +1,14 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -2348,7 +2348,6 @@ - execute_process(COMMAND sh ${SDL2_SOURCE_DIR}/build-scripts/updaterev.sh - WORKING_DIRECTORY ${SDL2_BINARY_DIR}) - endif() +@@ -2555,7 +2555,6 @@ endif() + configure_file("${SDL2_SOURCE_DIR}/include/SDL_revision.h.cmake" + "${SDL2_BINARY_DIR}/include/SDL_revision.h") + -if(NOT WINDOWS OR CYGWIN OR MINGW) set(prefix ${CMAKE_INSTALL_PREFIX}) -@@ -2375,7 +2375,7 @@ +@@ -2590,7 +2590,7 @@ Libs.private:") set(SDL_STATIC_LIBS ${_SDL_STATIC_LIBS}) listtostrrev(SDL_LIBS _SDL_LIBS) set(SDL_LIBS ${_SDL_LIBS}) @@ -17,7 +17,7 @@ listtostr(EXTRA_LIBS _EXTRA_LIBS "-l") set(SDL_STATIC_LIBS ${SDL_LIBS} ${EXTRA_LDFLAGS} ${_EXTRA_LIBS}) list(REMOVE_DUPLICATES SDL_STATIC_LIBS) -@@ -2403,7 +2403,6 @@ +@@ -2611,7 +2611,6 @@ Libs.private:") "${SDL2_BINARY_DIR}/sdl2-config" @ONLY) configure_file("${SDL2_SOURCE_DIR}/SDL2.spec.in" "${SDL2_BINARY_DIR}/SDL2.spec" @ONLY) @@ -25,11 +25,12 @@ macro(check_add_debug_flag FLAG SUFFIX) check_c_compiler_flag(${FLAG} HAS_C_FLAG_${SUFFIX}) -@@ -2728,6 +2728,7 @@ +@@ -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_FULL_DATAROOTDIR}/aclocal") + install(FILES "${SDL2_SOURCE_DIR}/sdl2.m4" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/aclocal") 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 b23212fa0..b7c56c14b 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,15 +1,15 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1295,12 +1295,6 @@ +@@ -1342,12 +1342,6 @@ elseif(UNIX AND NOT APPLE AND NOT ANDROID AND NOT RISCOS AND NOT HAIKU) set(HAVE_FCITX TRUE) endif() - pkg_search_module(IBUS ibus-1.0 ibus) - if(IBUS_FOUND) - set(HAVE_IBUS_IBUS_H TRUE) -- include_directories(${IBUS_INCLUDE_DIRS}) +- 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) - set(SDL_USE_IME TRUE) + set(SDL_USE_IME 1) 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 index e5ab21467..e24057c3e 100644 --- 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 @@ -1,6 +1,6 @@ --- a/SDL2Config.cmake +++ b/SDL2Config.cmake -@@ -32,6 +2,7 @@ +@@ -46,6 +46,7 @@ foreach(prop ${relprops}) endif() endforeach() @@ -8,7 +8,7 @@ foreach(prop ${relprops}) get_target_property(sdl2mainimplib SDL2::SDL2main ${prop}) if(sdl2mainimplib) -@@ -37,6 +37,7 @@ +@@ -53,6 +54,7 @@ foreach(prop ${relprops}) break() endif() endforeach() @@ -16,7 +16,7 @@ foreach(prop ${dbgprops}) get_target_property(sdl2implibdbg SDL2::SDL2 ${prop}) -@@ -47,6 +47,7 @@ +@@ -62,6 +64,7 @@ foreach(prop ${dbgprops}) endif() endforeach() @@ -24,7 +24,7 @@ foreach(prop ${dbgprops}) get_target_property(sdl2mainimplibdbg SDL2::SDL2main ${prop}) if(sdl2mainimplibdbg) -@@ -55,6 +55,7 @@ +@@ -69,6 +72,7 @@ foreach(prop ${dbgprops}) break() endif() endforeach() diff --git a/external_imported/vcpkg/ports/sdl2/0004-Define-crt-macros.patch b/external_imported/vcpkg/ports/sdl2/0004-Define-crt-macros.patch new file mode 100644 index 000000000..ac8f185a7 --- /dev/null +++ b/external_imported/vcpkg/ports/sdl2/0004-Define-crt-macros.patch @@ -0,0 +1,15 @@ +--- 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/0004-sdl2-alias-on-static-build.patch b/external_imported/vcpkg/ports/sdl2/0004-sdl2-alias-on-static-build.patch deleted file mode 100644 index 6bb4eb061..000000000 --- a/external_imported/vcpkg/ports/sdl2/0004-sdl2-alias-on-static-build.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/SDL2Config.cmake -+++ b/SDL2Config.cmake -@@ -1,5 +1,17 @@ - include("${CMAKE_CURRENT_LIST_DIR}/SDL2Targets.cmake") - -+# on static-only builds create an alias -+if(NOT TARGET SDL2::SDL2 AND TARGET SDL2::SDL2-static) -+ if(CMAKE_VERSION VERSION_LESS "3.11") -+ message(FATAL_ERROR "At least CMake 3.11 is required for this configuration.") -+ elseif(CMAKE_VERSION VERSION_LESS "3.18") -+ # Aliasing local targets is not supported on CMake < 3.18, so make all targets global. -+ set_target_properties(SDL2::SDL2-static PROPERTIES IMPORTED_GLOBAL TRUE) -+ set_target_properties(SDL2::SDL2main PROPERTIES IMPORTED_GLOBAL TRUE) -+ endif() -+ add_library(SDL2::SDL2 ALIAS SDL2::SDL2-static) -+endif() -+ - # provide ${SDL2_LIBRARIES}, ${SDL2_INCLUDE_DIRS} etc, like sdl2-config.cmake does, - # for compatibility between SDL2 built with autotools and SDL2 built with CMake - diff --git a/external_imported/vcpkg/ports/sdl2/0005-Fix-uwp-joystick.patch b/external_imported/vcpkg/ports/sdl2/0005-Fix-uwp-joystick.patch new file mode 100644 index 000000000..eb67d882d --- /dev/null +++ b/external_imported/vcpkg/ports/sdl2/0005-Fix-uwp-joystick.patch @@ -0,0 +1,25 @@ +--- 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/0005-sdl2-fix-mingw-checks.patch b/external_imported/vcpkg/ports/sdl2/0005-sdl2-fix-mingw-checks.patch deleted file mode 100644 index 9eda39cc0..000000000 --- a/external_imported/vcpkg/ports/sdl2/0005-sdl2-fix-mingw-checks.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1475,7 +1475,7 @@ elseif(WINDOWS) - if(DEFINED MSVC_VERSION AND NOT ${MSVC_VERSION} LESS 1700) - set(USE_WINSDK_DIRECTX TRUE) - endif() -- if(NOT CMAKE_COMPILER_IS_MINGW AND NOT USE_WINSDK_DIRECTX) -+ if(NOT MINGW AND NOT USE_WINSDK_DIRECTX) - if("$ENV{DXSDK_DIR}" STREQUAL "") - message_error("DIRECTX requires the \$DXSDK_DIR environment variable to be set") - endif() -@@ -1493,7 +1493,7 @@ elseif(WINDOWS) - check_include_file(dxgi.h HAVE_DXGI_H) - if(HAVE_D3D_H OR HAVE_D3D11_H OR HAVE_DDRAW_H OR HAVE_DSOUND_H OR HAVE_DINPUT_H) - set(HAVE_DIRECTX TRUE) -- if(NOT CMAKE_COMPILER_IS_MINGW AND NOT USE_WINSDK_DIRECTX) -+ if(NOT MINGW AND NOT USE_WINSDK_DIRECTX) - # TODO: change $ENV{DXSDL_DIR} to get the path from the include checks - link_directories($ENV{DXSDK_DIR}\\lib\\${PROCESSOR_ARCH}) - include_directories($ENV{DXSDK_DIR}\\Include) 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 new file mode 100644 index 000000000..84a58f318 --- /dev/null +++ b/external_imported/vcpkg/ports/sdl2/0006-Update-SDL_sysurl.cpp.patch @@ -0,0 +1,15 @@ +--- 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 new file mode 100644 index 000000000..39665a9b8 --- /dev/null +++ b/external_imported/vcpkg/ports/sdl2/0007-timer-Fix-Emscripten-declaration-after-statement-err.patch @@ -0,0 +1,45 @@ +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 53d74ff7f..67c43d4bb 100644 --- a/external_imported/vcpkg/ports/sdl2/portfile.cmake +++ b/external_imported/vcpkg/ports/sdl2/portfile.cmake @@ -1,16 +1,18 @@ -set(SDL2_VERSION 2.0.16) +set(SDL2_VERSION 2.0.20) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libsdl-org/SDL - REF release-2.0.16 - SHA512 45ce71f77b01f5fd886f92e5b3d96f1f72c7e0f70c09e615384a900533b941cad65bf6b54a125a9eeb8499e2056e9a8e54d4e654bccfca9730584792a2b18fbc + REF release-2.0.20 + SHA512 f8558057a06d4507190b369b2067aee55c22ab796b90bb663fbc36218e66ec14e2feb0ecd55f9b798bfd24fc94e2b4cb93eddc52a59f0709d6cb0ebdb6d9309b 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-sdl2-alias-on-static-build.patch - 0005-sdl2-fix-mingw-checks.patch # Can be removed once >= SDL 2.0.18 + 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) @@ -19,8 +21,8 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" FORCE_STATIC_VCRT) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - vulkan VIDEO_VULKAN - x11 X11_SHARED + vulkan SDL_VULKAN + x11 SDL_X11_SHARED ) if ("x11" IN_LIST FEATURES) @@ -35,8 +37,8 @@ vcpkg_cmake_configure( OPTIONS ${FEATURE_OPTIONS} -DSDL_STATIC=${SDL_STATIC} -DSDL_SHARED=${SDL_SHARED} - -DFORCE_STATIC_VCRT=${FORCE_STATIC_VCRT} - -DLIBC=ON + -DSDL_FORCE_STATIC_VCRT=${FORCE_STATIC_VCRT} + -DSDL_LIBC=ON ) vcpkg_cmake_install() @@ -97,4 +99,4 @@ 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() -vcpkg_fixup_pkgconfig() \ No newline at end of file +vcpkg_fixup_pkgconfig() diff --git a/external_imported/vcpkg/ports/sdl2/vcpkg.json b/external_imported/vcpkg/ports/sdl2/vcpkg.json index 3cb3c4374..af0042840 100644 --- a/external_imported/vcpkg/ports/sdl2/vcpkg.json +++ b/external_imported/vcpkg/ports/sdl2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdl2", - "version": "2.0.16", - "port-version": 3, + "version": "2.0.20", + "port-version": 1, "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", "dependencies": [ diff --git a/external_imported/vcpkg/ports/seal/gsl.patch b/external_imported/vcpkg/ports/seal/gsl.patch new file mode 100644 index 000000000..700c076be --- /dev/null +++ b/external_imported/vcpkg/ports/seal/gsl.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0039517..4cc8a01 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -149,7 +149,7 @@ if(SEAL_USE_MSGSL) + message(STATUS "Microsoft GSL: download ...") + seal_fetch_thirdparty_content(ExternalMSGSL) + else() +- find_package(Microsoft.GSL 3 CONFIG) ++ find_package(Microsoft.GSL 4 CONFIG) + if(NOT Microsoft.GSL_FOUND) + message(FATAL_ERROR "Microsoft GSL: not found") + else() diff --git a/external_imported/vcpkg/ports/seal/portfile.cmake b/external_imported/vcpkg/ports/seal/portfile.cmake index 080605602..868a030e7 100644 --- a/external_imported/vcpkg/ports/seal/portfile.cmake +++ b/external_imported/vcpkg/ports/seal/portfile.cmake @@ -6,6 +6,9 @@ vcpkg_from_github( REF 79234726053c45eede688400aa219fdec0810bd8 SHA512 634ad75d70f04cce220bfa9f6d13e8ddb293e8403ebd195e2c8b522b751a1a268021feea7843038037ed6d1b354b2e470ad565966a117613cf5371073afda9a4 HEAD_REF main + PATCHES + gsl.patch + shared-zstd.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/external_imported/vcpkg/ports/seal/shared-zstd.patch b/external_imported/vcpkg/ports/seal/shared-zstd.patch new file mode 100644 index 000000000..b8515fbcd --- /dev/null +++ b/external_imported/vcpkg/ports/seal/shared-zstd.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4cc8a01..b8c92c2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -205,7 +205,7 @@ if(SEAL_USE_ZSTD) + message(FATAL_ERROR "Zstandard: must be static") + endif() + elseif(TARGET zstd::libzstd_shared) +- message(FATAL_ERROR "Zstandard: must be static") ++ set(zstd_static "zstd::libzstd_shared") + else() + message(FATAL_ERROR "Zstandard: not found") + endif() diff --git a/external_imported/vcpkg/ports/seal/vcpkg.json b/external_imported/vcpkg/ports/seal/vcpkg.json index 7ff225449..be1b20e5d 100644 --- a/external_imported/vcpkg/ports/seal/vcpkg.json +++ b/external_imported/vcpkg/ports/seal/vcpkg.json @@ -1,9 +1,9 @@ { "name": "seal", "version-semver": "3.7.2", + "port-version": 2, "description": "Microsoft SEAL is an easy-to-use and powerful homomorphic encryption library.", "homepage": "https://github.com/microsoft/SEAL", - "supports": "!windows | (windows & static)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/sentencepiece/vcpkg.json b/external_imported/vcpkg/ports/sentencepiece/vcpkg.json index ed0f04c45..ad6898b3f 100644 --- a/external_imported/vcpkg/ports/sentencepiece/vcpkg.json +++ b/external_imported/vcpkg/ports/sentencepiece/vcpkg.json @@ -1,7 +1,9 @@ { "name": "sentencepiece", "version": "0.1.96", + "port-version": 1, "description": "SentencePiece is an unsupervised text tokenizer and detokenizer mainly for Neural Network-based text generation systems where the vocabulary size is predetermined prior to the neural model training", + "supports": "!((windows | uwp) & !static)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/sentry-native/portfile.cmake b/external_imported/vcpkg/ports/sentry-native/portfile.cmake index 1527f7423..59ad22c2e 100644 --- a/external_imported/vcpkg/ports/sentry-native/portfile.cmake +++ b/external_imported/vcpkg/ports/sentry-native/portfile.cmake @@ -1,11 +1,7 @@ -if(NOT VCPKG_TARGET_IS_OSX) - vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") -endif() - vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/getsentry/sentry-native/releases/download/0.4.13/sentry-native.zip" - FILENAME "sentry-native-0.4.13.zip" - SHA512 d3b1022886533057a08a6e36e9f36fb709882bc6ba1356a2c4004062ad7805d2e85fd06bda36a89a9d336a54c8668c79c7eaf89aa7954488729c052f3dc88f37 + URLS "https://github.com/getsentry/sentry-native/releases/download/0.4.15/sentry-native.zip" + FILENAME "sentry-native-0.4.15.zip" + SHA512 bbe568cc92fa20d69db5bb9efc5ac1a27d05c3ac28c36addd827fba64b2945ce23cbdb3c0daf76b0a140de4949b6c76607f00000ceb7989d8a33b791d30c8152 ) vcpkg_extract_source_archive_ex( @@ -30,8 +26,13 @@ if (NOT DEFINED SENTRY_BACKEND) endif() endif() +if(VCPKG_TARGET_IS_WINDOWS AND 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() + vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DSENTRY_BUILD_TESTS=OFF -DSENTRY_BUILD_EXAMPLES=OFF @@ -59,7 +60,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") endif() file( - INSTALL ${SOURCE_PATH}/LICENSE - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright ) diff --git a/external_imported/vcpkg/ports/sentry-native/vcpkg.json b/external_imported/vcpkg/ports/sentry-native/vcpkg.json index 12809ae40..b25d67db0 100644 --- a/external_imported/vcpkg/ports/sentry-native/vcpkg.json +++ b/external_imported/vcpkg/ports/sentry-native/vcpkg.json @@ -1,9 +1,10 @@ { "name": "sentry-native", - "version-semver": "0.4.13", + "version-semver": "0.4.15", "description": "Sentry SDK for C, C++ and native applications.", "homepage": "https://sentry.io/", - "supports": "!(arm | (arm64 & !osx) | uwp)", + "license": "MIT", + "supports": "osx | (!arm & !uwp)", "dependencies": [ { "name": "curl", diff --git a/external_imported/vcpkg/ports/serdepp/portfile.cmake b/external_imported/vcpkg/ports/serdepp/portfile.cmake new file mode 100644 index 000000000..3e347b7c9 --- /dev/null +++ b/external_imported/vcpkg/ports/serdepp/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO injae/serdepp + REF v0.1.4 + SHA512 da84ad82e882c0cada5c9dd3c77afd45aaf7b3b4eb150257b09b9b4854b349fdb2c39be2f6ba40bb39b34262e44609a02afba1ec860625f25a2313f7ac34a055 + HEAD_REF main +) + + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSERDEPP_BUILD_TESTING=OFF + -DENABLE_INLINE_CPPM_TOOLS=ON +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/serdepp) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/cmake" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/lib/cmake" +) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/serdepp/vcpkg.json b/external_imported/vcpkg/ports/serdepp/vcpkg.json new file mode 100644 index 000000000..0bf3d3c7a --- /dev/null +++ b/external_imported/vcpkg/ports/serdepp/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "serdepp", + "version": "0.1.4", + "description": "c++ 17 universal serialize deserialize library like rust serde, support libraries: [nlohmann_json, fmt, yaml-cpp, toml11, rapidjson]", + "homepage": "https://github.com/injae/serdepp", + "license": "MIT", + "dependencies": [ + "magic-enum", + "nameof", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/sfml/arm64.patch b/external_imported/vcpkg/ports/sfml/arm64.patch new file mode 100644 index 000000000..7faefc0e6 --- /dev/null +++ b/external_imported/vcpkg/ports/sfml/arm64.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 67b61712ec..73711753ae 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -253,10 +253,12 @@ if(SFML_OS_MACOSX) + endif() + endif() + +- # only the default architecture (i.e. 64-bit) is supported +- if(NOT CMAKE_OSX_ARCHITECTURES STREQUAL "x86_64") +- message(FATAL_ERROR "Only 64-bit architecture is supported") +- endif() ++ # only the default x86_64 or arm64 are supported ++ foreach (arch IN LISTS CMAKE_OSX_ARCHITECTURES) ++ if (NOT (arch STREQUAL "x86_64" OR arch STREQUAL "arm64")) ++ message(FATAL_ERROR "Invalid arch ${arch}") ++ endif() ++ endforeach() + + # configure Xcode templates + set(XCODE_TEMPLATES_ARCH "\$(NATIVE_ARCH_ACTUAL)") diff --git a/external_imported/vcpkg/ports/sfml/portfile.cmake b/external_imported/vcpkg/ports/sfml/portfile.cmake index f832303a7..2352bfabd 100644 --- a/external_imported/vcpkg/ports/sfml/portfile.cmake +++ b/external_imported/vcpkg/ports/sfml/portfile.cmake @@ -6,22 +6,22 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH PATCHES use-system-freetype.patch stb_include.patch + arm64.patch ) -file(REMOVE_RECURSE ${SOURCE_PATH}/extlibs) +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 "") +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) +file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/Modules/FindFreetype.cmake") if(VCPKG_TARGET_IS_LINUX) message(STATUS "SFML currently requires the following libraries from the system package manager:\n libudev\n libx11\n libxrandr\n opengl\n\nThese can be installed on Ubuntu systems via apt-get install libx11-dev libxrandr-dev libxi-dev libudev-dev libgl1-mesa-dev") endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DSFML_BUILD_FRAMEWORKS=OFF -DSFML_USE_SYSTEM_DEPS=ON @@ -29,32 +29,32 @@ vcpkg_configure_cmake( -DSFML_GENERATE_PDB=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/SFML) +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) +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}") + 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}") + 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) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/sfml-main.lib) - file(COPY ${CURRENT_PACKAGES_DIR}/debug/lib/sfml-main-d.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/sfml-main-d.lib) +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/sfml-main.lib") + file(COPY "${CURRENT_PACKAGES_DIR}/lib/sfml-main.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/manual-link") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/sfml-main.lib") + file(COPY "${CURRENT_PACKAGES_DIR}/debug/lib/sfml-main-d.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/sfml-main-d.lib") file(GLOB FILES "${CURRENT_PACKAGES_DIR}/share/sfml/SFML*Targets-*.cmake") foreach(FILE ${FILES}) - file(READ "${FILE}" _contents) - string(REPLACE "/lib/sfml-main" "/lib/manual-link/sfml-main" _contents "${_contents}") - file(WRITE "${FILE}" "${_contents}") + vcpkg_replace_string("${FILE}" "/lib/sfml-main" "/lib/manual-link/sfml-main") endforeach() endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) -configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage COPYONLY) -configure_file(${SOURCE_PATH}/license.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +vcpkg_fixup_pkgconfig() + +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) +configure_file("${SOURCE_PATH}/license.md" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/external_imported/vcpkg/ports/sfml/vcpkg.json b/external_imported/vcpkg/ports/sfml/vcpkg.json index 64c7f5358..de544f640 100644 --- a/external_imported/vcpkg/ports/sfml/vcpkg.json +++ b/external_imported/vcpkg/ports/sfml/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sfml", "version": "2.5.1", - "port-version": 10, + "port-version": 12, "description": "Simple and fast multimedia library", "homepage": "https://github.com/sfml/sfml", "dependencies": [ @@ -10,6 +10,14 @@ "libogg", "libvorbis", "openal-soft", - "stb" + "stb", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/shaderc/fix-export-cmakefiles.patch b/external_imported/vcpkg/ports/shaderc/fix-export-cmakefiles.patch new file mode 100644 index 000000000..75e3aba81 --- /dev/null +++ b/external_imported/vcpkg/ports/shaderc/fix-export-cmakefiles.patch @@ -0,0 +1,93 @@ +diff --git a/libshaderc/CMakeLists.txt b/libshaderc/CMakeLists.txt +index f3277f0..5fd58ef 100644 +--- a/libshaderc/CMakeLists.txt ++++ b/libshaderc/CMakeLists.txt +@@ -28,7 +28,9 @@ if (NOT BUILD_SHARED_LIBS) + add_library(shaderc STATIC ${SHADERC_SOURCES}) + shaderc_default_compile_options(shaderc) + target_include_directories(shaderc +- PUBLIC include ++ PUBLIC ++ $ ++ $ + PRIVATE ${glslang_SOURCE_DIR} + ${SPIRV-Headers_SOURCE_DIR}/include) + set(shaderc_install_target shaderc) +@@ -37,7 +39,9 @@ else() + add_library(shaderc_shared SHARED ${SHADERC_SOURCES}) + shaderc_default_compile_options(shaderc_shared) + target_include_directories(shaderc_shared +- PUBLIC include ++ PUBLIC ++ $ ++ $ + PRIVATE ${glslang_SOURCE_DIR} + ${SPIRV-Headers_SOURCE_DIR}/include) + target_compile_definitions(shaderc_shared +@@ -59,10 +63,14 @@ if(SHADERC_ENABLE_INSTALL) + DESTINATION + ${CMAKE_INSTALL_INCLUDEDIR}/shaderc) + +- install(TARGETS ${shaderc_install_target} ++ install(TARGETS ${shaderc_install_target} EXPORT unofficial-shadercTargets + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ install(EXPORT unofficial-shadercTargets ++ NAMESPACE unofficial::shaderc:: ++ DESTINATION share/unofficial-shaderc ++ ) + endif(SHADERC_ENABLE_INSTALL) + + find_package(Threads) +@@ -79,6 +87,11 @@ else() + target_link_libraries(shaderc_shared PRIVATE ${SHADERC_LIBS}) + endif() + ++file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc-config.cmake.in" ++[[include("${CMAKE_CURRENT_LIST_DIR}/unofficial-shadercTargets.cmake")]]) ++configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc-config.cmake" @ONLY) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc-config.cmake DESTINATION share/unofficial-shaderc) ++ + shaderc_add_tests( + TEST_PREFIX shaderc + LINK_LIBS shaderc +diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt +index 4926203..b152d7b 100644 +--- a/libshaderc_util/CMakeLists.txt ++++ b/libshaderc_util/CMakeLists.txt +@@ -39,7 +39,10 @@ add_library(shaderc_util STATIC + + shaderc_default_compile_options(shaderc_util) + target_include_directories(shaderc_util +- PUBLIC include PRIVATE ${glslang_SOURCE_DIR}) ++ PUBLIC ++ $ ++ $ ++ PRIVATE ${glslang_SOURCE_DIR}) + # We use parts of Glslang's HLSL compilation interface, which + # now requires this preprocessor definition. + add_definitions(-DENABLE_HLSL) +@@ -50,12 +53,21 @@ target_link_libraries(shaderc_util PRIVATE + SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT}) + + if(SHADERC_ENABLE_INSTALL AND NOT BUILD_SHARED_LIBS) +- install(TARGETS shaderc_util ++ install(TARGETS shaderc_util EXPORT unofficial-shaderc_utilTargets + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ install(EXPORT unofficial-shaderc_utilTargets ++ NAMESPACE unofficial::shaderc_util:: ++ DESTINATION share/unofficial-shaderc_util ++ ) + endif(SHADERC_ENABLE_INSTALL) + ++file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc_util-config.cmake.in" ++[[include("${CMAKE_CURRENT_LIST_DIR}/unofficial-shaderc_utilTargets.cmake")]]) ++configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc_util-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc_util-config.cmake" @ONLY) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc_util-config.cmake DESTINATION share/unofficial-shaderc_util) ++ + shaderc_add_tests( + TEST_PREFIX shaderc_util + LINK_LIBS shaderc_util diff --git a/external_imported/vcpkg/ports/shaderc/portfile.cmake b/external_imported/vcpkg/ports/shaderc/portfile.cmake index be59aa5ba..4a2f62cba 100644 --- a/external_imported/vcpkg/ports/shaderc/portfile.cmake +++ b/external_imported/vcpkg/ports/shaderc/portfile.cmake @@ -11,9 +11,10 @@ vcpkg_from_github( disable-update-version.patch fix-build-type.patch fix-install-shaderc_util.patch + fix-export-cmakefiles.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/build-version.inc DESTINATION ${SOURCE_PATH}/glslc/src) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/build-version.inc" DESTINATION "${SOURCE_PATH}/glslc/src") set(OPTIONS) if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") @@ -25,9 +26,8 @@ vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_EXE_PATH ${PYTHON3} DIRECTORY) vcpkg_add_to_path(PREPEND "${PYTHON3_EXE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${OPTIONS} -DSHADERC_SKIP_TESTS=true @@ -36,12 +36,14 @@ vcpkg_configure_cmake( -DSHADERC_ENABLE_EXAMPLES=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-shaderc CONFIG_PATH share/unofficial-shaderc) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-shaderc_util CONFIG_PATH share/unofficial-shaderc_util) vcpkg_copy_tools(TOOL_NAMES glslc AUTO_CLEAN) -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) diff --git a/external_imported/vcpkg/ports/shaderc/vcpkg.json b/external_imported/vcpkg/ports/shaderc/vcpkg.json index e7e490c00..903544d80 100644 --- a/external_imported/vcpkg/ports/shaderc/vcpkg.json +++ b/external_imported/vcpkg/ports/shaderc/vcpkg.json @@ -1,11 +1,20 @@ { "name": "shaderc", "version": "2021.1", - "port-version": 1, + "port-version": 2, "description": "A collection of tools, libraries and tests for shader compilation.", "homepage": "https://github.com/google/shaderc", + "license": "Apache-2.0", "dependencies": [ "glslang", - "spirv-tools" + "spirv-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/shaderwriter/portfile.cmake b/external_imported/vcpkg/ports/shaderwriter/portfile.cmake index c53367fe8..b785430a7 100644 --- a/external_imported/vcpkg/ports/shaderwriter/portfile.cmake +++ b/external_imported/vcpkg/ports/shaderwriter/portfile.cmake @@ -1,30 +1,24 @@ - vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO DragonJoker/ShaderWriter - REF v1.1.0 - SHA512 7c2a311f332342a2fc7d37e646314fe79f28a00292ff082903b3fc30f3ff86f222936fd2bc9d85d79a66caf854b05bfa5546f9d299c0764d695c027c5101bc74 + REF 8b1b0614f49c27ab08ff16ce632fcac44f24d6d5 + HEAD_REF development + SHA512 697ecfee5dc9cbfe3cc724b7acd90107ea40bba58448536b1726eb3755f8c96e77b9a31317b567d77ed9e9b5c6decede73c4c7f1a760f11eff0cba2711b3c548 ) vcpkg_from_github(OUT_SOURCE_PATH CMAKE_SOURCE_PATH REPO DragonJoker/CMakeUtils - REF 0d750fb17099157f0e15e09cdf834453f3e8557a + REF acbce0a4966d0689148975aaa3c581af2b4e33a7 HEAD_REF master - SHA512 579ad01149180b2295a0441b3c4b575448d2f4335d013948b15c7b70c0232d3488ac296d4864a7808773fa3e3c1a8fc4de0c7b42a6595cc9b9d27f154321984a + SHA512 f2f45520554b576b3896ef9068549878e05a57a8bd0a3a4ab8c218bba9dee49febfe8cb7edb85b8ff51bdd86dee576cace6b8506a6226484d2b640408a3246ba ) -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(REMOVE_RECURSE "${SOURCE_PATH}/CMake") +file(COPY "${CMAKE_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/CMake") string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DPROJECTS_USE_PRECOMPILED_HEADERS=OFF -DSDW_GENERATE_SOURCE=OFF @@ -32,12 +26,10 @@ vcpkg_configure_cmake( -DSDW_BUILD_TESTS=OFF -DSDW_BUILD_STATIC_SDW=${BUILD_STATIC} -DSDW_BUILD_STATIC_SDAST=${BUILD_STATIC} - -DSDW_BUILD_EXPORTER_GLSL_STATIC=${BUILD_STATIC} - -DSDW_BUILD_EXPORTER_HLSL_STATIC=${BUILD_STATIC} - -DSDW_BUILD_EXPORTER_SPIRV_STATIC=${BUILD_STATIC} + -DSDW_UNITY_BUILD=ON ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/shaderwriter) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/shaderwriter) -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/shaderwriter/vcpkg.json b/external_imported/vcpkg/ports/shaderwriter/vcpkg.json index 15f2a0bfd..524382657 100644 --- a/external_imported/vcpkg/ports/shaderwriter/vcpkg.json +++ b/external_imported/vcpkg/ports/shaderwriter/vcpkg.json @@ -1,6 +1,17 @@ { "name": "shaderwriter", - "version": "1.1.0", + "version": "2.2.0", "description": "Library to write shaders directly from C++ code, supports GLSL, HLSL and SPIRV outputs.", - "homepage": "https://github.com/DragonJoker/ShaderWriter" + "homepage": "https://github.com/DragonJoker/ShaderWriter", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/shapelib/fix-usage.patch b/external_imported/vcpkg/ports/shapelib/fix-usage.patch new file mode 100644 index 000000000..8b22423fa --- /dev/null +++ b/external_imported/vcpkg/ports/shapelib/fix-usage.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b3b3b51..ea3f129 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -73,8 +73,8 @@ set( + + # Export build information to help other projects link installed + # shapelib software. Only one of these signatures is required +-# for the export_shp name. +-install(EXPORT export_shp DESTINATION ${CMAKE_INSTALL_SHP_DATADIR}) ++# for the shpConfig name. ++install(EXPORT shpConfig DESTINATION ${CMAKE_INSTALL_SHP_DATADIR}) + + # Initial boilerplate done, now build library and executables. + +@@ -127,12 +127,17 @@ if(USE_RPATH) + endif(USE_RPATH) + + install(TARGETS shp +- EXPORT export_shp ++ EXPORT shpConfig + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ) + ++INSTALL(EXPORT shpConfig ++ DESTINATION share/shp ++) ++ ++ + # executables to be built and installed. + set(executables + shpcreate diff --git a/external_imported/vcpkg/ports/shapelib/vcpkg.json b/external_imported/vcpkg/ports/shapelib/vcpkg.json index ae310d8c4..db87581cf 100644 --- a/external_imported/vcpkg/ports/shapelib/vcpkg.json +++ b/external_imported/vcpkg/ports/shapelib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "shapelib", - "version-string": "1.5.0", - "port-version": 2, + "version": "1.5.0", + "port-version": 3, "description": "Shapefile C Library is simple C API for reading and writing ESRI Shapefiles", "homepage": "https://download.osgeo.org/shapelib", "dependencies": [ diff --git a/external_imported/vcpkg/ports/shiva/no_copy_dll.patch b/external_imported/vcpkg/ports/shiva/no_copy_dll.patch new file mode 100644 index 000000000..add7f22a4 --- /dev/null +++ b/external_imported/vcpkg/ports/shiva/no_copy_dll.patch @@ -0,0 +1,13 @@ +diff --git a/modules/python/CMakeLists.txt b/modules/python/CMakeLists.txt +index eef14ee87..d52a147d8 100644 +--- a/modules/python/CMakeLists.txt ++++ b/modules/python/CMakeLists.txt +@@ -4,7 +4,7 @@ set(MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}) + find_package(pybind11 CONFIG REQUIRED) + + +-if (WIN32) ++if (WIN32 AND FALSE) + ## We need pyton dll + file(GLOB PYTHON_DLL ${PYTHON_LIBRARIES}/../*.dll) + diff --git a/external_imported/vcpkg/ports/shiva/portfile.cmake b/external_imported/vcpkg/ports/shiva/portfile.cmake index 72beec0e0..884a8de10 100644 --- a/external_imported/vcpkg/ports/shiva/portfile.cmake +++ b/external_imported/vcpkg/ports/shiva/portfile.cmake @@ -1,24 +1,30 @@ -vcpkg_find_acquire_program(PYTHON2) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Milerius/shiva REF 1.0 SHA512 d1ce33e89b17fa8f82e21b51dfa1308e38c617fea52c34a20b7b6c8643318280df24c043238ddd73ba2dbc139c5b5de1c2cb3add1f5629a54694c78b415d73d1 HEAD_REF master + PATCHES no_copy_dll.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +find_library(PYTHON_RELEASE NAMES python310 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(PYTHON_DEBUG NAMES python310_d python310 PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +include(SelectLibraryConfigurations) +select_library_configurations(PYTHON) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE OPTIONS - -DSHIVA_BUILD_TESTS=OFF - -DPYTHON_EXECUTABLE=${PYTHON2} + -DSHIVA_BUILD_TESTS=OFF + "-DPYTHON_LIBRARY=${PYTHON_LIBRARIES}" + "-DPYTHON_LIBRARIES=${PYTHON_LIBRARIES}" + "-DPYTHON_EXECUTABLE=${CURRENT_INSTALLED_DIR}/tools/python3/python${VCPKG_EXECUTABLE_SUFFIX}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/shiva) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/shiva") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/shiva) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/shiva/LICENSE ${CURRENT_PACKAGES_DIR}/share/shiva/copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") +file(COPY "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/shiva") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/shiva/LICENSE" "${CURRENT_PACKAGES_DIR}/share/shiva/copyright") diff --git a/external_imported/vcpkg/ports/shiva/vcpkg.json b/external_imported/vcpkg/ports/shiva/vcpkg.json index d080dd5a0..447297bd0 100644 --- a/external_imported/vcpkg/ports/shiva/vcpkg.json +++ b/external_imported/vcpkg/ports/shiva/vcpkg.json @@ -1,7 +1,7 @@ { "name": "shiva", - "version-string": "1.0", - "port-version": 4, + "version": "1.0", + "port-version": 5, "description": "Modern C++ Game Engine", "homepage": "https://github.com/Milerius/shiva", "dependencies": [ @@ -17,6 +17,14 @@ "nlohmann-json", "pybind11", "sol2", - "spdlog" + "spdlog", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/shogun/eigen-3.4.patch b/external_imported/vcpkg/ports/shogun/eigen-3.4.patch new file mode 100644 index 000000000..c6cd369b1 --- /dev/null +++ b/external_imported/vcpkg/ports/shogun/eigen-3.4.patch @@ -0,0 +1,65 @@ +--- a/src/shogun/machine/gp/MultiLaplaceInferenceMethod.cpp ++++ b/src/shogun/machine/gp/MultiLaplaceInferenceMethod.cpp +@@ -84,9 +84,9 @@ class CMultiPsiLine : public func_base + float64_t result=0; + for(index_t bl=0; blblock(bl*n,0,n,1)*CMath::exp(log_scale*2.0); +- result+=alpha->block(bl*n,0,n,1).dot(eigen_f.block(bl*n,0,n,1))/2.0; +- eigen_f.block(bl*n,0,n,1)+=eigen_m; ++ eigen_f.segment(bl*n,n)=K*alpha->segment(bl*n,n)*CMath::exp(log_scale*2.0); ++ result+=alpha->segment(bl*n,n).dot(eigen_f.segment(bl*n,n))/2.0; ++ eigen_f.segment(bl*n,n)+=eigen_m; + } + + // get first and second derivatives of log likelihood +@@ -272,7 +272,7 @@ void CMultiLaplaceInferenceMethod::update_alpha() + { + Map alpha(m_alpha.vector, m_alpha.vlen); + for(index_t bl=0; bl chol_tmp((eigen_sD*eigen_sD.transpose()).cwiseProduct(eigen_ktrtr*CMath::exp(m_log_scale*2.0))+ + MatrixXd::Identity(m_ktrtr.num_rows, m_ktrtr.num_cols)); + MatrixXd eigen_L_tmp=chol_tmp.matrixU(); +@@ -341,11 +341,11 @@ void CMultiLaplaceInferenceMethod::update_alpha() + VectorXd tmp2=m_tmp.array().rowwise().sum(); + + for(index_t bl=0; bl &eigen_c=eigen_W; + for(index_t bl=0; bl c_tmp(eigen_c.data(),n,C); + +@@ -409,7 +409,7 @@ float64_t CMultiLaplaceInferenceMethod::get_derivative_helper(SGMatrix CMultiLaplaceInferenceMethod::get_derivative_wrt_mean( + result[i]=0; + //currently only compute the explicit term + for(index_t bl=0; bl,$>>:/wd4251 - /wd4275>) - endif() diff --git a/external_imported/vcpkg/ports/spdlog/portfile.cmake b/external_imported/vcpkg/ports/spdlog/portfile.cmake index 77909960b..264772c85 100644 --- a/external_imported/vcpkg/ports/spdlog/portfile.cmake +++ b/external_imported/vcpkg/ports/spdlog/portfile.cmake @@ -1,16 +1,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gabime/spdlog - REF v1.9.2 - SHA512 87b12a792cf2d740ef29db4b6055788a487b6d474662b878711b8a5534efea5f0d97b6ac357834500b66cc65e1ba8934446a695e9691fd5d4b95397b6871555c + REF v1.10.0 + SHA512 e82ec0a0c813ed2f1c8a31a0f21dbb733d0a7bd8d05284feae3bd66040bc53ad47a93b26c3e389c7e5623cfdeba1854d690992c842748e072aab3e6e6ecc5666 HEAD_REF v1.x - PATCHES fix-mingw-build.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - benchmark SPDLOG_BUILD_BENCH - wchar SPDLOG_WCHAR_SUPPORT + benchmark SPDLOG_BUILD_BENCH + wchar SPDLOG_WCHAR_SUPPORT ) # configured in triplet file @@ -46,19 +45,9 @@ 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) -vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/spdlog/fmt/fmt.h - "#if !defined(SPDLOG_FMT_EXTERNAL)" - "#if 0 // !defined(SPDLOG_FMT_EXTERNAL)" -) - -vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/spdlog/fmt/ostr.h - "#if !defined(SPDLOG_FMT_EXTERNAL)" - "#if 0 // !defined(SPDLOG_FMT_EXTERNAL)" -) - -vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/spdlog/fmt/chrono.h - "#if !defined(SPDLOG_FMT_EXTERNAL)" - "#if 0 // !defined(SPDLOG_FMT_EXTERNAL)" +vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/spdlog/tweakme.h + "// #define SPDLOG_FMT_EXTERNAL" + "#define SPDLOG_FMT_EXTERNAL" ) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include diff --git a/external_imported/vcpkg/ports/spdlog/vcpkg.json b/external_imported/vcpkg/ports/spdlog/vcpkg.json index 46c4202b7..b643f8bf1 100644 --- a/external_imported/vcpkg/ports/spdlog/vcpkg.json +++ b/external_imported/vcpkg/ports/spdlog/vcpkg.json @@ -1,6 +1,6 @@ { "name": "spdlog", - "version-semver": "1.9.2", + "version-semver": "1.10.0", "description": "Very fast, header only, C++ logging library", "homepage": "https://github.com/gabime/spdlog", "license": "MIT", diff --git a/external_imported/vcpkg/ports/speex/portfile.cmake b/external_imported/vcpkg/ports/speex/portfile.cmake index 14a11d813..b3c81875c 100644 --- a/external_imported/vcpkg/ports/speex/portfile.cmake +++ b/external_imported/vcpkg/ports/speex/portfile.cmake @@ -14,12 +14,11 @@ vcpkg_from_github( if(VCPKG_TARGET_IS_WINDOWS) 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() if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/speex/speex.h" @@ -28,9 +27,15 @@ if(VCPKG_TARGET_IS_WINDOWS) ) endif() else() + 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) + 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() diff --git a/external_imported/vcpkg/ports/speex/vcpkg.json b/external_imported/vcpkg/ports/speex/vcpkg.json index 5265e6ab0..b5f4250c0 100644 --- a/external_imported/vcpkg/ports/speex/vcpkg.json +++ b/external_imported/vcpkg/ports/speex/vcpkg.json @@ -1,7 +1,15 @@ { "name": "speex", - "version-string": "1.2.0", - "port-version": 9, + "version": "1.2.0", + "port-version": 11, "description": "Speex is an Open Source/Free Software patent-free audio compression format designed for speech.", - "homepage": "https://github.com/xiph/speex" + "homepage": "https://github.com/xiph/speex", + "license": null, + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true, + "platform": "windows" + } + ] } diff --git a/external_imported/vcpkg/ports/speexdsp/jitter_ctl.patch b/external_imported/vcpkg/ports/speexdsp/jitter_ctl.patch new file mode 100644 index 000000000..0fd3971e9 --- /dev/null +++ b/external_imported/vcpkg/ports/speexdsp/jitter_ctl.patch @@ -0,0 +1,14 @@ +diff --git a/win32/libspeexdsp.def b/win32/libspeexdsp.def +index 45fc69d9..9b5abbad 100755 +--- a/win32/libspeexdsp.def ++++ b/win32/libspeexdsp.def +@@ -40,6 +40,8 @@ jitter_buffer_get + jitter_buffer_get_pointer_timestamp + jitter_buffer_tick + jitter_buffer_update_delay ++jitter_buffer_ctl ++jitter_buffer_remaining_span + + ; + ; speex_preprocess.h + \ No newline at end of file diff --git a/external_imported/vcpkg/ports/speexdsp/portfile.cmake b/external_imported/vcpkg/ports/speexdsp/portfile.cmake index 445bc2aca..276ea6e4d 100644 --- a/external_imported/vcpkg/ports/speexdsp/portfile.cmake +++ b/external_imported/vcpkg/ports/speexdsp/portfile.cmake @@ -16,6 +16,8 @@ else() OUT_SOURCE_PATH SOURCE_PATH ARCHIVE "${ARCHIVE}" REF "1.2.0" + PATCHES + jitter_ctl.patch ) endif() diff --git a/external_imported/vcpkg/ports/speexdsp/vcpkg.json b/external_imported/vcpkg/ports/speexdsp/vcpkg.json index 8cbd9c54d..f62f8416d 100644 --- a/external_imported/vcpkg/ports/speexdsp/vcpkg.json +++ b/external_imported/vcpkg/ports/speexdsp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "speexdsp", - "version-string": "1.2.0", - "port-version": 6, + "version": "1.2.0", + "port-version": 7, "description": "A patent-free, Open Source/Free Software DSP library.", "homepage": "https://speex.org/" } diff --git a/external_imported/vcpkg/ports/spirv-headers/portfile.cmake b/external_imported/vcpkg/ports/spirv-headers/portfile.cmake index 2256792e9..272746438 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 bcf55210f13a4fa3c3d0963b509ff1070e434c79 - SHA512 d0553b95f28b77209862059cd0a8c15ca3340f33e13d9bb75340ced07a5aa07b8b9eaa1bdc42daa0dbf78679c3b1ef3d344c73b17518061249cdc67000568c37 + REF sdk-1.3.204.1 + SHA512 ef994e0a5232cb21377ed39ef6a941b59eb45524f1d78092a6476245e4e0fb692780e98f5cc2176fdc2fd95430cce523fa376b0eed97042523b5f14a0586955f HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/spirv-headers/vcpkg.json b/external_imported/vcpkg/ports/spirv-headers/vcpkg.json index 53093e4ff..ff5cf7cf8 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-date": "2021-03-25", + "version": "1.3.204.1", "description": "Machine-readable files for the SPIR-V Registry", "homepage": "https://github.com/KhronosGroup/SPIRV-Headers" } diff --git a/external_imported/vcpkg/ports/spirv-reflect/CMakeLists.txt b/external_imported/vcpkg/ports/spirv-reflect/CMakeLists.txt new file mode 100644 index 000000000..7fc007d90 --- /dev/null +++ b/external_imported/vcpkg/ports/spirv-reflect/CMakeLists.txt @@ -0,0 +1,33 @@ +cmake_minimum_required(VERSION 3.1) +project(spirv-reflect) + +set_property(GLOBAL PROPERTY USE_FOLDERS ON) + +add_library(spirv-reflect ${CMAKE_CURRENT_SOURCE_DIR}/spirv_reflect.h + ${CMAKE_CURRENT_SOURCE_DIR}/spirv_reflect.c) +if (SPIRV_REFLECT_ENABLE_ASSERTS) + target_compile_definitions(spirv-reflect PRIVATE SPIRV_REFLECT_ENABLE_ASSERTS) +endif() +set_target_properties(spirv-reflect PROPERTIES CXX_STANDARD 11) +target_include_directories(spirv-reflect PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) +if(WIN32) + target_compile_definitions(spirv-reflect PRIVATE _CRT_SECURE_NO_WARNINGS) +endif() + +target_include_directories(spirv-reflect INTERFACE $) + +install( + TARGETS spirv-reflect EXPORT unofficial-spirv-reflect-config + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib +) + +install( + EXPORT unofficial-spirv-reflect-config + NAMESPACE unofficial::spirv-reflect:: + DESTINATION share/unofficial-spirv-reflect +) + +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/spirv_reflect.h" DESTINATION include) +install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include" DESTINATION include) diff --git a/external_imported/vcpkg/ports/spirv-reflect/portfile.cmake b/external_imported/vcpkg/ports/spirv-reflect/portfile.cmake new file mode 100644 index 000000000..068652edd --- /dev/null +++ b/external_imported/vcpkg/ports/spirv-reflect/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KhronosGroup/SPIRV-Reflect + REF sdk-1.3.204.1 + SHA512 af0bfcb7a8565cbd981034900760d304792e9dfb0a166b712e3506475fdeff282e0ba0f02d82d671ee05e7ed0792815eba654b66af0739404bf38c9e12ebf4f5 + HEAD_REF master +) + +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") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/spirv-reflect" RENAME copyright) diff --git a/external_imported/vcpkg/ports/spirv-reflect/vcpkg.json b/external_imported/vcpkg/ports/spirv-reflect/vcpkg.json new file mode 100644 index 000000000..dc532e47d --- /dev/null +++ b/external_imported/vcpkg/ports/spirv-reflect/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "spirv-reflect", + "version": "1.3.204.1", + "description": "SPIRV-Reflect is a lightweight library that provides a C/C++ reflection API for SPIR-V shader bytecode in Vulkan applications.", + "homepage": "https://github.com/KhronosGroup/SPIRV-Reflect", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "vulkan" + ] +} diff --git a/external_imported/vcpkg/ports/spirv-tools/0001-don-t-use-MP4.patch b/external_imported/vcpkg/ports/spirv-tools/0001-don-t-use-MP4.patch deleted file mode 100644 index 0203129be..000000000 --- a/external_imported/vcpkg/ports/spirv-tools/0001-don-t-use-MP4.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt -index 8247f6f..e28f6ee 100644 ---- a/source/CMakeLists.txt -+++ b/source/CMakeLists.txt -@@ -420,7 +420,3 @@ if(ENABLE_SPIRV_TOOLS_INSTALL) - install(FILES ${CMAKE_BINARY_DIR}/${SPIRV_TOOLS}Config.cmake DESTINATION ${PACKAGE_DIR}) - endif(ENABLE_SPIRV_TOOLS_INSTALL) - --if(MSVC AND (NOT ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang"))) -- # Enable parallel builds across four cores for this lib -- add_definitions(/MP4) --endif() -diff --git a/source/fuzz/CMakeLists.txt b/source/fuzz/CMakeLists.txt -index 804fcf0..4915f07 100644 ---- a/source/fuzz/CMakeLists.txt -+++ b/source/fuzz/CMakeLists.txt -@@ -419,10 +419,6 @@ if(SPIRV_BUILD_FUZZER) - ${CMAKE_CURRENT_BINARY_DIR}/protobufs/spvtoolsfuzz.pb.cc - ) - -- if(MSVC AND (NOT ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang"))) -- # Enable parallel builds across four cores for this lib -- add_definitions(/MP4) -- endif() - - spvtools_pch(SPIRV_TOOLS_FUZZ_SOURCES pch_source_fuzz) - -diff --git a/source/opt/CMakeLists.txt b/source/opt/CMakeLists.txt -index 88d5658..e3faab7 100644 ---- a/source/opt/CMakeLists.txt -+++ b/source/opt/CMakeLists.txt -@@ -218,11 +218,6 @@ set(SPIRV_TOOLS_OPT_SOURCES - wrap_opkill.cpp - ) - --if(MSVC AND (NOT ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang"))) -- # Enable parallel builds across four cores for this lib -- add_definitions(/MP4) --endif() -- - spvtools_pch(SPIRV_TOOLS_OPT_SOURCES pch_source_opt) - - add_library(SPIRV-Tools-opt ${SPIRV_TOOLS_LIBRARY_TYPE} ${SPIRV_TOOLS_OPT_SOURCES}) -diff --git a/source/reduce/CMakeLists.txt b/source/reduce/CMakeLists.txt -index e589ad5..b93a37b 100644 ---- a/source/reduce/CMakeLists.txt -+++ b/source/reduce/CMakeLists.txt -@@ -71,10 +71,6 @@ set(SPIRV_TOOLS_REDUCE_SOURCES - simple_conditional_branch_to_branch_reduction_opportunity.cpp - ) - --if(MSVC AND (NOT ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang"))) -- # Enable parallel builds across four cores for this lib -- add_definitions(/MP4) --endif() - - spvtools_pch(SPIRV_TOOLS_REDUCE_SOURCES pch_source_reduce) - diff --git a/external_imported/vcpkg/ports/spirv-tools/cmake-install.patch b/external_imported/vcpkg/ports/spirv-tools/cmake-install.patch deleted file mode 100644 index ef21cb8f0..000000000 --- a/external_imported/vcpkg/ports/spirv-tools/cmake-install.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6ed56a8..66d1e66 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -210,15 +210,9 @@ else() - endif() - - if(ENABLE_SPIRV_TOOLS_INSTALL) -- if(WIN32) -- macro(spvtools_config_package_dir TARGET PATH) -- set(${PATH} ${TARGET}/cmake) -- endmacro() -- else() -- macro(spvtools_config_package_dir TARGET PATH) -- set(${PATH} ${CMAKE_INSTALL_LIBDIR}/cmake/${TARGET}) -- endmacro() -- endif() -+ macro(spvtools_config_package_dir TARGET PATH) -+ set(${PATH} ${CMAKE_INSTALL_DATADIR}/${TARGET}) -+ endmacro() - - macro(spvtools_generate_config_file TARGET) - file(WRITE ${CMAKE_BINARY_DIR}/${TARGET}Config.cmake diff --git a/external_imported/vcpkg/ports/spirv-tools/install-config-typo.patch b/external_imported/vcpkg/ports/spirv-tools/install-config-typo.patch deleted file mode 100644 index c356f4b52..000000000 --- a/external_imported/vcpkg/ports/spirv-tools/install-config-typo.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/source/reduce/CMakeLists.txt b/source/reduce/CMakeLists.txt -index 51e9b1d..90b1cb7 100644 ---- a/source/reduce/CMakeLists.txt -+++ b/source/reduce/CMakeLists.txt -@@ -96,10 +96,10 @@ if(ENABLE_SPIRV_TOOLS_INSTALL) - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -- export(EXPORT SPIRV-Tools-reduceTargets FILE SPIRV-Tools-reduceTarget.cmake) -+ export(EXPORT SPIRV-Tools-reduceTargets FILE SPIRV-Tools-reduceTargets.cmake) - - spvtools_config_package_dir(SPIRV-Tools-reduce PACKAGE_DIR) -- install(EXPORT SPIRV-Tools-reduceTargets FILE SPIRV-Tools-reduceTarget.cmake -+ install(EXPORT SPIRV-Tools-reduceTargets FILE SPIRV-Tools-reduceTargets.cmake - DESTINATION ${PACKAGE_DIR}) - - spvtools_generate_config_file(SPIRV-Tools-reduce) diff --git a/external_imported/vcpkg/ports/spirv-tools/portfile.cmake b/external_imported/vcpkg/ports/spirv-tools/portfile.cmake index 670b70a46..3997af9ef 100644 --- a/external_imported/vcpkg/ports/spirv-tools/portfile.cmake +++ b/external_imported/vcpkg/ports/spirv-tools/portfile.cmake @@ -1,15 +1,8 @@ - -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/SPIRV-Tools - REF v2021.1 - SHA512 e8478eacb86415f75a1e5b3f66a0508b01a9f7e9d8b070eb0329ca56be137f5543dd42125a1033cb8552c01f46e11affd7fda866231b3742c66de9b4341930d5 - PATCHES - cmake-install.patch - install-config-typo.patch - 0001-don-t-use-MP4.patch + REF v2022.1 + SHA512 19ff4386c74c15f9b870d5348b76c7d643da5bf1637b1faed153d9ec9f00de941a83a22782f169b4aa5001c715721937c3bb3bc07541a60e503a0455a1d2287e ) vcpkg_find_acquire_program(PYTHON3) @@ -25,33 +18,71 @@ else() set(SKIP_EXECUTABLES OFF) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DSPIRV-Headers_SOURCE_DIR=${CURRENT_INSTALLED_DIR} -DSPIRV_WERROR=OFF - -DSPIRV_SKIP_EXECUTABLES=${SKIP_EXECUTABLES} # option SPIRV_SKIP_TESTS follows this value + -DSPIRV_SKIP_TESTS=ON + -DSPIRV_SKIP_EXECUTABLES=${SKIP_EXECUTABLES} -DENABLE_SPIRV_TOOLS_INSTALL=${TOOLS_INSTALL} -DSPIRV_TOOLS_BUILD_STATIC=ON + -DENABLE_SPIRV_TOOLS_INSTALL=ON ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/SPIRV-Tools TARGET_PATH share/SPIRV-Tools) # the directory name is capitalized as opposed to the package name -vcpkg_fixup_cmake_targets(CONFIG_PATH share/SPIRV-Tools-link TARGET_PATH share/SPIRV-Tools-link) -vcpkg_fixup_cmake_targets(CONFIG_PATH share/SPIRV-Tools-opt TARGET_PATH share/SPIRV-Tools-opt) -vcpkg_fixup_cmake_targets(CONFIG_PATH share/SPIRV-Tools-reduce TARGET_PATH share/SPIRV-Tools-reduce) +vcpkg_cmake_install() + # the directory name is capitalized as opposed to the port name +if(WIN32) + vcpkg_cmake_config_fixup(CONFIG_PATH SPIRV-Tools/cmake PACKAGE_NAME SPIRV-Tools) + vcpkg_cmake_config_fixup(CONFIG_PATH SPIRV-Tools-link/cmake PACKAGE_NAME SPIRV-Tools-link) + vcpkg_cmake_config_fixup(CONFIG_PATH SPIRV-Tools-lint/cmake PACKAGE_NAME SPIRV-Tools-lint) + vcpkg_cmake_config_fixup(CONFIG_PATH SPIRV-Tools-opt/cmake PACKAGE_NAME SPIRV-Tools-opt) + vcpkg_cmake_config_fixup(CONFIG_PATH SPIRV-Tools-reduce/cmake PACKAGE_NAME SPIRV-Tools-reduce) +else() + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools PACKAGE_NAME SPIRV-Tools DO_NOT_DELETE_PARENT_CONFIG_PATH) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools-link PACKAGE_NAME SPIRV-Tools-link DO_NOT_DELETE_PARENT_CONFIG_PATH) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools-lint PACKAGE_NAME SPIRV-Tools-lint DO_NOT_DELETE_PARENT_CONFIG_PATH) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools-opt PACKAGE_NAME SPIRV-Tools-opt DO_NOT_DELETE_PARENT_CONFIG_PATH) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools-reduce PACKAGE_NAME SPIRV-Tools-reduce) # now delete +endif() vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") # only static linkage, i.e. no need to preserve .dll/.so files -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/SPIRV-Tools-shared.dll") -file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libSPIRV-Tools-shared.so") -file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libSPIRV-Tools-shared.so") if(TOOLS_INSTALL) - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools") - file(RENAME "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + vcpkg_copy_tools( + TOOL_NAMES + spirv-as + spirv-cfg + spirv-dis + spirv-link + spirv-lint + spirv-opt + spirv-reduce + spirv-val + AUTO_CLEAN + ) +endif() + +if(WIN32) + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/SPIRV-Tools" + "${CURRENT_PACKAGES_DIR}/debug/SPIRV-Tools-link" + "${CURRENT_PACKAGES_DIR}/debug/SPIRV-Tools-lint" + "${CURRENT_PACKAGES_DIR}/debug/SPIRV-Tools-opt" + "${CURRENT_PACKAGES_DIR}/debug/SPIRV-Tools-reduce" + "${CURRENT_PACKAGES_DIR}/SPIRV-Tools" + "${CURRENT_PACKAGES_DIR}/SPIRV-Tools-link" + "${CURRENT_PACKAGES_DIR}/SPIRV-Tools-lint" + "${CURRENT_PACKAGES_DIR}/SPIRV-Tools-opt" + "${CURRENT_PACKAGES_DIR}/SPIRV-Tools-reduce" + ) +endif() +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + # lesspipe.sh is the only file there + 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/spirv-tools/vcpkg.json b/external_imported/vcpkg/ports/spirv-tools/vcpkg.json index bbd48de51..01d71eb66 100644 --- a/external_imported/vcpkg/ports/spirv-tools/vcpkg.json +++ b/external_imported/vcpkg/ports/spirv-tools/vcpkg.json @@ -1,9 +1,18 @@ { "name": "spirv-tools", - "version-string": "2021.1", + "version": "2022.1", "description": "API and commands for processing SPIR-V modules", "homepage": "https://github.com/KhronosGroup/SPIRV-Tools", + "license": "Apache-2.0", "dependencies": [ - "spirv-headers" + "spirv-headers", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/sqlcipher/CMakeLists.txt b/external_imported/vcpkg/ports/sqlcipher/CMakeLists.txt index 1fe1e8c7d..35eeb68aa 100644 --- a/external_imported/vcpkg/ports/sqlcipher/CMakeLists.txt +++ b/external_imported/vcpkg/ports/sqlcipher/CMakeLists.txt @@ -40,7 +40,10 @@ endif() target_include_directories(sqlcipher INTERFACE $) if(NOT WIN32) find_package(Threads REQUIRED) - target_link_libraries(sqlcipher PRIVATE Threads::Threads ${CMAKE_DL_LIBS} m) + target_link_libraries(sqlcipher PRIVATE Threads::Threads ${CMAKE_DL_LIBS}) +endif() +if (UNIX AND NOT APPLE) + target_link_libraries(sqlcipher PRIVATE m) endif() target_link_libraries(sqlcipher PRIVATE ${OPENSSL_CRYPTO_LIBRARY}) diff --git a/external_imported/vcpkg/ports/sqlcipher/portfile.cmake b/external_imported/vcpkg/ports/sqlcipher/portfile.cmake index 141503804..55d0b01e4 100644 --- a/external_imported/vcpkg/ports/sqlcipher/portfile.cmake +++ b/external_imported/vcpkg/ports/sqlcipher/portfile.cmake @@ -1,12 +1,10 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) -vcpkg_fail_port_install( ON_TARGET "UWP" "OSX" "Linux") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sqlcipher/sqlcipher - REF v4.5.0 - SHA512 d4c4fd97269721cf6e6a3195f67ef8b23bfb91d38336e7e049e7dc5c6ace25909f456463ba4202bc715a768da6885127755b036c291c7fb599de84a0a4c4bb7f + REF v4.5.1 + SHA512 157ab90e1b80ae9ae85c68c6b77008fe8ab5b526cbb2604297a5ba54279286b4cac1fecd0db552e0113a75ff61a198f649611b8bde4dec5156c443e7b7fbe0c3 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/sqlcipher/vcpkg.json b/external_imported/vcpkg/ports/sqlcipher/vcpkg.json index 4ec446da5..2d67e5175 100644 --- a/external_imported/vcpkg/ports/sqlcipher/vcpkg.json +++ b/external_imported/vcpkg/ports/sqlcipher/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sqlcipher", - "version": "4.5.0", + "version": "4.5.1", "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", "supports": "windows & !uwp & !static", diff --git a/external_imported/vcpkg/ports/sqlite3/CMakeLists.txt b/external_imported/vcpkg/ports/sqlite3/CMakeLists.txt index bf2022c20..aa14b8bb9 100644 --- a/external_imported/vcpkg/ports/sqlite3/CMakeLists.txt +++ b/external_imported/vcpkg/ports/sqlite3/CMakeLists.txt @@ -1,51 +1,145 @@ cmake_minimum_required(VERSION 3.10) + project(sqlite3 C) -include_directories(.) +option(ENABLE_FTS3 "Enable the FTS3 extension" OFF) +option(ENABLE_FTS4 "Enable the FTS4 extension" OFF) +option(ENABLE_FTS5 "Enable the FTS5 extension" OFF) +option(ENABLE_MEMSYS3 "Enable MEMSYS3" OFF) +option(ENABLE_MEMSYS5 "Enable MEMSYS5" OFF) +option(ENABLE_MATH_FUNCTION "Enable math functions" OFF) +option(ENABLE_LIMIT "Enable the UPDATE/DELETE LIMIT clause" OFF) +option(ENABLE_RTREE "Enable the RTREE extension" OFF) +option(ENABLE_SESSION "Enable the SESSION extension" OFF) +option(ENABLE_OMIT_LOAD_EXT "Enable loading of external extensions" OFF) +option(WITH_GEOPOLY "Enable geopoly functionality for sqlite3" OFF) +option(WITH_JSON1 "Enable JSON functionality for sqlite3" OFF) +option(WITH_ZLIB "Build sqlite3 with zlib support" OFF) +option(SQLITE3_SKIP_TOOLS "Disable build sqlite3 executable" OFF) + if(BUILD_SHARED_LIBS) if(UNIX) - set(API "-DSQLITE_API=__attribute__((visibility(\"default\")))") - elseif(CMAKE_SYSTEM_NAME MATCHES "Windows") - set(API "-DSQLITE_API=__declspec(dllexport)") + set(SQLITE_API "-DSQLITE_API=__attribute__((visibility(\"default\")))") + elseif(WIN32) + set(SQLITE_API "-DSQLITE_API=__declspec(dllexport)") else() message(FATAL_ERROR "Unsupported platform: ${CMAKE_SYSTEM_NAME}") endif() -else() - set(API "-DSQLITE_API=extern") endif() + add_library(sqlite3 sqlite3.c) +target_include_directories(sqlite3 PUBLIC $ $) + target_compile_definitions( sqlite3 PRIVATE - $<$:SQLITE_DEBUG> - ${API} - -DSQLITE_ENABLE_RTREE + $<$:SQLITE_DEBUG=1> + $<$:SQLITE_ENABLE_SELECTTRACE> + $<$:SQLITE_ENABLE_WHERETRACE> + ${SQLITE_API} -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_ENABLE_COLUMN_METADATA ) +if (BUILD_SHARED_LIBS) + if (UNIX) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_API=__attribute__((visibility(\"default\")))") + target_compile_definitions(sqlite3 INTERFACE "SQLITE_API=__attribute__((visibility(\"default\")))") + elseif (WIN32) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_API=__declspec(dllimport)") + target_compile_definitions(sqlite3 INTERFACE "SQLITE_API=__declspec(dllimport)") + endif() +endif() + +if (ENABLE_FTS3) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_ENABLE_FTS3") + target_compile_definitions(sqlite3 PUBLIC SQLITE_ENABLE_FTS3) +endif() + +if (ENABLE_FTS4) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_ENABLE_FTS4") + target_compile_definitions(sqlite3 PUBLIC SQLITE_ENABLE_FTS4) +endif() + +if (ENABLE_FTS5) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_ENABLE_FTS5") + target_compile_definitions(sqlite3 PUBLIC SQLITE_ENABLE_FTS5) +endif() + +if (ENABLE_MEMSYS3) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_ENABLE_MEMSYS3") + target_compile_definitions(sqlite3 PUBLIC SQLITE_ENABLE_MEMSYS3) +endif() + +if (ENABLE_MEMSYS5) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_ENABLE_MEMSYS5") + target_compile_definitions(sqlite3 PUBLIC SQLITE_ENABLE_MEMSYS5) +endif() + +if (ENABLE_MATH_FUNCTION) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_ENABLE_MATH_FUNCTIONS") + target_compile_definitions(sqlite3 PUBLIC SQLITE_ENABLE_MATH_FUNCTIONS) +endif() + +if (ENABLE_LIMIT) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT") + target_compile_definitions(sqlite3 PUBLIC SQLITE_ENABLE_UPDATE_DELETE_LIMIT) +endif() + +if (ENABLE_RTREE) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_ENABLE_RTREE") + target_compile_definitions(sqlite3 PUBLIC SQLITE_ENABLE_RTREE) +endif() + +if (ENABLE_SESSION) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_PREUPDATE_HOOK") + target_compile_definitions(sqlite3 PUBLIC SQLITE_ENABLE_SESSION SQLITE_ENABLE_PREUPDATE_HOOK) +endif() + +if (ENABLE_OMIT_LOAD_EXT) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_OMIT_LOAD_EXTENSION") + target_compile_definitions(sqlite3 PUBLIC SQLITE_OMIT_LOAD_EXTENSION) +endif() + if(WITH_GEOPOLY) - add_compile_definitions(SQLITE_ENABLE_GEOPOLY) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_ENABLE_GEOPOLY") + target_compile_definitions(sqlite3 PUBLIC SQLITE_ENABLE_GEOPOLY) endif() if(WITH_JSON1) - add_compile_definitions(SQLITE_ENABLE_JSON1) + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_ENABLE_JSON1") + target_compile_definitions(sqlite3 PUBLIC SQLITE_ENABLE_JSON1) +endif() + +if (WIN32) + string(APPEND PKGCONFIG_DEFINES " -DQLITE_OS_WIN=1") + target_compile_definitions(sqlite3 PUBLIC -DSQLITE_OS_WIN=1) + + if(CMAKE_SYSTEM_NAME MATCHES "WindowsStore") + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_OS_WINRT=1") + target_compile_definitions(sqlite3 PUBLIC -DSQLITE_OS_WINRT=1) + endif() +else() + string(APPEND PKGCONFIG_DEFINES " -DSQLITE_OS_UNIX=1") + target_compile_definitions(sqlite3 PUBLIC -DSQLITE_OS_UNIX=1) endif() -target_include_directories(sqlite3 INTERFACE $) if(NOT WIN32) find_package(Threads REQUIRED) - target_link_libraries(sqlite3 PRIVATE Threads::Threads ${CMAKE_DL_LIBS}) + target_link_libraries(sqlite3 PUBLIC Threads::Threads ${CMAKE_DL_LIBS}) endif() -if(CMAKE_SYSTEM_NAME MATCHES "WindowsStore") - target_compile_definitions(sqlite3 PRIVATE -DSQLITE_OS_WINRT=1) +if (WITH_ZLIB) + find_package(ZLIB REQUIRED) + target_link_libraries(sqlite3 PUBLIC ZLIB::ZLIB) endif() if(NOT SQLITE3_SKIP_TOOLS) add_executable(sqlite3-bin shell.c) + target_link_libraries(sqlite3-bin PRIVATE sqlite3) + install(TARGETS sqlite3-bin sqlite3 RUNTIME DESTINATION tools LIBRARY DESTINATION lib @@ -72,5 +166,6 @@ if(UNIX) else() set(PKGCONFIG_LIBS_PRIVATE "") endif() + configure_file(sqlite3.pc.in sqlite3.pc @ONLY) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sqlite3.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") diff --git a/external_imported/vcpkg/ports/sqlite3/portfile.cmake b/external_imported/vcpkg/ports/sqlite3/portfile.cmake index 5c66acf20..30ef7c855 100644 --- a/external_imported/vcpkg/ports/sqlite3/portfile.cmake +++ b/external_imported/vcpkg/ports/sqlite3/portfile.cmake @@ -1,7 +1,7 @@ # Be sure to update both of these versions together. -set(SQLITE_VERSION 3370000) -set(PKGCONFIG_VERSION 3.37.0) -set(SQLITE_HASH e33935e513e52c825ebdef8eab92a4a839731a3b8fffcd5910a5dbd305ffd4cb627bf10c3d191dd934d1d6707e4a199dd098073953322768d5210fc726eb22fd) +set(SQLITE_VERSION 3370100) +set(PKGCONFIG_VERSION 3.37.1) +set(SQLITE_HASH b59343772dc4c6bb8e05fff6206eeb44861efa52c120c789ce6b733e974cf950657b6ab369aa405d75f45ed9cf1cb8128a76447bc63e9ce9822578d71581a7a3) vcpkg_download_distfile(ARCHIVE URLS "https://sqlite.org/2021/sqlite-amalgamation-${SQLITE_VERSION}.zip" @@ -21,10 +21,21 @@ file(COPY "${CMAKE_CURRENT_LIST_DIR}/sqlite3.pc.in" DESTINATION "${SOURCE_PATH}" vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - geopoly WITH_GEOPOLY - json1 WITH_JSON1 + fts3 ENABLE_FTS3 + fts4 ENABLE_FTS4 + fts5 ENABLE_FTS5 + memsys3 ENABLE_MEMSYS3 + memsys5 ENABLE_MEMSYS5 + math ENABLE_MATH_FUNCTION + limit ENABLE_LIMIT + rtree ENABLE_RTREE + session ENABLE_SESSION + omit-load-extension ENABLE_OMIT_LOAD_EXT + geopoly WITH_GEOPOLY + json1 WITH_JSON1 + zlib WITH_ZLIB INVERTED_FEATURES - tool SQLITE3_SKIP_TOOLS + tool SQLITE3_SKIP_TOOLS ) vcpkg_cmake_configure( @@ -37,6 +48,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() +vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT} CONFIG_PATH share/unofficial-${PORT}) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") @@ -58,4 +70,3 @@ if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") endif() file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright "SQLite is in the Public Domain.\nhttp://www.sqlite.org/copyright.html\n") -vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/sqlite3/sqlite3.pc.in b/external_imported/vcpkg/ports/sqlite3/sqlite3.pc.in index d265632d1..c7ecbf1a5 100644 --- a/external_imported/vcpkg/ports/sqlite3/sqlite3.pc.in +++ b/external_imported/vcpkg/ports/sqlite3/sqlite3.pc.in @@ -8,4 +8,4 @@ Description: SQL database engine Version: @PKGCONFIG_VERSION@ Libs: -L${libdir} -lsqlite3 Libs.private: @PKGCONFIG_LIBS_PRIVATE@ -Cflags: -I${includedir} +Cflags: -I${includedir} @PKGCONFIG_DEFINES@ diff --git a/external_imported/vcpkg/ports/sqlite3/vcpkg.json b/external_imported/vcpkg/ports/sqlite3/vcpkg.json index cbbc04005..f59f84fc6 100644 --- a/external_imported/vcpkg/ports/sqlite3/vcpkg.json +++ b/external_imported/vcpkg/ports/sqlite3/vcpkg.json @@ -1,9 +1,10 @@ { "name": "sqlite3", - "version": "3.37.0", + "version": "3.37.2", "port-version": 1, "description": "SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine.", - "homepage": "https://sqlite.org/", + "homepage": "https://github.com/sqlite/sqlite", + "license": "blessing", "dependencies": [ { "name": "vcpkg-cmake", @@ -15,14 +16,50 @@ } ], "features": { + "fts3": { + "description": "Enable the FTS3 extension" + }, + "fts4": { + "description": "Enable the FTS4 extension" + }, + "fts5": { + "description": "Enable the FTS5 extension" + }, "geopoly": { - "description": "enable geopoly functionality for sqlite3" + "description": "Enable geopoly functionality for sqlite3" }, "json1": { - "description": "enable JSON functionality for sqlite3" + "description": "Enable JSON functionality for sqlite3" + }, + "limit": { + "description": "Enable the UPDATE/DELETE LIMIT clause" + }, + "math": { + "description": "Enable math functions" + }, + "memsys3": { + "description": "Enable MEMSYS3" + }, + "memsys5": { + "description": "Enable MEMSYS5" + }, + "omit-load-extension": { + "description": "Enable loading of external extensions" + }, + "rtree": { + "description": "Enable the RTREE extension" + }, + "session": { + "description": "Enable the SESSION extension" }, "tool": { - "description": "sqlite3 executable" + "description": "Build sqlite3 executable" + }, + "zlib": { + "description": "Build sqlite3 with zlib support", + "dependencies": [ + "zlib" + ] } } } diff --git a/external_imported/vcpkg/ports/starlink-ast/portfile.cmake b/external_imported/vcpkg/ports/starlink-ast/portfile.cmake index b2169c666..058b37bad 100644 --- a/external_imported/vcpkg/ports/starlink-ast/portfile.cmake +++ b/external_imported/vcpkg/ports/starlink-ast/portfile.cmake @@ -1,14 +1,12 @@ -vcpkg_fail_port_install(ON_TARGET "Linux" "OSX") - vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/Starlink/ast/releases/download/v9.2.5/ast-9.2.5.tar.gz" - FILENAME "ast-9.2.5.tar.gz" - SHA512 2eee3df56ca49a9fbb6b103b26f41a63a7b77533bcc74bc4154b57567ee6da53d5c7ff1d38c4ad0ce330d9b902e35d40184fa9e985506c3dcbbb03071be65760 + URLS "https://github.com/Starlink/ast/releases/download/v9.2.7/ast-9.2.7.tar.gz" + FILENAME "ast-9.2.7.tar.gz" + SHA512 4778658fe6b08af29b51807e2d988f8425d99d630a14d8fef9ca4ea43016d676df419a93c4b2fdecc0549c28c0665f61e366bd4e7aa896ebb8e47f56d5af1887 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE ${ARCHIVE} ) set(CONFIGURE_OPTIONS diff --git a/external_imported/vcpkg/ports/starlink-ast/vcpkg.json b/external_imported/vcpkg/ports/starlink-ast/vcpkg.json index 340d9a424..5acdf6d3d 100644 --- a/external_imported/vcpkg/ports/starlink-ast/vcpkg.json +++ b/external_imported/vcpkg/ports/starlink-ast/vcpkg.json @@ -1,6 +1,7 @@ { "name": "starlink-ast", - "version-semver": "9.2.5", + "version": "9.2.7", + "port-version": 1, "description": "The AST library provides a comprehensive range of facilities for attaching world coordinate systems to astronomical data, for retrieving and interpreting that information and for generating graphical output based on it", "homepage": "https://starlink.eao.hawaii.edu/starlink/AST", "supports": "windows", diff --git a/external_imported/vcpkg/ports/superlu/portfile.cmake b/external_imported/vcpkg/ports/superlu/portfile.cmake index 3d21ec510..7b4f8d25a 100644 --- a/external_imported/vcpkg/ports/superlu/portfile.cmake +++ b/external_imported/vcpkg/ports/superlu/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xiaoyeli/superlu diff --git a/external_imported/vcpkg/ports/superlu/vcpkg.json b/external_imported/vcpkg/ports/superlu/vcpkg.json index 08b6be02a..fc100ad2e 100644 --- a/external_imported/vcpkg/ports/superlu/vcpkg.json +++ b/external_imported/vcpkg/ports/superlu/vcpkg.json @@ -1,7 +1,7 @@ { "name": "superlu", - "version-string": "2020-01-07", - "port-version": 4, + "version-date": "2020-01-07", + "port-version": 5, "description": "Supernodal sparse direct solver.", "homepage": "https://github.com/xiaoyeli/superlu", "supports": "!(uwp | arm)", diff --git a/external_imported/vcpkg/ports/taglib/portfile.cmake b/external_imported/vcpkg/ports/taglib/portfile.cmake index f7a18e098..a951b7e64 100644 --- a/external_imported/vcpkg/ports/taglib/portfile.cmake +++ b/external_imported/vcpkg/ports/taglib/portfile.cmake @@ -11,13 +11,13 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") set(WINRT_OPTIONS -DHAVE_VSNPRINTF=1 -DPLATFORM_WINRT=1) endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS ${WINRT_OPTIONS} ) - -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/taglib.pc") if(EXISTS "${pcfile}") @@ -29,7 +29,6 @@ if(EXISTS "${pcfile}") vcpkg_replace_string("${pcfile}" "Requires: " "Requires: zlib") vcpkg_replace_string("${pcfile}" " -lz" "") endif() -vcpkg_fixup_pkgconfig() # remove the debug/include files file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") @@ -39,8 +38,11 @@ file(COPY "${SOURCE_PATH}/COPYING.LGPL" DESTINATION "${CURRENT_PACKAGES_DIR}/sha 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) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/taglib/taglib_export.h" "defined(TAGLIB_STATIC)" "1") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() diff --git a/external_imported/vcpkg/ports/taglib/vcpkg.json b/external_imported/vcpkg/ports/taglib/vcpkg.json index 03ffc7881..54e9759ba 100644 --- a/external_imported/vcpkg/ports/taglib/vcpkg.json +++ b/external_imported/vcpkg/ports/taglib/vcpkg.json @@ -1,11 +1,15 @@ { "name": "taglib", "version-semver": "1.12.0", - "port-version": 1, + "port-version": 2, "description": "TagLib Audio Meta-Data Library", "homepage": "https://taglib.org/", "license": "LGPL-2.1 OR MPL-1.1", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, "zlib" ] } diff --git a/external_imported/vcpkg/ports/taskflow/portfile.cmake b/external_imported/vcpkg/ports/taskflow/portfile.cmake index 56e6564a3..87c60ac15 100644 --- a/external_imported/vcpkg/ports/taskflow/portfile.cmake +++ b/external_imported/vcpkg/ports/taskflow/portfile.cmake @@ -2,14 +2,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO taskflow/taskflow - REF cbcf750895259d1e01089d4cc4535dc962bc7848 #v3.2.0 - SHA512 584f81a8c9d314fbd5bc3497cead659488e17ded90cca9144e867ea5d18f50bd8bc554eaefc21ed82e73b5c92a89c5502434e214b0543b65442a2c261d2ef396 + REF bfad4b9a0cc5acad5fc99fb6ff6b904b79f27f93 #v3.3.0 + SHA512 489807c84438a727832e9d530c9b2948240bebee48f210ce4a8c69917cbb71306df378440621b1bf091e4aa62c86681d71afd38a3343c8ea872a4eefcabc496e HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DTF_BUILD_BENCHMARKS=OFF -DTF_BUILD_CUDA=OFF @@ -19,11 +18,11 @@ vcpkg_configure_cmake( -DCMAKE_CUDA_COMPILER=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Taskflow) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Taskflow) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/taskflow/vcpkg.json b/external_imported/vcpkg/ports/taskflow/vcpkg.json index a71f32208..9d2cbca95 100644 --- a/external_imported/vcpkg/ports/taskflow/vcpkg.json +++ b/external_imported/vcpkg/ports/taskflow/vcpkg.json @@ -1,6 +1,17 @@ { "name": "taskflow", - "version": "3.2.0", + "version": "3.3.0", "description": "Fast Parallel Tasking Programming Library using Modern C++", - "homepage": "https://github.com/taskflow/taskflow" + "homepage": "https://github.com/taskflow/taskflow", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/tbb/portfile.cmake b/external_imported/vcpkg/ports/tbb/portfile.cmake index bf65511b7..e826081f8 100644 --- a/external_imported/vcpkg/ports/tbb/portfile.cmake +++ b/external_imported/vcpkg/ports/tbb/portfile.cmake @@ -1,6 +1,4 @@ -if (NOT VCPKG_TARGET_IS_LINUX AND NOT VCPKG_TARGET_IS_OSX) - vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp") -endif() +set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/external_imported/vcpkg/ports/tbb/vcpkg.json b/external_imported/vcpkg/ports/tbb/vcpkg.json index 101e41bd7..09ab4cd1e 100644 --- a/external_imported/vcpkg/ports/tbb/vcpkg.json +++ b/external_imported/vcpkg/ports/tbb/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tbb", "version-string": "2020_U3", - "port-version": 6, + "port-version": 8, "description": "Intel's Threading Building Blocks.", "homepage": "https://github.com/01org/tbb", "supports": "!(uwp | arm | arm64) | linux | osx" diff --git a/external_imported/vcpkg/ports/tcb-span/portfile.cmake b/external_imported/vcpkg/ports/tcb-span/portfile.cmake new file mode 100644 index 000000000..48edffef3 --- /dev/null +++ b/external_imported/vcpkg/ports/tcb-span/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO tcbrindle/span + REF 427f6bd0bbf36ad46aec4d8bdd7760beeb10dd33 # master commit 2021-12-15 + SHA512 c775bd50bc68d98fcde5e99bb9b6594c8ac9ef15fa15efe89c253b4135df77d83e58743d3c7e90d3aff03429251497a7d56d1900f6e258416c0664a82326243c + HEAD_REF master +) + +# Just a single header +file( + INSTALL "${SOURCE_PATH}/include/tcb/span.hpp" + DESTINATION "${CURRENT_PACKAGES_DIR}/include/tcb" +) + +# Handle copyright +file( + INSTALL "${SOURCE_PATH}/LICENSE_1_0.txt" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) diff --git a/external_imported/vcpkg/ports/tcb-span/vcpkg.json b/external_imported/vcpkg/ports/tcb-span/vcpkg.json new file mode 100644 index 000000000..777f195d0 --- /dev/null +++ b/external_imported/vcpkg/ports/tcb-span/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tcb-span", + "version-date": "2021-12-15", + "description": "Implementation of C++20's std::span for older compilers", + "homepage": "https://github.com/tcbrindle/span", + "license": "BSL-1.0" +} diff --git a/external_imported/vcpkg/ports/teemo/portfile.cmake b/external_imported/vcpkg/ports/teemo/portfile.cmake index c097389de..6d0a1a7ee 100644 --- a/external_imported/vcpkg/ports/teemo/portfile.cmake +++ b/external_imported/vcpkg/ports/teemo/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP" "osx") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/teemo diff --git a/external_imported/vcpkg/ports/teemo/vcpkg.json b/external_imported/vcpkg/ports/teemo/vcpkg.json index 49835d203..ed999e2eb 100644 --- a/external_imported/vcpkg/ports/teemo/vcpkg.json +++ b/external_imported/vcpkg/ports/teemo/vcpkg.json @@ -1,6 +1,7 @@ { "name": "teemo", "version": "2.6", + "port-version": 1, "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/tensorflow-cc/portfile.cmake b/external_imported/vcpkg/ports/tensorflow-cc/portfile.cmake index 4cf12cf52..ee9926b15 100644 --- a/external_imported/vcpkg/ports/tensorflow-cc/portfile.cmake +++ b/external_imported/vcpkg/ports/tensorflow-cc/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "x86" "arm" ON_TARGET "UWP") - if(VCPKG_TARGET_IS_WINDOWS) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) endif() diff --git a/external_imported/vcpkg/ports/tensorflow-cc/vcpkg.json b/external_imported/vcpkg/ports/tensorflow-cc/vcpkg.json index ad074c8b0..9bb69848c 100644 --- a/external_imported/vcpkg/ports/tensorflow-cc/vcpkg.json +++ b/external_imported/vcpkg/ports/tensorflow-cc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tensorflow-cc", "version-semver": "2.7.0", - "port-version": 1, + "port-version": 2, "description": "Library for computation using data flow graphs for scalable machine learning (C++ API version)", "homepage": "https://github.com/tensorflow/tensorflow", "supports": "!(x86 | arm | uwp)", diff --git a/external_imported/vcpkg/ports/tensorflow/portfile.cmake b/external_imported/vcpkg/ports/tensorflow/portfile.cmake index fac0e9ada..1782730f9 100644 --- a/external_imported/vcpkg/ports/tensorflow/portfile.cmake +++ b/external_imported/vcpkg/ports/tensorflow/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "x86" "arm" ON_TARGET "uwp") - set(TF_LIB_SUFFIX "") set(TF_PORT_SUFFIX "") set(TF_INCLUDE_DIRS "\${TENSORFLOW_INSTALL_PREFIX}/include") diff --git a/external_imported/vcpkg/ports/tensorflow/vcpkg.json b/external_imported/vcpkg/ports/tensorflow/vcpkg.json index 18801c70c..2c00ec901 100644 --- a/external_imported/vcpkg/ports/tensorflow/vcpkg.json +++ b/external_imported/vcpkg/ports/tensorflow/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tensorflow", "version-semver": "2.7.0", - "port-version": 1, + "port-version": 2, "description": "Library for computation using data flow graphs for scalable machine learning (C API version)", "homepage": "https://github.com/tensorflow/tensorflow", "supports": "!(x86 | arm | uwp)", diff --git a/external_imported/vcpkg/ports/tensorpipe/portfile.cmake b/external_imported/vcpkg/ports/tensorpipe/portfile.cmake index d6e941d72..b81a37c89 100644 --- a/external_imported/vcpkg/ports/tensorpipe/portfile.cmake +++ b/external_imported/vcpkg/ports/tensorpipe/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "windows" "uwp") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/external_imported/vcpkg/ports/tensorpipe/vcpkg.json b/external_imported/vcpkg/ports/tensorpipe/vcpkg.json index 82971d8ad..3ddcb1d5a 100644 --- a/external_imported/vcpkg/ports/tensorpipe/vcpkg.json +++ b/external_imported/vcpkg/ports/tensorpipe/vcpkg.json @@ -1,6 +1,7 @@ { "name": "tensorpipe", "version-date": "2021-04-26", + "port-version": 1, "description": "A tensor-aware point-to-point communication primitive for machine learning", "homepage": "https://github.com/pytorch/tensorpipe", "supports": "linux | osx", diff --git a/external_imported/vcpkg/ports/tesseract/vcpkg.json b/external_imported/vcpkg/ports/tesseract/vcpkg.json index 38463ce08..6b2477d6b 100644 --- a/external_imported/vcpkg/ports/tesseract/vcpkg.json +++ b/external_imported/vcpkg/ports/tesseract/vcpkg.json @@ -1,10 +1,10 @@ { "name": "tesseract", "version": "4.1.1", - "port-version": 9, + "port-version": 10, "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": "!(windows & (arm | arm64))", + "supports": "!arm", "dependencies": [ "leptonica", "libarchive", diff --git a/external_imported/vcpkg/ports/tfhe/portfile.cmake b/external_imported/vcpkg/ports/tfhe/portfile.cmake index fc06a54a6..6eb77f140 100644 --- a/external_imported/vcpkg/ports/tfhe/portfile.cmake +++ b/external_imported/vcpkg/ports/tfhe/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Unix" ON_TARGET "Windows") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tfhe/tfhe diff --git a/external_imported/vcpkg/ports/tfhe/vcpkg.json b/external_imported/vcpkg/ports/tfhe/vcpkg.json index 73898248b..9749d5d1c 100644 --- a/external_imported/vcpkg/ports/tfhe/vcpkg.json +++ b/external_imported/vcpkg/ports/tfhe/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tfhe", "version-semver": "1.0.1", - "port-version": 2, + "port-version": 3, "description": "TFHE is open-source software distributed under the terms of the Apache 2.0 license.", "homepage": "https://github.com/tfhe/tfhe", "supports": "!windows" diff --git a/external_imported/vcpkg/ports/tgbot-cpp/portfile.cmake b/external_imported/vcpkg/ports/tgbot-cpp/portfile.cmake index 859b5d03e..dba7d1e16 100644 --- a/external_imported/vcpkg/ports/tgbot-cpp/portfile.cmake +++ b/external_imported/vcpkg/ports/tgbot-cpp/portfile.cmake @@ -1,17 +1,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO reo7sp/tgbot-cpp - REF v1.2.1 - SHA512 b094f9c80dd15b7930b7d7250169b3199d9c84b84826adececa8237111f5ba384ec790dbe969999f362ca2fb35b93950d053777ce5f167007e33c3e4eb133453 + REF v1.3 + SHA512 1b992c7705a5f7bb081df3eb032feb78b2b5eb2e73a7be822cd12552702a4d18ac9eecbd0c842f2d6c48757e91d3f8ceb5965237264b9ec18657e51c3bde7f79 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) diff --git a/external_imported/vcpkg/ports/tgbot-cpp/vcpkg.json b/external_imported/vcpkg/ports/tgbot-cpp/vcpkg.json index 360b9c706..3543ee054 100644 --- a/external_imported/vcpkg/ports/tgbot-cpp/vcpkg.json +++ b/external_imported/vcpkg/ports/tgbot-cpp/vcpkg.json @@ -1,9 +1,9 @@ { "name": "tgbot-cpp", - "version-string": "1.2.1", - "port-version": 1, + "version": "1.3", "description": "C++14 library for Telegram bot API.", "homepage": "https://github.com/reo7sp/tgbot-cpp", + "license": "MIT", "dependencies": [ "boost-algorithm", "boost-asio", @@ -14,6 +14,10 @@ "boost-variant", "curl", "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, "zlib" ] } diff --git a/external_imported/vcpkg/ports/tgui/portfile.cmake b/external_imported/vcpkg/ports/tgui/portfile.cmake index e30d93ac4..fc5fa414f 100644 --- a/external_imported/vcpkg/ports/tgui/portfile.cmake +++ b/external_imported/vcpkg/ports/tgui/portfile.cmake @@ -23,10 +23,9 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS tool TGUI_BUILD_GUI_BUILDER ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE - PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} -DTGUI_MISC_INSTALL_PREFIX=${TGUI_SHARE_PATH} -DTGUI_SHARED_LIBS=${TGUI_SHARED_LIBS} @@ -34,8 +33,8 @@ vcpkg_configure_cmake( -DTGUI_BUILD_EXAMPLES=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/TGUI) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/TGUI) vcpkg_copy_pdbs() if("tool" IN_LIST FEATURES) @@ -60,5 +59,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/TGUI/extlibs/nanosvg" "${CU file(RENAME "${CURRENT_PACKAGES_DIR}/share/doc" "${CURRENT_PACKAGES_DIR}/share/${PORT}/doc") +vcpkg_fixup_pkgconfig() + # Handle copyright file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/tgui/vcpkg.json b/external_imported/vcpkg/ports/tgui/vcpkg.json index 387a20c90..2dce59186 100644 --- a/external_imported/vcpkg/ports/tgui/vcpkg.json +++ b/external_imported/vcpkg/ports/tgui/vcpkg.json @@ -1,9 +1,20 @@ { "name": "tgui", "version-date": "2021-04-19", - "port-version": 2, + "port-version": 3, "description": "TGUI is an easy to use, cross-platform, C++ GUI for SFML.", "homepage": "https://tgui.eu", + "license": "Zlib", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "default-features": [ "sdl2", "sfml" diff --git a/external_imported/vcpkg/ports/theia/eigen-3.4.patch b/external_imported/vcpkg/ports/theia/eigen-3.4.patch new file mode 100644 index 000000000..9bbd5e24b --- /dev/null +++ b/external_imported/vcpkg/ports/theia/eigen-3.4.patch @@ -0,0 +1,24 @@ +--- a/libraries/akaze/src/nldiffusion_functions.cpp ++++ b/libraries/akaze/src/nldiffusion_functions.cpp +@@ -222,8 +222,8 @@ void halfsample_image(const RowMatrixXf& src, RowMatrixXf& dst) { + + // Do the whole resampling in one pass by using neighboring values. First, we + // compute the borders. +- const double x_kernel_size = static_cast(src.cols()) / dst.cols(); +- const double y_kernel_size = static_cast(src.rows()) / dst.rows(); ++ const int x_kernel_size = static_cast(src.cols()) / dst.cols(); ++ const int y_kernel_size = static_cast(src.rows()) / dst.rows(); + + // Do simple linear interpolation. + if (x_kernel_size == 2 && y_kernel_size == 2) { +@@ -237,8 +237,8 @@ void halfsample_image(const RowMatrixXf& src, RowMatrixXf& dst) { + return; + } + +- const double x_kernel_clamped_size = static_cast(ceil(x_kernel_size)); +- const double y_kernel_clamped_size = static_cast(ceil(y_kernel_size)); ++ const int x_kernel_clamped_size = static_cast(ceil(static_cast(src.cols()) / dst.cols())); ++ const int y_kernel_clamped_size = static_cast(ceil(static_cast(src.rows()) / dst.rows())); + + // Set up precomputed factor matrices. + Eigen::RowVectorXf x_kernel_mul(static_cast(x_kernel_clamped_size)), diff --git a/external_imported/vcpkg/ports/theia/portfile.cmake b/external_imported/vcpkg/ports/theia/portfile.cmake index 6fa187a1e..c68a4a685 100644 --- a/external_imported/vcpkg/ports/theia/portfile.cmake +++ b/external_imported/vcpkg/ports/theia/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( PATCHES fix-external-dependencies.patch fix-external-dependencies2.patch + eigen-3.4.patch ) file(REMOVE ${SOURCE_PATH}/cmake/FindSuiteSparse.cmake) diff --git a/external_imported/vcpkg/ports/theia/vcpkg.json b/external_imported/vcpkg/ports/theia/vcpkg.json index f424735b4..c02f1aecd 100644 --- a/external_imported/vcpkg/ports/theia/vcpkg.json +++ b/external_imported/vcpkg/ports/theia/vcpkg.json @@ -1,7 +1,7 @@ { "name": "theia", "version-string": "0.8", - "port-version": 5, + "port-version": 6, "description": "An open source library for multiview geometry and structure from motion", "homepage": "https://github.com/sweeneychris/TheiaSfM", "dependencies": [ diff --git a/external_imported/vcpkg/ports/tidy-html5/portfile.cmake b/external_imported/vcpkg/ports/tidy-html5/portfile.cmake index 159ed86aa..350d98859 100644 --- a/external_imported/vcpkg/ports/tidy-html5/portfile.cmake +++ b/external_imported/vcpkg/ports/tidy-html5/portfile.cmake @@ -8,35 +8,28 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" NO_CHARSET_FLAG OPTIONS -DBUILD_SHARED_LIB=OFF -DTIDY_CONSOLE_SHARED=OFF ) +vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/libxslt/bin") +vcpkg_cmake_install() -vcpkg_install_cmake() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -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(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/tidy-html5) +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/tidyd.exe") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/tidyd") -if(VCPKG_TARGET_IS_WINDOWS) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/tidy.exe ${CURRENT_PACKAGES_DIR}/tools/tidy-html5/tidy.exe) -else() - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/tidy ${CURRENT_PACKAGES_DIR}/tools/tidy-html5/tidy) -endif() +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) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) - -file(INSTALL ${SOURCE_PATH}/README/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/tidy-html5 RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +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/vcpkg.json b/external_imported/vcpkg/ports/tidy-html5/vcpkg.json index 7071cab8f..1c16d8657 100644 --- a/external_imported/vcpkg/ports/tidy-html5/vcpkg.json +++ b/external_imported/vcpkg/ports/tidy-html5/vcpkg.json @@ -1,7 +1,18 @@ { "name": "tidy-html5", - "version-string": "5.7.28", - "port-version": 4, + "version": "5.7.28", + "port-version": 5, "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://github.com/htacg/tidy-html5", + "license": null, + "dependencies": [ + { + "name": "libxslt", + "host": true + }, + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/tiff/fix-pkgconfig.patch b/external_imported/vcpkg/ports/tiff/fix-pkgconfig.patch index a67910ef5..f5bcdec3e 100644 --- a/external_imported/vcpkg/ports/tiff/fix-pkgconfig.patch +++ b/external_imported/vcpkg/ports/tiff/fix-pkgconfig.patch @@ -1,3 +1,14 @@ +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 @@ -35,7 +46,7 @@ index abe75a6..8899725 100644 Cflags: -I${includedir} +Requires.private: @tiff_requires_private@ diff --git a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt -index db5f140..6db71ee 100755 +index db5f140..32721ec 100755 --- a/libtiff/CMakeLists.txt +++ b/libtiff/CMakeLists.txt @@ -106,14 +106,19 @@ target_include_directories(tiff @@ -58,7 +69,7 @@ index db5f140..6db71ee 100755 if(JPEG_DUAL_MODE_8_12) target_include_directories(tiff PRIVATE ${JPEG12_INCLUDE_DIR}) target_link_libraries(tiff PRIVATE ${JPEG12_LIBRARIES}) -@@ -127,14 +132,23 @@ if(LERC_SUPPORT) +@@ -127,15 +132,29 @@ if(LERC_SUPPORT) endif() if(LZMA_SUPPORT) target_link_libraries(tiff PRIVATE LibLZMA::LibLZMA) @@ -73,12 +84,21 @@ index db5f140..6db71ee 100755 + string(APPEND tiff_requires_private " libwebp") endif() target_link_libraries(tiff PRIVATE CMath::CMath) -+if(CMath_LIBRARY) -+ string(APPEND tiff_libs_private " -lm") + ++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 16e2b5fee..c8d53313f 100644 --- a/external_imported/vcpkg/ports/tiff/portfile.cmake +++ b/external_imported/vcpkg/ports/tiff/portfile.cmake @@ -17,13 +17,6 @@ if(VCPKG_TARGET_IS_UWP) list(APPEND EXTRA_OPTIONS "-DUSE_WIN32_FILEIO=OFF") # On UWP we use the unix I/O api. endif() -if("cxx" IN_LIST FEATURES) - vcpkg_fail_port_install( - MESSAGE "Feature 'cxx' is not supported on ${VCPKG_TARGET_ARCHITECTURE}." - ON_ARCH arm arm64 - ) -endif() - vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES cxx cxx 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 b722944ea..40b159093 100644 --- a/external_imported/vcpkg/ports/tiff/vcpkg-cmake-wrapper.cmake.in +++ b/external_imported/vcpkg/ports/tiff/vcpkg-cmake-wrapper.cmake.in @@ -20,9 +20,9 @@ if(TIFF_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") list(APPEND z_vcpkg_tiff_libraries ${WEBP_LIBRARIES}) endif() if(@lzma@) - find_package(LibLZMA CONFIG ${z_vcpkg_tiff_find_options}) + find_package(LibLZMA ${z_vcpkg_tiff_find_options}) list(APPEND z_vcpkg_tiff_link_libraries LibLZMA::LibLZMA) - list(APPEND z_vcpkg_tiff_libraries ${LZMA_LIBRARIES}) + list(APPEND z_vcpkg_tiff_libraries ${LIBLZMA_LIBRARIES}) endif() if(@jpeg@) find_package(JPEG ${z_vcpkg_tiff_find_options}) diff --git a/external_imported/vcpkg/ports/tiff/vcpkg.json b/external_imported/vcpkg/ports/tiff/vcpkg.json index 742e66e5a..59f4c26e8 100644 --- a/external_imported/vcpkg/ports/tiff/vcpkg.json +++ b/external_imported/vcpkg/ports/tiff/vcpkg.json @@ -1,9 +1,10 @@ { "name": "tiff", "version": "4.3.0", - "port-version": 3, + "port-version": 6, "description": "A library that supports the manipulation of TIFF image files", "homepage": "https://libtiff.gitlab.io/libtiff/", + "license": null, "dependencies": [ { "name": "vcpkg-cmake", @@ -17,7 +18,8 @@ ], "features": { "cxx": { - "description": "Build C++ libtiffxx library" + "description": "Build C++ libtiffxx library", + "supports": "!arm" }, "jpeg": { "description": "Support JPEG compression in TIFF image files", diff --git a/external_imported/vcpkg/ports/tinkerforge/portfile.cmake b/external_imported/vcpkg/ports/tinkerforge/portfile.cmake index cfc5c3989..96f561ae5 100644 --- a/external_imported/vcpkg/ports/tinkerforge/portfile.cmake +++ b/external_imported/vcpkg/ports/tinkerforge/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - set(VERSION 2_1_25) vcpkg_download_distfile(ARCHIVE diff --git a/external_imported/vcpkg/ports/tinkerforge/vcpkg.json b/external_imported/vcpkg/ports/tinkerforge/vcpkg.json index 6590a57f1..bc809a76a 100644 --- a/external_imported/vcpkg/ports/tinkerforge/vcpkg.json +++ b/external_imported/vcpkg/ports/tinkerforge/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tinkerforge", - "version-string": "2.1.25", - "port-version": 1, + "version": "2.1.25", + "port-version": 2, "description": "Tinkerforge C API bindings for bricks and bricklets", "supports": "!uwp" } diff --git a/external_imported/vcpkg/ports/tinycbor/CMakeLists.txt b/external_imported/vcpkg/ports/tinycbor/CMakeLists.txt new file mode 100644 index 000000000..b902a7df3 --- /dev/null +++ b/external_imported/vcpkg/ports/tinycbor/CMakeLists.txt @@ -0,0 +1,9 @@ +cmake_minimum_required(VERSION 3.20) +project(tinycbor C) + +file(GLOB sources src/cbor*.c) +list(FILTER sources EXCLUDE REGEX "cbortojson.c$") +add_library(tinycbor ${sources}) + +install(TARGETS tinycbor) +install(FILES src/cbor.h src/cborjson.h src/tinycbor-version.h DESTINATION include/tinycbor) diff --git a/external_imported/vcpkg/ports/tinycbor/portfile.cmake b/external_imported/vcpkg/ports/tinycbor/portfile.cmake new file mode 100644 index 000000000..325b4eb08 --- /dev/null +++ b/external_imported/vcpkg/ports/tinycbor/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO intel/tinycbor + REF v0.6.0 + SHA512 af1ed05c03d3aed56e35fdcaad3235992f96b5043b594c0246e600e4b1f085df78c5345beaac8758c2b5db2952ab83997019de5940857eecb81d84b6fb642093 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") + +vcpkg_cmake_install() + +# Remove duplicated include headers +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/tinycbor/vcpkg.json b/external_imported/vcpkg/ports/tinycbor/vcpkg.json new file mode 100644 index 000000000..23016c5f7 --- /dev/null +++ b/external_imported/vcpkg/ports/tinycbor/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "tinycbor", + "version-semver": "0.6.0", + "port-version": 1, + "description": "Concise Binary Object Representation (CBOR) Library", + "homepage": "https://github.com/intel/tinycbor", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/tinyexif/portfile.cmake b/external_imported/vcpkg/ports/tinyexif/portfile.cmake index 12e6f5cb9..5a697f13f 100644 --- a/external_imported/vcpkg/ports/tinyexif/portfile.cmake +++ b/external_imported/vcpkg/ports/tinyexif/portfile.cmake @@ -1,28 +1,27 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cdcseacave/TinyEXIF - REF c57a5fec1a847ec0e7b482b2da72e1f04fc2e147 - SHA512 a968e79b4b7a6f5f189328a8dc493da5c0d568526b5dca46b9bfc0cf85295fb348bd0b38828fedbb7b6e4467fc8932d0d7b435b4acbfe662e954cbed1d0ea914 + REF 6e56015f56ee0f387f1b8c76e50eb35ac60372da #2022-02-15 + SHA512 46f55a163cfed2d8fadd7ac0425b190c59136252e5f60d945f6655d0a6df20ea08f272d25c66e76df4c8c0340f654cef875da12627b8bef88f8f6e875fc1bf48 HEAD_REF master ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} -DBUILD_DEMO=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/TinyEXIF) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/TinyEXIF) 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}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/tinyexif RENAME copyright) +file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/tinyexif/vcpkg.json b/external_imported/vcpkg/ports/tinyexif/vcpkg.json index 1d5a0f8cc..708541d3d 100644 --- a/external_imported/vcpkg/ports/tinyexif/vcpkg.json +++ b/external_imported/vcpkg/ports/tinyexif/vcpkg.json @@ -1,10 +1,17 @@ { "name": "tinyexif", - "version-string": "1.0.2", - "port-version": 7, + "version-date": "2022-02-15", "description": "tiny ISO-compliant C++ EXIF and XMP parsing library for JPEG images", "homepage": "https://github.com/cdcseacave/TinyEXIF", "dependencies": [ - "tinyxml2" + "tinyxml2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/tinyfiledialogs/portfile.cmake b/external_imported/vcpkg/ports/tinyfiledialogs/portfile.cmake index 10929dec1..b93dec69f 100644 --- a/external_imported/vcpkg/ports/tinyfiledialogs/portfile.cmake +++ b/external_imported/vcpkg/ports/tinyfiledialogs/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_git( diff --git a/external_imported/vcpkg/ports/tinyfiledialogs/vcpkg.json b/external_imported/vcpkg/ports/tinyfiledialogs/vcpkg.json index 6bc220ee0..ca44d2c9e 100644 --- a/external_imported/vcpkg/ports/tinyfiledialogs/vcpkg.json +++ b/external_imported/vcpkg/ports/tinyfiledialogs/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tinyfiledialogs", "version": "3.8.8", - "port-version": 3, + "port-version": 4, "description": "Highly portable and cross-platform dialogs for native inputbox, passwordbox, colorpicker and more", "homepage": "https://sourceforge.net/projects/tinyfiledialogs/", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/tmx/portfile.cmake b/external_imported/vcpkg/ports/tmx/portfile.cmake index 1ddf5a4f2..ee7616910 100644 --- a/external_imported/vcpkg/ports/tmx/portfile.cmake +++ b/external_imported/vcpkg/ports/tmx/portfile.cmake @@ -13,9 +13,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() -file(RENAME "${CURRENT_PACKAGES_DIR}/lib/cmake/tmx/tmxExports.cmake" "${CURRENT_PACKAGES_DIR}/lib/cmake/tmx/tmxTargets.cmake") vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/tmx) -file(RENAME "${CURRENT_PACKAGES_DIR}/share/tmx/tmxTargets.cmake" "${CURRENT_PACKAGES_DIR}/share/tmx/tmxExports.cmake") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" diff --git a/external_imported/vcpkg/ports/tmx/vcpkg.json b/external_imported/vcpkg/ports/tmx/vcpkg.json index f21eba4ed..764177045 100644 --- a/external_imported/vcpkg/ports/tmx/vcpkg.json +++ b/external_imported/vcpkg/ports/tmx/vcpkg.json @@ -1,6 +1,7 @@ { "name": "tmx", "version": "1.2.0", + "port-version": 1, "description": "A portable C library to load tiled maps in your games.", "dependencies": [ "libxml2", diff --git a/external_imported/vcpkg/ports/tomlplusplus/portfile.cmake b/external_imported/vcpkg/ports/tomlplusplus/portfile.cmake index b1c3e85b0..5c5dca582 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 v2.5.0 - SHA512 7394cda2009b37e88f9028ee5d1887120bed7042833c7cb218d7705cdc92273c81a84163ff0be034d3f23c8dd93e63b7615134a4b0e1c580e1e945fae45c7d35 + REF v3.0.1 + SHA512 bfb05d16715d1e8b54177e905c0a83470e7472c9c474874d70528558bbf0b0ba0daae67e1e44d99c45de3f87918bca57e889caba2e3da5e351045aee7e6a144b HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/tomlplusplus/vcpkg.json b/external_imported/vcpkg/ports/tomlplusplus/vcpkg.json index 267b097da..39bfa48c4 100644 --- a/external_imported/vcpkg/ports/tomlplusplus/vcpkg.json +++ b/external_imported/vcpkg/ports/tomlplusplus/vcpkg.json @@ -1,9 +1,9 @@ { "name": "tomlplusplus", - "version": "2.5.0", - "port-version": 3, + "version": "3.0.1", "description": "Header-only TOML config file parser and serializer for modern C++.", "homepage": "https://marzer.github.io/tomlplusplus/", + "license": "MIT", "supports": "!uwp", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/tool-meson/vcpkg.json b/external_imported/vcpkg/ports/tool-meson/vcpkg.json index 617d20486..4601eda68 100644 --- a/external_imported/vcpkg/ports/tool-meson/vcpkg.json +++ b/external_imported/vcpkg/ports/tool-meson/vcpkg.json @@ -1,9 +1,12 @@ { "name": "tool-meson", - "version-date": "2021-11-19", + "version-date": "2022-01-21", "description": "Meson build system", "homepage": "https://github.com/mesonbuild/meson", "dependencies": [ - "vcpkg-tool-meson" + { + "name": "vcpkg-tool-meson", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/tracy/add-install.patch b/external_imported/vcpkg/ports/tracy/add-install.patch deleted file mode 100644 index bccfa195e..000000000 --- a/external_imported/vcpkg/ports/tracy/add-install.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9fd34587..2ce57f6f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,7 +6,9 @@ find_package(Threads REQUIRED) - - add_library(TracyClient TracyClient.cpp) - target_compile_features(TracyClient PUBLIC cxx_std_11) --target_include_directories(TracyClient PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) -+target_include_directories(TracyClient PUBLIC -+ $ -+ $) - target_link_libraries( - TracyClient - PUBLIC -@@ -43,3 +45,32 @@ set_option(TRACY_NO_FRAME_IMAGE "Disable capture of frame images" OFF) - set_option(TRACE_NO_SAMPLING "Disable call stack sampling" OFF) - set_option(TRACY_NO_VERIFY "Disable zone validation for C API" OFF) - set_option(TRACY_NO_VSYNC_CAPTURE "Disable capture of hardware Vsync events" OFF) -+ -+if(BUILD_SHARED_LIBS) -+ target_compile_definitions(TracyClient PRIVATE TRACY_EXPORTS) -+ target_compile_definitions(TracyClient PUBLIC TRACY_IMPORTS) -+endif() -+ -+include(CMakePackageConfigHelpers) -+include(GNUInstallDirs) -+ -+set(includes -+ ${CMAKE_CURRENT_LIST_DIR}/TracyC.h -+ ${CMAKE_CURRENT_LIST_DIR}/Tracy.hpp -+ ${CMAKE_CURRENT_LIST_DIR}/TracyD3D11.hpp -+ ${CMAKE_CURRENT_LIST_DIR}/TracyD3D12.hpp -+ ${CMAKE_CURRENT_LIST_DIR}/TracyLua.hpp -+ ${CMAKE_CURRENT_LIST_DIR}/TracyOpenCL.hpp -+ ${CMAKE_CURRENT_LIST_DIR}/TracyOpenGL.hpp -+ ${CMAKE_CURRENT_LIST_DIR}/TracyVulkan.hpp) -+ -+install(TARGETS TracyClient -+ EXPORT TracyConfig -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+install(FILES ${includes} -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -+install(EXPORT TracyConfig -+ FILE TracyConfig.cmake -+ DESTINATION share/Tracy) diff --git a/external_imported/vcpkg/ports/tracy/portfile.cmake b/external_imported/vcpkg/ports/tracy/portfile.cmake index 7d89380cf..d5063151d 100644 --- a/external_imported/vcpkg/ports/tracy/portfile.cmake +++ b/external_imported/vcpkg/ports/tracy/portfile.cmake @@ -1,11 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wolfpld/tracy - REF b7a27d02afe1941eed8f64f2164447ff1a06daa6 - SHA512 027adffc1e362610016a86c7e37c97dc836d14ca0c8579281f0d53c443c58c206ad80d33936a18668c2695b9009cbbb7acbc16ec516b83f796870dc527e469e1 + REF 9ba7171c3dd6f728268a820ee268a62c75f2dfb6 + SHA512 a2898cd04a532a5cc71fd6c5fd3893ebff68df25fc38e8d988ba4a8a6cbe33e3d0049661029d002160b94b57421e5c5b7400658b404e51bfab721d204dd0cc5d HEAD_REF master - PATCHES - add-install.patch ) vcpkg_cmake_configure( diff --git a/external_imported/vcpkg/ports/tracy/vcpkg.json b/external_imported/vcpkg/ports/tracy/vcpkg.json index 538d71d60..9821d14bf 100644 --- a/external_imported/vcpkg/ports/tracy/vcpkg.json +++ b/external_imported/vcpkg/ports/tracy/vcpkg.json @@ -1,6 +1,6 @@ { "name": "tracy", - "version": "0.7.8", + "version": "0.8.0", "description": "A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications.", "homepage": "https://github.com/wolfpld/tracy", "supports": "!(windows & (arm | uwp))", diff --git a/external_imported/vcpkg/ports/trantor/portfile.cmake b/external_imported/vcpkg/ports/trantor/portfile.cmake index 012a185dd..f2dcdfb46 100644 --- a/external_imported/vcpkg/ports/trantor/portfile.cmake +++ b/external_imported/vcpkg/ports/trantor/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO an-tao/trantor - REF v1.5.4 - SHA512 adb98a78d254b19ec0866cf3bfa06011123fca4553e73702024ebe4cde6d95fb1de29d6894d89362339b82e1a6738b32ffc1a682cbb33ae94354df4a45cda8c7 + REF v1.5.5 + SHA512 41068dcefcaf55908735126375b65a83a7d7085f30d5eb14e8d73fa255405ec77164c34b9ef0e5e6da3aeae3e66b9d57d4fca8901d63d4414bf8e857bd25dcd4 HEAD_REF master PATCHES vcpkg.patch diff --git a/external_imported/vcpkg/ports/trantor/vcpkg.json b/external_imported/vcpkg/ports/trantor/vcpkg.json index c975df37c..3af0abe63 100644 --- a/external_imported/vcpkg/ports/trantor/vcpkg.json +++ b/external_imported/vcpkg/ports/trantor/vcpkg.json @@ -1,8 +1,9 @@ { "name": "trantor", - "version-semver": "1.5.4", + "version-semver": "1.5.5", "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", "dependencies": [ "c-ares", "openssl", diff --git a/external_imported/vcpkg/ports/triangle/portfile.cmake b/external_imported/vcpkg/ports/triangle/portfile.cmake index 38b027986..15f027c2c 100644 --- a/external_imported/vcpkg/ports/triangle/portfile.cmake +++ b/external_imported/vcpkg/ports/triangle/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_download_distfile(ARCHIVE_FILE URLS "http://www.netlib.org/voronoi/triangle.zip" FILENAME "triangle.zip" diff --git a/external_imported/vcpkg/ports/triangle/vcpkg.json b/external_imported/vcpkg/ports/triangle/vcpkg.json index 816f50152..29cd78867 100644 --- a/external_imported/vcpkg/ports/triangle/vcpkg.json +++ b/external_imported/vcpkg/ports/triangle/vcpkg.json @@ -1,7 +1,7 @@ { "name": "triangle", - "version-string": "1.6", - "port-version": 1, + "version": "1.6", + "port-version": 2, "description": "A Two-Dimensional Quality Mesh Generator and Delaunay Triangulator.", "homepage": "http://www.cs.cmu.edu/~quake/triangle.html", "supports": "!uwp" diff --git a/external_imported/vcpkg/ports/triton/001-fix-dependency-z3.patch b/external_imported/vcpkg/ports/triton/001-fix-dependency-z3.patch new file mode 100644 index 000000000..fd3ee5f30 --- /dev/null +++ b/external_imported/vcpkg/ports/triton/001-fix-dependency-z3.patch @@ -0,0 +1,42 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a8bbe47..966ded8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -99,9 +99,9 @@ list(APPEND CMAKE_MODULE_PATH "${TRITON_ROOT}/CMakeModules/") + # Find Z3 + if(Z3_INTERFACE) + message(STATUS "Compiling with Z3 SMT solver") +- find_package(Z3 REQUIRED) +- include_directories(${Z3_INCLUDE_DIRS}) ++ find_package(Z3 CONFIG REQUIRED) + set(TRITON_Z3_INTERFACE ON) ++ set(Z3_LIBRARIES z3::libz3) + endif() + + # Find bitwuzla +diff --git a/src/libtriton/Config.cmake.in b/src/libtriton/Config.cmake.in +index 683b5f2..5df941e 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 + + include(CMakeFindDependencyMacro) + find_dependency(Boost) ++if (@Z3_INTERFACE@) ++ 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/002-fix-dependency-capstone.patch b/external_imported/vcpkg/ports/triton/002-fix-dependency-capstone.patch new file mode 100644 index 000000000..d4814709e --- /dev/null +++ b/external_imported/vcpkg/ports/triton/002-fix-dependency-capstone.patch @@ -0,0 +1,60 @@ +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-capstone-5.patch b/external_imported/vcpkg/ports/triton/003-fix-capstone-5.patch new file mode 100644 index 000000000..4d2f08c56 --- /dev/null +++ b/external_imported/vcpkg/ports/triton/003-fix-capstone-5.patch @@ -0,0 +1,62 @@ +diff --git a/src/libtriton/arch/x86/x86Specifications.cpp b/src/libtriton/arch/x86/x86Specifications.cpp +index 0806ac3..6295c95 100644 +--- a/src/libtriton/arch/x86/x86Specifications.cpp ++++ b/src/libtriton/arch/x86/x86Specifications.cpp +@@ -153,9 +153,11 @@ namespace triton { + tritonId = triton::arch::x86::ID_INS_FIADD; + break; + ++#if CS_API_MAJOR < 5 + case triton::extlibs::capstone::X86_INS_FADDP: + tritonId = triton::arch::x86::ID_INS_FADDP; + break; ++#endif + + case triton::extlibs::capstone::X86_INS_ADOX: + tritonId = triton::arch::x86::ID_INS_ADOX; +@@ -2877,9 +2879,11 @@ namespace triton { + tritonId = triton::arch::x86::ID_INS_FUCOM; + break; + ++#if CS_API_MAJOR < 5 + case triton::extlibs::capstone::X86_INS_UD2B: + tritonId = triton::arch::x86::ID_INS_UD2B; + break; ++#endif + + case triton::extlibs::capstone::X86_INS_UNPCKHPD: + tritonId = triton::arch::x86::ID_INS_UNPCKHPD; +@@ -3037,17 +3041,21 @@ namespace triton { + tritonId = triton::arch::x86::ID_INS_VCVTDQ2PS; + break; + ++#if CS_API_MAJOR < 5 + case triton::extlibs::capstone::X86_INS_VCVTPD2DQX: + tritonId = triton::arch::x86::ID_INS_VCVTPD2DQX; + break; ++#endif + + case triton::extlibs::capstone::X86_INS_VCVTPD2DQ: + tritonId = triton::arch::x86::ID_INS_VCVTPD2DQ; + break; + ++#if CS_API_MAJOR < 5 + case triton::extlibs::capstone::X86_INS_VCVTPD2PSX: + tritonId = triton::arch::x86::ID_INS_VCVTPD2PSX; + break; ++#endif + + case triton::extlibs::capstone::X86_INS_VCVTPD2PS: + tritonId = triton::arch::x86::ID_INS_VCVTPD2PS; +@@ -3093,9 +3101,11 @@ namespace triton { + tritonId = triton::arch::x86::ID_INS_VCVTSS2USI; + break; + ++#if CS_API_MAJOR < 5 + case triton::extlibs::capstone::X86_INS_VCVTTPD2DQX: + tritonId = triton::arch::x86::ID_INS_VCVTTPD2DQX; + break; ++#endif + + case triton::extlibs::capstone::X86_INS_VCVTTPD2DQ: + tritonId = triton::arch::x86::ID_INS_VCVTTPD2DQ; diff --git a/external_imported/vcpkg/ports/triton/004-fix-python.patch b/external_imported/vcpkg/ports/triton/004-fix-python.patch new file mode 100644 index 000000000..19c0604f5 --- /dev/null +++ b/external_imported/vcpkg/ports/triton/004-fix-python.patch @@ -0,0 +1,27 @@ +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 new file mode 100644 index 000000000..991631203 --- /dev/null +++ b/external_imported/vcpkg/ports/triton/portfile.cmake @@ -0,0 +1,53 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO JonathanSalwan/Triton + REF 64a2b9b0490c82e41b37e623b1d0da14e2382e7a + SHA512 ff99a270813043df2bc0da765e04aae4b9d5a911d20c6e5ffca1472eae8d6e1fcfff3cd56da023d6a77a647644839430bf72902acd84ec521a0e098f185d275c + PATCHES + 001-fix-dependency-z3.patch + 002-fix-dependency-capstone.patch + 003-fix-capstone-5.patch + 004-fix-python.patch +) + +string(COMPARE NOTEQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" DYNAMICLIB) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATICCRT) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "python" PYTHON_BINDINGS +) + +set(ADDITIONAL_OPTIONS ) +if(PYTHON_BINDINGS) + vcpkg_find_acquire_program(PYTHON3) + list(APPEND ADDITIONAL_OPTIONS + -DPYTHON_EXECUTABLE=${PYTHON3} + ) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DZ3_INTERFACE=ON + -DBUILD_SHARED_LIBS=${DYNAMICLIB} + -DMSVC_STATIC=${STATICCRT} + -DBUILD_EXAMPLES=OFF + -DENABLE_TEST=OFF + ${ADDITIONAL_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +# Move cmake configs +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") + +# 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 new file mode 100644 index 000000000..e97ea3d51 --- /dev/null +++ b/external_imported/vcpkg/ports/triton/vcpkg.json @@ -0,0 +1,43 @@ +{ + "name": "triton", + "version": "0.9", + "port-version": 2, + "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, + "features": [ + "arm", + "arm64", + "x86" + ] + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "z3" + ], + "features": { + "python": { + "description": "Build Triton with Python bindings", + "dependencies": [ + { + "name": "python3", + "default-features": false + } + ] + } + } +} diff --git a/external_imported/vcpkg/ports/ttauri/portfile.cmake b/external_imported/vcpkg/ports/ttauri/portfile.cmake index b2878a2d2..52eeca7ba 100644 --- a/external_imported/vcpkg/ports/ttauri/portfile.cmake +++ b/external_imported/vcpkg/ports/ttauri/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "x86" "arm" "arm64") -vcpkg_fail_port_install(ON_TARGET "linux" "uwp" "osx") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/external_imported/vcpkg/ports/ttauri/vcpkg.json b/external_imported/vcpkg/ports/ttauri/vcpkg.json index 5bc11e747..b59bd25f4 100644 --- a/external_imported/vcpkg/ports/ttauri/vcpkg.json +++ b/external_imported/vcpkg/ports/ttauri/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ttauri", "version": "0.5.0", + "port-version": 1, "maintainers": "@takev", "description": "A portable, low latency, retained-mode GUI framework written in C++.", "homepage": "https://github.com/ttauri-project/ttauri", diff --git a/external_imported/vcpkg/ports/turbobase64/portfile.cmake b/external_imported/vcpkg/ports/turbobase64/portfile.cmake index 0c4e89e63..e4db2c00b 100644 --- a/external_imported/vcpkg/ports/turbobase64/portfile.cmake +++ b/external_imported/vcpkg/ports/turbobase64/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP" "Windows") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO powturbo/Turbo-Base64 diff --git a/external_imported/vcpkg/ports/turbobase64/vcpkg.json b/external_imported/vcpkg/ports/turbobase64/vcpkg.json index dc418d68b..b0e93558d 100644 --- a/external_imported/vcpkg/ports/turbobase64/vcpkg.json +++ b/external_imported/vcpkg/ports/turbobase64/vcpkg.json @@ -1,7 +1,8 @@ { "name": "turbobase64", - "version-string": "2020-01-12", - "port-version": 1, + "version-date": "2020-01-12", + "port-version": 2, "description": "Fastest Base64 SIMD/Neon library", - "homepage": "https://github.com/powturbo/Turbo-Base64" + "homepage": "https://github.com/powturbo/Turbo-Base64", + "supports": "!windows" } diff --git a/external_imported/vcpkg/ports/tvision/portfile.cmake b/external_imported/vcpkg/ports/tvision/portfile.cmake index c8f42021d..4df140166 100644 --- a/external_imported/vcpkg/ports/tvision/portfile.cmake +++ b/external_imported/vcpkg/ports/tvision/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO magiblot/tvision @@ -20,4 +18,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}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/tvision/vcpkg.json b/external_imported/vcpkg/ports/tvision/vcpkg.json index 4e1f52a18..9d2af79cc 100644 --- a/external_imported/vcpkg/ports/tvision/vcpkg.json +++ b/external_imported/vcpkg/ports/tvision/vcpkg.json @@ -1,6 +1,7 @@ { "name": "tvision", "version-date": "2021-08-10", + "port-version": 1, "description": "A modern port of Turbo Vision 2.0, the classical framework for text-based user interfaces.", "homepage": "https://github.com/magiblot/tvision", "license": "MIT", diff --git a/external_imported/vcpkg/ports/umock-c/portfile.cmake b/external_imported/vcpkg/ports/umock-c/portfile.cmake index 71fb57c1d..4e9345fcd 100644 --- a/external_imported/vcpkg/ports/umock-c/portfile.cmake +++ b/external_imported/vcpkg/ports/umock-c/portfile.cmake @@ -36,5 +36,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR configure_file(${SOURCE_PATH}/readme.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) vcpkg_copy_pdbs() - - diff --git a/external_imported/vcpkg/ports/umock-c/vcpkg.json b/external_imported/vcpkg/ports/umock-c/vcpkg.json index 0456f2b98..d791b44b5 100644 --- a/external_imported/vcpkg/ports/umock-c/vcpkg.json +++ b/external_imported/vcpkg/ports/umock-c/vcpkg.json @@ -1,7 +1,6 @@ { "name": "umock-c", - "version-string": "2020-06-17", - "port-version": 2, + "version-date": "2022-01-21", "description": "A pure C mocking library", "homepage": "https://github.com/Azure/umock-c", "dependencies": [ diff --git a/external_imported/vcpkg/ports/unicorn-lib/CMakeLists.txt b/external_imported/vcpkg/ports/unicorn-lib/CMakeLists.txt index 16c160080..b668c3c09 100644 --- a/external_imported/vcpkg/ports/unicorn-lib/CMakeLists.txt +++ b/external_imported/vcpkg/ports/unicorn-lib/CMakeLists.txt @@ -4,8 +4,7 @@ project(Unicorn_Lib LANGUAGES CXX DESCRIPTION "Unicode library for C++ by Ross S set(CMAKE_CXX_STANDARD 17) option(UNICORN_LIB_SKIP_HEADERS "If the headers installation is skipped or not." OFF) -find_path(RS_CORE_LIB_INCLUDE_DIR rs-core/common.hpp) -#find_library(RW_UTILITIES_LIBRARY NAMES rw_utilities) +include(SelectLibraryConfigurations) find_package(ZLIB REQUIRED) find_library(PCRE2_LIBRARY_DEBUG NAMES pcre2-8d pcre2-8-staticd HINTS ${INSTALLED_LIB_PATH}) find_library(PCRE2_LIBRARY_RELEASE NAMES pcre2-8 pcre2-8-static HINTS ${INSTALLED_LIB_PATH}) @@ -13,26 +12,25 @@ select_library_configurations(PCRE2) file(GLOB_RECURSE UNICORN_LIB_SOURCES ${PROJECT_SOURCE_DIR}/unicorn/*.cpp) foreach(ITR ${UNICORN_LIB_SOURCES}) - if(ITR MATCHES "(.*)-test.cpp(.*)") - list(REMOVE_ITEM UNICORN_LIB_SOURCES ${ITR}) - endif() + if(ITR MATCHES "(.*)-test.cpp(.*)") + list(REMOVE_ITEM UNICORN_LIB_SOURCES ${ITR}) + endif() endforeach() add_library(unicorn-lib ${UNICORN_LIB_SOURCES}) target_include_directories( - unicorn-lib - PUBLIC ${PROJECT_SOURCE_DIR} - PUBLIC ${RS_CORE_LIB_INCLUDE_DIR} + unicorn-lib + PUBLIC ${PROJECT_SOURCE_DIR} ) target_compile_definitions( - unicorn-lib - PRIVATE -DUNICODE -D_UNICODE _CRT_SECURE_NO_WARNINGS + unicorn-lib + PRIVATE -DUNICODE -D_UNICODE _CRT_SECURE_NO_WARNINGS ) target_link_libraries(unicorn-lib PUBLIC ${PCRE2_LIBRARY}) target_link_libraries(unicorn-lib PUBLIC ZLIB::ZLIB) if(NOT UNICORN_LIB_SKIP_HEADERS) - install(DIRECTORY ${PROJECT_SOURCE_DIR}/unicorn DESTINATION include FILES_MATCHING PATTERN "*.hpp") + install(DIRECTORY ${PROJECT_SOURCE_DIR}/unicorn DESTINATION include FILES_MATCHING PATTERN "*.hpp") endif() install(TARGETS unicorn-lib RUNTIME DESTINATION bin diff --git a/external_imported/vcpkg/ports/unicorn-lib/portfile.cmake b/external_imported/vcpkg/ports/unicorn-lib/portfile.cmake index dfdc82bca..a206c633c 100644 --- a/external_imported/vcpkg/ports/unicorn-lib/portfile.cmake +++ b/external_imported/vcpkg/ports/unicorn-lib/portfile.cmake @@ -6,24 +6,22 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CaptainCrowbar/unicorn-lib - REF 01cc7fcd2d60dbc083767d448477638e5ec8b92a # 2020-03-02 - SHA512 d8ffb80c589b34d850a507570d7d8ec707a6a23b469d484f47c80566883bd4883da23a4701434f361231a7615065ff5f1e42e40c028975f43f198c307353ec9d + REF 44e975ffc8dcd8dedbe01a8cbe7812e351f3f74f # 2022-01-24 + SHA512 b22264420174c950ca8025e861366118d79a53edce9297d84af9511e255af5971c3719f0b464f4a4886848edea7c2ba4ae32ce9abab135628d64adbde5fa7b0d HEAD_REF master ) file(COPY ${CURRENT_PORT_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DUNICORN_LIB_SKIP_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -# 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/unicorn-lib/vcpkg.json b/external_imported/vcpkg/ports/unicorn-lib/vcpkg.json index 5aee95051..9a7ed9aeb 100644 --- a/external_imported/vcpkg/ports/unicorn-lib/vcpkg.json +++ b/external_imported/vcpkg/ports/unicorn-lib/vcpkg.json @@ -1,13 +1,19 @@ { "name": "unicorn-lib", - "version-date": "2020-03-02", - "port-version": 2, + "version-date": "2022-01-24", "description": "Unicode library for C++ by Ross Smith", "homepage": "https://github.com/CaptainCrowbar/unicorn-lib", + "license": "MIT", "dependencies": [ - "libiconv", "pcre2", - "rs-core-lib", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/external_imported/vcpkg/ports/unicorn/portfile.cmake b/external_imported/vcpkg/ports/unicorn/portfile.cmake index aee7b65b9..cccfbfe21 100644 --- a/external_imported/vcpkg/ports/unicorn/portfile.cmake +++ b/external_imported/vcpkg/ports/unicorn/portfile.cmake @@ -12,8 +12,8 @@ set(VCPKG_CRT_LINKAGE "static") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO unicorn-engine/unicorn - REF abe452babc13299f598a47f7c87873a4ae34bf09 # accessed on 2020-09-14 - SHA512 8ad4b76cc98fc9d21421c93ad7084665622fd0ed4de87cb189c5d7ed1bbc83ccd365bd08c4ccfa81539e42fa3a74ffc7e2e33a74f2bfdfd4b2b9e2e5425f2fc9 + REF 52f90cda023abaca510d59f021c88629270ad6c0 # v1.0.3 + SHA512 bb47e7d680b122e38bd9390f44a3f7e3c3e314ea3ac86dbab3e755b7bcc2db5daca3a4432276a874f59675f811f7785d68ec0d39696c955d3718d6a720adf70b HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/unicorn/vcpkg.json b/external_imported/vcpkg/ports/unicorn/vcpkg.json index bc01677b8..e4ea908ad 100644 --- a/external_imported/vcpkg/ports/unicorn/vcpkg.json +++ b/external_imported/vcpkg/ports/unicorn/vcpkg.json @@ -1,8 +1,8 @@ { "name": "unicorn", - "version-string": "2020-09-14", - "port-version": 1, + "version": "1.0.3", "description": "Unicorn is a lightweight multi-platform, multi-architecture CPU emulator framework", "homepage": "https://github.com/unicorn-engine/unicorn", - "supports": "!uwp" + "license": "GPL-2.0-only", + "supports": "windows & !uwp & !arm" } diff --git a/external_imported/vcpkg/ports/unrar/Config.cmake.in b/external_imported/vcpkg/ports/unrar/Config.cmake.in new file mode 100644 index 000000000..79add4e2f --- /dev/null +++ b/external_imported/vcpkg/ports/unrar/Config.cmake.in @@ -0,0 +1,22 @@ + +get_filename_component(_unrar_root "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_unrar_root "${_unrar_root}" PATH) +get_filename_component(_unrar_root "${_unrar_root}" PATH) + +set(_unrar_lib "${_unrar_root}/lib/unrar.lib") +if (EXISTS "${_unrar_lib}") + + add_library(unofficial::unrar::unrar INTERFACE IMPORTED) + set_target_properties(unofficial::unrar::unrar PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${_unrar_root}/include") + set_target_properties(unofficial::unrar::unrar PROPERTIES IMPORTED_LOCATION "${_unrar_lib}") + set_property(TARGET unofficial::unrar::unrar APPEND PROPERTY IMPORTED_CONFIGURATIONS) + set(unrar_FOUND TRUE) + +else() + + set(unrar_FOUND FALSE) + +endif() +unset(_unrar_lib) + +unset(_unrar_root) diff --git a/external_imported/vcpkg/ports/unrar/portfile.cmake b/external_imported/vcpkg/ports/unrar/portfile.cmake index 239316f07..a7041a813 100644 --- a/external_imported/vcpkg/ports/unrar/portfile.cmake +++ b/external_imported/vcpkg/ports/unrar/portfile.cmake @@ -26,15 +26,17 @@ vcpkg_build_msbuild( ) #INCLUDE (named dll.hpp in source, and unrar.h in all rarlabs distributions) -file(INSTALL ${SOURCE_PATH}/dll.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include RENAME unrar.h) +file(INSTALL "${SOURCE_PATH}/dll.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include" RENAME unrar.h) #DLL & LIB -file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/unrar.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) -file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/unrar.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/unrar.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) -file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/unrar.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) +file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/unrar.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") +file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/unrar.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") +file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/unrar.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") +file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/unrar.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") vcpkg_copy_pdbs() +configure_file("${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/unofficial-unrar/unofficial-unrar-config.cmake" @ONLY) + #COPYRIGHT -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/unrar RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/unrar/vcpkg.json b/external_imported/vcpkg/ports/unrar/vcpkg.json index 5646a0190..579dc62ea 100644 --- a/external_imported/vcpkg/ports/unrar/vcpkg.json +++ b/external_imported/vcpkg/ports/unrar/vcpkg.json @@ -1,7 +1,9 @@ { "name": "unrar", - "version-string": "5.8.1", - "port-version": 1, + "version": "5.8.1", + "port-version": 3, "description": "rarlab's unrar library", - "homepage": "https://www.rarlab.com" + "homepage": "https://www.rarlab.com", + "license": null, + "supports": "windows & !uwp & !arm & !static" } diff --git a/external_imported/vcpkg/ports/usd/portfile.cmake b/external_imported/vcpkg/ports/usd/portfile.cmake index 6abb5c15e..58d328ea8 100644 --- a/external_imported/vcpkg/ports/usd/portfile.cmake +++ b/external_imported/vcpkg/ports/usd/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "x86") - # Don't file if the bin folder exists. We need exe and custom files. SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/external_imported/vcpkg/ports/usd/vcpkg.json b/external_imported/vcpkg/ports/usd/vcpkg.json index e284433ec..dd308fe5d 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": 1, + "port-version": 2, "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/utf8h/portfile.cmake b/external_imported/vcpkg/ports/utf8h/portfile.cmake index a8980161b..041d253aa 100644 --- a/external_imported/vcpkg/ports/utf8h/portfile.cmake +++ b/external_imported/vcpkg/ports/utf8h/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sheredom/utf8.h - REF 146be69f88575d753317d8ef13b16f80e0656fc7 - SHA512 3ce20a440aa6c83b2079cad1385ba96688c2ae866b9dee013bc461f3ba180154231e3a18d3d020b4617b1c17b2cb36ea10c53656a48dd1294ed8324ed5b9acfb + REF 500d4ea9f4c3449e5243c088d8af8700f7189734 + SHA512 fbae7dbfd932176058dacb33ea491d17eb8e02c845e1ef2afc0ae482f563578a8a8011a8578f4aa8593bb0d7de8ba2df140bda05859a9a6bd67f6545ca0d7421 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/utf8h/vcpkg.json b/external_imported/vcpkg/ports/utf8h/vcpkg.json index 41f297972..620e9bbe8 100644 --- a/external_imported/vcpkg/ports/utf8h/vcpkg.json +++ b/external_imported/vcpkg/ports/utf8h/vcpkg.json @@ -1,6 +1,6 @@ { "name": "utf8h", - "version-date": "2021-10-21", + "version-date": "2021-11-18", "description": "Single header utf8 string functions for C and C++", "homepage": "https://github.com/sheredom/utf8.h" } diff --git a/external_imported/vcpkg/ports/uthenticode/openssl.patch b/external_imported/vcpkg/ports/uthenticode/openssl.patch new file mode 100644 index 000000000..e447c1fad --- /dev/null +++ b/external_imported/vcpkg/ports/uthenticode/openssl.patch @@ -0,0 +1,72 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 75b82ee..47bed29 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -3,11 +3,7 @@ cmake_minimum_required(VERSION 3.10 FATAL_ERROR) + project(uthenticode) + + find_package(pe-parse REQUIRED) +-find_package( +- OpenSSL 1.1 +- COMPONENTS Crypto +- REQUIRED +-) ++find_package(OpenSSL REQUIRED) + + add_library("${PROJECT_NAME}" uthenticode.cpp) + +@@ -38,7 +34,7 @@ else () + target_link_libraries("${PROJECT_NAME}" PUBLIC pe-parse::pe-parser-library) + endif () + +-target_link_libraries("${PROJECT_NAME}" PUBLIC OpenSSL::Crypto) ++target_link_libraries("${PROJECT_NAME}" PUBLIC OpenSSL::SSL OpenSSL::Crypto) + + install( + TARGETS "${PROJECT_NAME}" +diff --git a/src/include/uthenticode.h b/src/include/uthenticode.h +index 8422cc3..938d8b8 100644 +--- a/src/include/uthenticode.h ++++ b/src/include/uthenticode.h +@@ -48,6 +48,7 @@ DECLARE_ASN1_FUNCTIONS(Authenticode_SpcIndirectDataContent) + * So we wrap it here for use with unique_ptr. + */ + void OpenSSL_free(void *ptr); ++void SK_X509_free(stack_st_X509 *ptr); + + /* Convenient self-releasing aliases for libcrypto and custom ASN.1 types. + */ +@@ -56,7 +57,7 @@ using ASN1_OBJECT_ptr = std::unique_ptr; + using OpenSSL_ptr = std::unique_ptr; + using BN_ptr = std::unique_ptr; +-using STACK_OF_X509_ptr = std::unique_ptr; ++using STACK_OF_X509_ptr = std::unique_ptr; + + using SectionList = std::vector; + +diff --git a/src/uthenticode.cpp b/src/uthenticode.cpp +index b1be0bc..7043589 100644 +--- a/src/uthenticode.cpp ++++ b/src/uthenticode.cpp +@@ -39,6 +39,11 @@ IMPLEMENT_ASN1_FUNCTIONS(Authenticode_SpcIndirectDataContent) + void OpenSSL_free(void *ptr) { + OPENSSL_free(ptr); + } ++ ++void SK_X509_free(stack_st_X509 *ptr) { ++ sk_X509_free(ptr); ++} ++ + // clang-format on + } // namespace impl + +@@ -252,7 +257,7 @@ std::vector SignedData::get_signers() const { + if (signers_stack_ptr == nullptr) { + return {}; + } +- auto signers_stack = impl::STACK_OF_X509_ptr(signers_stack_ptr, sk_X509_free); ++ auto signers_stack = impl::STACK_OF_X509_ptr(signers_stack_ptr, impl::SK_X509_free); + + std::vector signers; + for (auto i = 0; i < sk_X509_num(signers_stack.get()); ++i) { diff --git a/external_imported/vcpkg/ports/uthenticode/portfile.cmake b/external_imported/vcpkg/ports/uthenticode/portfile.cmake index 730d411fd..74a6a2957 100644 --- a/external_imported/vcpkg/ports/uthenticode/portfile.cmake +++ b/external_imported/vcpkg/ports/uthenticode/portfile.cmake @@ -1,11 +1,11 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO trailofbits/uthenticode REF v1.0.6 SHA512 6C9C4DD9E1FE7C329E10BC39E41927C8B82DD004275A88385C691AD85EF4079EBE2922083D5252019B8B25CC540F48E544B42B8178F256AE987D6B677713B063 HEAD_REF master + PATCHES + openssl.patch ) # compatibility fix for newer versions of pe-parse diff --git a/external_imported/vcpkg/ports/uthenticode/vcpkg.json b/external_imported/vcpkg/ports/uthenticode/vcpkg.json index 9ed6e1f7c..13ece8b48 100644 --- a/external_imported/vcpkg/ports/uthenticode/vcpkg.json +++ b/external_imported/vcpkg/ports/uthenticode/vcpkg.json @@ -1,6 +1,7 @@ { "name": "uthenticode", - "version-string": "1.0.6", + "version": "1.0.6", + "port-version": 2, "description": "A cross-platform library for verifying Authenticode signatures", "homepage": "https://github.com/trailofbits/uthenticode", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/uvatlas/portfile.cmake b/external_imported/vcpkg/ports/uvatlas/portfile.cmake index ddb6325d3..21defe3fb 100644 --- a/external_imported/vcpkg/ports/uvatlas/portfile.cmake +++ b/external_imported/vcpkg/ports/uvatlas/portfile.cmake @@ -1,13 +1,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_fail_port_install(ON_TARGET "OSX") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/UVAtlas - REF nov2021b - SHA512 14227447265c138359f3d189adde04daded386d061ad43128a97759e862005840e89b140f8a8f330808fa90035d8fdc2aa18437ac5447d2f849d8426f32b9cbb - HEAD_REF master + REF mar2022 + SHA512 8e532a754d1b07108c98e099221a1c6eb39e1386e2e61d8694e041fcdf0556d1aeaed703018b18aa0cc2972c1b874fedd4d7b5e5694c504e70d623a78e6eb421 + HEAD_REF main ) if (VCPKG_HOST_IS_LINUX) @@ -37,9 +35,9 @@ vcpkg_cmake_config_fixup(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ("eigen" IN_LIST FEATURES))) vcpkg_download_distfile( UVATLASTOOL_EXE - URLS "https://github.com/Microsoft/UVAtlas/releases/download/nov2021/uvatlastool.exe" - FILENAME "uvatlastool-nov2021.exe" - SHA512 84de6bc74901f3ab888b90126cc1ac64de564eb33c605fffe37b2199ad132a53b01271f1f551fcc067c144c599380764b9e50884ce5df32f43b2c58777da0722 + URLS "https://github.com/Microsoft/UVAtlas/releases/download/mar2022/uvatlastool.exe" + FILENAME "uvatlastool-mar2022.exe" + SHA512 d4179b755a9f8d81c180c86ae7e2d177dd0842f78fc81d96b87fa6551407a038edb8250529e45a9b783514e27cbe2a806bac4af47c3db5c34a6e4adc602f5ff4 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/uvatlas/") @@ -48,7 +46,7 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ${UVATLASTOOL_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/uvatlas/) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool-nov2021.exe ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool-mar2022.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 8a2191e06..98c6954a7 100644 --- a/external_imported/vcpkg/ports/uvatlas/vcpkg.json +++ b/external_imported/vcpkg/ports/uvatlas/vcpkg.json @@ -1,6 +1,6 @@ { "name": "uvatlas", - "version-date": "2021-11-08", + "version-date": "2022-03-24", "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/uwebsockets/portfile.cmake b/external_imported/vcpkg/ports/uwebsockets/portfile.cmake index 6b8e659e1..31984b177 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.8.0 - SHA512 2ebb75ce2cd0194b9846a16ea69eb7d9aa25e3673cca0afbb61946989380256ebc27cf24c98bee0bf1264c7b60d84ebb01511454973e5ce165fafc7f75b52902 + REF v20.11.0 + SHA512 cd4efb386b4d140c6ccbfa92e8be1d3c9b896474a3074b95ad35bedde9face80a1e4bae594359555010d76c2ccf8243b29e97079de8b0f18cda510274135b8e0 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/uwebsockets/vcpkg.json b/external_imported/vcpkg/ports/uwebsockets/vcpkg.json index 369692864..fe675dbb0 100644 --- a/external_imported/vcpkg/ports/uwebsockets/vcpkg.json +++ b/external_imported/vcpkg/ports/uwebsockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "uwebsockets", - "version-semver": "20.8.0", + "version-semver": "20.11.0", "description": "Simple, secure & standards compliant web I/O for the most demanding of applications", "homepage": "https://github.com/uWebSockets/uWebSockets", "dependencies": [ diff --git a/external_imported/vcpkg/ports/v-hacd/portfile.cmake b/external_imported/vcpkg/ports/v-hacd/portfile.cmake index 3e4cdefa3..70148bfb9 100644 --- a/external_imported/vcpkg/ports/v-hacd/portfile.cmake +++ b/external_imported/vcpkg/ports/v-hacd/portfile.cmake @@ -1,8 +1,5 @@ -vcpkg_fail_port_install(ON_ARCH "arm") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kmammou/v-hacd diff --git a/external_imported/vcpkg/ports/v-hacd/vcpkg.json b/external_imported/vcpkg/ports/v-hacd/vcpkg.json index 338e0337b..217ee155f 100644 --- a/external_imported/vcpkg/ports/v-hacd/vcpkg.json +++ b/external_imported/vcpkg/ports/v-hacd/vcpkg.json @@ -1,7 +1,7 @@ { "name": "v-hacd", - "version-string": "3.2.0", - "port-version": 2, + "version": "3.2.0", + "port-version": 3, "description": "The V-HACD library decomposes a 3D surface into a set of \"near\" convex parts.", "homepage": "https://github.com/kmammou/v-hacd", "supports": "!arm", diff --git a/external_imported/vcpkg/ports/v8/vcpkg.json b/external_imported/vcpkg/ports/v8/vcpkg.json index fa621d36e..5f82dceb8 100644 --- a/external_imported/vcpkg/ports/v8/vcpkg.json +++ b/external_imported/vcpkg/ports/v8/vcpkg.json @@ -1,7 +1,7 @@ { "name": "v8", "version": "9.1.269.39", - "port-version": 2, + "port-version": 3, "description": "Google Chrome's JavaScript engine", "homepage": "https://v8.dev", "supports": "!(arm | arm64 | uwp | osx)", @@ -15,6 +15,10 @@ "name": "pthread", "platform": "linux" }, + { + "name": "vcpkg-tool-python2", + "host": true + }, "zlib" ] } diff --git a/external_imported/vcpkg/ports/vamp-sdk/CMakeLists.txt b/external_imported/vcpkg/ports/vamp-sdk/CMakeLists.txt index a3d98073d..c5e29d922 100644 --- a/external_imported/vcpkg/ports/vamp-sdk/CMakeLists.txt +++ b/external_imported/vcpkg/ports/vamp-sdk/CMakeLists.txt @@ -81,6 +81,12 @@ target_link_libraries(vamp-hostsdk PUBLIC SndFile::sndfile) target_link_libraries(vamp-sdk PUBLIC SndFile::sndfile) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig/vamp.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/vamp.pc" @ONLY) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig/vamp-hostsdk.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/vamp-hostsdk.pc" @ONLY) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig/vamp-sdk.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/vamp-sdk.pc" @ONLY) +file(GLOB PKGCONFIG_FILES "${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/*.pc") +install(FILES ${PKGCONFIG_FILES} DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + install( TARGETS vamp-hostsdk vamp-sdk RUNTIME DESTINATION bin diff --git a/external_imported/vcpkg/ports/vamp-sdk/portfile.cmake b/external_imported/vcpkg/ports/vamp-sdk/portfile.cmake index 890f68e4a..83c60e6fa 100644 --- a/external_imported/vcpkg/ports/vamp-sdk/portfile.cmake +++ b/external_imported/vcpkg/ports/vamp-sdk/portfile.cmake @@ -7,12 +7,13 @@ vcpkg_from_github( file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA ) -vcpkg_install_cmake() +vcpkg_cmake_install() + +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/external_imported/vcpkg/ports/vamp-sdk/vcpkg.json b/external_imported/vcpkg/ports/vamp-sdk/vcpkg.json index 2e6b1fea4..1c2156b51 100644 --- a/external_imported/vcpkg/ports/vamp-sdk/vcpkg.json +++ b/external_imported/vcpkg/ports/vamp-sdk/vcpkg.json @@ -2,11 +2,19 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", "name": "vamp-sdk", "version": "2.10", - "port-version": 1, + "port-version": 2, "description": "Library for Vamp plugins", "homepage": "https://www.vamp-plugins.org/develop.html", "supports": "!uwp", "dependencies": [ - "libsndfile" + "libsndfile", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/vc/portfile.cmake b/external_imported/vcpkg/ports/vc/portfile.cmake index 3b51c8141..35a5461e9 100644 --- a/external_imported/vcpkg/ports/vc/portfile.cmake +++ b/external_imported/vcpkg/ports/vc/portfile.cmake @@ -1,8 +1,6 @@ -vcpkg_fail_port_install(ON_ARCH "arm64") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO VcDevel/Vc + REPO VcDevel/Vc REF 1.4.2 SHA512 9a929cd48bdf6b8e94765bd649e7ec42b10dea28e36eff288223d72cffa5f4fc8693e942aa3f780b42d8a0c1824fcabff22ec0622aa8ea5232c9123858b8bbbf HEAD_REF 1.4 diff --git a/external_imported/vcpkg/ports/vc/vcpkg.json b/external_imported/vcpkg/ports/vc/vcpkg.json index d63975fbe..14ab1d8bb 100644 --- a/external_imported/vcpkg/ports/vc/vcpkg.json +++ b/external_imported/vcpkg/ports/vc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vc", - "version-string": "1.4.2", - "port-version": 1, + "version": "1.4.2", + "port-version": 2, "description": "SIMD Vector Classes for C++ .", "homepage": "https://github.com/VcDevel/Vc", "supports": "!arm64" diff --git a/external_imported/vcpkg/ports/vcpkg-cmake-config/vcpkg.json b/external_imported/vcpkg/ports/vcpkg-cmake-config/vcpkg.json index e00a7dbcc..a99271b63 100644 --- a/external_imported/vcpkg/ports/vcpkg-cmake-config/vcpkg.json +++ b/external_imported/vcpkg/ports/vcpkg-cmake-config/vcpkg.json @@ -1,4 +1,4 @@ { "name": "vcpkg-cmake-config", - "version-date": "2021-12-28" + "version-date": "2022-02-06" } 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 bdbaf0b32..4045ae1ea 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 @@ -9,6 +9,7 @@ Additionally corrects common issues with targets, such as absolute paths and inc vcpkg_cmake_config_fixup( [PACKAGE_NAME ] [CONFIG_PATH ] + [TOOLS_PATH ] [DO_NOT_DELETE_PARENT_CONFIG_PATH] [NO_PREFIX_CORRECTION] ) @@ -34,11 +35,13 @@ and applies a rather simply correction which in some cases will yield the wrong ## How it Works 1. Moves `/debug//*targets-debug.cmake` to `/share/${PACKAGE_NAME}`. -2. Removes `/debug//*config.cmake`. -3. Transform all references matching `/bin/*.exe` to `/tools//*.exe` on Windows. -4. Transform all references matching `/bin/*` to `/tools//*` on other platforms. -5. Fixes `${_IMPORT_PREFIX}` in auto generated targets. -6. Replace `${CURRENT_INSTALLED_DIR}` with `${_IMPORT_PREFIX}` in configs and targets. +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 @@ -52,7 +55,7 @@ endif() set(Z_VCPKG_CMAKE_CONFIG_FIXUP_GUARD ON CACHE INTERNAL "guard variable") 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" "") + cmake_parse_arguments(PARSE_ARGV 0 "arg" "DO_NOT_DELETE_PARENT_CONFIG_PATH;NO_PREFIX_CORRECTION" "PACKAGE_NAME;CONFIG_PATH;TOOLS_PATH" "") if(DEFINED arg_UNPARSED_ARGUMENTS) message(FATAL_ERROR "vcpkg_cmake_config_fixup was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") @@ -63,6 +66,9 @@ function(vcpkg_cmake_config_fixup) if(NOT arg_CONFIG_PATH) set(arg_CONFIG_PATH "share/${arg_PACKAGE_NAME}") endif() + if(NOT arg_TOOLS_PATH) + set(arg_TOOLS_PATH "tools/${PORT}") + endif() set(target_path "share/${arg_PACKAGE_NAME}") string(REPLACE "." "\\." EXECUTABLE_SUFFIX "${VCPKG_TARGET_EXECUTABLE_SUFFIX}") @@ -130,23 +136,13 @@ function(vcpkg_cmake_config_fixup) endif() endif() - file(GLOB_RECURSE unused_files - "${debug_share}/*[Tt]argets.cmake" - "${debug_share}/*[Cc]onfig.cmake" - "${debug_share}/*[Cc]onfigVersion.cmake" - "${debug_share}/*[Cc]onfig-version.cmake" - ) - foreach(unused_file IN LISTS unused_files) - file(REMOVE "${unused_file}") - endforeach() - file(GLOB_RECURSE release_targets "${release_share}/*-release.cmake" ) foreach(release_target IN LISTS release_targets) file(READ "${release_target}" contents) string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${_IMPORT_PREFIX}" contents "${contents}") - string(REGEX REPLACE "\\\${_IMPORT_PREFIX}/bin/([^ \"]+${EXECUTABLE_SUFFIX})" "\${_IMPORT_PREFIX}/tools/${PORT}/\\1" contents "${contents}") + string(REGEX REPLACE "\\\${_IMPORT_PREFIX}/bin/([^ \"]+${EXECUTABLE_SUFFIX})" "\${_IMPORT_PREFIX}/${arg_TOOLS_PATH}/\\1" contents "${contents}") file(WRITE "${release_target}" "${contents}") endforeach() @@ -159,7 +155,7 @@ function(vcpkg_cmake_config_fixup) file(READ "${debug_target}" contents) string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${_IMPORT_PREFIX}" contents "${contents}") - string(REGEX REPLACE "\\\${_IMPORT_PREFIX}/bin/([^ \";]+${EXECUTABLE_SUFFIX})" "\${_IMPORT_PREFIX}/tools/${PORT}/\\1" contents "${contents}") + string(REGEX REPLACE "\\\${_IMPORT_PREFIX}/bin/([^ \";]+${EXECUTABLE_SUFFIX})" "\${_IMPORT_PREFIX}/${arg_TOOLS_PATH}/\\1" contents "${contents}") string(REPLACE "\${_IMPORT_PREFIX}/lib" "\${_IMPORT_PREFIX}/debug/lib" contents "${contents}") string(REPLACE "\${_IMPORT_PREFIX}/bin" "\${_IMPORT_PREFIX}/debug/bin" contents "${contents}") file(WRITE "${release_share}/${debug_target_rel}" "${contents}") @@ -169,8 +165,16 @@ function(vcpkg_cmake_config_fixup) endif() #Fix ${_IMPORT_PREFIX} and absolute paths in cmake generated targets and configs; - #Since those can be renamed we have to check in every *.cmake + #Since those can be renamed we have to check in every *.cmake, but only once. file(GLOB_RECURSE main_cmakes "${release_share}/*.cmake") + if(NOT DEFINED Z_VCPKG_CMAKE_CONFIG_ALREADY_FIXED_UP) + vcpkg_list(SET Z_VCPKG_CMAKE_CONFIG_ALREADY_FIXED_UP) + endif() + foreach(already_fixed_up IN LISTS Z_VCPKG_CMAKE_CONFIG_ALREADY_FIXED_UP) + vcpkg_list(REMOVE_ITEM main_cmakes "${already_fixed_up}") + endforeach() + vcpkg_list(APPEND Z_VCPKG_CMAKE_CONFIG_ALREADY_FIXED_UP ${main_cmakes}) + set(Z_VCPKG_CMAKE_CONFIG_ALREADY_FIXED_UP "${Z_VCPKG_CMAKE_CONFIG_ALREADY_FIXED_UP}" CACHE INTERNAL "") foreach(main_cmake IN LISTS main_cmakes) file(READ "${main_cmake}" contents) @@ -201,6 +205,38 @@ get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)]] contents "${contents}") # This is a meson-related workaround, see https://github.com/mesonbuild/meson/issues/6955 endif() + # Merge release and debug configurations of target property INTERFACE_LINK_LIBRARIES. + string(REPLACE "${release_share}/" "${debug_share}/" debug_cmake "${main_cmake}") + if(DEFINED VCPKG_BUILD_TYPE) + # Skip. Warning: A release-only port in a dual-config installation + # may pull release dependencies into the debug configuration. + elseif(NOT contents MATCHES "INTERFACE_LINK_LIBRARIES") + # Skip. No relevant properties. + elseif(NOT contents MATCHES "# Generated CMake target import file\\.") + # Skip. No safe assumptions about a matching debug import file. + elseif(NOT EXISTS "${debug_cmake}") + message(SEND_ERROR "Did not find a debug import file matching '${main_cmake}'") + else() + file(READ "${debug_cmake}" debug_contents) + while(contents MATCHES "set_target_properties\\(([^ \$]*) PROPERTIES[^)]*\\)") + set(matched_command "${CMAKE_MATCH_0}") + string(REPLACE "+" "\\+" target "${CMAKE_MATCH_1}") + if(NOT debug_contents MATCHES "set_target_properties\\(${target} PROPERTIES[^)]*\\)") + message(SEND_ERROR "Did not find a debug configuration for target '${target}'.") + endif() + set(debug_command "${CMAKE_MATCH_0}") + string(REGEX MATCH " INTERFACE_LINK_LIBRARIES \"([^\"]*)\"" release_line "${matched_command}") + set(release_libs "${CMAKE_MATCH_1}") + string(REGEX MATCH " INTERFACE_LINK_LIBRARIES \"([^\"]*)\"" debug_line "${debug_command}") + set(debug_libs "${CMAKE_MATCH_1}") + z_vcpkg_cmake_config_fixup_merge(merged_libs release_libs debug_libs) + string(REPLACE "${release_line}" " INTERFACE_LINK_LIBRARIES \"${merged_libs}\"" updated_command "${matched_command}") + string(REPLACE "set_target_properties" "set_target_properties::done" updated_command "${updated_command}") # Prevend 2nd match + string(REPLACE "${matched_command}" "${updated_command}" contents "${contents}") + endwhile() + string(REPLACE "set_target_properties::done" "set_target_properties" contents "${contents}") # Restore original command + endif() + #Fix absolute paths to installed dir with ones relative to ${CMAKE_CURRENT_LIST_DIR} #This happens if vcpkg built libraries are directly linked to a target instead of using #an imported target. @@ -219,6 +255,16 @@ get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)]] file(WRITE "${main_cmake}" "${contents}") endforeach() + file(GLOB_RECURSE unused_files + "${debug_share}/*[Tt]argets.cmake" + "${debug_share}/*[Cc]onfig.cmake" + "${debug_share}/*[Cc]onfigVersion.cmake" + "${debug_share}/*[Cc]onfig-version.cmake" + ) + foreach(unused_file IN LISTS unused_files) + file(REMOVE "${unused_file}") + endforeach() + # Remove /debug// if it's empty. file(GLOB_RECURSE remaining_files "${debug_share}/*") if(remaining_files STREQUAL "") @@ -231,3 +277,36 @@ get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)]] file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") endif() endfunction() + +# Merges link interface library lists for release and debug +# into a single expression which use generator expression as necessary. +function(z_vcpkg_cmake_config_fixup_merge out_var release_var debug_var) + set(release_libs "VCPKG;${${release_var}}") + string(REGEX REPLACE ";optimized;([^;]*)" ";\\1" release_libs "${release_libs}") + string(REGEX REPLACE ";debug;([^;]*)" ";" release_libs "${release_libs}") + list(REMOVE_AT release_libs 0) + list(FILTER release_libs EXCLUDE REGEX [[^\\[$]<\\[$]:]]) + list(TRANSFORM release_libs REPLACE [[^\\[$]<\\[$]>:(.*)>$]] "\\1") + + set(debug_libs "VCPKG;${${debug_var}}") + string(REGEX REPLACE ";optimized;([^;]*)" ";" debug_libs "${debug_libs}") + string(REGEX REPLACE ";debug;([^;]*)" ";\\1" debug_libs "${debug_libs}") + list(REMOVE_AT debug_libs 0) + list(FILTER debug_libs EXCLUDE REGEX [[^\\[$]<\\[$]>:]]) + list(TRANSFORM debug_libs REPLACE [[^\\[$]<\\[$]:(.*)>$]] "\\1") + + set(merged_libs "") + foreach(release_lib debug_lib IN ZIP_LISTS release_libs debug_libs) + if(release_lib STREQUAL debug_lib) + list(APPEND merged_libs "${release_lib}") + else() + if(release_lib) + list(APPEND merged_libs "\\\$<\\\$>:${release_lib}>") + endif() + if(debug_lib) + list(APPEND merged_libs "\\\$<\\\$:${debug_lib}>") + endif() + endif() + endforeach() + set("${out_var}" "${merged_libs}" PARENT_SCOPE) +endfunction() diff --git a/external_imported/vcpkg/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt b/external_imported/vcpkg/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt index 084042fb1..190455d9a 100644 --- a/external_imported/vcpkg/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt +++ b/external_imported/vcpkg/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt @@ -8,7 +8,10 @@ list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_CROSSCOMPILING CMAKE_SYSTEM_NAME CMAKE_HOST_SYSTEM_NAME CMAKE_SYSTEM_PROCESSOR - CMAKE_HOST_SYSTEM_PROCESSOR) + CMAKE_HOST_SYSTEM_PROCESSOR + CMAKE_SIZEOF_VOID_P + MSVC + MSVC_VERSION) if(CMAKE_SYSTEM_NAME MATCHES "Darwin") list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_OSX_DEPLOYMENT_TARGET CMAKE_OSX_SYSROOT) @@ -21,6 +24,7 @@ endforeach() set(COMPILERS ${VCPKG_LANGUAGES} RC) foreach(prog IN LISTS COMPILERS) list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${prog}_COMPILER) + list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${prog}_COMPILER_ID) endforeach() # Variables to check foreach(_lang IN LISTS VCPKG_LANGUAGES) @@ -74,7 +78,7 @@ endif() project(get_cmake_vars LANGUAGES ${VCPKG_LANGUAGES}) -foreach(VAR IN LISTS VCPKG_VARS_TO_CHECK) +foreach(VAR IN LISTS VCPKG_VARS_TO_CHECK VCPKG_FLAGS_TO_CHECK) string(APPEND OUTPUT_STRING "set(${VCPKG_VAR_PREFIX}_${VAR} \"${${VAR}}\")\n") endforeach() @@ -87,38 +91,68 @@ foreach(_env IN LISTS VCPKG_ENV_VARS_TO_CHECK) endif() 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}}") +set(EXTRA_FLAGS "") + +if(APPLE) + if(CMAKE_OSX_SYSROOT) + string(APPEND EXTRA_FLAGS " -isysroot \"${CMAKE_OSX_SYSROOT}\"") 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() - string(APPEND ${flag_var} " -isysroot ${CMAKE_OSX_SYSROOT}") - endif() + foreach(arch IN LISTS CMAKE_OSX_ARCHITECTURES) + string(APPEND EXTRA_FLAGS " -arch ${arch}") + endforeach() + if(CMAKE_OSX_DEPLOYMENT_TARGET) + if(CMAKE_SYSTEM_NAME STREQUAL "iOS") + string(APPEND EXTRA_FLAGS " -mios-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}") + elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + string(APPEND EXTRA_FLAGS " -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}") endif() endif() -endmacro() - -foreach(flag IN LISTS VCPKG_FLAGS_TO_CHECK) - string(STRIP "${${flag}}" ${flag}) # Strip leading and trailing whitespaces - _vcpkg_adjust_flags(${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}) - _vcpkg_adjust_flags(${flag}_${config}) - string(APPEND OUTPUT_STRING "set(${VCPKG_VAR_PREFIX}_RAW_${flag}_${config} \"${CMAKE_${flag}_FLAGS_${config}}\")\n") - set(COMBINED_${flag}_${config} "${${flag}} ${${flag}_${config}}") - string(STRIP "${COMBINED_${flag}_${config}}" COMBINED_${flag}_${config}) - string(APPEND OUTPUT_STRING "set(${VCPKG_VAR_PREFIX}_${flag}_${config} \"${COMBINED_${flag}_${config}}\")\n") - endforeach() +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() + string(APPEND EXTRA_FLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_TARGET} \"${CMAKE_CXX_COMPILER_TARGET}\"") + endif() +endif() +if(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN) + if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + string(APPEND EXTRA_FLAGS " \"${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}\"") + else() + string(APPEND EXTRA_FLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN} \"${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}\"") + endif() +endif() +if(CMAKE_SYSROOT AND CMAKE_CXX_COMPILE_OPTIONS_SYSROOT) + string(APPEND EXTRA_FLAGS " \"${CMAKE_CXX_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}\"") +endif() + +foreach(flags CXX C SHARED_LINKER EXE_LINKER) + set(${flags}_FLAGS "${CMAKE_${flags}_FLAGS} ${CMAKE_${flags}_FLAGS_${VCPKG_CONFIGS}} ${EXTRA_FLAGS}") +endforeach() + +foreach(flags STATIC_LINKER RC) + set(${flags}_FLAGS "${CMAKE_${flags}_FLAGS} ${CMAKE_${flags}_FLAGS_${VCPKG_CONFIGS}}") endforeach() +foreach(incdir IN LISTS CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES) + string(APPEND CXX_FLAGS " \"${CMAKE_INCLUDE_FLAG_CXX}${incdir}\"") +endforeach() + +foreach(incdir IN LISTS CMAKE_C_STANDARD_INCLUDE_DIRECTORIES) + string(APPEND C_FLAGS " \"${CMAKE_INCLUDE_FLAG_C}${incdir}\"") +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 + string(REGEX REPLACE "(^| )/" "\\1-" ${flag}_FLAGS "${${flag}_FLAGS}") + endif() + string(REPLACE "\\" "\\\\" ${flag}_FLAGS "${${flag}_FLAGS}") + string(REPLACE "\"" "\\\"" ${flag}_FLAGS "${${flag}_FLAGS}") + string(REPLACE "\$" "\\\$" ${flag}_FLAGS "${${flag}_FLAGS}") + string(APPEND OUTPUT_STRING "set(VCPKG_COMBINED_${flag}_FLAGS_${VCPKG_CONFIGS} \"${${flag}_FLAGS}\")\n") +endforeach() file(WRITE "${VCPKG_OUTPUT_FILE}" "${OUTPUT_STRING}") @@ -137,12 +171,26 @@ file(WRITE "${VCPKG_OUTPUT_FILE}" "${OUTPUT_STRING}") # CMAKE_CXX_COMPILER # CMAKE_RC_COMPILER +# Program details: +# CMAKE__COMPILER_ID +# MSVC +# MSVC_VERSION + # Flags: # CMAKE__FLAGS # CMAKE__FLAGS_ # CMAKE_RC_FLAGS # CMAKE_SHARED_LINKER_FLAGS +# CMAKE_SHARED_LINKER_FLAGS_ # CMAKE_STATIC_LINKER_FLAGS # CMAKE_STATIC_LINKER_FLAGS_ # CMAKE_EXE_LINKER_FLAGS # CMAKE_EXE_LINKER_FLAGS_ + +# Additional information: +# CMAKE_SIZEOF_VOID_P +# CMAKE_CROSSCOMPILING +# CMAKE_SYSTEM_NAME +# CMAKE_HOST_SYSTEM_NAME +# CMAKE_SYSTEM_PROCESSOR +# CMAKE_HOST_SYSTEM_PROCESSOR diff --git a/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg.json b/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg.json index bc765f2a3..dbfc761c4 100644 --- a/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg.json +++ b/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg.json @@ -1,4 +1,5 @@ { "name": "vcpkg-cmake", - "version-date": "2021-12-20" + "version-date": "2022-04-07", + "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 ef27a6c91..5520f0de3 100644 --- a/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_build.cmake +++ b/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_build.cmake @@ -19,6 +19,8 @@ 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`, @@ -46,10 +48,10 @@ function(vcpkg_cmake_build) set(arg_LOGFILE_BASE "build") endif() - set(build_args) - set(target_args) - set(parallel_args) - set(no_parallel_args) + 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 @@ -63,8 +65,15 @@ function(vcpkg_cmake_build) set(parallel_args "/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 "") + elseif(Z_VCPKG_CMAKE_GENERATOR STREQUAL "Xcode") + list(APPEND parallel_args -jobs "${VCPKG_CONCURRENCY}") + list(APPEND 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") + message(WARNING "Unrecognized GENERATOR setting from vcpkg_cmake_configure().") endif() if(DEFINED arg_TARGET) 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 b5241d527..ed312a05d 100644 --- a/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake +++ b/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake @@ -86,7 +86,7 @@ This command supplies many common arguments to CMake. To see the full list, exam * [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) +* [opencv4](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv4/portfile.cmake) #]===] if(Z_VCPKG_CMAKE_CONFIGURE_GUARD) return() @@ -159,71 +159,18 @@ function(vcpkg_cmake_configure) set(ninja_can_be_used OFF) endif() - set(generator) + set(generator "Ninja") if(DEFINED arg_GENERATOR) set(generator "${arg_GENERATOR}") elseif(arg_WINDOWS_USE_MSBUILD OR NOT ninja_can_be_used) - if(VCPKG_PLATFORM_TOOLSET STREQUAL "v120") - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(generator "Visual Studio 12 2013") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(generator "Visual Studio 12 2013 Win64") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - set(generator "Visual Studio 12 2013 ARM") - endif() - elseif(VCPKG_PLATFORM_TOOLSET STREQUAL "v140") - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(generator "Visual Studio 14 2015") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(generator "Visual Studio 14 2015 Win64") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - set(generator "Visual Studio 14 2015 ARM") - endif() - elseif(VCPKG_PLATFORM_TOOLSET STREQUAL "v141") - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(generator "Visual Studio 15 2017") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(generator "Visual Studio 15 2017 Win64") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - set(generator "Visual Studio 15 2017 ARM") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - set(generator "Visual Studio 15 2017") - set(arch "ARM64") - endif() - elseif(VCPKG_PLATFORM_TOOLSET STREQUAL "v142") - set(generator "Visual Studio 16 2019") - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(arch "Win32") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(arch "x64") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - set(arch "ARM") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - set(arch "ARM64") - else() - set(generator) - endif() - elseif(VCPKG_PLATFORM_TOOLSET STREQUAL "v143") - set(generator "Visual Studio 17 2022") - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(arch "Win32") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(arch "x64") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - set(arch "ARM") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - set(arch "ARM64") - else() - set(generator) - endif() - endif() - else() - set(generator "Ninja") + set(generator "") + set(arch "") + z_vcpkg_get_visual_studio_generator(OUT_GENERATOR generator OUT_ARCH arch) endif() - if(NOT DEFINED generator) + if(NOT generator) if(NOT VCPKG_CMAKE_SYSTEM_NAME) - set(VCPKG_CMAKE_SYSTEM_NAME Windows) + set(VCPKG_CMAKE_SYSTEM_NAME "Windows") endif() message(FATAL_ERROR "Unable to determine appropriate generator for: " "${VCPKG_CMAKE_SYSTEM_NAME}-${VCPKG_TARGET_ARCHITECTURE}-${VCPKG_PLATFORM_TOOLSET}") @@ -280,23 +227,7 @@ function(vcpkg_cmake_configure) endif() if(NOT DEFINED VCPKG_CHAINLOAD_TOOLCHAIN_FILE) - if(VCPKG_TARGET_IS_MINGW) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/mingw.cmake") - elseif(VCPKG_TARGET_IS_WINDOWS) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake") - elseif(VCPKG_TARGET_IS_LINUX) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/linux.cmake") - elseif(VCPKG_TARGET_IS_ANDROID) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/android.cmake") - elseif(VCPKG_TARGET_IS_OSX) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/osx.cmake") - elseif(VCPKG_TARGET_IS_IOS) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/ios.cmake") - elseif(VCPKG_TARGET_IS_FREEBSD) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/freebsd.cmake") - elseif(VCPKG_TARGET_IS_OPENBSD) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/openbsd.cmake") - endif() + z_vcpkg_select_default_vcpkg_chainload_toolchain() endif() diff --git a/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_get_vars.cmake b/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_get_vars.cmake index ec1a99809..e8a1feec4 100644 --- a/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_get_vars.cmake +++ b/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_get_vars.cmake @@ -12,6 +12,16 @@ vcpkg_cmake_get_vars() 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. 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 0a609aa8d..6eddcfb91 100644 --- a/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_install.cmake +++ b/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_install.cmake @@ -14,7 +14,7 @@ vcpkg_cmake_install( 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.cmake +[`vcpkg_cmake_build()`]: vcpkg_cmake_build.md ## Examples: diff --git a/external_imported/vcpkg/ports/vcpkg-get-python-packages/README.md b/external_imported/vcpkg/ports/vcpkg-get-python-packages/README.md new file mode 100644 index 000000000..8061d05d9 --- /dev/null +++ b/external_imported/vcpkg/ports/vcpkg-get-python-packages/README.md @@ -0,0 +1,6 @@ +# vcpkg-get-python-packages + +**Experimental: will change or be removed at any time** + +`vcpkg-get-python-packages` provides `x_vcpkg_get_python_packages()`, a function which simplifies getting +python packages. diff --git a/external_imported/vcpkg/ports/vcpkg-get-python-packages/copyright b/external_imported/vcpkg/ports/vcpkg-get-python-packages/copyright new file mode 100644 index 000000000..2e4eac826 --- /dev/null +++ b/external_imported/vcpkg/ports/vcpkg-get-python-packages/copyright @@ -0,0 +1,23 @@ +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-get-python-packages/portfile.cmake b/external_imported/vcpkg/ports/vcpkg-get-python-packages/portfile.cmake new file mode 100644 index 000000000..7df06a5bc --- /dev/null +++ b/external_imported/vcpkg/ports/vcpkg-get-python-packages/portfile.cmake @@ -0,0 +1,7 @@ +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" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/external_imported/vcpkg/ports/vcpkg-get-python-packages/vcpkg-port-config.cmake b/external_imported/vcpkg/ports/vcpkg-get-python-packages/vcpkg-port-config.cmake new file mode 100644 index 000000000..a061a7128 --- /dev/null +++ b/external_imported/vcpkg/ports/vcpkg-get-python-packages/vcpkg-port-config.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/x_vcpkg_get_python_packages.cmake") diff --git a/external_imported/vcpkg/ports/vcpkg-get-python-packages/vcpkg.json b/external_imported/vcpkg/ports/vcpkg-get-python-packages/vcpkg.json new file mode 100644 index 000000000..36e86bb1b --- /dev/null +++ b/external_imported/vcpkg/ports/vcpkg-get-python-packages/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "vcpkg-get-python-packages", + "version-date": "2022-02-12", + "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 new file mode 100644 index 000000000..c13019651 --- /dev/null +++ b/external_imported/vcpkg/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake @@ -0,0 +1,70 @@ +#[===[.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") + + if(NOT DEFINED arg_PYTHON_EXECUTABLE) + message(FATAL_ERROR "PYTHON_EXECUTABLE must be specified.") + endif() + if(NOT DEFINED arg_PACKAGES) + message(FATAL_ERROR "PACKAGES 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. + 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}") + 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() + 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() + 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() +endfunction() diff --git a/external_imported/vcpkg/ports/vcpkg-gfortran/portfile.cmake b/external_imported/vcpkg/ports/vcpkg-gfortran/portfile.cmake index 7939c7684..d1b7168a5 100644 --- a/external_imported/vcpkg/ports/vcpkg-gfortran/portfile.cmake +++ b/external_imported/vcpkg/ports/vcpkg-gfortran/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "linux" "osx") include(vcpkg_find_fortran) vcpkg_find_fortran(FORTRAN_CMAKE) if(VCPKG_USE_INTERNAL_Fortran) @@ -49,4 +48,4 @@ if(VCPKG_USE_INTERNAL_Fortran) set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) else() set(VCPKG_POLICY_EMPTY_PACKAGE enabled) -endif() \ No newline at end of file +endif() diff --git a/external_imported/vcpkg/ports/vcpkg-gfortran/vcpkg.json b/external_imported/vcpkg/ports/vcpkg-gfortran/vcpkg.json index 604a1626d..ea146c420 100644 --- a/external_imported/vcpkg/ports/vcpkg-gfortran/vcpkg.json +++ b/external_imported/vcpkg/ports/vcpkg-gfortran/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vcpkg-gfortran", - "version-string": "3", - "port-version": 1, + "version": "3", + "port-version": 2, "description": "Metaport to install gfortran dependencies from msys if VCPKG_USE_EXTERNAL_Fortran is false", "supports": "windows & !arm" } diff --git a/external_imported/vcpkg/ports/vcpkg-gn/vcpkg.json b/external_imported/vcpkg/ports/vcpkg-gn/vcpkg.json index 64bdccd0e..26d89e680 100644 --- a/external_imported/vcpkg/ports/vcpkg-gn/vcpkg.json +++ b/external_imported/vcpkg/ports/vcpkg-gn/vcpkg.json @@ -1,6 +1,13 @@ { "name": "vcpkg-gn", "version-date": "2021-11-16", + "port-version": 1, "description": "https://gn.googlesource.com/gn/+/4aa9bdfa05b688c58d3d7d3e496f3f18cbb3d89e", - "supports": "native & !x86" + "supports": "native & !x86", + "dependencies": [ + { + "name": "vcpkg-tool-python2", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/vcpkg-pkgconfig-get-modules/portfile.cmake b/external_imported/vcpkg/ports/vcpkg-pkgconfig-get-modules/portfile.cmake index 18df919b4..f82cf371b 100644 --- a/external_imported/vcpkg/ports/vcpkg-pkgconfig-get-modules/portfile.cmake +++ b/external_imported/vcpkg/ports/vcpkg-pkgconfig-get-modules/portfile.cmake @@ -4,9 +4,10 @@ if(NOT TARGET_TRIPLET STREQUAL HOST_TRIPLET) endif() file(COPY - "${CMAKE_CURRENT_LIST_DIR}/x_vcpkg_pkgconfig_get_modules.cmake" "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" "${CMAKE_CURRENT_LIST_DIR}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +configure_file("${CMAKE_CURRENT_LIST_DIR}/x_vcpkg_pkgconfig_get_modules.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/x_vcpkg_pkgconfig_get_modules.cmake" @ONLY) + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) 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 3098b94f3..06a3a549e 100644 --- a/external_imported/vcpkg/ports/vcpkg-pkgconfig-get-modules/vcpkg.json +++ b/external_imported/vcpkg/ports/vcpkg-pkgconfig-get-modules/vcpkg.json @@ -1,5 +1,11 @@ { "name": "vcpkg-pkgconfig-get-modules", - "version-date": "2021-04-02", - "port-version": 1 + "version-date": "2022-02-10", + "dependencies": [ + { + "name": "pkgconf", + "host": true, + "default-features": false + } + ] } 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 cfe417be0..5a4dec12b 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 @@ -9,6 +9,7 @@ Retrieve required module information from pkgconfig modules x_vcpkg_pkgconfig_get_modules( PREFIX MODULES ... + [CFLAGS] [LIBS] [LIBRARIES] [LIBRARIES_DIRS] @@ -45,7 +46,7 @@ endif() set(Z_VCPKG_PKGCONFIG_GET_MODULES_GUARD ON CACHE INTERNAL "guard variable") function(x_vcpkg_pkgconfig_get_modules) - cmake_parse_arguments(PARSE_ARGV 0 "arg" "LIBS;LIBRARIES;LIBRARIES_DIR;INCLUDE_DIRS" "PREFIX" "MODULES") + cmake_parse_arguments(PARSE_ARGV 0 "arg" "CFLAGS;LIBS;LIBRARIES;LIBRARIES_DIR;INCLUDE_DIRS" "PREFIX" "MODULES") if(NOT DEFINED arg_PREFIX OR arg_PREFIX STREQUAL "") message(FATAL_ERROR "x_vcpkg_pkgconfig_get_modules requires parameter PREFIX!") endif() @@ -56,7 +57,8 @@ function(x_vcpkg_pkgconfig_get_modules) message(FATAL_ERROR "extra arguments passed to x_vcpkg_pkgconfig_get_modules: ${arg_UNPARSED_ARGUMENTS}") endif() - vcpkg_find_acquire_program(PKGCONFIG) + set(PKGCONFIG "${CURRENT_INSTALLED_DIR}/../@HOST_TRIPLET@/tools/pkgconf/pkgconf@VCPKG_HOST_EXECUTABLE_SUFFIX@") + set(backup_PKG_CONFIG_PATH "$ENV{PKG_CONFIG_PATH}") set(var_suffixes) @@ -94,6 +96,14 @@ function(x_vcpkg_pkgconfig_get_modules) ) list(APPEND var_suffixes INCLUDE_DIRS_RELEASE) endif() + if(arg_CFLAGS) + execute_process( + COMMAND "${PKGCONFIG}" --cflags ${arg_MODULES} + OUTPUT_VARIABLE ${arg_PREFIX}_CFLAGS_RELEASE + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + list(APPEND var_suffixes CFLAGS_RELEASE) + endif() endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") z_vcpkg_set_pkgconfig_path("${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig" "${backup_PKG_CONFIG_PATH}") @@ -129,6 +139,14 @@ function(x_vcpkg_pkgconfig_get_modules) ) list(APPEND var_suffixes INCLUDE_DIRS_DEBUG) endif() + if(arg_CFLAGS) + execute_process( + COMMAND "${PKGCONFIG}" --cflags ${arg_MODULES} + OUTPUT_VARIABLE ${arg_PREFIX}_CFLAGS_DEBUG + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + list(APPEND var_suffixes CFLAGS_DEBUG) + endif() endif() set(ENV{PKG_CONFIG_PATH} "${backup_PKG_CONFIG_PATH}") diff --git a/external_imported/vcpkg/ports/vcpkg-qmake/vcpkg.json b/external_imported/vcpkg/ports/vcpkg-qmake/vcpkg.json index eed210035..af140d3c2 100644 --- a/external_imported/vcpkg/ports/vcpkg-qmake/vcpkg.json +++ b/external_imported/vcpkg/ports/vcpkg-qmake/vcpkg.json @@ -1,6 +1,7 @@ { "name": "vcpkg-qmake", - "version-date": "2021-10-23", + "version-date": "2022-02-14", + "license": "MIT", "supports": "native", "dependencies": [ "pkgconf", 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 b0483e8cf..86222e099 100644 --- a/external_imported/vcpkg/ports/vcpkg-qmake/vcpkg_qmake_configure.cmake +++ b/external_imported/vcpkg/ports/vcpkg-qmake/vcpkg_qmake_configure.cmake @@ -131,12 +131,12 @@ function(vcpkg_qmake_configure) 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) vcpkg_list(APPEND qmake_comp_flags "QMAKE_LIBS+=${VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES} ${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES}" - "QMAKE_RC+=${VCPKG_DETECTED_CMAKE_RC_FLAGS_${buildtype}}" - "QMAKE_CFLAGS_${buildtype}*=${VCPKG_DETECTED_CMAKE_C_FLAGS_${buildtype}}" - "QMAKE_CXXFLAGS_${buildtype}*=${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${buildtype}}" - "QMAKE_LFLAGS*=${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${buildtype}}" - "QMAKE_LFLAGS_DLL*=${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${buildtype}}" - "QMAKE_LFLAGS_EXE*=${VCPKG_DETECTED_CMAKE_EXE_LINKER_FLAGS_${buildtype}}" + "QMAKE_RC+=${VCPKG_COMBINED_RC_FLAGS_${buildtype}}" + "QMAKE_CFLAGS_${buildtype}*=${VCPKG_COMBINED_C_FLAGS_${buildtype}}" + "QMAKE_CXXFLAGS_${buildtype}*=${VCPKG_COMBINED_CXX_FLAGS_${buildtype}}" + "QMAKE_LFLAGS*=${VCPKG_COMBINED_SHARED_LINKER_FLAGS_${buildtype}}" + "QMAKE_LIBFLAGS*=${VCPKG_COMBINED_STATIC_LINKER_FLAGS_${buildtype}}" + "QMAKE_LFLAGS_EXE*=${VCPKG_COMBINED_EXE_LINKER_FLAGS_${buildtype}}" ) message(STATUS "Configuring ${config_triplet}") diff --git a/external_imported/vcpkg/ports/vcpkg-tool-gyp-nss/portfile.cmake b/external_imported/vcpkg/ports/vcpkg-tool-gyp-nss/portfile.cmake new file mode 100644 index 000000000..16bd07b2f --- /dev/null +++ b/external_imported/vcpkg/ports/vcpkg-tool-gyp-nss/portfile.cmake @@ -0,0 +1,21 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +set(PROGNAME gyp-nss) +set(PROG_VERSION b3177c3f6c2c45a8ca098ae0f0ebb4536c624762) +set(ARCHIVE gyp-nss-${PROG_VERSION}) + +vcpkg_download_distfile(ARCHIVE_PATH + URLS "https://github.com/plq/gyp-nss/archive/${PROG_VERSION}.zip" + SHA512 7cd05e1bdcdb579e8226ecae2e925285e164349927f60350b87703afe9cbdc308f044bc9f6455318f99778b7b49304003aab47f6c587a13e6fbdaaa1533c558d + FILENAME "${ARCHIVE}.zip" +) + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools") + +vcpkg_execute_in_download_mode( + COMMAND "${CMAKE_COMMAND}" -E tar xzf "${ARCHIVE_PATH}" + WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools" +) +file(GLOB_RECURSE folders "${CURRENT_PACKAGES_DIR}/tools/*" LIST_DIRECTORIES true) + +file(RENAME "${CURRENT_PACKAGES_DIR}/tools/${ARCHIVE}" "${CURRENT_PACKAGES_DIR}/tools/gyp-nss") diff --git a/external_imported/vcpkg/ports/vcpkg-tool-gyp-nss/vcpkg.json b/external_imported/vcpkg/ports/vcpkg-tool-gyp-nss/vcpkg.json new file mode 100644 index 000000000..74299811b --- /dev/null +++ b/external_imported/vcpkg/ports/vcpkg-tool-gyp-nss/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "vcpkg-tool-gyp-nss", + "version-date": "2022-03-04", + "description": "https://github.com/plq/gyp-nss", + "supports": "native" +} diff --git a/external_imported/vcpkg/ports/vcpkg-tool-lessmsi/portfile.cmake b/external_imported/vcpkg/ports/vcpkg-tool-lessmsi/portfile.cmake new file mode 100644 index 000000000..cd523cf41 --- /dev/null +++ b/external_imported/vcpkg/ports/vcpkg-tool-lessmsi/portfile.cmake @@ -0,0 +1,17 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +set(version v1.10.0) + +vcpkg_download_distfile(archive_path + URLS "https://github.com/activescott/lessmsi/releases/download/${version}/lessmsi-${version}.zip" + FILENAME "lessmsi-${version}.zip" + SHA512 91be9363d75e8ca0129304008ddc26fe575cc4fd76d7f43ef0a6ff414855dc1c6e412f4e694b2950026e02cc3d31b18bd8c2e4c03e1ddce01477f3f2d2197479 +) + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + +file(ARCHIVE_EXTRACT + INPUT "${archive_path}" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}" +) + diff --git a/external_imported/vcpkg/ports/vcpkg-tool-lessmsi/vcpkg.json b/external_imported/vcpkg/ports/vcpkg-tool-lessmsi/vcpkg.json new file mode 100644 index 000000000..df6fc3711 --- /dev/null +++ b/external_imported/vcpkg/ports/vcpkg-tool-lessmsi/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "vcpkg-tool-lessmsi", + "version": "1.10.0", + "description": "This is a utility with a graphical user interface and a command line interface that can be used to view and extract the contents of an MSI file.", + "homepage": "https://github.com/activescott/lessmsi", + "license": "MIT", + "supports": "native & windows" +} diff --git a/external_imported/vcpkg/ports/vcpkg-tool-meson/portfile.cmake b/external_imported/vcpkg/ports/vcpkg-tool-meson/portfile.cmake index fd0110847..c4a941146 100644 --- a/external_imported/vcpkg/ports/vcpkg-tool-meson/portfile.cmake +++ b/external_imported/vcpkg/ports/vcpkg-tool-meson/portfile.cmake @@ -49,6 +49,7 @@ if(NOT "${program}") PATCHES meson-intl.patch fix_linker_detection.patch ) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/meson/test cases") endif() z_vcpkg_find_acquire_program_find_internal("${program}" @@ -56,6 +57,6 @@ z_vcpkg_find_acquire_program_find_internal("${program}" PATHS ${paths_to_search} NAMES ${search_names} ) -#vcpkg_find_acquire_program(MESON) + message(STATUS "Using meson: ${MESON}") file(WRITE "${CURRENT_PACKAGES_DIR}/share/meson/version.txt" "${program_version}") # For vcpkg_find_acquire_program diff --git a/external_imported/vcpkg/ports/vcpkg-tool-meson/vcpkg.json b/external_imported/vcpkg/ports/vcpkg-tool-meson/vcpkg.json index ec48241bd..82a1d87ae 100644 --- a/external_imported/vcpkg/ports/vcpkg-tool-meson/vcpkg.json +++ b/external_imported/vcpkg/ports/vcpkg-tool-meson/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vcpkg-tool-meson", "version": "0.60.2", - "port-version": 1, + "port-version": 2, "description": "Meson build system", "homepage": "https://github.com/mesonbuild/meson", "supports": "native" diff --git a/external_imported/vcpkg/ports/vcpkg-tool-mozbuild/portfile.cmake b/external_imported/vcpkg/ports/vcpkg-tool-mozbuild/portfile.cmake new file mode 100644 index 000000000..28a65b99d --- /dev/null +++ b/external_imported/vcpkg/ports/vcpkg-tool-mozbuild/portfile.cmake @@ -0,0 +1,28 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +set(PROGNAME mozbuild) +set(EXE_NAME mozmake) +set(PROG_VERSION 3.3) +set(ARCHIVE MozillaBuildSetup-${PROG_VERSION}) +set(BASE_URL "https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-") +set(URL "${BASE_URL}${PROG_VERSION}.exe") +set(HASH ac33d15dd9c974ef8ad581f9b414520a9d5e3b9816ab2bbf3e305d0a33356cc22c356cd9761e64a19588d17b6c13f124e837cfb462a36b8da898899e7db22ded) + +if(VCPKG_CROSSCOMPILING) + message(FATAL_ERROR "This is a host only port!") +endif() + +vcpkg_download_distfile(ARCHIVE_PATH + URLS "${URL}" + SHA512 ${HASH} + FILENAME "${ARCHIVE}.7z.exe" +) + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/mozbuild") + +vcpkg_find_acquire_program(7Z) + +vcpkg_execute_in_download_mode( + COMMAND "${7Z}" x "${ARCHIVE_PATH}" -aoa + WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/mozbuild" +) diff --git a/external_imported/vcpkg/ports/vcpkg-tool-mozbuild/vcpkg.json b/external_imported/vcpkg/ports/vcpkg-tool-mozbuild/vcpkg.json new file mode 100644 index 000000000..feb244e7e --- /dev/null +++ b/external_imported/vcpkg/ports/vcpkg-tool-mozbuild/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "vcpkg-tool-mozbuild", + "version": "3.3", + "description": "mozbuild is a Python package providing functionality used by Mozilla’s build system", + "homepage": "https://firefox-source-docs.mozilla.org/build/buildsystem/mozbuild/index.html", + "supports": "native & x64 & windows" +} diff --git a/external_imported/vcpkg/ports/vcpkg-tool-python2/portfile.cmake b/external_imported/vcpkg/ports/vcpkg-tool-python2/portfile.cmake new file mode 100644 index 000000000..703173bba --- /dev/null +++ b/external_imported/vcpkg/ports/vcpkg-tool-python2/portfile.cmake @@ -0,0 +1,60 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +if(VCPKG_TARGET_IS_WINDOWS) + set(arch_suffix "") + set(program_name python) + set(program_version 2.7.18) + if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86) + set(tool_subdirectory "python-${program_version}-x86") + set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}.msi") + set(download_filename "python-${program_version}.msi") + set(download_sha512 2c112733c777ddbf189b0a54047a9d5851ebce0564cc38b9687d79ce6c7a09006109dbad8627fb1a60c3ad55e261db850d9dfa454af0533b460b2afc316fe115) + else() + set(tool_subdirectory "python-${program_version}-x64") + set(arch_suffix ".amd64") + set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}.amd64.msi") + set(download_filename "python-${program_version}.amd64.msi") + set(download_sha512 6a81a413b80fd39893e7444fd47efa455d240cbb77a456c9d12f7cf64962b38c08cfa244cd9c50a65947c40f936c6c8c5782f7236d7b92445ab3dd01e82af23e) + endif() + set(paths_to_search "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}") + + vcpkg_download_distfile(archive_path + URLS ${download_urls} + SHA512 "${download_sha512}" + FILENAME "${download_filename}" + ) + set(output_path "${CURRENT_PACKAGES_DIR}/manual-tools") # vcpkg.cmake adds everything in /tools to CMAKE_PROGRAM_PATH. That is not desired for Python2 + file(MAKE_DIRECTORY "${output_path}") + cmake_path(NATIVE_PATH archive_path archive_path_native) # lessmsi is a bit picky about path formats. + message(STATUS "Extracting Python2 ...") + vcpkg_execute_in_download_mode( + COMMAND "${CURRENT_HOST_INSTALLED_DIR}/tools/vcpkg-tool-lessmsi/lessmsi.exe" x "${archive_path_native}" # Using output_path here does not work in bash + WORKING_DIRECTORY "${output_path}" + OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/lessmsi-${TARGET_TRIPLET}-out.log" + ERROR_FILE "${CURRENT_BUILDTREES_DIR}/lessmsi-${TARGET_TRIPLET}-err.log" + RESULT_VARIABLE error_code + ) + if(error_code) + message(FATAL_ERROR "Couldn't extract Python2 with lessmsi!") + endif() + message(STATUS "Extracting Python2 ... finished!") + file(RENAME "${output_path}/python-2.7.18${arch_suffix}/SourceDir/" "${output_path}/${PORT}/") + file(REMOVE_RECURSE "${output_path}/python-2.7.18.amd64" + # Files below are not part of a msiexec installation/extraction. + "${output_path}/${PORT}/Windows" + "${output_path}/${PORT}/Microsoft.VC90.CRT.manifest" + "${output_path}/${PORT}/msvcr90.dll") + z_vcpkg_find_acquire_program_find_internal("PYTHON2" + INTERPRETER "${interpreter}" + PATHS ${paths_to_search} + NAMES ${program_name} + ) + if(NOT PYTHON2) + message(FATAL_ERROR "Unable to find python2: ${PYTHON2}") + endif() + message(STATUS "Using python2: ${PYTHON2}") + set(details "set(program_version \"${program_version}\")\n") + string(APPEND details "set(paths_to_search \"\${CURRENT_HOST_INSTALLED_DIR}/manual-tools/${PORT}\")\n") + file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/details.cmake" "${details}") +endif() + diff --git a/external_imported/vcpkg/ports/vcpkg-tool-python2/vcpkg.json b/external_imported/vcpkg/ports/vcpkg-tool-python2/vcpkg.json new file mode 100644 index 000000000..346a8b15c --- /dev/null +++ b/external_imported/vcpkg/ports/vcpkg-tool-python2/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "vcpkg-tool-python2", + "version": "2.7.18", + "description": "Python 2", + "homepage": "https://www.python.org/download/releases/2.0/", + "license": "PSF-2.0", + "supports": "!uwp & !(arm & windows)", + "dependencies": [ + { + "name": "vcpkg-tool-lessmsi", + "host": true, + "platform": "windows" + } + ] +} diff --git a/external_imported/vcpkg/ports/vectorclass/portfile.cmake b/external_imported/vcpkg/ports/vectorclass/portfile.cmake index 2ec273262..ae5823889 100644 --- a/external_imported/vcpkg/ports/vectorclass/portfile.cmake +++ b/external_imported/vcpkg/ports/vectorclass/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO vectorclass/version2 diff --git a/external_imported/vcpkg/ports/vectorclass/vcpkg.json b/external_imported/vcpkg/ports/vectorclass/vcpkg.json index ce2f69c84..40b26d754 100644 --- a/external_imported/vcpkg/ports/vectorclass/vcpkg.json +++ b/external_imported/vcpkg/ports/vectorclass/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vectorclass", "version-string": "2.00.01", - "port-version": 1, + "port-version": 2, "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)" diff --git a/external_imported/vcpkg/ports/vlpp/CMakeLists.txt b/external_imported/vcpkg/ports/vlpp/CMakeLists.txt index f8df1b338..5c254595f 100644 --- a/external_imported/vcpkg/ports/vlpp/CMakeLists.txt +++ b/external_imported/vcpkg/ports/vlpp/CMakeLists.txt @@ -13,6 +13,10 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") endif() +if(NOT CMAKE_CXX_STANDARD) + set(CMAKE_CXX_STANDARD 14) +endif() + # Create and configure the target add_library(Vlpp ${SRCS}) diff --git a/external_imported/vcpkg/ports/vlpp/portfile.cmake b/external_imported/vcpkg/ports/vlpp/portfile.cmake index 96a04e6cb..b7f91d9ee 100644 --- a/external_imported/vcpkg/ports/vlpp/portfile.cmake +++ b/external_imported/vcpkg/ports/vlpp/portfile.cmake @@ -8,20 +8,19 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Tools -file(INSTALL ${SOURCE_PATH}/Tools/CppMerge.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools) +file(INSTALL "${SOURCE_PATH}/Tools/CppMerge.exe" DESTINATION "${CURRENT_PACKAGES_DIR}/tools") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/vlpp RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/vlpp" RENAME copyright) diff --git a/external_imported/vcpkg/ports/vlpp/vcpkg.json b/external_imported/vcpkg/ports/vlpp/vcpkg.json index 85650b62a..3bc64f290 100644 --- a/external_imported/vcpkg/ports/vlpp/vcpkg.json +++ b/external_imported/vcpkg/ports/vlpp/vcpkg.json @@ -1,7 +1,13 @@ { "name": "vlpp", "version-string": "0.11.0.0", - "port-version": 1, + "port-version": 2, "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" + "homepage": "https://github.com/vczh-libraries/Release", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/volk/portfile.cmake b/external_imported/vcpkg/ports/volk/portfile.cmake index e2083887d..fe58d7998 100644 --- a/external_imported/vcpkg/ports/volk/portfile.cmake +++ b/external_imported/vcpkg/ports/volk/portfile.cmake @@ -4,22 +4,22 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeux/volk - REF 5a605f5d6997bd929b666700a36ca3d9bd1d7a47 - SHA512 ed6faf13828f3e47c4f12f8d19952c94589420539e98405bf2a4b7959518357dcc2f210746f3683d3862ac8c80821f3c863d49f4625e2dac85d2a680567e4f00 + REF 1.3.204 + SHA512 73108aff5bed08f711730948c80070a8d913f2ba2e7886232cd981272fe47bc85cff84eabfdf14d4261c658b58ee098a9bd837222f65323f304d6abcdbeb8613 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DVOLK_INSTALL=ON +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DVOLK_INSTALL=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/volk) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/volk) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +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(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") diff --git a/external_imported/vcpkg/ports/volk/vcpkg.json b/external_imported/vcpkg/ports/volk/vcpkg.json index 3d3f4a1e6..32734f128 100644 --- a/external_imported/vcpkg/ports/volk/vcpkg.json +++ b/external_imported/vcpkg/ports/volk/vcpkg.json @@ -1,14 +1,22 @@ { "name": "volk", - "version-string": "2019-09-26", - "port-version": 1, + "version": "1.3.204", "description": [ "Meta loader for Vulkan API.", "Note that the static library target volk::volk is built without platform-specific defines.", "Use the header-only target volk::volk_headers if you require platform-specific extensions." ], "homepage": "https://github.com/zeux/volk", + "license": "MIT", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "vulkan" ] } diff --git a/external_imported/vcpkg/ports/vtk/FindLZ4.patch b/external_imported/vcpkg/ports/vtk/FindLZ4.patch index 7f65de529..635d0261b 100644 --- a/external_imported/vcpkg/ports/vtk/FindLZ4.patch +++ b/external_imported/vcpkg/ports/vtk/FindLZ4.patch @@ -42,8 +42,8 @@ index 8c94e3bcd..ade3f9451 100644 - endif () -endif () +find_package(LZ4 CONFIG REQUIRED) -+set_target_properties(lz4::lz4 PROPERTIES IMPORTED_GLOBAL TRUE) +if(NOT TARGET LZ4::LZ4) -+add_library(LZ4::LZ4 ALIAS lz4::lz4) ++ add_library(LZ4::LZ4 INTERFACE IMPORTED) ++ target_link_libraries(LZ4::LZ4 INTERFACE lz4::lz4) +endif() \ No newline at end of file diff --git a/external_imported/vcpkg/ports/vtk/FindLZMA.patch b/external_imported/vcpkg/ports/vtk/FindLZMA.patch index cb7f80963..990f2b2ae 100644 --- a/external_imported/vcpkg/ports/vtk/FindLZMA.patch +++ b/external_imported/vcpkg/ports/vtk/FindLZMA.patch @@ -1,86 +1,16 @@ -diff --git a/CMake/FindLZMA.cmake b/CMake/FindLZMA.cmake -index 0c8c7943c..d60669484 100644 ---- a/CMake/FindLZMA.cmake -+++ b/CMake/FindLZMA.cmake -@@ -1,9 +1,17 @@ - find_path(LZMA_INCLUDE_DIR - NAMES lzma.h - DOC "lzma include directory") --find_library(LZMA_LIBRARY -+# Note LZMA_LIBRARY is set somewhere else. Maybe one of the configs/wrappers installed by VCPKG defines it. -+# The original FindLZMA chokes on it since it contains optimized/debug keywords -+# VTK should probably switch to FindLibLZMA from CMake -+find_library(LZMA_LIBRARY_RELEASE - NAMES lzma - DOC "lzma library") -+find_library(LZMA_LIBRARY_DEBUG -+ NAMES lzmad lzma NAMES_PER_DIR -+ DOC "lzma library") -+ include(SelectLibraryConfigurations) -+ select_library_configurations( LZMA ) - - if (LZMA_INCLUDE_DIR) - file(STRINGS "${LZMA_INCLUDE_DIR}/lzma/version.h" _lzma_version_lines -@@ -20,22 +26,50 @@ endif () - - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(LZMA -- REQUIRED_VARS LZMA_LIBRARY LZMA_INCLUDE_DIR -+ REQUIRED_VARS LZMA_LIBRARY LZMA_LIBRARY_RELEASE LZMA_LIBRARY_DEBUG LZMA_INCLUDE_DIR - VERSION_VAR LZMA_VERSION) - - if (LZMA_FOUND) - set(LZMA_LIBRARIES "${LZMA_LIBRARY}") - set(LZMA_INCLUDE_DIRS "${LZMA_INCLUDE_DIR}") -- -+ - if (NOT TARGET LZMA::LZMA) - include(vtkDetectLibraryType) -- vtk_detect_library_type(lzma_library_type -- PATH "${LZMA_LIBRARY}") -- add_library(LZMA::LZMA "${lzma_library_type}" IMPORTED) -- unset(lzma_library_type) -- set_target_properties(LZMA::LZMA PROPERTIES -- IMPORTED_LOCATION "${LZMA_LIBRARY}" -- IMPORTED_IMPLIB "${LZMA_LIBRARY}" -- INTERFACE_INCLUDE_DIRECTORIES "${LZMA_INCLUDE_DIR}") -- endif () -+ if(LZMA_LIBRARY_RELEASE) -+ vtk_detect_library_type(lzma_library_type -+ PATH "${LZMA_LIBRARY_RELEASE}") -+ elseif(LZMA_LIBRARY_DEBUG) -+ vtk_detect_library_type(lzma_library_type -+ PATH "${LZMA_LIBRARY_DEBUG}") -+ else() -+ vtk_detect_library_type(lzma_library_type -+ PATH "${LZMA_LIBRARY}") -+ endif() -+ -+ add_library(LZMA::LZMA "${lzma_library_type}" IMPORTED) -+ set_target_properties(LZMA::LZMA PROPERTIES -+ INTERFACE_INCLUDE_DIRECTORIES "${LZMA_INCLUDE_DIR}") -+ if(LZMA_LIBRARY_RELEASE) -+ set_target_properties(LZMA::LZMA PROPERTIES -+ IMPORTED_LOCATION_RELEASE "${LZMA_LIBRARY_RELEASE}" -+ IMPORTED_IMPLIB_RELEASE "${LZMA_LIBRARY_RELEASE}") -+ endif() -+ if(LZMA_LIBRARY_DEBUG) -+ set_target_properties(LZMA::LZMA PROPERTIES -+ IMPORTED_LOCATION_DEBUG "${LZMA_LIBRARY_DEBUG}" -+ IMPORTED_IMPLIB_DEBUG "${LZMA_LIBRARY_DEBUG}") -+ endif() -+ -+ # Guard against possible stupidity of depending projects reading only LOCATION without configuration -+ if(CMAKE_BUILD_TYPE MATCHES "Debug") -+ set_target_properties(LZMA::LZMA PROPERTIES -+ IMPORTED_LOCATION "${LZMA_LIBRARY_DEBUG}" -+ IMPORTED_IMPLIB "${LZMA_LIBRARY_DEBUG}") -+ else() -+ set_target_properties(LZMA::LZMA PROPERTIES -+ IMPORTED_LOCATION "${LZMA_LIBRARY_RELEASE}" -+ IMPORTED_IMPLIB "${LZMA_LIBRARY_RELEASE}") -+ endif() -+ endif() -+ #set_target_properties(LZMA::LZMA PROPERTIES IMPORTED_GLOBAL TRUE) - endif () - \ No newline at end of file +diff --git a/CMake/FindLZMA.cmake b/CMake/FindLZMA.cmake +index 0c8c794..796558c 100644 +--- a/CMake/FindLZMA.cmake ++++ b/CMake/FindLZMA.cmake +@@ -1,3 +1,11 @@ ++find_package(LibLZMA) ++set(LZMA_INCLUDE_DIR "${LIBLZMA_INCLUDE_DIR}" CACHE INTERNAL "") ++set(LZMA_LIBRARY "${LIBLZMA_LIBRARIES}" CACHE INTERNAL "") ++if(NOT TARGET LZMA::LZMA) ++ add_library(LZMA::LZMA INTERFACE IMPORTED) ++ target_link_libraries(LZMA::LZMA INTERFACE LibLZMA::LibLZMA) ++endif() ++ + find_path(LZMA_INCLUDE_DIR + NAMES lzma.h + DOC "lzma include directory") diff --git a/external_imported/vcpkg/ports/vtk/portfile.cmake b/external_imported/vcpkg/ports/vtk/portfile.cmake index cff5332c1..64dd5901a 100644 --- a/external_imported/vcpkg/ports/vtk/portfile.cmake +++ b/external_imported/vcpkg/ports/vtk/portfile.cmake @@ -296,6 +296,9 @@ file(REMOVE "${CURRENT_PACKAGES_DIR}/share/${PORT}/FindEXPAT.cmake") file(RENAME "${CURRENT_PACKAGES_DIR}/share/licenses" "${CURRENT_PACKAGES_DIR}/share/${PORT}/licenses") +if(EXISTS "${CURRENT_PACKAGES_DIR}/include/vtk-9.0/vtkChemistryConfigure.h") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/vtk-9.0/vtkChemistryConfigure.h" "${SOURCE_PATH}" "not/existing") +endif() # ============================================================================= # Usage configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) diff --git a/external_imported/vcpkg/ports/vtk/vcpkg.json b/external_imported/vcpkg/ports/vtk/vcpkg.json index 2ce6162f3..fb5a115dc 100644 --- a/external_imported/vcpkg/ports/vtk/vcpkg.json +++ b/external_imported/vcpkg/ports/vtk/vcpkg.json @@ -1,9 +1,10 @@ { "name": "vtk", "version-semver": "9.0.3-pv5.9.1", - "port-version": 5, + "port-version": 10, "description": "Software system for 3D computer graphics, image processing, and visualization", "homepage": "https://github.com/Kitware/VTK", + "license": "BSD-3-Clause", "dependencies": [ "double-conversion", "eigen3", @@ -30,7 +31,7 @@ "lz4", "netcdf-c", "pegtl-2", - "proj4", + "proj", "pugixml", "sqlite3", "tiff", diff --git a/external_imported/vcpkg/ports/vulkan-memory-allocator/portfile.cmake b/external_imported/vcpkg/ports/vulkan-memory-allocator/portfile.cmake index c0b27259a..32a96bdbf 100644 --- a/external_imported/vcpkg/ports/vulkan-memory-allocator/portfile.cmake +++ b/external_imported/vcpkg/ports/vulkan-memory-allocator/portfile.cmake @@ -1,13 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator - REF 55868965ae1fa956c07695d4642e1add8c9450f7 - SHA512 433d8a961a1fa4c80894f014fdfbbcafeb94932a3eea2eced9c7109dcbf7350a60efb9fb1d8f3c621f2d72c118f47f82f8e9e6f4db75038fbad3a727b5896479 + REF 42be483bd5c6605e789e011aac684e0b95d05359 #v3.0.0 + SHA512 5bb2240481511e51f1617f2c010a3e93a1c72a63713ed4aecf94488e7f46c78a3cfc591e8f94e14b1262b264bc06e1a78cfe69967b41e02441fad1a433747ee6 HEAD_REF master ) file(COPY "${SOURCE_PATH}/include/vk_mem_alloc.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -file(COPY ${CMAKE_CURRENT_LIST_DIR}/unofficial-vulkan-memory-allocator-config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/unofficial-vulkan-memory-allocator) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/unofficial-vulkan-memory-allocator-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-vulkan-memory-allocator") -configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/vulkan-memory-allocator/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/external_imported/vcpkg/ports/vulkan-memory-allocator/vcpkg.json b/external_imported/vcpkg/ports/vulkan-memory-allocator/vcpkg.json index fe8efacdc..50a39ecc5 100644 --- a/external_imported/vcpkg/ports/vulkan-memory-allocator/vcpkg.json +++ b/external_imported/vcpkg/ports/vulkan-memory-allocator/vcpkg.json @@ -1,6 +1,7 @@ { "name": "vulkan-memory-allocator", - "version-string": "2021-07-07", - "port-version": 1, - "description": "Easy to integrate Vulkan memory allocation library from GPUOpen" + "version": "3.0.0", + "description": "Easy to integrate Vulkan memory allocation library from GPUOpen", + "homepage": "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator", + "license": "MIT" } diff --git a/external_imported/vcpkg/ports/wampcc/portfile.cmake b/external_imported/vcpkg/ports/wampcc/portfile.cmake index e50d780dc..6940a964c 100644 --- a/external_imported/vcpkg/ports/wampcc/portfile.cmake +++ b/external_imported/vcpkg/ports/wampcc/portfile.cmake @@ -3,15 +3,6 @@ if (VCPKG_TARGET_IS_WINDOWS) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) endif() -if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(BUILD_ARCH "Win32") -elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(BUILD_ARCH "x64") -elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - set(BUILD_ARCH "ARM") -else() - message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") -endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -21,33 +12,22 @@ vcpkg_from_github( HEAD_REF master ) -# Utils build is broken under Windows -if ("utils" IN_LIST FEATURES) - if (VCPKG_TARGET_IS_WINDOWS) - message(FATAL_ERROR "'utils' build is broken under Windows") - endif() - - set(ENABLE_UTILS ON) -else() - set(ENABLE_UTILS OFF) -endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + examples BUILD_EXAMPLES + utils BUILD_UTILS +) -if ("examples" IN_LIST FEATURES) - set(ENABLE_EXAMPLES ON) -else() - set(ENABLE_EXAMPLES OFF) -endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DBUILD_UTILS:BOOL=${ENABLE_UTILS} - -DBUILD_EXAMPLES:BOOL=${ENABLE_EXAMPLES} -DBUILD_TESTS:BOOL=OFF # Tests build is broken + ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/wampcc RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -vcpkg_fixup_pkgconfig() +vcpkg_fixup_pkgconfig() diff --git a/external_imported/vcpkg/ports/wampcc/vcpkg.json b/external_imported/vcpkg/ports/wampcc/vcpkg.json index 025aed5a3..a1d992491 100644 --- a/external_imported/vcpkg/ports/wampcc/vcpkg.json +++ b/external_imported/vcpkg/ports/wampcc/vcpkg.json @@ -1,19 +1,26 @@ { "name": "wampcc", - "version-string": "2019-09-04", - "port-version": 2, + "version-date": "2019-09-04", + "port-version": 3, "description": "Wampcc is C++ library that implements the Web Application Messaging Protocol (WAMP) protocol.", + "license": "MIT", + "supports": "!(windows & arm64)", "dependencies": [ "jansson", "libuv", - "openssl" + "openssl", + { + "name": "vcpkg-cmake", + "host": true + } ], "features": { "examples": { "description": "Build example apps" }, "utils": { - "description": "Build utility apps" + "description": "Build utility apps", + "supports": "!windows" } } } diff --git a/external_imported/vcpkg/ports/wangle/portfile.cmake b/external_imported/vcpkg/ports/wangle/portfile.cmake index dca45cfe4..bf8313bef 100644 --- a/external_imported/vcpkg/ports/wangle/portfile.cmake +++ b/external_imported/vcpkg/ports/wangle/portfile.cmake @@ -3,40 +3,39 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/wangle - REF v2021.06.14.00 - SHA512 15fd2c9515ec3d0c3293a8f96d01d3e91e2ef82694d592aae6573648957f691a7da5d7c2aef7391a827a67e2f58fef7668778e0f0323aac11c5b16a1ba889cc3 + REF v2022.03.21.00 + SHA512 069fe7758ccb2f33665f53109047f2e0158e248fda8c760eddd978afd6980acbc6421db60721bf320deca557369377c8757f13c67f8685e3a98394324e75e72e HEAD_REF master PATCHES fix-config-cmake.patch fix_dependency.patch ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/wangle" - PREFER_NINJA OPTIONS -DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF -DINCLUDE_INSTALL_DIR:STRING=include ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/wangle) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/wangle) -file(READ ${CURRENT_PACKAGES_DIR}/share/wangle/wangle-targets.cmake _contents) +file(READ "${CURRENT_PACKAGES_DIR}/share/wangle/wangle-targets.cmake" _contents) STRING(REPLACE "\${_IMPORT_PREFIX}/lib/" "\${_IMPORT_PREFIX}/\$<\$:debug/>lib/" _contents "${_contents}") STRING(REPLACE "\${_IMPORT_PREFIX}/debug/lib/" "\${_IMPORT_PREFIX}/\$<\$:debug/>lib/" _contents "${_contents}") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/wangle/wangle-targets.cmake "${_contents}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/wangle/wangle-targets.cmake" "${_contents}") vcpkg_copy_pdbs() file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/include/wangle/util/test - ${CURRENT_PACKAGES_DIR}/include/wangle/ssl/test/certs - ${CURRENT_PACKAGES_DIR}/include/wangle/service/test - ${CURRENT_PACKAGES_DIR}/include/wangle/deprecated/rx/test + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/include/wangle/util/test" + "${CURRENT_PACKAGES_DIR}/include/wangle/ssl/test/certs" + "${CURRENT_PACKAGES_DIR}/include/wangle/service/test" + "${CURRENT_PACKAGES_DIR}/include/wangle/deprecated/rx/test" ) -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}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/wangle/vcpkg.json b/external_imported/vcpkg/ports/wangle/vcpkg.json index c499e71f0..fb51f4338 100644 --- a/external_imported/vcpkg/ports/wangle/vcpkg.json +++ b/external_imported/vcpkg/ports/wangle/vcpkg.json @@ -1,8 +1,9 @@ { "name": "wangle", - "version-string": "2021.06.14.00", + "version-string": "2022.03.21.00", "description": "Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way.", "homepage": "https://github.com/facebook/wangle", + "license": "Apache-2.0", "dependencies": [ "boost-context", "boost-filesystem", @@ -14,6 +15,14 @@ "folly", "glog", "libevent", - "openssl" + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/wavpack/portfile.cmake b/external_imported/vcpkg/ports/wavpack/portfile.cmake index aa7300aa5..2c0dba8ad 100644 --- a/external_imported/vcpkg/ports/wavpack/portfile.cmake +++ b/external_imported/vcpkg/ports/wavpack/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dbry/WavPack diff --git a/external_imported/vcpkg/ports/wavpack/vcpkg.json b/external_imported/vcpkg/ports/wavpack/vcpkg.json index bf488fb54..7918e036d 100644 --- a/external_imported/vcpkg/ports/wavpack/vcpkg.json +++ b/external_imported/vcpkg/ports/wavpack/vcpkg.json @@ -1,6 +1,7 @@ { "name": "wavpack", "version": "5.4.0", + "port-version": 1, "description": "WavPack encode/decode library, command-line programs, and several plugins", "homepage": "https://github.com/dbry/WavPack", "supports": "!(arm | arm64)" diff --git a/external_imported/vcpkg/ports/websocketpp/cxx20.patch b/external_imported/vcpkg/ports/websocketpp/cxx20.patch new file mode 100644 index 000000000..34283e2b1 --- /dev/null +++ b/external_imported/vcpkg/ports/websocketpp/cxx20.patch @@ -0,0 +1,66 @@ +diff --git "a/websocketpp/endpoint.hpp" "b/websocketpp/endpoint.hpp" +index c124b1d..9ce8a62 100644 +--- "a/websocketpp/endpoint.hpp" ++++ "b/websocketpp/endpoint.hpp" +@@ -109,7 +109,7 @@ public: + + + /// Destructor +- ~endpoint() {} ++ ~endpoint() {} + + #ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_ + // no copy constructor because endpoints are not copyable +diff --git "a/websocketpp/logger/basic.hpp" "b/websocketpp/logger/basic.hpp" +index 8451413..4c9d836 100644 +--- "a/websocketpp/logger/basic.hpp" ++++ "b/websocketpp/logger/basic.hpp" +@@ -58,33 +58,33 @@ namespace log { + template + class basic { + public: +- basic(channel_type_hint::value h = ++ basic(channel_type_hint::value h = + channel_type_hint::access) + : m_static_channels(0xffffffff) + , m_dynamic_channels(0) + , m_out(h == channel_type_hint::error ? &std::cerr : &std::cout) {} + +- basic(std::ostream * out) ++ basic(std::ostream * out) + : m_static_channels(0xffffffff) + , m_dynamic_channels(0) + , m_out(out) {} + +- basic(level c, channel_type_hint::value h = ++ basic(level c, channel_type_hint::value h = + channel_type_hint::access) + : m_static_channels(c) + , m_dynamic_channels(0) + , m_out(h == channel_type_hint::error ? &std::cerr : &std::cout) {} + +- basic(level c, std::ostream * out) ++ basic(level c, std::ostream * out) + : m_static_channels(c) + , m_dynamic_channels(0) + , m_out(out) {} + + /// Destructor +- ~basic() {} ++ ~basic() {} + + /// Copy constructor +- basic(basic const & other) ++ basic(basic const & other) + : m_static_channels(other.m_static_channels) + , m_dynamic_channels(other.m_dynamic_channels) + , m_out(other.m_out) +@@ -97,7 +97,7 @@ public: + + #ifdef _WEBSOCKETPP_MOVE_SEMANTICS_ + /// Move constructor +- basic(basic && other) ++ basic(basic && other) + : m_static_channels(other.m_static_channels) + , m_dynamic_channels(other.m_dynamic_channels) + , m_out(other.m_out) diff --git a/external_imported/vcpkg/ports/websocketpp/portfile.cmake b/external_imported/vcpkg/ports/websocketpp/portfile.cmake index 8feb3bd8e..2592ca331 100644 --- a/external_imported/vcpkg/ports/websocketpp/portfile.cmake +++ b/external_imported/vcpkg/ports/websocketpp/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF 56123c87598f8b1dd471be83ca841ceae07f95ba # 0.8.2 SHA512 f185a66e5a7c783254352a6ef87e2e559f681032b7368765d08393ed12bcae76825abed7dcaea73de09df644320409dad46279701f5f469520542a2c9b6a6163 HEAD_REF master + PATCHES + cxx20.patch ) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/external_imported/vcpkg/ports/websocketpp/vcpkg.json b/external_imported/vcpkg/ports/websocketpp/vcpkg.json index 460fa86ca..daa7f5cf6 100644 --- a/external_imported/vcpkg/ports/websocketpp/vcpkg.json +++ b/external_imported/vcpkg/ports/websocketpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "websocketpp", "version": "0.8.2", - "port-version": 1, + "port-version": 2, "description": "Library that implements RFC6455 The WebSocket Protocol", "homepage": "https://github.com/zaphoyd/websocketpp", "documentation": "http://docs.websocketpp.org/", diff --git a/external_imported/vcpkg/ports/wincrypt/vcpkg.json b/external_imported/vcpkg/ports/wincrypt/vcpkg.json index 02cad22f7..938cad7fa 100644 --- a/external_imported/vcpkg/ports/wincrypt/vcpkg.json +++ b/external_imported/vcpkg/ports/wincrypt/vcpkg.json @@ -1,6 +1,7 @@ { "name": "wincrypt", - "version-string": "0.0", - "port-version": 3, - "description": "Windows Cryptography." + "version": "0.0", + "port-version": 4, + "description": "Windows Cryptography.", + "supports": "windows" } diff --git a/external_imported/vcpkg/ports/winpcap/portfile.cmake b/external_imported/vcpkg/ports/winpcap/portfile.cmake index 196ad02b8..aebe6997f 100644 --- a/external_imported/vcpkg/ports/winpcap/portfile.cmake +++ b/external_imported/vcpkg/ports/winpcap/portfile.cmake @@ -10,12 +10,6 @@ vcpkg_download_distfile(ARCHIVE SHA512 89a5109ed17f8069f7a43497f6fec817c58620dbc5fa506e52069b9113c5bc13f69c307affe611281cb727cfa0f8529d07044d41427e350b24468ccc89a87f33 ) -vcpkg_download_distfile(COPYRIGHT - URLS "https://www.winpcap.org/misc/copyright.htm" - FILENAME "Wpcap_license.htm" - SHA512 bb2519e8f3d02c408fa3f2ef339adda1cc31338d05d2fa4ce25d5369427243fd3e2abc4b21aa654b2be5791f53c2281847a4a15778ffcb90576fd166140c7d2e -) - # MSBuild performs in-source builds, so to ensure reliability we must clear them each time file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/src) @@ -174,4 +168,5 @@ endif() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/pcap-stdinc.h" "#define inline __inline" "#ifndef __cplusplus\n#define inline __inline\n#endif") -configure_file(${COPYRIGHT} "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "The latest license is available in https://www.winpcap.org/misc/copyright.htm and in the header files. +") diff --git a/external_imported/vcpkg/ports/winpcap/vcpkg.json b/external_imported/vcpkg/ports/winpcap/vcpkg.json index aa4d92347..be838b77b 100644 --- a/external_imported/vcpkg/ports/winpcap/vcpkg.json +++ b/external_imported/vcpkg/ports/winpcap/vcpkg.json @@ -1,7 +1,8 @@ { "name": "winpcap", "version": "4.1.3", - "port-version": 6, + "port-version": 8, "description": "WinPcap is the industry-standard tool for link-layer network access in Windows environments.", - "homepage": "https://www.winpcap.org" + "homepage": "https://www.winpcap.org", + "supports": "windows" } diff --git a/external_imported/vcpkg/ports/winreg/portfile.cmake b/external_imported/vcpkg/ports/winreg/portfile.cmake index e4c5b08ce..085f76d80 100644 --- a/external_imported/vcpkg/ports/winreg/portfile.cmake +++ b/external_imported/vcpkg/ports/winreg/portfile.cmake @@ -1,11 +1,8 @@ -# WinReg - Header-only library -vcpkg_fail_port_install(ON_TARGET "linux" "osx") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GiovanniDicanio/WinReg - REF 2594342b7fe6065430bc377961c37d30614cb4ff #v4.1.2 - SHA512 924cdb77518c3f0843e95cd7e7d4626d4c0c466444cd79fdfa6943975154a54f4eb0d4bd45b8d37d73c650467b1d2728543176688f356c5100d98810e95c9fe8 + REF 4ac74bfec290ec4376100372f59dbc2554e54692 #v5.1.0 + SHA512 3d25725c9fc781ffdfa1bbd3ed143a8381d40a1613d4786861e13b180098a5ce92ff193cf25d7490be0096c2eafcace45e6a2f94fbfaa28964d12b80b55d0637 HEAD_REF master ) @@ -13,4 +10,4 @@ vcpkg_from_github( file(COPY "${SOURCE_PATH}/WinReg/WinReg.hpp" 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/winreg/vcpkg.json b/external_imported/vcpkg/ports/winreg/vcpkg.json index 7aa2cbf4a..cfe7aeac9 100644 --- a/external_imported/vcpkg/ports/winreg/vcpkg.json +++ b/external_imported/vcpkg/ports/winreg/vcpkg.json @@ -1,7 +1,8 @@ { "name": "winreg", - "version": "4.1.2", + "version": "5.1.0", "description": "High-level C++ wrapper around the Windows Registry C API.", "homepage": "https://github.com/GiovanniDicanio/WinReg", + "license": "MIT", "supports": "windows | uwp" } diff --git a/external_imported/vcpkg/ports/winsock2/vcpkg.json b/external_imported/vcpkg/ports/winsock2/vcpkg.json index 472dc00d2..02e569826 100644 --- a/external_imported/vcpkg/ports/winsock2/vcpkg.json +++ b/external_imported/vcpkg/ports/winsock2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "winsock2", - "version-string": "0.0", - "port-version": 3, - "description": "Windows Sockets." + "version": "0.0", + "port-version": 4, + "description": "Windows Sockets.", + "supports": "windows" } diff --git a/external_imported/vcpkg/ports/winsparkle/portfile.cmake b/external_imported/vcpkg/ports/winsparkle/portfile.cmake new file mode 100644 index 000000000..1c86809a6 --- /dev/null +++ b/external_imported/vcpkg/ports/winsparkle/portfile.cmake @@ -0,0 +1,48 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/vslavik/winsparkle/releases/download/v0.7.0/WinSparkle-0.7.0.zip" + FILENAME "winsparkle-070.zip" + SHA512 c2cf29e1880534c170110f8e5a966939aecc9a9e05afc87868400074f1492fcac949b61e2ce4636eadd2f127caad3660e0f763476e9523aad3834d673f6edd77 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +file(GLOB HEADER_LIST "${SOURCE_PATH}/include/*.h") +file(INSTALL ${HEADER_LIST} DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") +file(GLOB TOOLS_LIST "${SOURCE_PATH}/bin/*.bat") +file(INSTALL ${TOOLS_LIST} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + + +# Note: It is an explicit design goal for WinSparkle to be a single +# self-contained DLL with no external dependencies (to the point that +# it even links to static CRT!). This matters for e.g. in-app delta updates +# or re-launching the app after update. It is not statically linked even if a +# static linking is used for everything else. +set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled) + +if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + + # We have no debug, but since Winsparkle is a self-contained dll, we can copy it to the Debug folder as well + file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") +elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + + # We have no debug, but since Winsparkle is a self-contained dll, we can copy it to the Debug folder as well + file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") +else() + message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") +endif() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/external_imported/vcpkg/ports/winsparkle/vcpkg.json b/external_imported/vcpkg/ports/winsparkle/vcpkg.json new file mode 100644 index 000000000..b2055e91a --- /dev/null +++ b/external_imported/vcpkg/ports/winsparkle/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "winsparkle", + "version": "0.7.0", + "port-version": 1, + "description": "WinSparkle is an easy-to-use software update library for Windows developers.", + "homepage": "https://winsparkle.org", + "license": "MIT", + "supports": "windows & !(arm | uwp)" +} diff --git a/external_imported/vcpkg/ports/wintoast/portfile.cmake b/external_imported/vcpkg/ports/wintoast/portfile.cmake index c99d50212..3cbb33b65 100644 --- a/external_imported/vcpkg/ports/wintoast/portfile.cmake +++ b/external_imported/vcpkg/ports/wintoast/portfile.cmake @@ -1,7 +1,3 @@ -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "${PORT} does not currently support UWP") -endif() - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( @@ -12,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}" OPTIONS_RELEASE -DINSTALL_HEADERS=ON OPTIONS_DEBUG -DINSTALL_HEADERS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Install license -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/wintoast/vcpkg.json b/external_imported/vcpkg/ports/wintoast/vcpkg.json index 2d0a41de5..b96aa95b3 100644 --- a/external_imported/vcpkg/ports/wintoast/vcpkg.json +++ b/external_imported/vcpkg/ports/wintoast/vcpkg.json @@ -1,7 +1,13 @@ { "name": "wintoast", - "version-string": "1.2.0", - "port-version": 1, + "version": "1.2.0", + "port-version": 2, "description": "WinToast is a lightly library written in C++ which brings a complete integration of the modern toast notifications of Windows 8 & Windows 10.", - "supports": "!uwp" + "supports": "windows & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/wpilib/portfile.cmake b/external_imported/vcpkg/ports/wpilib/portfile.cmake index cbe4051f7..f4b48dc30 100644 --- a/external_imported/vcpkg/ports/wpilib/portfile.cmake +++ b/external_imported/vcpkg/ports/wpilib/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "OSX") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wpilibsuite/allwpilib diff --git a/external_imported/vcpkg/ports/wpilib/vcpkg.json b/external_imported/vcpkg/ports/wpilib/vcpkg.json index c96157cc6..b0e07c291 100644 --- a/external_imported/vcpkg/ports/wpilib/vcpkg.json +++ b/external_imported/vcpkg/ports/wpilib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "wpilib", "version-string": "2020.3.2", - "port-version": 1, + "port-version": 2, "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", "supports": "!osx", diff --git a/external_imported/vcpkg/ports/wt/0007-boost_1_77_0.patch b/external_imported/vcpkg/ports/wt/0007-boost_1_77_0.patch deleted file mode 100644 index 8fed5713d..000000000 --- a/external_imported/vcpkg/ports/wt/0007-boost_1_77_0.patch +++ /dev/null @@ -1,15 +0,0 @@ - src/Wt/Render/CssParser.C | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/Wt/Render/CssParser.C b/src/Wt/Render/CssParser.C -index b8d409e..6bb47b4 100644 ---- a/src/Wt/Render/CssParser.C -+++ b/src/Wt/Render/CssParser.C -@@ -39,6 +39,7 @@ using namespace Wt::Render; - #include - #endif - #include -+#include - - #include - diff --git a/external_imported/vcpkg/ports/wt/portfile.cmake b/external_imported/vcpkg/ports/wt/portfile.cmake index 30dd1af9a..9b8dd5624 100644 --- a/external_imported/vcpkg/ports/wt/portfile.cmake +++ b/external_imported/vcpkg/ports/wt/portfile.cmake @@ -1,14 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO emweb/wt - REF d3ee790da1826529e3d025d919f5c3608d029562 # 4.5.0 - SHA512 2fe66269bb59db81d3611f2857ac3ba0ae7448a54d216bd7aa72701f1e6e291a738421f460f4614198785bbd084ab1e19e84a3f67cbc15556015e2f259941f11 + REF bc76cbea5bb845c4d0fb642968eb1b278ddbb047 # 4.6.1 + SHA512 416baaaf89cdbe2e9cf234df44dc0b90493c995b52ca9840cb5a5acf2904fe7d81da178ac4e0bf06dcd44fbac74fa75fe570901dd8fd4987a1bec4aeb54baad6 HEAD_REF master PATCHES 0002-link-glew.patch 0005-XML_file_path.patch 0006-GraphicsMagick.patch - 0007-boost_1_77_0.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED_LIBS) @@ -45,7 +44,7 @@ else() endif() vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" GENERATOR Ninja OPTIONS -DINSTALL_CONFIG_FILE_PATH="${DOWNLOADS}/wt" @@ -55,6 +54,9 @@ vcpkg_cmake_configure( -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF + -DWTHTTP_CONFIGURATION= + -DCONFIGURATION= + -DCONNECTOR_HTTP=ON -DENABLE_HARU=ON -DHARU_DYNAMIC=${SHARED_LIBS} @@ -72,16 +74,22 @@ vcpkg_cmake_configure( -DUSE_SYSTEM_GLEW=ON -DCMAKE_INSTALL_DIR=share + # see https://redmine.webtoolkit.eu/issues/9646 + -DWTHTTP_CONFIGURATION= + -DCONFIGURATION= + ) vcpkg_cmake_install() vcpkg_cmake_config_fixup() # There is no way to suppress installation of the headers and resource files in debug build. -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}/var" "${CURRENT_PACKAGES_DIR}/debug/var") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/var) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/var) +# RUNDIR is only used for wtfcgi what we don't build. See https://redmine.webtoolkit.eu/issues/9646 +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/Wt/WConfig.h" "#define RUNDIR \"${CURRENT_PACKAGES_DIR}/var/run/wt\"" "") -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/wt/vcpkg.json b/external_imported/vcpkg/ports/wt/vcpkg.json index 303e56c77..727e7cd83 100644 --- a/external_imported/vcpkg/ports/wt/vcpkg.json +++ b/external_imported/vcpkg/ports/wt/vcpkg.json @@ -1,7 +1,6 @@ { "name": "wt", - "version-string": "4.5.0", - "port-version": 2, + "version": "4.6.1", "description": "Wt is a C++ library for developing web applications", "homepage": "https://github.com/emweb/wt", "dependencies": [ diff --git a/external_imported/vcpkg/ports/wxwidgets/fix-linux-configure.patch b/external_imported/vcpkg/ports/wxwidgets/fix-linux-configure.patch new file mode 100644 index 000000000..059bb42b7 --- /dev/null +++ b/external_imported/vcpkg/ports/wxwidgets/fix-linux-configure.patch @@ -0,0 +1,49 @@ +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/portfile.cmake b/external_imported/vcpkg/ports/wxwidgets/portfile.cmake index 441968607..441943a4a 100644 --- a/external_imported/vcpkg/ports/wxwidgets/portfile.cmake +++ b/external_imported/vcpkg/ports/wxwidgets/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES disable-platform-lib-dir.patch fix-build.patch + fix-linux-configure.patch # Remove this patch in the next update ) set(OPTIONS) @@ -21,6 +22,15 @@ if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64 OR VCPKG_TARGET_ARCHITECTURE STREQUA ) 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}) + find_program(system_pkg_config NAMES pkg-config) + if(system_pkg_config) + set(ENV{PKG_CONFIG} "${system_pkg_config}") + endif() +endif() + # 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 # which is why they must be set in a custom triplet rather than a port feature. @@ -33,7 +43,7 @@ if(NOT DEFINED WXWIDGETS_USE_STD_CONTAINERS) endif() vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DwxUSE_REGEX=builtin -DwxUSE_ZLIB=sys @@ -49,21 +59,23 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/lib/*.dll") -if(DLLS) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) - foreach(DLL ${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 ${DLLS}) - get_filename_component(N "${DLL}" NAME) - file(RENAME ${DLL} ${CURRENT_PACKAGES_DIR}/debug/bin/${N}) - endforeach() +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() if(VCPKG_TARGET_IS_WINDOWS) @@ -75,14 +87,14 @@ endif() # do the copy pdbs now after the dlls got moved to the expected /bin folder above vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/msvc) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(GLOB_RECURSE INCLUDES ${CURRENT_PACKAGES_DIR}/include/*.h) -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/mswu/wx/setup.h) - list(APPEND INCLUDES ${CURRENT_PACKAGES_DIR}/lib/mswu/wx/setup.h) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/msvc") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(GLOB_RECURSE INCLUDES "${CURRENT_PACKAGES_DIR}/include/*.h") +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/mswu/wx/setup.h") + list(APPEND INCLUDES "${CURRENT_PACKAGES_DIR}/lib/mswu/wx/setup.h") endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/mswud/wx/setup.h) - list(APPEND INCLUDES ${CURRENT_PACKAGES_DIR}/debug/lib/mswud/wx/setup.h) +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/mswud/wx/setup.h") + list(APPEND INCLUDES "${CURRENT_PACKAGES_DIR}/debug/lib/mswud/wx/setup.h") endif() foreach(INC IN LISTS INCLUDES) file(READ "${INC}" _contents) @@ -96,21 +108,27 @@ foreach(INC IN LISTS INCLUDES) file(WRITE "${INC}" "${_contents}") endforeach() -if(NOT EXISTS ${CURRENT_PACKAGES_DIR}/include/wx/setup.h) - file(GLOB_RECURSE WX_SETUP_H_FILES_DBG ${CURRENT_PACKAGES_DIR}/debug/lib/*.h) - file(GLOB_RECURSE WX_SETUP_H_FILES_REL ${CURRENT_PACKAGES_DIR}/lib/*.h) - - vcpkg_replace_string("${WX_SETUP_H_FILES_DBG}" "${CURRENT_PACKAGES_DIR}" "") - vcpkg_replace_string("${WX_SETUP_H_FILES_REL}" "${CURRENT_PACKAGES_DIR}" "") - - string(REPLACE "${CURRENT_PACKAGES_DIR}/debug/lib/" "" WX_SETUP_H_FILES_DBG "${WX_SETUP_H_FILES_DBG}") - string(REPLACE "/setup.h" "" WX_SETUP_H_DBG_RELATIVE "${WX_SETUP_H_FILES_DBG}") - - string(REPLACE "${CURRENT_PACKAGES_DIR}/lib/" "" WX_SETUP_H_FILES_REL "${WX_SETUP_H_FILES_REL}") - string(REPLACE "/setup.h" "" WX_SETUP_H_REL_RELATIVE "${WX_SETUP_H_FILES_REL}") - - configure_file(${CMAKE_CURRENT_LIST_DIR}/setup.h.in ${CURRENT_PACKAGES_DIR}/include/wx/setup.h @ONLY) +if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/include/wx/setup.h") + file(GLOB_RECURSE WX_SETUP_H_FILES_DBG "${CURRENT_PACKAGES_DIR}/debug/lib/*.h") + file(GLOB_RECURSE WX_SETUP_H_FILES_REL "${CURRENT_PACKAGES_DIR}/lib/*.h") + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + vcpkg_replace_string("${WX_SETUP_H_FILES_REL}" "${CURRENT_PACKAGES_DIR}" "") + + string(REPLACE "${CURRENT_PACKAGES_DIR}/lib/" "" WX_SETUP_H_FILES_REL "${WX_SETUP_H_FILES_REL}") + string(REPLACE "/setup.h" "" WX_SETUP_H_REL_RELATIVE "${WX_SETUP_H_FILES_REL}") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_replace_string("${WX_SETUP_H_FILES_DBG}" "${CURRENT_PACKAGES_DIR}" "") + + string(REPLACE "${CURRENT_PACKAGES_DIR}/debug/lib/" "" WX_SETUP_H_FILES_DBG "${WX_SETUP_H_FILES_DBG}") + string(REPLACE "/setup.h" "" WX_SETUP_H_DBG_RELATIVE "${WX_SETUP_H_FILES_DBG}") + endif() + + 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/wxwidgets) -configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/wxwidgets/usage COPYONLY) -file(INSTALL ${SOURCE_PATH}/docs/licence.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) + +file(INSTALL "${SOURCE_PATH}/docs/licence.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/wxwidgets/vcpkg.json b/external_imported/vcpkg/ports/wxwidgets/vcpkg.json index 43251a9e7..9a4cdf2a8 100644 --- a/external_imported/vcpkg/ports/wxwidgets/vcpkg.json +++ b/external_imported/vcpkg/ports/wxwidgets/vcpkg.json @@ -1,13 +1,14 @@ { "name": "wxwidgets", "version-semver": "3.1.5", - "port-version": 5, + "port-version": 8, "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", "supports": "!uwp", "dependencies": [ "expat", diff --git a/external_imported/vcpkg/ports/x-plane/portfile.cmake b/external_imported/vcpkg/ports/x-plane/portfile.cmake index 56ea2e77e..3b7c9a679 100644 --- a/external_imported/vcpkg/ports/x-plane/portfile.cmake +++ b/external_imported/vcpkg/ports/x-plane/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "x86" "arm" "arm64" "wasm32") - vcpkg_download_distfile(ARCHIVE URLS "http://developer.x-plane.com/wp-content/plugins/code-sample-generation/sample_templates/XPSDK303.zip" FILENAME "XPSDK303.zip" @@ -16,7 +14,7 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_OSX) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug/lib - ) + ) endif() # copy headers & sources diff --git a/external_imported/vcpkg/ports/x-plane/vcpkg.json b/external_imported/vcpkg/ports/x-plane/vcpkg.json index 4884ca8e8..6402bd4b5 100644 --- a/external_imported/vcpkg/ports/x-plane/vcpkg.json +++ b/external_imported/vcpkg/ports/x-plane/vcpkg.json @@ -1,6 +1,7 @@ { "name": "x-plane", - "version-string": "3.0.3", + "version": "3.0.3", + "port-version": 1, "description": "The X-Plane Plugin SDK", "homepage": "https://developer.x-plane.com/sdk/", "supports": "!(x86 | arm | wasm32)" diff --git a/external_imported/vcpkg/ports/x264/portfile.cmake b/external_imported/vcpkg/ports/x264/portfile.cmake index 79d874910..33e6979ac 100644 --- a/external_imported/vcpkg/ports/x264/portfile.cmake +++ b/external_imported/vcpkg/ports/x264/portfile.cmake @@ -1,7 +1,5 @@ set(X264_VERSION 164) -vcpkg_fail_port_install(ON_ARCH "arm") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mirror/x264 diff --git a/external_imported/vcpkg/ports/x264/vcpkg.json b/external_imported/vcpkg/ports/x264/vcpkg.json index 7a313e8ee..436cf0b5e 100644 --- a/external_imported/vcpkg/ports/x264/vcpkg.json +++ b/external_imported/vcpkg/ports/x264/vcpkg.json @@ -1,7 +1,7 @@ { "name": "x264", "version-string": "164-5db6aa6cab1b146", - "port-version": 3, + "port-version": 4, "description": "x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format", "homepage": "https://github.com/mirror/x264", "supports": "!(arm & windows)", diff --git a/external_imported/vcpkg/ports/xaudio2redist/Findxaudio2redist.cmake b/external_imported/vcpkg/ports/xaudio2redist/Findxaudio2redist.cmake deleted file mode 100644 index 18de7bfa4..000000000 --- a/external_imported/vcpkg/ports/xaudio2redist/Findxaudio2redist.cmake +++ /dev/null @@ -1,54 +0,0 @@ -include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) - -set(XAUDIO2REDIST_VERSION "1.2.8") - -if(NOT xaudio2redist_INCLUDE_DIR) - find_path(xaudio2redist_INCLUDE_DIR - NAMES xaudio2redist.h - PATH_SUFFIXES xaudio2redist) -endif() - -find_package_handle_standard_args(xaudio2redist - REQUIRED_VARS xaudio2redist_INCLUDE_DIR - VERSION_VAR XAUDIO2REDIST_VERSION) -mark_as_advanced(xaudio2redist_INCLUDE_DIR) - -string(REPLACE "/include/xaudio2redist" "/lib" xaudio2redist_LIB_DIR ${xaudio2redist_INCLUDE_DIR}) -string(REPLACE "/include/xaudio2redist" "/bin" xaudio2redist_BIN_DIR ${xaudio2redist_INCLUDE_DIR}) -string(REPLACE "/include/xaudio2redist" "/debug/lib" xaudio2redist_DEBUG_LIB_DIR ${xaudio2redist_INCLUDE_DIR}) -string(REPLACE "/include/xaudio2redist" "/debug/bin" xaudio2redist_DEBUG_BIN_DIR ${xaudio2redist_INCLUDE_DIR}) - -if(XAUDIO2REDIST_FOUND AND NOT TARGET Microsoft::XAudio2Redist) - set(XAUDIO2_RELEASE_LIB "${xaudio2redist_LIB_DIR}/xaudio2_9redist.lib") - set(XAUDIO2_RELEASE_DLL "${xaudio2redist_BIN_DIR}/xaudio2_9redist.dll") - - set(XAUDIO2_DEBUG_LIB "${xaudio2redist_DEBUG_LIB_DIR}/xaudio2_9redist.lib") - set(XAUDIO2_DEBUG_DLL "${xaudio2redist_DEBUG_BIN_DIR}/xaudio2_9redist.dll") - - add_library(Microsoft::XAudio2Redist SHARED IMPORTED) - set_target_properties(Microsoft::XAudio2Redist PROPERTIES - IMPORTED_LOCATION_RELEASE "${XAUDIO2_RELEASE_DLL}" - IMPORTED_IMPLIB_RELEASE "${XAUDIO2_RELEASE_LIB}" - IMPORTED_LOCATION_DEBUG "${XAUDIO2_DEBUG_DLL}" - IMPORTED_IMPLIB_DEBUG "${XAUDIO2_DEBUG_LIB}" - INTERFACE_INCLUDE_DIRECTORIES "${xaudio2redist_INCLUDE_DIR}" - IMPORTED_CONFIGURATIONS "Debug;Release" - IMPORTED_LINK_INTERFACE_LANGUAGES "C") -endif() - -if(XAUDIO2REDIST_FOUND AND NOT TARGET Microsoft::XApoBase) - set(XAPOBASE_RELEASE_LIB "${xaudio2redist_LIB_DIR}/xapobaseredist_md.lib") - set(XAPOBASE_DEBUG_LIB "${xaudio2redist_DEBUG_LIB_DIR}/xapobaseredist_md.lib") - - if(NOT EXISTS ${XAPOBASE_RELEASE_LIB}) - set(XAPOBASE_RELEASE_LIB "${xaudio2redist_LIB_DIR}/xapobaseredist.lib") - set(XAPOBASE_DEBUG_LIB "${xaudio2redist_DEBUG_LIB_DIR}/xapobaseredist.lib") - endif() - - add_library(Microsoft::XApoBase STATIC IMPORTED) - set_target_properties(Microsoft::XApoBase PROPERTIES - IMPORTED_LOCATION_RELEASE "${XAPOBASE_RELEASE_LIB}" - IMPORTED_LOCATION_DEBUG "${XAPOBASE_DEBUG_LIB}" - INTERFACE_INCLUDE_DIRECTORIES "${xaudio2redist_INCLUDE_DIR}" - IMPORTED_CONFIGURATIONS "Debug;Release") -endif() diff --git a/external_imported/vcpkg/ports/xaudio2redist/portfile.cmake b/external_imported/vcpkg/ports/xaudio2redist/portfile.cmake index 2e8b479ca..f6d7535d4 100644 --- a/external_imported/vcpkg/ports/xaudio2redist/portfile.cmake +++ b/external_imported/vcpkg/ports/xaudio2redist/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP" "Linux" "OSX") - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_download_distfile(ARCHIVE @@ -33,5 +31,4 @@ file(COPY "${PACKAGE_PATH}/build/native/debug/bin/${VCPKG_TARGET_ARCHITECTURE}/x file(INSTALL "${PACKAGE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/Findxaudio2redist.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +configure_file("${CMAKE_CURRENT_LIST_DIR}/xaudio2redist-config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" COPYONLY) diff --git a/external_imported/vcpkg/ports/xaudio2redist/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/xaudio2redist/vcpkg-cmake-wrapper.cmake deleted file mode 100644 index 32610b66f..000000000 --- a/external_imported/vcpkg/ports/xaudio2redist/vcpkg-cmake-wrapper.cmake +++ /dev/null @@ -1,11 +0,0 @@ -message(STATUS "Using VCPKG Findxaudio2redist") -set(XAUDIO2_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) -list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) - -list(REMOVE_ITEM ARGS "NO_MODULE") -list(REMOVE_ITEM ARGS "CONFIG") -list(REMOVE_ITEM ARGS "MODULE") - -_find_package(${ARGS}) - -set(CMAKE_MODULE_PATH ${XAUDIO2_PREV_MODULE_PATH}) diff --git a/external_imported/vcpkg/ports/xaudio2redist/vcpkg.json b/external_imported/vcpkg/ports/xaudio2redist/vcpkg.json index cb596c2fa..3c610f1f9 100644 --- a/external_imported/vcpkg/ports/xaudio2redist/vcpkg.json +++ b/external_imported/vcpkg/ports/xaudio2redist/vcpkg.json @@ -1,7 +1,9 @@ { "name": "xaudio2redist", - "version-string": "1.2.8", + "version": "1.2.8", + "port-version": 2, "description": "Redistributable version of XAudio 2.9 for Windows 7 SP1 or later", "homepage": "https://aka.ms/XAudio2Redist", + "license": null, "supports": "windows & !arm & !uwp & !static" } diff --git a/external_imported/vcpkg/ports/xaudio2redist/xaudio2redist-config.cmake.in b/external_imported/vcpkg/ports/xaudio2redist/xaudio2redist-config.cmake.in new file mode 100644 index 000000000..023827fc5 --- /dev/null +++ b/external_imported/vcpkg/ports/xaudio2redist/xaudio2redist-config.cmake.in @@ -0,0 +1,35 @@ + +get_filename_component(_xaudio2_root "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_xaudio2_root "${_xaudio2_root}" PATH) +get_filename_component(_xaudio2_root "${_xaudio2_root}" PATH) + +set(_xaudio2_root_lib "${_xaudio2_root}/lib/xaudio2_9redist.lib") +if (EXISTS "${_xaudio2_root_lib}") + + add_library(Microsoft::XAudio2Redist SHARED IMPORTED) + set_target_properties(Microsoft::XAudio2Redist PROPERTIES + IMPORTED_LOCATION_RELEASE "${_xaudio2_root}/bin/xaudio2_9redist.dll" + IMPORTED_IMPLIB_RELEASE "${_xaudio2_root_lib}" + IMPORTED_LOCATION_DEBUG "${_xaudio2_root}/debug/bin/xaudio2_9redist.dll" + IMPORTED_IMPLIB_DEBUG "${_xaudio2_root}/debug/lib/xaudio2_9redist.lib" + INTERFACE_INCLUDE_DIRECTORIES "${_xaudio2_root}/include/xaudio2redist" + IMPORTED_CONFIGURATIONS "Debug;Release" + IMPORTED_LINK_INTERFACE_LANGUAGES "C") + + add_library(Microsoft::XApoBase STATIC IMPORTED) + set_target_properties(Microsoft::XApoBase PROPERTIES + IMPORTED_LOCATION_RELEASE "${_xaudio2_root}/lib/xapobaseredist_md.lib" + IMPORTED_LOCATION_DEBUG "${_xaudio2_root}/debug/lib/xapobaseredist_md.lib" + INTERFACE_INCLUDE_DIRECTORIES "${_xaudio2_root}/include/xaudio2redist" + IMPORTED_CONFIGURATIONS "Debug;Release") + + set(xaudio2redist_FOUND TRUE) + +else() + + set(xaudio2redist_FOUND FALSE) + +endif() + +unset(_xaudio2_root_lib) +unset(_xaudio2_root) diff --git a/external_imported/vcpkg/ports/xbyak/portfile.cmake b/external_imported/vcpkg/ports/xbyak/portfile.cmake index 2bfc9ff8f..67ac14359 100644 --- a/external_imported/vcpkg/ports/xbyak/portfile.cmake +++ b/external_imported/vcpkg/ports/xbyak/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO herumi/xbyak diff --git a/external_imported/vcpkg/ports/xbyak/vcpkg.json b/external_imported/vcpkg/ports/xbyak/vcpkg.json index cf7a9efbd..cc668903b 100644 --- a/external_imported/vcpkg/ports/xbyak/vcpkg.json +++ b/external_imported/vcpkg/ports/xbyak/vcpkg.json @@ -1,6 +1,7 @@ { "name": "xbyak", "version-string": "6.00", + "port-version": 1, "description": "Xbyak is a JIT assembler for x86(IA-32)/x64(AMD64, x86-64).", "homepage": "https://github.com/herumi/xbyak", "supports": "!(arm | uwp)", diff --git a/external_imported/vcpkg/ports/xerces-c/portfile.cmake b/external_imported/vcpkg/ports/xerces-c/portfile.cmake index 22d44193d..d09f44251 100644 --- a/external_imported/vcpkg/ports/xerces-c/portfile.cmake +++ b/external_imported/vcpkg/ports/xerces-c/portfile.cmake @@ -56,7 +56,7 @@ configure_file( ${CURRENT_PACKAGES_DIR}/share/xercesc @ONLY ) - + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" @@ -66,3 +66,13 @@ file(REMOVE_RECURSE file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) vcpkg_fixup_pkgconfig() +if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(pc_file_release "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/xerces-c.pc") + set(pc_file_debug "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/xerces-c.pc") + if(EXISTS "${pc_file_release}") + vcpkg_replace_string("${pc_file_release}" "-lxerces-c" "-lxerces-c_3") + endif() + if(EXISTS "${pc_file_debug}") + vcpkg_replace_string("${pc_file_debug}" "-lxerces-c" "-lxerces-c_3D") + endif() +endif() \ No newline at end of file diff --git a/external_imported/vcpkg/ports/xerces-c/vcpkg.json b/external_imported/vcpkg/ports/xerces-c/vcpkg.json index bb836f898..41cb5a1cb 100644 --- a/external_imported/vcpkg/ports/xerces-c/vcpkg.json +++ b/external_imported/vcpkg/ports/xerces-c/vcpkg.json @@ -1,9 +1,10 @@ { "name": "xerces-c", - "version-string": "3.2.3", - "port-version": 3, + "version": "3.2.3", + "port-version": 4, "description": "Xerces-C++ is a XML parser, for parsing, generating, manipulating, and validating XML documents using the DOM, SAX, and SAX2 APIs.", "homepage": "https://github.com/apache/xerces-c", + "license": "Apache-2.0", "features": { "icu": { "description": "ICU support", diff --git a/external_imported/vcpkg/ports/xmlsec/portfile.cmake b/external_imported/vcpkg/ports/xmlsec/portfile.cmake index 280f9aea7..06100e4c1 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 xmlsec-1_2_32 - SHA512 45e2efc6bdf6ec09db6ff01b521c3fbcf44aa9804d5692bea5296e80d7fc2f05fac322868f82840a7b67e0abd4233222098aa94a29ec9a6a7d049180cf131c57 + REF e628e70040cb0d81a561462472806aeaac1d1bc7 #xmlsec-1_2_33 + SHA512 2d4485941d354160f7fabd84394c61eef9dcea8be572d78bf7da7370880747f86ff76127fa000f8b0de06f462abef17d653270dee680fa35d96cc8200fb4d1a6 HEAD_REF master PATCHES pkgconfig_fixes.patch @@ -10,18 +10,15 @@ vcpkg_from_github( file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DPORT_DIR=${CMAKE_CURRENT_LIST_DIR} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DINSTALL_HEADERS_TOOLS=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() vcpkg_fixup_pkgconfig() -file(INSTALL ${SOURCE_PATH}/Copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/Copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/xmlsec/vcpkg.json b/external_imported/vcpkg/ports/xmlsec/vcpkg.json index 0d2c235da..446cfcf1a 100644 --- a/external_imported/vcpkg/ports/xmlsec/vcpkg.json +++ b/external_imported/vcpkg/ports/xmlsec/vcpkg.json @@ -1,10 +1,18 @@ { "name": "xmlsec", - "version": "1.2.32", + "version": "1.2.33", "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": [ "libxml2", - "openssl" + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/xmsh/portfile.cmake b/external_imported/vcpkg/ports/xmsh/portfile.cmake deleted file mode 100644 index 7d74e7da9..000000000 --- a/external_imported/vcpkg/ports/xmsh/portfile.cmake +++ /dev/null @@ -1,37 +0,0 @@ -vcpkg_find_acquire_program(PYTHON3) - -vcpkg_fail_port_install(ON_TARGET "Windows") -message("Building with a gcc version less than 7.1.0 is not supported.") - -vcpkg_from_gitlab( - GITLAB_URL https://gitlab.com - OUT_SOURCE_PATH SOURCE_PATH - REPO libxmsh/xmsh - REF e1900845b796ef977db70519b2ac08eebd788236 - SHA512 643c6c94956de9b6fae635b6528e8ba756f4a2bc38de71613c2dd8d47f4a043aee7b6e7fec1870b306be3bea9f5c0c81d1d343bfc27883b3fba986fbc5b15406 - HEAD_REF master -) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DPYTHON3_EXECUTABLE=${PYTHON3} -) - -vcpkg_find_acquire_program(PYTHON3) -get_filename_component(PYPATH ${PYTHON3} PATH) -set(ENV{PATH} "$ENV{PATH};${PYPATH}") - -vcpkg_install_cmake() - -vcpkg_copy_pdbs() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -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}/copyright.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/external_imported/vcpkg/ports/xmsh/vcpkg.json b/external_imported/vcpkg/ports/xmsh/vcpkg.json deleted file mode 100644 index fedee5f02..000000000 --- a/external_imported/vcpkg/ports/xmsh/vcpkg.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "xmsh", - "version-string": "0.5.2", - "port-version": 2, - "description": "Reference Implementation of XMSH Library", - "homepage": "https://gitlab.com/libxmsh/xmsh", - "dependencies": [ - "nlohmann-json", - "tl-expected" - ] -} diff --git a/external_imported/vcpkg/ports/xnnpack/use-packages.patch b/external_imported/vcpkg/ports/xnnpack/use-packages.patch index 17d274c99..e31fbc745 100644 --- a/external_imported/vcpkg/ports/xnnpack/use-packages.patch +++ b/external_imported/vcpkg/ports/xnnpack/use-packages.patch @@ -37,8 +37,8 @@ index b69ce50c..1e8938b7 100755 ENDIF() ENDIF() -TARGET_LINK_LIBRARIES(XNNPACK PRIVATE cpuinfo) -+find_package(unofficial-cpuinfo CONFIG REQUIRED) -+target_link_libraries(XNNPACK PUBLIC unofficial::cpuinfo::clog unofficial::cpuinfo::cpuinfo) ++find_package(cpuinfo CONFIG REQUIRED) ++target_link_libraries(XNNPACK PUBLIC cpuinfo::clog cpuinfo::cpuinfo) # ---[ Configure pthreadpool -IF(NOT TARGET pthreadpool) diff --git a/external_imported/vcpkg/ports/xnnpack/vcpkg.json b/external_imported/vcpkg/ports/xnnpack/vcpkg.json index cb0339e28..6c692a05b 100644 --- a/external_imported/vcpkg/ports/xnnpack/vcpkg.json +++ b/external_imported/vcpkg/ports/xnnpack/vcpkg.json @@ -1,9 +1,10 @@ { "name": "xnnpack", "version-date": "2021-05-17", - "port-version": 1, + "port-version": 2, "description": "High-efficiency floating-point neural network inference operators for mobile, server, and Web", "homepage": "https://github.com/google/XNNPACK", + "license": "BSD-3-Clause", "supports": "!(arm & windows) & !uwp", "dependencies": [ "cpuinfo", diff --git a/external_imported/vcpkg/ports/xqilla/CMakeLists.txt b/external_imported/vcpkg/ports/xqilla/CMakeLists.txt new file mode 100644 index 000000000..85ecad218 --- /dev/null +++ b/external_imported/vcpkg/ports/xqilla/CMakeLists.txt @@ -0,0 +1,457 @@ +cmake_minimum_required(VERSION 3.21) +cmake_policy(VERSION 3.21) + +if (BUILD_SHARED_LIBS) + add_definitions("-DXQILLA_APIS=") +else() + add_definitions("-DXQILLA_API=") +endif() + +project(xqilla C CXX) + +add_library(xqilla +./src/exceptions/XQException.cpp +./src/exceptions/XQillaException.cpp +./src/fastxdm/FastXDMSequenceBuilder.cpp +./src/fastxdm/FastXDMNodeImpl.cpp +./src/fastxdm/FastXDMDocument.cpp +./src/fastxdm/FastXDMUpdateFactory.cpp +./src/fastxdm/FastXDMConfiguration.cpp +./src/ast/XQAttributeConstructor.cpp +./src/ast/XQOrderingChange.cpp +./src/ast/XQReturn.cpp +./src/ast/XQPredicate.cpp +./src/ast/XQNamespaceBinding.cpp +./src/ast/XQCopy.cpp +./src/ast/XQQuantified.cpp +./src/ast/NumericFunction.cpp +./src/ast/XQOperator.cpp +./src/ast/XQVariable.cpp +./src/ast/StaticAnalysis.cpp +./src/ast/XQFunctionRef.cpp +./src/ast/XQCastAs.cpp +./src/ast/XQStep.cpp +./src/ast/XQLiteral.cpp +./src/ast/XQCopyOf.cpp +./src/ast/XQElementConstructor.cpp +./src/ast/XQDocumentConstructor.cpp +./src/ast/XQTreatAs.cpp +./src/ast/XQCallTemplate.cpp +./src/ast/XQTextConstructor.cpp +./src/ast/XQNamespaceConstructor.cpp +./src/ast/XQMap.cpp +./src/ast/XQFunctionCoercion.cpp +./src/ast/XQTypeswitch.cpp +./src/ast/XQAtomize.cpp +./src/ast/XQInlineFunction.cpp +./src/ast/XQSequence.cpp +./src/ast/LetTuple.cpp +./src/ast/WhereTuple.cpp +./src/ast/XQPIConstructor.cpp +./src/ast/XQFunctionDeref.cpp +./src/ast/StaticType.cpp +./src/ast/ContextTuple.cpp +./src/ast/XQGlobalVariable.cpp +./src/ast/OrderByTuple.cpp +./src/ast/ForTuple.cpp +./src/ast/XQFunction.cpp +./src/ast/CountTuple.cpp +./src/ast/XQFunctionConversion.cpp +./src/ast/XQApplyTemplates.cpp +./src/ast/XQCommentConstructor.cpp +./src/ast/XQCastableAs.cpp +./src/ast/XQIf.cpp +./src/ast/XQContextItem.cpp +./src/ast/XQDOMConstructor.cpp +./src/ast/ASTNodeImpl.cpp +./src/ast/TupleNode.cpp +./src/ast/XQNav.cpp +./src/ast/XQEffectiveBooleanValue.cpp +./src/ast/XQDocumentOrder.cpp +./src/ast/XQFunctionCall.cpp +./src/ast/XQValidate.cpp +./src/ast/ConvertFunctionArg.cpp +./src/ast/XQPartialApply.cpp +./src/ast/XQAnalyzeString.cpp +./src/axis/NodeTest.cpp +./src/fulltext/FTContent.cpp +./src/fulltext/FTOrder.cpp +./src/fulltext/DefaultTokenStore.cpp +./src/fulltext/DefaultTokenizer.cpp +./src/fulltext/FTWords.cpp +./src/fulltext/FTOr.cpp +./src/fulltext/FTContains.cpp +./src/fulltext/FTScope.cpp +./src/fulltext/FTWindow.cpp +./src/fulltext/FTMildnot.cpp +./src/fulltext/FTAnd.cpp +./src/fulltext/FTUnaryNot.cpp +./src/fulltext/FTDistance.cpp +./src/framework/ProxyMemoryManager.cpp +./src/framework/XPath2MemoryManagerImpl.cpp +./src/framework/StringPool.cpp +./src/framework/BaseMemoryManager.cpp +./src/framework/ReferenceCounted.cpp +./src/xqc/XQillaXQCExpression.cpp +./src/xqc/XQillaXQCStaticContext.cpp +./src/xqc/XQillaXQCDynamicContext.cpp +./src/xqc/XQillaXQCImplementation.cpp +./src/xqc/XQillaXQCSequence.cpp +./src/schema/SequenceType.cpp +./src/schema/FaxppDocumentCacheImpl.cpp +./src/schema/AnyAtomicTypeDatatypeValidator.cpp +./src/schema/DocumentCacheImpl.cpp +./src/schema/SchemaValidatorFilter.cpp +./src/optimizer/Optimizer.cpp +./src/optimizer/StaticTyper.cpp +./src/optimizer/ASTVisitor.cpp +./src/optimizer/ASTReleaser.cpp +./src/optimizer/ASTCopier.cpp +./src/optimizer/QueryPathNode.cpp +./src/optimizer/QueryPathTreeGenerator.cpp +./src/optimizer/ASTToXML.cpp +./src/optimizer/PartialEvaluator.cpp +./src/xqts/TestSuiteRunner.cpp +./src/xqts/TestSuiteParser.cpp +./src/xqts/TestSuiteResultListener.cpp +./src/items/Numeric.cpp +./src/items/DatatypeFactory.cpp +./src/items/AnyAtomicType.cpp +./src/items/DateOrTimeType.cpp +./src/items/DatatypeLookup.cpp +./src/items/Timezone.cpp +./src/items/ATUntypedAtomic.cpp +./src/items/impl/ATUntypedAtomicImpl.cpp +./src/items/impl/FunctionRefImpl.cpp +./src/items/impl/ATStringOrDerivedImpl.cpp +./src/items/impl/ATDateTimeOrDerivedImpl.cpp +./src/items/impl/ATDurationOrDerivedImpl.cpp +./src/items/impl/ATAnySimpleTypeImpl.cpp +./src/items/impl/ATTimeOrDerivedImpl.cpp +./src/items/impl/ATGYearOrDerivedImpl.cpp +./src/items/impl/ATFloatOrDerivedImpl.cpp +./src/items/impl/ATGMonthOrDerivedImpl.cpp +./src/items/impl/ATGDayOrDerivedImpl.cpp +./src/items/impl/ATBooleanOrDerivedImpl.cpp +./src/items/impl/ATQNameOrDerivedImpl.cpp +./src/items/impl/ATDoubleOrDerivedImpl.cpp +./src/items/impl/ATAnyURIOrDerivedImpl.cpp +./src/items/impl/ATGYearMonthOrDerivedImpl.cpp +./src/items/impl/ATNotationOrDerivedImpl.cpp +./src/items/impl/ATHexBinaryOrDerivedImpl.cpp +./src/items/impl/ATBase64BinaryOrDerivedImpl.cpp +./src/items/impl/ATDecimalOrDerivedImpl.cpp +./src/items/impl/ATGMonthDayOrDerivedImpl.cpp +./src/items/impl/ATDateOrDerivedImpl.cpp +./src/items/Item.cpp +./src/items/Node.cpp +./src/items/ATDurationOrDerived.cpp +./src/lexer/XSLT2Lexer.cpp +./src/lexer/XQLexer.cpp +./src/lexer/XQLexer2.cpp +./src/simple-api/XQilla.cpp +./src/simple-api/XQQuery.cpp +./src/utils/UTF8Str.cpp +./src/utils/XMLChCompare.cpp +./src/utils/XStr.cpp +./src/utils/DelayedModule.cpp +./src/utils/ContextUtils.cpp +./src/utils/UnicodeTransformer.cpp +./src/utils/NumUtils.cpp +./src/utils/XPath2Utils.cpp +./src/utils/XPath2NSUtils.cpp +./src/utils/DateUtils.cpp +./src/utils/XQillaPlatformUtils.cpp +./src/mapm/mapm_mt.cpp +./src/mapm/m_apm.cpp +./src/xerces/XercesNodeImpl.cpp +./src/xerces/AncestorAxis.cpp +./src/xerces/FollowingAxis.cpp +./src/xerces/XercesURIResolver.cpp +./src/xerces/AttributeAxis.cpp +./src/xerces/NamespaceAxis.cpp +./src/xerces/DescendantOrSelfAxis.cpp +./src/xerces/XercesConfiguration.cpp +./src/xerces/PrecedingAxis.cpp +./src/xerces/ParentAxis.cpp +./src/xerces/PrecedingSiblingAxis.cpp +./src/xerces/ChildAxis.cpp +./src/xerces/DescendantAxis.cpp +./src/xerces/Axis.cpp +./src/xerces/XercesUpdateFactory.cpp +./src/xerces/AncestorOrSelfAxis.cpp +./src/xerces/XercesSequenceBuilder.cpp +./src/xerces/FollowingSiblingAxis.cpp +./src/parser/XQParser.cpp +./src/parser/QName.cpp +./src/functions/FunctionMinutesFromTime.cpp +./src/functions/FunctionWords.cpp +./src/functions/FunctionMonthFromDateTime.cpp +./src/functions/FunctionLocalNameFromQName.cpp +./src/functions/FunctionDistinctValues.cpp +./src/functions/FunctionMonthsFromDuration.cpp +./src/functions/FunctionCos.cpp +./src/functions/FunctionTrace.cpp +./src/functions/FunctionTimezoneFromDate.cpp +./src/functions/FunctionCodepointsToString.cpp +./src/functions/FunctionMinutesFromDateTime.cpp +./src/functions/FunctionYearFromDate.cpp +./src/functions/FunctionStaticBaseURI.cpp +./src/functions/BuiltInModules.cpp +./src/functions/FunctionAtan.cpp +./src/functions/FunctionCurrentDateTime.cpp +./src/functions/FunctionAdjustTimeToTimezone.cpp +./src/functions/FunctionCeiling.cpp +./src/functions/FunctionExplain.cpp +./src/functions/FunctionImplicitTimezone.cpp +./src/functions/FunctionStartsWith.cpp +./src/functions/FunctionLowerCase.cpp +./src/functions/FunctionString.cpp +./src/functions/FunctionSentences.cpp +./src/functions/FunctionYearsFromDuration.cpp +./src/functions/FunctionNamespaceURIFromQName.cpp +./src/functions/XQillaFunction.cpp +./src/functions/FunctionParseHTML.cpp +./src/functions/FunctionDayFromDate.cpp +./src/functions/FunctionId.cpp +./src/functions/FunctionEmpty.cpp +./src/functions/FunctionUnparsedText.cpp +./src/functions/FunctionAdjustDateTimeToTimezone.cpp +./src/functions/FunctionTimezoneFromTime.cpp +./src/functions/FunctionRoot.cpp +./src/functions/FunctionCount.cpp +./src/functions/FunctionPosition.cpp +./src/functions/FunctionCurrentDate.cpp +./src/functions/FunctionFunctionArity.cpp +./src/functions/EXSLTMathFunction.cpp +./src/functions/FunctionRegexGroup.cpp +./src/functions/FunctionError.cpp +./src/functions/FunctionSerializeJSON.cpp +./src/functions/FunctionTimezoneFromDateTime.cpp +./src/functions/FunctionHead.cpp +./src/functions/FunctionStringLength.cpp +./src/functions/FunctionFloor.cpp +./src/functions/FunctionResolveURI.cpp +./src/functions/FunctionLog.cpp +./src/functions/FunctionContains.cpp +./src/functions/FunctionMatches.cpp +./src/functions/FunctionMonthFromDate.cpp +./src/functions/FunctionSecondsFromTime.cpp +./src/functions/FunctionSubstring.cpp +./src/functions/FunctionDateTime.cpp +./src/functions/FunctionCollection.cpp +./src/functions/FunctionConcat.cpp +./src/functions/FunctionParseXML.cpp +./src/functions/FunctionAnalyzeString.cpp +./src/functions/FunctionTime.cpp +./src/functions/FunctionDocument.cpp +./src/functions/FunctionCompare.cpp +./src/functions/FunctionTokenize.cpp +./src/functions/FunctionSecondsFromDuration.cpp +./src/functions/FunctionSignature.cpp +./src/functions/FunctionHoursFromDateTime.cpp +./src/functions/FunctionDayFromDateTime.cpp +./src/functions/FunctionAsin.cpp +./src/functions/FunctionUpperCase.cpp +./src/functions/FunctionMinutesFromDuration.cpp +./src/functions/RegExpFunction.cpp +./src/functions/FunctionCurrentTime.cpp +./src/functions/FunctionYearFromDateTime.cpp +./src/functions/FunctionLast.cpp +./src/functions/FunctionLookup.cpp +./src/functions/FunctionDaysFromDuration.cpp +./src/functions/XQUserFunction.cpp +./src/functions/FunctionHoursFromTime.cpp +./src/functions/FunctionNilled.cpp +./src/functions/FunctionLang.cpp +./src/functions/FunctionDoc.cpp +./src/functions/FunctionParseJSON.cpp +./src/functions/FunctionFunctionName.cpp +./src/functions/FunctionEndsWith.cpp +./src/functions/FunctionDocAvailable.cpp +./src/functions/FunctionDefaultCollation.cpp +./src/functions/FunctionNormalizeUnicode.cpp +./src/functions/FunctionAbs.cpp +./src/functions/FunctionStringToCodepoints.cpp +./src/functions/FunctionPower.cpp +#./src/functions/FunctionSubstringBeforeAfter.cpp +./src/functions/FunctionUnordered.cpp +./src/functions/FunctionNodeName.cpp +./src/functions/FunctionSin.cpp +./src/functions/FunctionPrefixFromQName.cpp +./src/functions/FunctionAdjustDateToTimezone.cpp +./src/functions/FunctionQName.cpp +./src/functions/FunctionRoundHalfToEven.cpp +./src/functions/FunctionNot.cpp +./src/functions/FunctionReplace.cpp +./src/functions/FunctionBaseURI.cpp +./src/functions/FunctionExp.cpp +./src/functions/ExternalFunction.cpp +./src/functions/FunctionLocalname.cpp +./src/functions/FuncFactory.cpp +./src/functions/FunctionNamespaceUri.cpp +./src/functions/FunctionSecondsFromDateTime.cpp +./src/functions/FunctionHoursFromDuration.cpp +./src/functions/FunctionDocumentURI.cpp +./src/functions/FunctionNumber.cpp +./src/functions/FunctionRound.cpp +./src/functions/FunctionAcos.cpp +./src/functions/FunctionIdref.cpp +./src/functions/FunctionName.cpp +./src/functions/FunctionCaseFold.cpp +./src/functions/FunctionSqrt.cpp +./src/functions/FunctionTail.cpp +./src/functions/FunctionTan.cpp +./src/functions/FunctionNormalizeSpace.cpp +./src/debug/DebugHookDecorator.cpp +./src/debug/InputParser.cpp +./src/debug/TupleDebugHook.cpp +./src/debug/InteractiveDebugger.cpp +./src/debug/StackFrame.cpp +./src/debug/ASTDebugHook.cpp +./src/dom-api/impl/XQillaXMLGrammarPoolImpl.cpp +./src/dom-api/impl/XQillaExpressionImpl.cpp +./src/dom-api/impl/XPath2ResultImpl.cpp +./src/dom-api/impl/XPathNamespaceImpl.cpp +./src/dom-api/impl/XQillaDocumentImpl.cpp +./src/dom-api/impl/XQillaBuilderImpl.cpp +./src/dom-api/impl/XPathDocumentImpl.cpp +./src/dom-api/impl/XQillaNSResolverImpl.cpp +./src/dom-api/XQillaImplementation.cpp +./src/dom-api/XPath2NodeSerializer.cpp +./src/runtime/EmptyResult.cpp +./src/runtime/ResultBufferImpl.cpp +./src/runtime/ClosureResult.cpp +./src/runtime/Result.cpp +./src/runtime/SequenceResult.cpp +./src/runtime/ResultImpl.cpp +./src/runtime/Sequence.cpp +./src/runtime/ResultBuffer.cpp +./src/events/NSFixupFilter.cpp +./src/events/EventGenerator.cpp +./src/events/NoInheritFilter.cpp +./src/events/EventSerializer.cpp +./src/events/QueryPathTreeFilter.cpp +./src/events/ContentSequenceFilter.cpp +./src/context/impl/CollationImpl.cpp +./src/context/impl/ItemFactoryImpl.cpp +./src/context/impl/XQContextImpl.cpp +./src/context/impl/XQDynamicContextImpl.cpp +./src/context/impl/VarTypeStoreImpl.cpp +./src/context/impl/VarStoreImpl.cpp +./src/context/impl/VarHashEntryImpl.cpp +./src/context/impl/CodepointCollation.cpp +./src/context/UpdateFactory.cpp +./src/tools/compile-delayed-module.cpp +./src/update/UInsertAfter.cpp +./src/update/UTransform.cpp +./src/update/UInsertAsFirst.cpp +./src/update/UInsertBefore.cpp +./src/update/UInsertInto.cpp +./src/update/UReplace.cpp +./src/update/UDelete.cpp +./src/update/UInsertAsLast.cpp +./src/update/UReplaceValueOf.cpp +./src/update/URename.cpp +./src/update/PendingUpdateList.cpp +./src/update/FunctionPut.cpp +./src/update/UApplyUpdates.cpp +./src/operators/UnaryMinus.cpp +./src/operators/GeneralComp.cpp +./src/operators/Plus.cpp +./src/operators/ComparisonOperator.cpp +./src/operators/And.cpp +./src/operators/OrderComparison.cpp +./src/operators/LessThanEqual.cpp +./src/operators/Minus.cpp +./src/operators/LessThan.cpp +./src/operators/GreaterThan.cpp +./src/operators/Equals.cpp +./src/operators/NodeComparison.cpp +./src/operators/Union.cpp +./src/operators/Or.cpp +./src/operators/NotEquals.cpp +./src/operators/IntegerDivide.cpp +./src/operators/Except.cpp +./src/operators/Divide.cpp +./src/operators/GreaterThanEqual.cpp +./src/operators/Multiply.cpp +./src/operators/ArithmeticOperator.cpp +./src/operators/Mod.cpp +./src/operators/Intersect.cpp +./src/yajl/yajl_encode.c +./src/yajl/yajl.c +./src/yajl/yajl_parser.c +./src/yajl/yajl_buf.c +./src/yajl/yajl_gen.c +./src/yajl/yajl_lex.c +./src/utils/utf8proc/utf8proc.c +./src/mapm/mapm_log.c +./src/mapm/mapm_div.c +./src/mapm/mapmfmul.c +./src/mapm/mapm_add.c +./src/mapm/mapmhsin.c +./src/mapm/mapm_fft.c +./src/mapm/mapmipwr.c +./src/mapm/mapmasin.c +./src/mapm/mapm_rnd.c +./src/mapm/mapmutl2.c +./src/mapm/mapm_fam.c +./src/mapm/mapm_fpf.c +./src/mapm/mapmutil.c +./src/mapm/mapm5sin.c +./src/mapm/mapmstck.c +./src/mapm/mapm_exp.c +./src/mapm/mapm_mul.c +./src/mapm/mapmfact.c +./src/mapm/mapmgues.c +./src/mapm/mapm_flr.c +./src/mapm/mapmcbrt.c +./src/mapm/mapm_lg3.c +./src/mapm/mapm_rcp.c +./src/mapm/mapm_sin.c +./src/mapm/mapmistr.c +./src/mapm/mapmhasn.c +./src/mapm/mapmasn0.c +./src/mapm/mapmrsin.c +./src/mapm/mapm_set.c +./src/mapm/mapmsqrt.c +./src/mapm/mapm_gcd.c +./src/mapm/mapm_lg2.c +./src/mapm/mapmcnst.c +./src/mapm/mapm_pow.c +./src/mapm/mapmpwr2.c +./src/mapm/mapm_cpi.c +) + +include_directories(include) +find_package(XercesC REQUIRED) + +target_include_directories(xqilla PRIVATE "${XercesC_INCLUDE_DIRS}") +target_include_directories(xqilla PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include") + +if (BUILD_SHARED_LIBS) + target_link_libraries(xqilla PUBLIC debug "${XercesC_LIBRARY_DEBUG}") + target_link_libraries(xqilla PUBLIC optimized "${XercesC_LIBRARY_RELEASE}") +endif() + +install( + TARGETS xqilla + EXPORT unofficial-xqilla + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install( + DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/xqilla" + CONFIGURATIONS Release + DESTINATION include +) + +install( + EXPORT unofficial-xqilla + DESTINATION share/unofficial-xqilla + FILE unofficial-xqillaConfig.cmake + NAMESPACE unofficial::xqilla:: +) diff --git a/external_imported/vcpkg/ports/xqilla/fix-compare.patch b/external_imported/vcpkg/ports/xqilla/fix-compare.patch new file mode 100644 index 000000000..7e2d0d39a --- /dev/null +++ b/external_imported/vcpkg/ports/xqilla/fix-compare.patch @@ -0,0 +1,26 @@ +diff --git a/include/xqilla/ast/XQDocumentOrder.hpp b/include/xqilla/ast/XQDocumentOrder.hpp +index 81189e6..c22280a 100644 +--- a/include/xqilla/ast/XQDocumentOrder.hpp ++++ b/include/xqilla/ast/XQDocumentOrder.hpp +@@ -68,7 +68,7 @@ private: + public: + uniqueLessThanCompareFn(const DynamicContext *context) + : context_(context) {} +- bool operator()(const Node::Ptr &first, const Node::Ptr &second) ++ bool operator()(const Node::Ptr &first, const Node::Ptr &second) const + { + return first->uniqueLessThan(second, context_); + } +diff --git a/src/lexer/XQLexer.cpp b/src/lexer/XQLexer.cpp +index 69c923f..aed0465 100644 +--- a/src/lexer/XQLexer.cpp ++++ b/src/lexer/XQLexer.cpp +@@ -235,7 +235,7 @@ static void yy_flex_free YY_PROTO(( void * )); + #define YY_SKIP_YYWRAP + #define yytext_ptr yytext + +-#include ++#include "FlexLexer.h" + int yyFlexLexer::yylex() + { + LexerError( "yyFlexLexer::yylex invoked but %option yyclass used" ); diff --git a/external_imported/vcpkg/ports/xqilla/portfile.cmake b/external_imported/vcpkg/ports/xqilla/portfile.cmake new file mode 100644 index 000000000..c02aa2753 --- /dev/null +++ b/external_imported/vcpkg/ports/xqilla/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://sourceforge.net/projects/xqilla/files/XQilla-2.3.4.tar.gz/download" + FILENAME "XQilla-2.3.4.tar.gz" + SHA512 f744ff883675887494780d24ecdc94afa394d3795d1544b1c598016b3f936c340ad7cd84529ac12962e3c5ce2f1be928a0cd4f9b9eb70e6645a38b0728cb1994 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES "fix-compare.patch" +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + NO_CHARSET_FLAG +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-xqilla) +vcpkg_copy_pdbs() + + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/xqilla" RENAME copyright) diff --git a/external_imported/vcpkg/ports/xqilla/vcpkg.json b/external_imported/vcpkg/ports/xqilla/vcpkg.json new file mode 100644 index 000000000..5206797d1 --- /dev/null +++ b/external_imported/vcpkg/ports/xqilla/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "xqilla", + "version": "2.3.4", + "port-version": 1, + "description": "XQuery and XPath 2 library", + "homepage": "http://xqilla.sourceforge.net/HomePage", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "xerces-c" + ] +} diff --git a/external_imported/vcpkg/ports/xtensor/portfile.cmake b/external_imported/vcpkg/ports/xtensor/portfile.cmake index a9be2459d..dfaf6fc58 100644 --- a/external_imported/vcpkg/ports/xtensor/portfile.cmake +++ b/external_imported/vcpkg/ports/xtensor/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xtensor-stack/xtensor - REF f3c11b2d810159e7063daddeaa0764f4006e5a73 # 0.23.10 - SHA512 85d94a3e346a13f8d802260e7b182a34f83ed7adddb5c082f10fdaac995ba5b895ea20daf33ac99d3f44e9eb95fdc4ec051eb006259258c4c2ae762c5f08399f + REF 825c0fd8a465049c06ad89fa3911b342dbffcabf # 0.24.0 + SHA512 18b030efb88255108f3e2a0f5da9f082c32f2b637cb83fcabd5b579b0cff67b503d378037088c535497da09c00a5430ca87e737235b3b0b449da183925d99e68 HEAD_REF master ) @@ -14,9 +14,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS tbb XTENSOR_USE_TBB ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DXTENSOR_ENABLE_ASSERT=OFF -DXTENSOR_CHECK_DIMENSION=OFF @@ -29,10 +28,10 @@ vcpkg_configure_cmake( ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -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 ${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) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/xtensor/vcpkg.json b/external_imported/vcpkg/ports/xtensor/vcpkg.json index 439e46066..dbd5083e5 100644 --- a/external_imported/vcpkg/ports/xtensor/vcpkg.json +++ b/external_imported/vcpkg/ports/xtensor/vcpkg.json @@ -1,10 +1,19 @@ { "name": "xtensor", - "version": "0.23.10", + "version": "0.24.0", "description": "C++ tensors with broadcasting and lazy computing", "homepage": "https://github.com/xtensor-stack/xtensor", + "license": "BSD-3-Clause", "dependencies": [ "nlohmann-json", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "xtl" ], "features": { diff --git a/external_imported/vcpkg/ports/yajl/portfile.cmake b/external_imported/vcpkg/ports/yajl/portfile.cmake index c01987dee..43783a708 100644 --- a/external_imported/vcpkg/ports/yajl/portfile.cmake +++ b/external_imported/vcpkg/ports/yajl/portfile.cmake @@ -1,32 +1,43 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lloyd/yajl - REF 2.1.0 - SHA512 9e786d080803df80ec03a9c2f447501e6e8e433a6baf636824bc1d50ecf4f5f80d7dfb1d47958aeb0a30fe459bd0ef033d41bc6a79e1dc6e6b5eade930b19b02 + REF a0ecdde0c042b9256170f2f8890dd9451a4240aa #2.1.0 + SHA512 cf0279fdbdc21d07bc0f2d409f1dddb39fd2ad62ab9872e620f46de4753958f8c59e44ef2ee734547f0f25f9490bada8c9e97dcc1a4b14b25d3e7a7254f8e1f3 HEAD_REF master - PATCHES ${CMAKE_CURRENT_LIST_DIR}/cmake.patch + PATCHES cmake.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/yajl RENAME copyright) +if (EXISTS "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig/yajl.pc") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig/yajl.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/yajl.pc") +endif() +if (EXISTS "${CURRENT_PACKAGES_DIR}/share/pkgconfig/yajl.pc") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") + file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig/yajl.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/yajl.pc") +endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/share/pkgconfig) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/share/pkgconfig") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) - file(GLOB SHAREDOBJECTS ${CURRENT_PACKAGES_DIR}/lib/libyajl.so* ${CURRENT_PACKAGES_DIR}/debug/lib/libyajl.so*) - file(REMOVE_RECURSE ${SHAREDOBJECTS} ${CURRENT_PACKAGES_DIR}/lib/yajl.lib ${CURRENT_PACKAGES_DIR}/debug/lib/yajl.lib) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + file(GLOB SHAREDOBJECTS "${CURRENT_PACKAGES_DIR}/lib/libyajl.so*" "${CURRENT_PACKAGES_DIR}/debug/lib/libyajl.so*") + file(REMOVE_RECURSE "${SHAREDOBJECTS}" "${CURRENT_PACKAGES_DIR}/lib/yajl.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/yajl.lib") else() - file(GLOB EXES ${CURRENT_PACKAGES_DIR}/bin/*.exe ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) + file(GLOB EXES "${CURRENT_PACKAGES_DIR}/bin/*.exe" "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe") file(REMOVE_RECURSE ${EXES} - ${CURRENT_PACKAGES_DIR}/lib/yajl_s.lib ${CURRENT_PACKAGES_DIR}/debug/lib/yajl_s.lib - ${CURRENT_PACKAGES_DIR}/lib/libyajl_s.a ${CURRENT_PACKAGES_DIR}/debug/lib/libyajl_s.a + "${CURRENT_PACKAGES_DIR}/lib/yajl_s.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/yajl_s.lib" + "${CURRENT_PACKAGES_DIR}/lib/libyajl_s.a" "${CURRENT_PACKAGES_DIR}/debug/lib/libyajl_s.a" ) endif() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/yajl" RENAME copyright) diff --git a/external_imported/vcpkg/ports/yajl/vcpkg.json b/external_imported/vcpkg/ports/yajl/vcpkg.json index 7d05045ab..d031be7ce 100644 --- a/external_imported/vcpkg/ports/yajl/vcpkg.json +++ b/external_imported/vcpkg/ports/yajl/vcpkg.json @@ -1,6 +1,14 @@ { "name": "yajl", "version-string": "2.1.0", - "port-version": 2, - "description": "Yet Another JSON Library" + "port-version": 3, + "description": "Yet Another JSON Library", + "homepage": "https://github.com/lloyd/yajl", + "license": "ISC", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/yara/CMakeLists.txt b/external_imported/vcpkg/ports/yara/CMakeLists.txt index b25a162b1..659fd48d2 100644 --- a/external_imported/vcpkg/ports/yara/CMakeLists.txt +++ b/external_imported/vcpkg/ports/yara/CMakeLists.txt @@ -52,6 +52,7 @@ set( libyara/libyara.c libyara/mem.c libyara/modules.c + libyara/modules/console/console.c libyara/modules/cuckoo/cuckoo.c libyara/modules/dotnet/dotnet.c libyara/modules/elf/elf.c @@ -84,11 +85,13 @@ set( set( yara_sources cli/args.c + cli/common.c cli/threading.c cli/yara.c ) set( yarac_sources cli/args.c + cli/common.c cli/yarac.c ) diff --git a/external_imported/vcpkg/ports/yara/portfile.cmake b/external_imported/vcpkg/ports/yara/portfile.cmake index b7ab617b7..5d179593a 100644 --- a/external_imported/vcpkg/ports/yara/portfile.cmake +++ b/external_imported/vcpkg/ports/yara/portfile.cmake @@ -3,22 +3,21 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO VirusTotal/yara - REF v4.1.1 - SHA512 e4474254249d5b3fbb7231fdec5f4e080be042098e1b2bc953aa93513ce0b4742e34acac2911687e75055ecd589d942f71b79c58ca47eee243626ab3ec8add71 + REF 136794355c51242b595af42309a234846d534e8b #v4.2.0 + SHA512 b0aabbf4d0ba585e3adab7dbdb708264c4d4140179e69c8bc57a2ea85cdd6d97f61e67e2ce06c8436450b4e0add7f475ff76d7ca549a9b1168ac057a6cbae776 HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -DDISABLE_INSTALL_TOOLS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() # 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/yara/vcpkg.json b/external_imported/vcpkg/ports/yara/vcpkg.json index 22f217411..0dee97a5d 100644 --- a/external_imported/vcpkg/ports/yara/vcpkg.json +++ b/external_imported/vcpkg/ports/yara/vcpkg.json @@ -1,10 +1,15 @@ { "name": "yara", - "version": "4.1.1", + "version": "4.2.0", "description": "The pattern matching swiss knife", "homepage": "https://github.com/VirusTotal/yara", + "license": "BSD-3-Clause", "dependencies": [ "jansson", - "openssl" + "openssl", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/yasm-tool-helper/vcpkg.json b/external_imported/vcpkg/ports/yasm-tool-helper/vcpkg.json index 72e1fba3b..dcc112ce3 100644 --- a/external_imported/vcpkg/ports/yasm-tool-helper/vcpkg.json +++ b/external_imported/vcpkg/ports/yasm-tool-helper/vcpkg.json @@ -1,12 +1,16 @@ { "name": "yasm-tool-helper", - "version-string": "2020-03-11", - "description": "Backfill that depends on yasm-tool:host", + "version-date": "2020-03-11", + "port-version": 1, + "description": "Backfill that depends on yasm:host", "homepage": "https://github.com/Microsoft/vcpkg", "dependencies": [ { - "name": "yasm-tool", - "host": true + "name": "yasm", + "host": true, + "features": [ + "tools" + ] } ] } diff --git a/external_imported/vcpkg/ports/yasm-tool-helper/yasm-tool-helper.cmake.in b/external_imported/vcpkg/ports/yasm-tool-helper/yasm-tool-helper.cmake.in index 48bd805f3..8e69ef519 100644 --- a/external_imported/vcpkg/ports/yasm-tool-helper/yasm-tool-helper.cmake.in +++ b/external_imported/vcpkg/ports/yasm-tool-helper/yasm-tool-helper.cmake.in @@ -1 +1 @@ -include("${CMAKE_CURRENT_LIST_DIR}/../../../@HOST_TRIPLET@/share/yasm-tool/vcpkg-port-config.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/../../../@HOST_TRIPLET@/share/yasm/vcpkg-port-config.cmake") diff --git a/external_imported/vcpkg/ports/yasm-tool/portfile.cmake b/external_imported/vcpkg/ports/yasm-tool/portfile.cmake index d4949bc9c..dba1f83f4 100644 --- a/external_imported/vcpkg/ports/yasm-tool/portfile.cmake +++ b/external_imported/vcpkg/ports/yasm-tool/portfile.cmake @@ -1,47 +1 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - -if(VCPKG_TARGET_IS_WINDOWS) - set(YASM_BUILD_BINARY ON) - set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) - set(VCPKG_LIBRARY_LINKAGE static) - - vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO yasm/yasm - REF 009450c7ad4d425fa5a10ac4bd6efbd25248d823 # 1.3.0 plus bugfixes for https://github.com/yasm/yasm/issues/153 - SHA512 a542577558676d11b52981925ea6219bffe699faa1682c033b33b7534f5a0dfe9f29c56b32076b68c48f65e0aef7c451be3a3af804c52caa4d4357de4caad83c - ) - - file(INSTALL "${SOURCE_PATH}/COPYING" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" - RENAME copyright) - foreach(LICENSE Artistic.txt BSD.txt GNU_GPL-2.0 GNU_LGPL-2.0) - file(COPY "${SOURCE_PATH}/${LICENSE}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") - endforeach() - - vcpkg_find_acquire_program(PYTHON3) - get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) - vcpkg_add_to_path("${PYTHON3_DIR}") - - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DENABLE_NLS=OFF - -DYASM_BUILD_TESTS=OFF - ) - vcpkg_install_cmake() - - vcpkg_copy_tools(TOOL_NAMES yasm) - - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include") -else() - set(YASM_BUILD_BINARY OFF) - set(VCPKG_POLICY_EMPTY_PACKAGE enabled) -endif() - -configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake.in" - "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake" @ONLY) +SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/external_imported/vcpkg/ports/yasm-tool/vcpkg.json b/external_imported/vcpkg/ports/yasm-tool/vcpkg.json index a3552faaa..e78d6b536 100644 --- a/external_imported/vcpkg/ports/yasm-tool/vcpkg.json +++ b/external_imported/vcpkg/ports/yasm-tool/vcpkg.json @@ -1,7 +1,13 @@ { "name": "yasm-tool", - "version": "1.3.0", - "description": "A modular assembler.", - "homepage": "http://yasm.tortall.net/", - "supports": "native & !uwp" + "version-date": "2021-12-14", + "description": "Legacy port. Use port yasm instead.", + "dependencies": [ + { + "name": "yasm", + "features": [ + "tools" + ] + } + ] } diff --git a/external_imported/vcpkg/ports/yasm/portfile.cmake b/external_imported/vcpkg/ports/yasm/portfile.cmake index 22b194b7f..37a891dc0 100644 --- a/external_imported/vcpkg/ports/yasm/portfile.cmake +++ b/external_imported/vcpkg/ports/yasm/portfile.cmake @@ -29,11 +29,11 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() if (BUILD_TOOLS) + vcpkg_copy_tools(TOOL_NAMES vsyasm yasm ytasm 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}") endif() - vcpkg_copy_tools(TOOL_NAMES vsyasm yasm ytasm AUTO_CLEAN) endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL static) @@ -42,5 +42,7 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +configure_file("${CURRENT_PORT_DIR}/vcpkg-port-config.cmake.in" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake" @ONLY) # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/yasm-tool/vcpkg-port-config.cmake.in b/external_imported/vcpkg/ports/yasm/vcpkg-port-config.cmake.in similarity index 81% rename from external_imported/vcpkg/ports/yasm-tool/vcpkg-port-config.cmake.in rename to external_imported/vcpkg/ports/yasm/vcpkg-port-config.cmake.in index 5abe7520a..af3742805 100644 --- a/external_imported/vcpkg/ports/yasm-tool/vcpkg-port-config.cmake.in +++ b/external_imported/vcpkg/ports/yasm/vcpkg-port-config.cmake.in @@ -11,11 +11,7 @@ function(yasm_tool_helper) message(FATAL_ERROR "Unexpected arguments to yasm_tool_helper: ${arg_UNPARSED_ARGUMENTS}") endif() - if(@YASM_BUILD_BINARY@) - set(YASM "${Z_YASM_TOOL_HELPER_LIST_DIR}/../../tools/yasm-tool/yasm.exe") - else() - vcpkg_find_acquire_program(YASM) - endif() + find_program(YASM yasm PATHS "${Z_YASM_TOOL_HELPER_LIST_DIR}/../../tools/yasm") if(arg_APPEND_TO_PATH) get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY) diff --git a/external_imported/vcpkg/ports/yasm/vcpkg.json b/external_imported/vcpkg/ports/yasm/vcpkg.json index d4ffbf9bd..f78ff7745 100644 --- a/external_imported/vcpkg/ports/yasm/vcpkg.json +++ b/external_imported/vcpkg/ports/yasm/vcpkg.json @@ -1,7 +1,7 @@ { "name": "yasm", - "version-string": "1.3.0", - "port-version": 2, + "version": "1.3.0", + "port-version": 3, "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", diff --git a/external_imported/vcpkg/ports/yato/portfile.cmake b/external_imported/vcpkg/ports/yato/portfile.cmake index e0b7a916b..7626249b6 100644 --- a/external_imported/vcpkg/ports/yato/portfile.cmake +++ b/external_imported/vcpkg/ports/yato/portfile.cmake @@ -1,8 +1,8 @@ -vcpkg_from_bitbucket( +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO alexey_gruzdev/yato - REF v1.0 - SHA512 631b870fd2704a03d9d66ef244f4e50968ae63da4fda0c7cd1f6ce2cea2b1e8b4506b0148cd1af1e133a70fd5d9cdc9d8c054edac6141118ee3c9427e186b270 + REPO agruzdev/Yato + REF 9b5a49f6ec4169b67b9e5ffd11fdae9c238b0a3d + SHA512 41962839cd13a314a17fef5f6065d7c3ed9967832039ca31993105685d584307d00f17c1514f4acf855a71fd884a1104c2d9c6a4461be5d2d7cfdc50b1ea7bdb HEAD_REF master ) @@ -17,24 +17,15 @@ file(COPY "${SOURCE_PATH}/modules/config/yato" DESTINATION "${CURRENT_PACKAGES_DIR}/include" ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DYATO_BUILD_TESTS:BOOL=OFF -DYATO_BUILD_ACTORS:BOOL=ON -DYATO_BUILD_CONFIG:BOOL=ON - -DYATO_CONFIG_MANUAL:BOOL=ON - -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG:PATH=${CURRENT_PACKAGES_DIR}/debug/lib/ - -DCMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG:PATH=${CURRENT_PACKAGES_DIR}/debug/lib/ - -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG:PATH=${CURRENT_PACKAGES_DIR}/debug/lib/ - -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE:PATH=${CURRENT_PACKAGES_DIR}/lib/ - -DCMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE:PATH=${CURRENT_PACKAGES_DIR}/lib/ - -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE:PATH=${CURRENT_PACKAGES_DIR}/lib/ ) -vcpkg_build_cmake() +vcpkg_cmake_build() # Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/yato) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/yato/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/yato/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/yato/vcpkg.json b/external_imported/vcpkg/ports/yato/vcpkg.json index 7a5840b6f..d854276ce 100644 --- a/external_imported/vcpkg/ports/yato/vcpkg.json +++ b/external_imported/vcpkg/ports/yato/vcpkg.json @@ -1,6 +1,13 @@ { "name": "yato", - "version-string": "1.0", - "port-version": 3, - "description": "Modern C++14 containers and utilities, actors system, typesafe config" + "version-date": "2022-03-06", + "description": "Modern C++14 containers and utilities, actors system, typesafe config", + "license": "Apache-2.0", + "supports": "!(windows & arm)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/z3/portfile.cmake b/external_imported/vcpkg/ports/z3/portfile.cmake index e5d5ec72a..2641de820 100644 --- a/external_imported/vcpkg/ports/z3/portfile.cmake +++ b/external_imported/vcpkg/ports/z3/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_find_acquire_program(PYTHON2) get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY) vcpkg_add_to_path("${PYTHON2_DIR}") @@ -7,8 +5,8 @@ vcpkg_add_to_path("${PYTHON2_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Z3Prover/z3 - REF z3-4.8.12 - SHA512 0B377923BDAFFACA1846AA2ABD61003BBECADFCDFC908ED3097D0AAC8F32028AC39D93FB4A9C2E2C2BFFFBDBEE80AA415875F17DE6C2EE2AE8E2B7921F788C6E + REF z3-4.8.14 + SHA512 10170516CA472258D2F9DF28CD036E43023A76A25F1E1670290C62F3890D935BF82770970054A5FD3A0F02559409E7ED4B18FB08347C040FF2F9E0918E152AAB HEAD_REF master PATCHES fix-install-path.patch ) diff --git a/external_imported/vcpkg/ports/z3/vcpkg.json b/external_imported/vcpkg/ports/z3/vcpkg.json index 1ad7aece5..ba3f5ed5e 100644 --- a/external_imported/vcpkg/ports/z3/vcpkg.json +++ b/external_imported/vcpkg/ports/z3/vcpkg.json @@ -1,8 +1,8 @@ { "name": "z3", - "version": "4.8.12", - "port-version": 1, + "version": "4.8.14", "description": "Z3 is a theorem prover from Microsoft Research", "homepage": "https://github.com/Z3Prover/z3", + "license": "MIT", "supports": "!uwp" } diff --git a/external_imported/vcpkg/ports/zeromq/portfile.cmake b/external_imported/vcpkg/ports/zeromq/portfile.cmake index ba51367e2..671fc2ed6 100644 --- a/external_imported/vcpkg/ports/zeromq/portfile.cmake +++ b/external_imported/vcpkg/ports/zeromq/portfile.cmake @@ -1,11 +1,12 @@ -vcpkg_fail_port_install(ON_TARGET "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeromq/libzmq REF v4.3.4 SHA512 ad828b1ab5a87983285a6b44b08240816ed1c4e2c73306ab1a851bf80df1892b5e2f92064a49fbadc1f4c75043625ace77dd25b64d5d1c2a7d1d61cc916fba0b - PATCHES fix-arm.patch + PATCHES + fix-arm.patch + zeromq-libzmq-4310-64e6d37ab8.diff # https://patch-diff.githubusercontent.com/raw/zeromq/libzmq/pull/4310.diff + zeromq-libzmq-4311-2b04e0ce47.diff # https://patch-diff.githubusercontent.com/raw/zeromq/libzmq/pull/4311.diff ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) @@ -14,8 +15,8 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - sodium WITH_LIBSODIUM - draft ENABLE_DRAFTS + sodium WITH_LIBSODIUM + draft ENABLE_DRAFTS websockets-sha1 ENABLE_WS ) @@ -25,7 +26,7 @@ if(VCPKG_TARGET_IS_MINGW) endif() vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DZMQ_BUILD_TESTS=OFF -DBUILD_STATIC=${BUILD_STATIC} diff --git a/external_imported/vcpkg/ports/zeromq/vcpkg.json b/external_imported/vcpkg/ports/zeromq/vcpkg.json index e7d469bf2..e3f4426db 100644 --- a/external_imported/vcpkg/ports/zeromq/vcpkg.json +++ b/external_imported/vcpkg/ports/zeromq/vcpkg.json @@ -1,9 +1,10 @@ { "name": "zeromq", "version": "4.3.4", - "port-version": 2, + "port-version": 5, "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", "supports": "!uwp", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/zeromq/zeromq-libzmq-4310-64e6d37ab8.diff b/external_imported/vcpkg/ports/zeromq/zeromq-libzmq-4310-64e6d37ab8.diff new file mode 100644 index 000000000..0d839ea02 --- /dev/null +++ b/external_imported/vcpkg/ports/zeromq/zeromq-libzmq-4310-64e6d37ab8.diff @@ -0,0 +1,55 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6c983c6698..21bcd414a0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -15,6 +15,7 @@ include(CheckCSourceCompiles) + include(CheckCSourceRuns) + include(CMakeDependentOption) + include(CheckCXXSymbolExists) ++include(CheckStructHasMember) + include(CheckTypeSize) + include(FindThreads) + include(GNUInstallDirs) +@@ -495,8 +496,12 @@ endif() + + if(NOT WIN32) + set(ZMQ_HAVE_IPC 1) ++ set(ZMQ_HAVE_STRUCT_SOCKADDR_UN 1) + else() + check_include_files("winsock2.h;afunix.h" ZMQ_HAVE_IPC) ++ if(ZMQ_HAVE_IPC) ++ check_struct_has_member("struct sockaddr_un" sun_path "winsock2.h;afunix.h" ZMQ_HAVE_STRUCT_SOCKADDR_UN) ++ endif() + endif() + + # ##################### BEGIN condition_variable_t selection +diff --git a/builds/cmake/platform.hpp.in b/builds/cmake/platform.hpp.in +index 2d23e8b288..18064362fe 100644 +--- a/builds/cmake/platform.hpp.in ++++ b/builds/cmake/platform.hpp.in +@@ -59,6 +59,7 @@ + #cmakedefine ZMQ_HAVE_LIBBSD + + #cmakedefine ZMQ_HAVE_IPC ++#cmakedefine ZMQ_HAVE_STRUCT_SOCKADDR_UN + + #cmakedefine ZMQ_USE_BUILTIN_SHA1 + #cmakedefine ZMQ_USE_NSS +diff --git a/src/windows.hpp b/src/windows.hpp +index 11c7581dee..24cce83d11 100644 +--- a/src/windows.hpp ++++ b/src/windows.hpp +@@ -98,3 +98,13 @@ static inline int poll (struct pollfd *pfd, unsigned long nfds, int timeout) + #define snprintf(buffer_, count_, format_, ...) \ + _snprintf_s (buffer_, count_, _TRUNCATE, format_, __VA_ARGS__) + #endif ++ ++// Workaround missing struct sockaddr_un in afunix.h. ++// Fix #3949. ++#if defined(ZMQ_HAVE_IPC) && !defined(ZMQ_HAVE_STRUCT_SOCKADDR_UN) ++struct sockaddr_un ++{ ++ ADDRESS_FAMILY sun_family; /* AF_UNIX */ ++ char sun_path[108]; /* pathname */ ++}; ++#endif diff --git a/external_imported/vcpkg/ports/zeromq/zeromq-libzmq-4311-2b04e0ce47.diff b/external_imported/vcpkg/ports/zeromq/zeromq-libzmq-4311-2b04e0ce47.diff new file mode 100644 index 000000000..52d1f50d2 --- /dev/null +++ b/external_imported/vcpkg/ports/zeromq/zeromq-libzmq-4311-2b04e0ce47.diff @@ -0,0 +1,18 @@ +diff --git a/src/windows.hpp b/src/windows.hpp +index 24cce83d11..c6d625188d 100644 +--- a/src/windows.hpp ++++ b/src/windows.hpp +@@ -90,7 +90,6 @@ static inline int poll (struct pollfd *pfd, unsigned long nfds, int timeout) + #ifndef AI_NUMERICSERV + #define AI_NUMERICSERV 0x0400 + #endif +-#endif + + // In MSVC prior to v14, snprintf is not available + // The closest implementation is the _snprintf_s function +@@ -108,3 +107,5 @@ struct sockaddr_un + char sun_path[108]; /* pathname */ + }; + #endif ++ ++#endif diff --git a/external_imported/vcpkg/ports/zkpp/portfile.cmake b/external_imported/vcpkg/ports/zkpp/portfile.cmake index 5ec1e78af..5347d7c8c 100644 --- a/external_imported/vcpkg/ports/zkpp/portfile.cmake +++ b/external_imported/vcpkg/ports/zkpp/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "Windows") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tgockel/zookeeper-cpp diff --git a/external_imported/vcpkg/ports/zkpp/vcpkg.json b/external_imported/vcpkg/ports/zkpp/vcpkg.json index 51000a32d..90453ef93 100644 --- a/external_imported/vcpkg/ports/zkpp/vcpkg.json +++ b/external_imported/vcpkg/ports/zkpp/vcpkg.json @@ -1,9 +1,10 @@ { "name": "zkpp", - "version-string": "0.2.3", - "port-version": 1, + "version": "0.2.3", + "port-version": 2, "description": "A ZooKeeper client for C++.", "homepage": "https://github.com/tgockel/zookeeper-cpp", + "supports": "!windows", "dependencies": [ "zookeeper" ] diff --git a/external_imported/vcpkg/ports/zlib/cmake_dont_build_more_than_needed.patch b/external_imported/vcpkg/ports/zlib/cmake_dont_build_more_than_needed.patch index a374f76d6..ed073e041 100644 --- a/external_imported/vcpkg/ports/zlib/cmake_dont_build_more_than_needed.patch +++ b/external_imported/vcpkg/ports/zlib/cmake_dont_build_more_than_needed.patch @@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 0fe939d..a1291d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -7,6 +7,7 @@ set(VERSION "1.2.11") +@@ -7,6 +7,7 @@ set(VERSION "1.2.12") option(ASM686 "Enable building i686 assembly implementation") option(AMD64 "Enable building amd64 assembly implementation") diff --git a/external_imported/vcpkg/ports/zlib/portfile.cmake b/external_imported/vcpkg/ports/zlib/portfile.cmake index 88e9e0fe4..f1699178f 100644 --- a/external_imported/vcpkg/ports/zlib/portfile.cmake +++ b/external_imported/vcpkg/ports/zlib/portfile.cmake @@ -1,9 +1,9 @@ -set(VERSION 1.2.11) +set(VERSION 1.2.12) vcpkg_download_distfile(ARCHIVE_FILE - URLS "https://www.zlib.net/zlib-${VERSION}.tar.gz" "https://downloads.sourceforge.net/project/libpng/zlib/${VERSION}/zlib-${VERSION}.tar.gz" - FILENAME "zlib1211.tar.gz" - SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae + URLS "https://www.zlib.net/zlib-${VERSION}.tar.gz" + FILENAME "zlib1212.tar.gz" + SHA512 cc2366fa45d5dfee1f983c8c51515e0cff959b61471e2e8d24350dea22d3f6fcc50723615a911b046ffc95f51ba337d39ae402131a55e6d1541d3b095d6c0a14 ) vcpkg_extract_source_archive_ex( diff --git a/external_imported/vcpkg/ports/zlib/vcpkg.json b/external_imported/vcpkg/ports/zlib/vcpkg.json index 4308e45a4..d147fad30 100644 --- a/external_imported/vcpkg/ports/zlib/vcpkg.json +++ b/external_imported/vcpkg/ports/zlib/vcpkg.json @@ -1,7 +1,6 @@ { "name": "zlib", - "version": "1.2.11", - "port-version": 13, + "version": "1.2.12", "description": "A compression library", "homepage": "https://www.zlib.net/" } diff --git a/external_imported/vcpkg/ports/zpp-bits/portfile.cmake b/external_imported/vcpkg/ports/zpp-bits/portfile.cmake new file mode 100644 index 000000000..02287e7b2 --- /dev/null +++ b/external_imported/vcpkg/ports/zpp-bits/portfile.cmake @@ -0,0 +1,14 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO eyalz800/zpp_bits + REF v4.3.3 + SHA512 6534711a75d62e4244125329db436ca27bf6b8c31aa9ecb92473f4e5687aa390d9d197d1cb91ed3452363af1537ffdef4a13fe6a1c3049616576a475ba69a548 + HEAD_REF master +) + +file( + COPY "${SOURCE_PATH}/zpp_bits.h" + DESTINATION "${CURRENT_PACKAGES_DIR}/include" +) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/zpp-bits/vcpkg.json b/external_imported/vcpkg/ports/zpp-bits/vcpkg.json new file mode 100644 index 000000000..b75cc2d3d --- /dev/null +++ b/external_imported/vcpkg/ports/zpp-bits/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "zpp-bits", + "version": "4.3.3", + "description": "A lightweight C++20 serialization and RPC library", + "homepage": "https://github.com/eyalz800/zpp_bits", + "license": "MIT" +} diff --git a/external_imported/vcpkg/ports/zstd/fix-c4703-error.patch b/external_imported/vcpkg/ports/zstd/fix-c4703-error.patch deleted file mode 100644 index 9af18d741..000000000 --- a/external_imported/vcpkg/ports/zstd/fix-c4703-error.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/lib/compress/zstd_lazy.c b/lib/compress/zstd_lazy.c -index 3d523e8..3dd1426 100644 ---- a/lib/compress/zstd_lazy.c -+++ b/lib/compress/zstd_lazy.c -@@ -1296,8 +1296,8 @@ size_t ZSTD_RowFindBestMatch_generic ( - size_t ddsIdx; - U32 ddsExtraAttempts; /* cctx hash tables are limited in searches, but allow extra searches into DDS */ - U32 dmsTag; -- U32* dmsRow; -- BYTE* dmsTagRow; -+ U32* dmsRow = NULL; -+ BYTE* dmsTagRow = NULL; - - if (dictMode == ZSTD_dedicatedDictSearch) { - const U32 ddsHashLog = dms->cParams.hashLog - ZSTD_LAZY_DDSS_BUCKET_LOG; diff --git a/external_imported/vcpkg/ports/zstd/no-static-suffix.patch b/external_imported/vcpkg/ports/zstd/no-static-suffix.patch new file mode 100644 index 000000000..4e61f96b8 --- /dev/null +++ b/external_imported/vcpkg/ports/zstd/no-static-suffix.patch @@ -0,0 +1,13 @@ +diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt +index 8234060..765f003 100644 +--- a/build/cmake/lib/CMakeLists.txt ++++ b/build/cmake/lib/CMakeLists.txt +@@ -112,7 +112,7 @@ endif () + + # With MSVC static library needs to be renamed to avoid conflict with import library + if (MSVC OR (WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT MINGW)) +- set(STATIC_LIBRARY_BASE_NAME zstd_static) ++ set(STATIC_LIBRARY_BASE_NAME zstd) + else () + set(STATIC_LIBRARY_BASE_NAME zstd) + endif () diff --git a/external_imported/vcpkg/ports/zstd/portfile.cmake b/external_imported/vcpkg/ports/zstd/portfile.cmake index af3a9d6b9..cc3aa7016 100644 --- a/external_imported/vcpkg/ports/zstd/portfile.cmake +++ b/external_imported/vcpkg/ports/zstd/portfile.cmake @@ -1,24 +1,17 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/zstd - REF a488ba114ec17ea1054b9057c26a046fc122b3b6 #v1.5.0 - SHA512 659576d0f52d2271b6b53f638b407b873888b1cffe4f014c3149d33a961653c2fcf7ff270bc669a5647205b573ef2809907645a4c89ab6c030ad65bce15547ae + REF f4a552a3fa24d9078f84157bd40e4f1bad49c488 #v1.5.2 + SHA512 5e0343cfc06d756c3f09647df39f1c15b39707c0b9b6d343b1be8f1e99d567b52f5b9228925c2190d1600a5b54822c2a4546b2443b13f43eb9a75f97e7fa41f5 HEAD_REF dev PATCHES install_pkgpc.patch - fix-c4703-error.patch + no-static-suffix.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ZSTD_BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ZSTD_BUILD_SHARED) -if(VCPKG_TARGET_IS_WINDOWS) - # Enable multithreaded mode. CMake build doesn't provide a multithreaded - # library target, but it is the default in Makefile and VS projects. - set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -DZSTD_MULTITHREAD") - set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS}") -endif() - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/build/cmake" OPTIONS @@ -28,40 +21,43 @@ vcpkg_cmake_configure( -DZSTD_BUILD_PROGRAMS=0 -DZSTD_BUILD_TESTS=0 -DZSTD_BUILD_CONTRIB=0 - OPTIONS_DEBUG - -DCMAKE_DEBUG_POSTFIX=d) # this is against the maintainer guidelines. - # Removing it probably requires a vcpkg-cmake-wrapper.cmake to correct downstreams FindZSTD.cmake + -DZSTD_MULTITHREAD_SUPPORT=1 +) vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/zstd) +vcpkg_fixup_pkgconfig() -# This enables find_package(ZSTD) and find_package(zstd) to find zstd on Linux(case sensitive filesystems) -file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/zstdConfig.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/zstd-config.cmake") -file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/zstdConfigVersion.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/zstd-config-version.cmake") - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - set(static_suffix "_static") -else() - set(static_suffix "") +file(READ "${CURRENT_PACKAGES_DIR}/share/zstd/zstdTargets.cmake" targets) +if(targets MATCHES "-pthread") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libzstd.pc" " -lzstd" " -lzstd -pthread") + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libzstd.pc" " -lzstd" " -lzstd -pthread") + endif() endif() -if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libzstd.pc") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libzstd.pc" "-lzstd" "-lzstd${static_suffix}") -endif() -if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libzstd.pc") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libzstd.pc" "-lzstd" "-lzstd${static_suffix}d") -endif() - -vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - foreach(HEADER zdict.h zstd.h zstd_errors.h) + foreach(HEADER IN ITEMS zdict.h zstd.h zstd_errors.h) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/${HEADER}" "defined(ZSTD_DLL_IMPORT) && (ZSTD_DLL_IMPORT==1)" "1" ) endforeach() endif() -file(COPY "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(COPY "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "ZSTD is dual licensed - see LICENSE and COPYING files\n") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(missing_target zstd::libzstd_static) + set(existing_target zstd::libzstd_shared) +else() + set(existing_target zstd::libzstd_static) + set(missing_target zstd::libzstd_shared) +endif() +file(WRITE "${CURRENT_PACKAGES_DIR}/share/zstd/zstdTargets-interface.cmake" " +add_library(${missing_target} IMPORTED INTERFACE) +set_target_properties(${missing_target} PROPERTIES INTERFACE_LINK_LIBRARIES ${existing_target}) +") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(READ "${SOURCE_PATH}/LICENSE" bsd) +file(READ "${SOURCE_PATH}/COPYING" gpl) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "ZSTD is dual licensed under BSD and GPLv2.\n\n${bsd}\n\n${gpl}") diff --git a/external_imported/vcpkg/ports/zstd/usage b/external_imported/vcpkg/ports/zstd/usage new file mode 100644 index 000000000..f01a2f5cf --- /dev/null +++ b/external_imported/vcpkg/ports/zstd/usage @@ -0,0 +1,4 @@ +The package zstd provides CMake targets: + + find_package(zstd CONFIG REQUIRED) + target_link_libraries(main PRIVATE $,zstd::libzstd_shared,zstd::libzstd_static>) diff --git a/external_imported/vcpkg/ports/zstd/vcpkg.json b/external_imported/vcpkg/ports/zstd/vcpkg.json index b8cef005a..841e1c721 100644 --- a/external_imported/vcpkg/ports/zstd/vcpkg.json +++ b/external_imported/vcpkg/ports/zstd/vcpkg.json @@ -1,9 +1,10 @@ { "name": "zstd", - "version-semver": "1.5.0", + "version": "1.5.2", "port-version": 1, "description": "Zstandard - Fast real-time compression algorithm", "homepage": "https://facebook.github.io/zstd/", + "license": "BSD-3-Clause OR GPL-2.0-only", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/ztd-text/portfile.cmake b/external_imported/vcpkg/ports/ztd-text/portfile.cmake new file mode 100644 index 000000000..377a475b0 --- /dev/null +++ b/external_imported/vcpkg/ports/ztd-text/portfile.cmake @@ -0,0 +1,37 @@ +vcpkg_from_github( + OUT_SOURCE_PATH ZTD_CMAKE_PATH + REPO soasis/cmake + REF 4277edaf7bf237de07c4a9833f6546872ab9f151 + SHA512 f05143068a1f22bd46aa0d8c250afb04b29ffbc0f32d746093bfb61f274d0e212ff9786a5163608097ed989b5b212d73811179f311a37d2b2eedce89cc75ee94 + HEAD_REF main +) + +vcpkg_from_github( + OUT_SOURCE_PATH ZTD_IDK_PATH + REPO soasis/idk + REF 6173bb3d433a3dab65e8c356ef69441aa5a86275 + SHA512 083711e9fc9b03aac34c5a7e182691a9bc9ee2d7c2d9ed2f55093423e2655f7a3829bd3e3db82bc42a78721795ca2d21a7b64c71f05e3c03ea3198f6228eb6f2 + HEAD_REF main +) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO soasis/text + REF d76205c12300234f815e099e5f8152f443515df5 + SHA512 836b6cb1a59cd1138bc4c00f9f511bced912d1d5dc36a4a7d757ef1cd7e31cf5046b5a32476ffa89ea9c0ca7834028774f9baa8c74bfc9287cc16ef3b4e987df + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DFETCHCONTENT_FULLY_DISCONNECTED=ON + -DFETCHCONTENT_SOURCE_DIR_ZTD.CMAKE=${ZTD_CMAKE_PATH} + -DFETCHCONTENT_SOURCE_DIR_ZTD.IDK=${ZTD_IDK_PATH} +) +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/bin" "${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/ztd-text/usage b/external_imported/vcpkg/ports/ztd-text/usage new file mode 100644 index 000000000..86c8ef9fc --- /dev/null +++ b/external_imported/vcpkg/ports/ztd-text/usage @@ -0,0 +1,4 @@ +The package ztd-text is header only and can be used from CMake via: + + find_path(ZTD_INCLUDE_DIRS ztd) + target_include_directories(main PRIVATE ${ZTD_INCLUDE_DIRS}) diff --git a/external_imported/vcpkg/ports/ztd-text/vcpkg.json b/external_imported/vcpkg/ports/ztd-text/vcpkg.json new file mode 100644 index 000000000..1de4a1396 --- /dev/null +++ b/external_imported/vcpkg/ports/ztd-text/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "ztd-text", + "version-date": "2022-03-21", + "description": "A spicy text library.", + "homepage": "https://github.com/soasis/text", + "license": "Apache-2.0", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/zxing-cpp/0001-opencv4-compat.patch b/external_imported/vcpkg/ports/zxing-cpp/0001-opencv4-compat.patch deleted file mode 100644 index 76ad1f4a0..000000000 --- a/external_imported/vcpkg/ports/zxing-cpp/0001-opencv4-compat.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ccb2ba9..5ade734 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,7 +1,7 @@ - cmake_minimum_required(VERSION 3.0) - - project(zxing) -- -+set(CMAKE_CXX_STANDARD 11) - option(BUILD_TESTING "Enable generation of test targets" OFF) - - set(CMAKE_LIBRARY_PATH /opt/local/lib ${CMAKE_LIBRARY_PATH}) -diff --git a/opencv-cli/src/main.cpp b/opencv-cli/src/main.cpp -index 63b6fd3..5900c4f 100644 ---- a/opencv-cli/src/main.cpp -+++ b/opencv-cli/src/main.cpp -@@ -135,14 +135,14 @@ int main(int argc, char** argv) { - - } - -- if (!videoCapture.set(CV_CAP_PROP_FRAME_WIDTH, captureWidth)) { -+ if (!videoCapture.set(cv::CAP_PROP_FRAME_WIDTH, captureWidth)) { - - // Log - cerr << "Failed to set frame width: " << captureWidth << " (ignoring)" << endl; - - } - -- if (!videoCapture.set(CV_CAP_PROP_FRAME_HEIGHT, captureHeight)) { -+ if (!videoCapture.set(cv::CAP_PROP_FRAME_HEIGHT, captureHeight)) { - - // Log - cerr << "Failed to set frame height: " << captureHeight << " (ignoring)" << endl; -@@ -166,7 +166,7 @@ int main(int argc, char** argv) { - if (result) { - - // Convert to grayscale -- cvtColor(image, grey, CV_BGR2GRAY); -+ cvtColor(image, grey, cv::COLOR_BGR2GRAY); - - try { - diff --git a/external_imported/vcpkg/ports/zxing-cpp/0002-improve-features.patch b/external_imported/vcpkg/ports/zxing-cpp/0002-improve-features.patch deleted file mode 100644 index 5776c36ea..000000000 --- a/external_imported/vcpkg/ports/zxing-cpp/0002-improve-features.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5ade734..54071bd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3,6 +3,8 @@ cmake_minimum_required(VERSION 3.0) - project(zxing) - set(CMAKE_CXX_STANDARD 11) - option(BUILD_TESTING "Enable generation of test targets" OFF) -+option(WITH_OPENCV "Build with opencv" OFF) -+option(WITH_ICONV "Build with iconv" OFF) - - set(CMAKE_LIBRARY_PATH /opt/local/lib ${CMAKE_LIBRARY_PATH}) - -@@ -43,8 +45,8 @@ if(WIN32) - endif() - - # OpenCV classes --find_package(OpenCV) --if(OpenCV_FOUND) -+if(WITH_OPENCV) -+ find_package(OpenCV REQUIRED) - list(APPEND LIBZXING_FILES - opencv/src/zxing/MatSource.cpp - opencv/src/zxing/MatSource.h -@@ -58,10 +60,10 @@ include_directories(core/src) - add_library(libzxing ${LIBZXING_FILES}) - set_target_properties(libzxing PROPERTIES PREFIX "") - --find_package(Iconv) --if(ICONV_FOUND) -- include_directories(${ICONV_INCLUDE_DIR}) -- target_link_libraries(libzxing ${ICONV_LIBRARIES}) -+if(WITH_ICONV) -+ find_package(Iconv REQUIRED) -+ include_directories(${Iconv_INCLUDE_DIRS}) -+ target_link_libraries(libzxing ${Iconv_LIBRARIES}) - else() - add_definitions(-DNO_ICONV=1) - endif() diff --git a/external_imported/vcpkg/ports/zxing-cpp/0003-fix-dependency-bigint.patch b/external_imported/vcpkg/ports/zxing-cpp/0003-fix-dependency-bigint.patch deleted file mode 100644 index e1453a21d..000000000 --- a/external_imported/vcpkg/ports/zxing-cpp/0003-fix-dependency-bigint.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0f172d3..4999942 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -42,10 +42,13 @@ include(source_files.cmake) - if(WIN32) - include_directories(core/lib/win32) - set(CMAKE_DEBUG_POSTFIX -debug) --else() -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - endif() - -+# Bigint -+find_package(bigint CONFIG REQUIRED) -+ -+link_libraries(bigint::bigint) -+ - # OpenCV classes - if(WITH_OPENCV) - find_package(OpenCV REQUIRED) -diff --git a/source_files.cmake b/source_files.cmake -index db3d8d4..39abe82 100644 ---- a/source_files.cmake -+++ b/source_files.cmake -@@ -1,28 +1,4 @@ - set(LIBZXING_FILES -- core/src/bigint/BigInteger.cc -- core/src/bigint/BigInteger.cc -- core/src/bigint/BigInteger.hh -- core/src/bigint/BigInteger.hh -- core/src/bigint/BigIntegerAlgorithms.cc -- core/src/bigint/BigIntegerAlgorithms.cc -- core/src/bigint/BigIntegerAlgorithms.hh -- core/src/bigint/BigIntegerAlgorithms.hh -- core/src/bigint/BigIntegerLibrary.hh -- core/src/bigint/BigIntegerLibrary.hh -- core/src/bigint/BigIntegerUtils.cc -- core/src/bigint/BigIntegerUtils.cc -- core/src/bigint/BigIntegerUtils.hh -- core/src/bigint/BigIntegerUtils.hh -- core/src/bigint/BigUnsigned.cc -- core/src/bigint/BigUnsigned.cc -- core/src/bigint/BigUnsigned.hh -- core/src/bigint/BigUnsigned.hh -- core/src/bigint/BigUnsignedInABase.cc -- core/src/bigint/BigUnsignedInABase.cc -- core/src/bigint/BigUnsignedInABase.hh -- core/src/bigint/BigUnsignedInABase.hh -- core/src/bigint/NumberlikeArray.hh -- core/src/bigint/NumberlikeArray.hh - core/src/zxing/aztec/AztecDetectorResult.cpp - core/src/zxing/aztec/AztecDetectorResult.h - core/src/zxing/aztec/AztecReader.cpp diff --git a/external_imported/vcpkg/ports/zxing-cpp/portfile.cmake b/external_imported/vcpkg/ports/zxing-cpp/portfile.cmake deleted file mode 100644 index ce2a45669..000000000 --- a/external_imported/vcpkg/ports/zxing-cpp/portfile.cmake +++ /dev/null @@ -1,53 +0,0 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO glassechidna/zxing-cpp - REF e0e40ddec63f38405aca5c8c1ff60b85ec8b1f10 - SHA512 222be56e3937136bd699a5d259a068b354ffcd34287bc8e0e8c33b924e9760501b81c56420d8062e0a924fefe95451778781b2aaa07207b0f18ce4ec33732581 - HEAD_REF master - PATCHES - 0001-opencv4-compat.patch - 0002-improve-features.patch - 0003-fix-dependency-bigint.patch -) - -file(REMOVE ${SOURCE_PATH}/cmake/FindModules/FindIconv.cmake) -# Depends on port bigint -file(REMOVE_RECURSE ${SOURCE_PATH}/core/src/bigint) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - opencv WITH_OPENCV - iconv WITH_ICONV -) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS ${FEATURE_OPTIONS} -) - -vcpkg_install_cmake() - -vcpkg_copy_pdbs() - -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) - -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/zxing/cmake TARGET_PATH share/zxing) - -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT}) -if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - file(COPY ${CURRENT_PACKAGES_DIR}/bin/zxing.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) -else() - file(COPY ${CURRENT_PACKAGES_DIR}/bin/zxing DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) -endif() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/zxing) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/zxing) - -# Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/external_imported/vcpkg/ports/zxing-cpp/vcpkg.json b/external_imported/vcpkg/ports/zxing-cpp/vcpkg.json deleted file mode 100644 index feb43da34..000000000 --- a/external_imported/vcpkg/ports/zxing-cpp/vcpkg.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "zxing-cpp", - "version-string": "2020-12", - "port-version": 3, - "description": "Barcode detection and decoding library.", - "homepage": "https://github.com/glassechidna/zxing-cpp", - "dependencies": [ - "bigint" - ], - "default-features": [ - "iconv", - "opencv" - ], - "features": { - "iconv": { - "description": "Build with libiconv", - "dependencies": [ - "libiconv" - ] - }, - "opencv": { - "description": "Build with opencv", - "dependencies": [ - "opencv" - ] - } - } -} diff --git a/external_imported/vcpkg/ports/zziplib/always-find-unixcommands-on-unix.patch b/external_imported/vcpkg/ports/zziplib/always-find-unixcommands-on-unix.patch deleted file mode 100644 index 9d3a39ade..000000000 --- a/external_imported/vcpkg/ports/zziplib/always-find-unixcommands-on-unix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt -index 52555d4..de06eae 100644 ---- a/zzip/CMakeLists.txt -+++ b/zzip/CMakeLists.txt -@@ -27,7 +27,7 @@ set(ZZIP_VERSION "${PROJECT_VERSION}") - set(ZZIP_PACKAGE_NAME "${PROJECT_NAME}lib") - set(ZZIP_PACKAGE_VERSION "${PROJECT_VERSION}") - --if(ZZIPCOMPAT) -+if(UNIX) - find_package ( UnixCommands REQUIRED ) # bash cp mv rm gzip tar - endif() - diff --git a/external_imported/vcpkg/ports/zziplib/cmake-project-include.cmake b/external_imported/vcpkg/ports/zziplib/cmake-project-include.cmake new file mode 100644 index 000000000..a8abb0e3b --- /dev/null +++ b/external_imported/vcpkg/ports/zziplib/cmake-project-include.cmake @@ -0,0 +1,3 @@ +if(WIN32) + add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS) +endif() diff --git a/external_imported/vcpkg/ports/zziplib/fix-export-define.patch b/external_imported/vcpkg/ports/zziplib/fix-export-define.patch deleted file mode 100644 index b57a9a698..000000000 --- a/external_imported/vcpkg/ports/zziplib/fix-export-define.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/zzip/conf.h b/zzip/conf.h -index 27b834a..7f01456 100644 ---- a/zzip/conf.h -+++ b/zzip/conf.h -@@ -203,7 +203,7 @@ - # endif - - --#if defined ZZIP_EXPORTS || defined ZZIPLIB_EXPORTS -+#if defined ZZIP_EXPORTS || defined ZZIPLIB_EXPORTS || defined libzzip_EXPORTS // CMake export defines - # undef ZZIP_DLL - #define ZZIP_DLL 1 - #endif diff --git a/external_imported/vcpkg/ports/zziplib/install-dll-to-proper-folder.patch b/external_imported/vcpkg/ports/zziplib/install-dll-to-proper-folder.patch deleted file mode 100644 index 4361fb983..000000000 --- a/external_imported/vcpkg/ports/zziplib/install-dll-to-proper-folder.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt -index a9f6e3a..f3a758b 100644 ---- a/zzip/CMakeLists.txt -+++ b/zzip/CMakeLists.txt -@@ -247,12 +247,14 @@ endif() - - install(FILES ${libzzip_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip ) - install(TARGETS libzzip -+ 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 -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() -@@ -260,6 +262,7 @@ endif() - if(ZZIPMMAPPED) - install(FILES ${libzzipmmapped_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip ) - install(TARGETS libzzipmmapped -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() diff --git a/external_imported/vcpkg/ports/zziplib/portfile.cmake b/external_imported/vcpkg/ports/zziplib/portfile.cmake index 9ee3ee64d..c771e9aa3 100644 --- a/external_imported/vcpkg/ports/zziplib/portfile.cmake +++ b/external_imported/vcpkg/ports/zziplib/portfile.cmake @@ -1,38 +1,19 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gdraheim/zziplib - REF 24a6c6de1956189bffcd8dffd2ef3197c6f3df29 # v0.13.71 - SHA512 246ee1d93f3f8a6889e9ab362e04e6814813844f2cdea0a782910bf07ca55ecd6d8b1c456b4180935464cebf291e7849af27ac0ed5cc080de5fb158f9f3aeffb + REF v0.13.72 + SHA512 4bb089e74813c6fac9657cd96e44e4a6469bf86aba3980d885c4573e8db45e74fd07bbdfcec9f36297c72227c8c0b2c37dab1bc4326cef8529960e482fe501c8 PATCHES - install-dll-to-proper-folder.patch no-release-postfix.patch - fix-export-define.patch - always-find-unixcommands-on-unix.patch ) -if(VCPKG_CRT_LINKAGE STREQUAL "static") - set(MSVC_STATIC_RUNTIME ON) -else() - set(MSVC_STATIC_RUNTIME OFF) -endif() +string(COMPARE EQUAL VCPKG_CRT_LINKAGE "static" MSVC_STATIC_RUNTIME) +string(COMPARE EQUAL VCPKG_LIBRARY_LINKAGE "static" BUILD_STATIC_LIBS) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(BUILD_STATIC_LIBS ON) -else() - set(BUILD_STATIC_LIBS OFF) -endif() - -if(VCPKG_TARGET_IS_WINDOWS) - set(ZZIPLIBTOOL OFF) -endif() - -set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS") -set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS") - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS + "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake" -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} -DMSVC_STATIC_RUNTIME=${MSVC_STATIC_RUNTIME} -DZZIPMMAPPED=OFF @@ -42,15 +23,30 @@ vcpkg_configure_cmake( -DZZIPBINS=OFF -DZZIPTEST=OFF -DZZIPDOCS=OFF - -DZZIPCOMPAT=OFF - -DZZIPLIBTOOL=${ZZIPLIBTOOL} +) +vcpkg_cmake_install() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/zzipfseeko.pc" + "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/zzipmmapped.pc" + "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/zzipfseeko.pc" + "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/zzipmmapped.pc" ) -vcpkg_install_cmake() +vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(READ "${SOURCE_PATH}/docs/COPYING.LIB" lgpl) +file(READ "${SOURCE_PATH}/docs/COPYING.MPL" mpl) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" +"${PORT} is shipping under a dual MPL / LGPL license where each of them +is separate and restrictions apply alternatively. -# Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +--- -vcpkg_fixup_pkgconfig() +${lgpl} + +--- + +${mpl} +") diff --git a/external_imported/vcpkg/ports/zziplib/vcpkg.json b/external_imported/vcpkg/ports/zziplib/vcpkg.json index cdbca5615..e0ede655b 100644 --- a/external_imported/vcpkg/ports/zziplib/vcpkg.json +++ b/external_imported/vcpkg/ports/zziplib/vcpkg.json @@ -1,10 +1,18 @@ { "name": "zziplib", - "version-string": "0.13.71", - "port-version": 3, + "version": "0.13.72", "description": "library providing read access on ZIP-archives", "homepage": "https://github.com/gdraheim/zziplib", + "license": "LGPL-2.0-or-later OR MPL-1.1", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/external_imported/vcpkg/scripts/Get-Changelog.ps1 b/external_imported/vcpkg/scripts/Get-Changelog.ps1 new file mode 100644 index 000000000..68f02957e --- /dev/null +++ b/external_imported/vcpkg/scripts/Get-Changelog.ps1 @@ -0,0 +1,502 @@ +#Requires -Version 5.0 +# We are not using Powershell >= 6.0, as the only supported debugger (vscode powershell extension) breaks on complex code. See: https://github.com/PowerShell/PowerShellEditorServices/issues/1295 +# This code can be run on PowerShell Core on any platform, but it is recommend to debug this code in Windows PowerShell ISE unless debugging happens to "just work" on your machine. +# Expect the fix to be out at around the end of 2020/beginning of 2021, at which point consider upgrading this script to PowerShell 7 the next time maintenance is necessary. +# -- Griffin Downs 2020-12-15 (@grdowns) + +using namespace System.Management.Automation +using namespace System.Collections.Generic + +<# +.SYNOPSIS + Changelog generator for vcpkg. +.DESCRIPTION + The changelog generator uses GitHub's Pull Request and Files API to get + pull requests and their associated file changes over the provided date range. + Then, the data is processed into buckets which are presented to the user + as a markdown file. +.EXAMPLE + Get-Changelog +.EXAMPLE + Get-Changelog -StartDate 11/1/20 -EndDate 12/1/20 +.EXAMPLE + $cred = Get-Credential + Get-Changelog -Credentials $cred +.OUTPUTS + A "CHANGELOG.md" file in the working directory. If the file already exists, + suffix is added to the filename and a new file is created to prevent overwriting. +#> +[CmdletBinding(PositionalBinding=$True)] +Param ( + # The begin date range (inclusive) + [Parameter(Mandatory=$True, Position=0)] + [ValidateScript({$_ -le (Get-Date)})] + [DateTime]$StartDate, + + # The end date range (exclusive) + [Parameter(Mandatory, Position=1)] + [ValidateScript({$_ -le (Get-Date)})] + [DateTime]$EndDate, + + [Parameter(Mandatory=$True)] + [String]$OutFile, + + # GitHub credentials (username and PAT) + [Parameter()] + [Credential()] + [PSCredential]$Credentials +) + +Set-StrictMode -Version 2 + +if (-not $Credentials) { + $Credentials = Get-Credential -Message 'Enter GitHub Credentials (username and PAT)' + if (-not $Credentials) { + throw [System.ArgumentException]::new( + 'Cannot process command because of the missing mandatory parameter: Credentials.' + ) + } +} + +function Get-AuthHeader() { + [CmdletBinding()] + Param( + [Parameter(Mandatory=$True)] + [Credential()] + [PSCredential]$Credentials + ) + @{ Authorization = 'Basic ' + [System.Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes( + "$($Credentials.UserName):$($Credentials.GetNetworkCredential().Password)")) } +} + +$response = Invoke-WebRequest -uri 'https://api.github.com' -Headers (Get-AuthHeader $Credentials) +if ('X-OAuth-Scopes' -notin $response.Headers.Keys) { + throw [System.ArgumentException]::new( + "Cannot validate argument on parameter 'Credentials'. Incorrect GitHub credentials" + ) +} + + +function Get-MergedPullRequests { + [CmdletBinding()] + [OutputType([Object[]])] + Param( + [Parameter(Mandatory=$True, Position=0)] + [ValidateScript({$_ -le (Get-Date)})] + [DateTime]$StartDate, + + # The end date range (exclusive) + [Parameter(Mandatory, Position=1)] + [ValidateScript({$_ -le (Get-Date)})] + [DateTime]$EndDate, + + [Parameter(Mandatory=$True)] + [Credential()] + [PSCredential]$Credentials + ) + Begin { + $RequestSplat = @{ + Uri = 'https://api.github.com/repos/Microsoft/vcpkg/pulls' + Body = @{ + state = 'closed' + sort = 'updated' + base = 'master' + per_page = 100 + direction = 'desc' + page = 1 + } + } + $Epoch = Get-Date -AsUTC + $DeltaEpochStart = ($Epoch - $StartDate).Ticks + + $ProgressSplat = @{ + Activity = "Searching for merged Pull Requests in date range: $($StartDate.ToString('yyyy-MM-dd')) - $($EndDate.ToString('yyyy-MM-dd'))" + PercentComplete = 0 + } + + Write-Progress @ProgressSplat + + $writeProgress = { + $ProgressSplat.PercentComplete = 100 * ($Epoch - $_.updated_at).Ticks / $DeltaEpochStart + Write-Progress @ProgressSplat -Status "Current item date: $($_.updated_at.ToString('yyyy-MM-dd'))" + } + } + Process { + while ($True) { + $response = Invoke-WebRequest -Headers (Get-AuthHeader $Credentials) @RequestSplat | ConvertFrom-Json + + foreach ($_ in $response) { + foreach ($x in 'created_at', 'merged_at', 'updated_at', 'closed_at') { + if ($_.$x) { $_.$x = [DateTime]::Parse($_.$x, + [System.Globalization.CultureInfo]::InvariantCulture, + [System.Globalization.DateTimeStyles]::AdjustToUniversal -bor [System.Globalization.DateTimeStyles]::AssumeUniversal) } + } + + if (-not $_.merged_at) { continue } + if ($_.updated_at -lt $StartDate) { return } + + &$WriteProgress + + if ($_.merged_at -ge $EndDate -or $_.merged_at -lt $StartDate) { continue } + + $_ + } + + $RequestSplat.Body.page++ + } + } +} + + +class PRFileMap { + [Object]$Pull + [Object[]]$Files +} + + +function Get-PullRequestFileMap { + [CmdletBinding()] + [OutputType([PRFileMap[]])] + Param ( + [Parameter(Mandatory=$True,ValueFromPipeline=$True)] + [Object]$Pull, + [Parameter(Mandatory=$True)] + [Credential()] + [PSCredential]$Credentials + ) + Begin { + $Pulls = [List[Object]]::new() + + $ProgressSplat = @{ + Activity = 'Getting Pull Request files' + PercentComplete = 0 + } + + $Count = 0 + $WriteProgress = { + $ProgressSplat.Status = 'Getting files for: #{0} ({1}/{2})' -f $_.number, $Count, $Pulls.Length + $ProgressSplat.PercentComplete = 100 * $Count / $Pulls.Length + Write-Progress @ProgressSplat + } + } + Process { + $Pulls += $Pull + } + End { + Write-Progress @ProgressSplat + $ProgressSplat += @{ Status = '' } + + $Pulls | ForEach-Object { + $Count++ + + [PRFileMap]@{ + Pull = $_ + Files = $( + $requestSplat = @{ + Uri = 'https://api.github.com/repos/Microsoft/vcpkg/pulls/{0}/files' -f $_.number + Body = @{ page = 0; per_page = 100 } + } + do { + $requestSplat.Body.page++ + + $response = Invoke-WebRequest -Headers (Get-AuthHeader $Credentials) @requestSplat | ConvertFrom-Json + + $response + } until ($response.Length -lt $requestSplat.Body.per_page) + ) + } + + &$WriteProgress + } + } +} + + +class DocumentationUpdate { + [String]$Path + [Boolean]$New + [List[Object]]$Pulls +} + + +function Select-Documentation { + [CmdletBinding()] + [OutputType([DocumentationUpdate])] + Param ( + [Parameter(Mandatory=$True,ValueFromPipeline=$True)] + [PRFileMap]$PRFileMap + ) + Begin { + $UpdatedDocumentation = @{} + } + Process { + $PRFileMap.Files | ForEach-Object { + if ($_.filename -notlike 'docs/*') { return } + + $new = $_.status -eq 'added' + if ($entry = $UpdatedDocumentation[$_.filename]) { + $entry.Pulls += $PRFileMap.Pull + $entry.New = $entry.New -or $new + } else { + $UpdatedDocumentation[$_.filename] = @{ + Pulls = [List[Object]]::new(@($PRFileMap.Pull)) + New = $new + } + } + } + } + End { + $UpdatedDocumentation.GetEnumerator() | ForEach-Object { + [DocumentationUpdate]@{ + Path = $_.Key + Pulls = $_.Value.Pulls + New = $_.Value.New + } + } + } +} + + +function Select-InfrastructurePullRequests { + [CmdletBinding()] + [OutputType([Object])] + Param ( + [Parameter(Mandatory=$True,ValueFromPipeline=$True)] + [PRFileMap]$PRFileMap + ) + Process { + switch -Wildcard ($PRFileMap.Files | Foreach-Object {$_.filename}) { + "docs/*" { continue } + "ports/*" { continue } + "versions/*" { continue } + "scripts/ci.baseline.txt" { continue } + Default { return $PRFileMap.Pull } + } + } +} + + +class Version { + [String]$Begin + [String]$End + [String]$BeginPort + [String]$EndPort +} + + +function Select-Version { + [CmdletBinding()] + [OutputType([Version])] + Param ( + [Parameter(Mandatory=$True,ValueFromPipeline=$True)] + [Object]$VersionFile + ) + Begin { + $V = [Version]@{} + } + Process { + $regex = switch ($VersionFile.filename | Split-Path -Leaf) { + 'CONTROL' { + '(?^[\+|\-]|)(?Version|[\+|\-]Port-Version):\s(?\S+)' + } + 'vcpkg.json' { + '(?^[\+|\-]|)\s*(\"(?version|version-date|version-string|version-semver)\":\s\"(?.+)\"|\"(?port-version)\":\s(?.+))' + } + Default { return } + } + + $VersionFile.Patch -split '\n' | ForEach-Object { + if ($_ -notmatch $regex) { return } + + $m = $Matches + switch -Wildcard ($m.operation + $m.field) { + 'Version*' { $V.Begin = $V.End = $m.version } + '-Version*' { $V.Begin = ($V.Begin, $m.version | Measure-Object -Minimum).Minimum } + '+Version*' { $V.End = ($V.End, $m.version | Measure-Object -Minimum).Minimum } + 'Port-Version' { $V.BeginPort = $V.EndPort = $m.version } + '-Port-Version' { $V.BeginPort = ($V.BeginPort, $m.version | Measure-Object -Minimum).Minimum } + '+Port-Version' { $V.EndPort = ($V.EndPort, $m.version | Measure-Object -Maximum).Maximum } + } + } + } + End { + if (-not $V.Begin) { $V.Begin = $V.End } + elseif (-not $V.End) { $V.End = $V.Begin } + + if (-not $V.BeginPort) { $V.BeginPort = '0' } + if (-not $V.EndPort) { $V.EndPort = '0' } + + $V + } +} + + +class PortUpdate { + [String]$Port + [Object[]]$Pulls + [Version]$Version + [Boolean]$New +} + + +function Select-UpdatedPorts { + [CmdletBinding()] + [OutputType([PortUpdate])] + Param ( + [Parameter(Mandatory=$True,ValueFromPipeline=$True)] + [PRFileMap]$PRFileMap + ) + Begin { + $ModifiedPorts = @{} + } + Process { + $PRFileMap.Files | Where-Object { + $_.filename -like 'ports/*/CONTROL' -or + $_.filename -like 'ports/*/vcpkg.json' + } | ForEach-Object { + $port = $_.filename.split('/')[1] + if ($entry = $ModifiedPorts[$port]) { + $entry.VersionFiles += $_ + if (-not $entry.Pulls.Contains($PRFileMap.Pull)) { $entry.Pulls += $PRFileMap.Pull } + } else { + $ModifiedPorts[$port] = @{ + VersionFiles = [List[Object]]::new(@($_)) + Pulls = [List[Object]]::new(@($PRFileMap.Pull)) + } + } + } + } + End { + $ModifiedPorts.GetEnumerator() | ForEach-Object { + $versionFiles = $_.Value.VersionFiles + if (-not ($versionChange = $versionFiles | Select-Version)) { return } + + function Find-File($x) { [bool]($versionFiles | Where-Object { $_.filename -like "*$x" }) } + function Find-NewFile($x) + { [bool]($versionFiles | Where-Object { $_.filename -like "*$x" -and $_.status -eq 'added' }) } + + [PortUpdate]@{ + Port = $_.Key + Pulls = $_.Value.Pulls + Version = $versionChange + New = (Find-NewFile 'CONTROL') -or (-not (Find-File 'CONTROL') -and (Find-NewFile 'vcpkg.json')) + } + } + } +} + +$MergedPRs = Get-MergedPullRequests -StartDate $StartDate -EndDate $EndDate -Credentials $Credentials +$MergedPRsSorted = $MergedPRs | Sort-Object -Property 'number' +$PRFileMaps = $MergedPRsSorted | Get-PullRequestFileMap -Credentials $Credentials + +$sortSplat = @{ Property = + @{ Expression = 'New'; Descending = $True }, @{ Expression = 'Path'; Descending = $False } } +$UpdatedDocumentation = $PRFileMaps | Select-Documentation | Sort-Object @sortSplat +$UpdatedInfrastructure = $PRFileMaps | Select-InfrastructurePullRequests +$UpdatedPorts = $PRFileMaps | Select-UpdatedPorts +$NewPorts = $UpdatedPorts | Where-Object { $_.New } +$ChangedPorts = $UpdatedPorts | Where-Object { -not $_.New } + +Write-Progress -Activity 'Selecting updates from pull request files' -Completed + +Write-Progress -Activity 'Writing changelog file' -PercentComplete -1 + +$output = @" +vcpkg ($($StartDate.ToString('yyyy.MM.dd')) - $((($EndDate).AddSeconds(-1)).ToString('yyyy.MM.dd'))) +--- +#### Total port count: +#### Total port count per triplet (tested): +|triplet|ports available| +|---|---| +|x86-windows|NUM| +|**x64-windows**|NUM| +|x64-windows-static|NUM| +|x64-windows-static-md|NUM| +|x64-uwp|NUM| +|arm64-windows|NUM| +|arm-uwp|NUM| +|**x64-osx**|NUM| +|**x64-linux**|NUM| + +"@ + +if ($UpdatedDocumentation) { + $output += @" +#### The following documentation has been updated: + +$(-join ($UpdatedDocumentation | ForEach-Object { + $PathWithoutDocs = ([string]$_.Path).Remove(0, 5) # 'docs/' + "- [{0}]({0}){1}`n" -f $PathWithoutDocs, $_.Path, ($(if ($_.New) { ' ***[NEW]***' } else { '' })) + + $_.Pulls | ForEach-Object { + " - [(#{0})]({1}) {2} (by @{3})`n" -f $_.number, $_.html_url, $_.title, $_.user.login + } +})) + +"@ +} + +if ($NewPorts) { + $output += @" +
+The following $($NewPorts.Length) ports have been added: + +|port|version| +|---|---| +$(-join ($NewPorts | 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}`n" -f $_.Version.End +})) +
+ +"@ +} + +if ($ChangedPorts) { + $output += @" +
+The following $($ChangedPorts.Length) ports have been updated: + +$(-join ($ChangedPorts | 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 + } +})) +
+ +"@ +} + +if ($UpdatedInfrastructure) { + $output += @" +
+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 +})) +
+ +"@ +} + +$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/addPoshVcpkgToPowershellProfile.ps1 b/external_imported/vcpkg/scripts/addPoshVcpkgToPowershellProfile.ps1 index 185f658c9..8dedc3d2b 100644 --- a/external_imported/vcpkg/scripts/addPoshVcpkgToPowershellProfile.ps1 +++ b/external_imported/vcpkg/scripts/addPoshVcpkgToPowershellProfile.ps1 @@ -54,3 +54,218 @@ if (Test-Path $profilePath) Add-Content $profilePath -Value "`n$profileEntry" -Encoding UTF8 Write-Host "`nSuccessfully added posh-vcpkg to your PowerShell profile. Please start a new PowerShell window for the changes to take effect." + +# SIG # Begin signature block +# MIIntwYJKoZIhvcNAQcCoIInqDCCJ6QCAQExDzANBglghkgBZQMEAgEFADB5Bgor +# BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG +# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCAQI5pjINs39W5V +# cJzzNG3YZ5LACp5BEUv+jJq20JhbqKCCDYEwggX/MIID56ADAgECAhMzAAACUosz +# qviV8znbAAAAAAJSMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAlVTMRMwEQYD +# VQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNy +# b3NvZnQgQ29ycG9yYXRpb24xKDAmBgNVBAMTH01pY3Jvc29mdCBDb2RlIFNpZ25p +# bmcgUENBIDIwMTEwHhcNMjEwOTAyMTgzMjU5WhcNMjIwOTAxMTgzMjU5WjB0MQsw +# CQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9u +# ZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMR4wHAYDVQQDExVNaWNy +# b3NvZnQgQ29ycG9yYXRpb24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +# AQDQ5M+Ps/X7BNuv5B/0I6uoDwj0NJOo1KrVQqO7ggRXccklyTrWL4xMShjIou2I +# sbYnF67wXzVAq5Om4oe+LfzSDOzjcb6ms00gBo0OQaqwQ1BijyJ7NvDf80I1fW9O +# L76Kt0Wpc2zrGhzcHdb7upPrvxvSNNUvxK3sgw7YTt31410vpEp8yfBEl/hd8ZzA +# v47DCgJ5j1zm295s1RVZHNp6MoiQFVOECm4AwK2l28i+YER1JO4IplTH44uvzX9o +# RnJHaMvWzZEpozPy4jNO2DDqbcNs4zh7AWMhE1PWFVA+CHI/En5nASvCvLmuR/t8 +# q4bc8XR8QIZJQSp+2U6m2ldNAgMBAAGjggF+MIIBejAfBgNVHSUEGDAWBgorBgEE +# AYI3TAgBBggrBgEFBQcDAzAdBgNVHQ4EFgQUNZJaEUGL2Guwt7ZOAu4efEYXedEw +# UAYDVR0RBEkwR6RFMEMxKTAnBgNVBAsTIE1pY3Jvc29mdCBPcGVyYXRpb25zIFB1 +# ZXJ0byBSaWNvMRYwFAYDVQQFEw0yMzAwMTIrNDY3NTk3MB8GA1UdIwQYMBaAFEhu +# ZOVQBdOCqhc3NyK1bajKdQKVMFQGA1UdHwRNMEswSaBHoEWGQ2h0dHA6Ly93d3cu +# bWljcm9zb2Z0LmNvbS9wa2lvcHMvY3JsL01pY0NvZFNpZ1BDQTIwMTFfMjAxMS0w +# Ny0wOC5jcmwwYQYIKwYBBQUHAQEEVTBTMFEGCCsGAQUFBzAChkVodHRwOi8vd3d3 +# Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2NlcnRzL01pY0NvZFNpZ1BDQTIwMTFfMjAx +# MS0wNy0wOC5jcnQwDAYDVR0TAQH/BAIwADANBgkqhkiG9w0BAQsFAAOCAgEAFkk3 +# uSxkTEBh1NtAl7BivIEsAWdgX1qZ+EdZMYbQKasY6IhSLXRMxF1B3OKdR9K/kccp +# kvNcGl8D7YyYS4mhCUMBR+VLrg3f8PUj38A9V5aiY2/Jok7WZFOAmjPRNNGnyeg7 +# l0lTiThFqE+2aOs6+heegqAdelGgNJKRHLWRuhGKuLIw5lkgx9Ky+QvZrn/Ddi8u +# TIgWKp+MGG8xY6PBvvjgt9jQShlnPrZ3UY8Bvwy6rynhXBaV0V0TTL0gEx7eh/K1 +# o8Miaru6s/7FyqOLeUS4vTHh9TgBL5DtxCYurXbSBVtL1Fj44+Od/6cmC9mmvrti +# yG709Y3Rd3YdJj2f3GJq7Y7KdWq0QYhatKhBeg4fxjhg0yut2g6aM1mxjNPrE48z +# 6HWCNGu9gMK5ZudldRw4a45Z06Aoktof0CqOyTErvq0YjoE4Xpa0+87T/PVUXNqf +# 7Y+qSU7+9LtLQuMYR4w3cSPjuNusvLf9gBnch5RqM7kaDtYWDgLyB42EfsxeMqwK +# WwA+TVi0HrWRqfSx2olbE56hJcEkMjOSKz3sRuupFCX3UroyYf52L+2iVTrda8XW +# esPG62Mnn3T8AuLfzeJFuAbfOSERx7IFZO92UPoXE1uEjL5skl1yTZB3MubgOA4F +# 8KoRNhviFAEST+nG8c8uIsbZeb08SeYQMqjVEmkwggd6MIIFYqADAgECAgphDpDS +# AAAAAAADMA0GCSqGSIb3DQEBCwUAMIGIMQswCQYDVQQGEwJVUzETMBEGA1UECBMK +# V2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0 +# IENvcnBvcmF0aW9uMTIwMAYDVQQDEylNaWNyb3NvZnQgUm9vdCBDZXJ0aWZpY2F0 +# ZSBBdXRob3JpdHkgMjAxMTAeFw0xMTA3MDgyMDU5MDlaFw0yNjA3MDgyMTA5MDla +# MH4xCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdS +# ZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKDAmBgNVBAMT +# H01pY3Jvc29mdCBDb2RlIFNpZ25pbmcgUENBIDIwMTEwggIiMA0GCSqGSIb3DQEB +# AQUAA4ICDwAwggIKAoICAQCr8PpyEBwurdhuqoIQTTS68rZYIZ9CGypr6VpQqrgG +# OBoESbp/wwwe3TdrxhLYC/A4wpkGsMg51QEUMULTiQ15ZId+lGAkbK+eSZzpaF7S +# 35tTsgosw6/ZqSuuegmv15ZZymAaBelmdugyUiYSL+erCFDPs0S3XdjELgN1q2jz +# y23zOlyhFvRGuuA4ZKxuZDV4pqBjDy3TQJP4494HDdVceaVJKecNvqATd76UPe/7 +# 4ytaEB9NViiienLgEjq3SV7Y7e1DkYPZe7J7hhvZPrGMXeiJT4Qa8qEvWeSQOy2u +# M1jFtz7+MtOzAz2xsq+SOH7SnYAs9U5WkSE1JcM5bmR/U7qcD60ZI4TL9LoDho33 +# X/DQUr+MlIe8wCF0JV8YKLbMJyg4JZg5SjbPfLGSrhwjp6lm7GEfauEoSZ1fiOIl +# XdMhSz5SxLVXPyQD8NF6Wy/VI+NwXQ9RRnez+ADhvKwCgl/bwBWzvRvUVUvnOaEP +# 6SNJvBi4RHxF5MHDcnrgcuck379GmcXvwhxX24ON7E1JMKerjt/sW5+v/N2wZuLB +# l4F77dbtS+dJKacTKKanfWeA5opieF+yL4TXV5xcv3coKPHtbcMojyyPQDdPweGF +# RInECUzF1KVDL3SV9274eCBYLBNdYJWaPk8zhNqwiBfenk70lrC8RqBsmNLg1oiM +# CwIDAQABo4IB7TCCAekwEAYJKwYBBAGCNxUBBAMCAQAwHQYDVR0OBBYEFEhuZOVQ +# BdOCqhc3NyK1bajKdQKVMBkGCSsGAQQBgjcUAgQMHgoAUwB1AGIAQwBBMAsGA1Ud +# DwQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFHItOgIxkEO5FAVO +# 4eqnxzHRI4k0MFoGA1UdHwRTMFEwT6BNoEuGSWh0dHA6Ly9jcmwubWljcm9zb2Z0 +# LmNvbS9wa2kvY3JsL3Byb2R1Y3RzL01pY1Jvb0NlckF1dDIwMTFfMjAxMV8wM18y +# Mi5jcmwwXgYIKwYBBQUHAQEEUjBQME4GCCsGAQUFBzAChkJodHRwOi8vd3d3Lm1p +# Y3Jvc29mdC5jb20vcGtpL2NlcnRzL01pY1Jvb0NlckF1dDIwMTFfMjAxMV8wM18y +# Mi5jcnQwgZ8GA1UdIASBlzCBlDCBkQYJKwYBBAGCNy4DMIGDMD8GCCsGAQUFBwIB +# FjNodHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2RvY3MvcHJpbWFyeWNw +# cy5odG0wQAYIKwYBBQUHAgIwNB4yIB0ATABlAGcAYQBsAF8AcABvAGwAaQBjAHkA +# XwBzAHQAYQB0AGUAbQBlAG4AdAAuIB0wDQYJKoZIhvcNAQELBQADggIBAGfyhqWY +# 4FR5Gi7T2HRnIpsLlhHhY5KZQpZ90nkMkMFlXy4sPvjDctFtg/6+P+gKyju/R6mj +# 82nbY78iNaWXXWWEkH2LRlBV2AySfNIaSxzzPEKLUtCw/WvjPgcuKZvmPRul1LUd +# d5Q54ulkyUQ9eHoj8xN9ppB0g430yyYCRirCihC7pKkFDJvtaPpoLpWgKj8qa1hJ +# Yx8JaW5amJbkg/TAj/NGK978O9C9Ne9uJa7lryft0N3zDq+ZKJeYTQ49C/IIidYf +# wzIY4vDFLc5bnrRJOQrGCsLGra7lstnbFYhRRVg4MnEnGn+x9Cf43iw6IGmYslmJ +# aG5vp7d0w0AFBqYBKig+gj8TTWYLwLNN9eGPfxxvFX1Fp3blQCplo8NdUmKGwx1j +# NpeG39rz+PIWoZon4c2ll9DuXWNB41sHnIc+BncG0QaxdR8UvmFhtfDcxhsEvt9B +# xw4o7t5lL+yX9qFcltgA1qFGvVnzl6UJS0gQmYAf0AApxbGbpT9Fdx41xtKiop96 +# eiL6SJUfq/tHI4D1nvi/a7dLl+LrdXga7Oo3mXkYS//WsyNodeav+vyL6wuA6mk7 +# r/ww7QRMjt/fdW1jkT3RnVZOT7+AVyKheBEyIXrvQQqxP/uozKRdwaGIm1dxVk5I +# RcBCyZt2WwqASGv9eZ/BvW1taslScxMNelDNMYIZjDCCGYgCAQEwgZUwfjELMAkG +# A1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx +# HjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEoMCYGA1UEAxMfTWljcm9z +# b2Z0IENvZGUgU2lnbmluZyBQQ0EgMjAxMQITMwAAAlKLM6r4lfM52wAAAAACUjAN +# BglghkgBZQMEAgEFAKCBrjAZBgkqhkiG9w0BCQMxDAYKKwYBBAGCNwIBBDAcBgor +# BgEEAYI3AgELMQ4wDAYKKwYBBAGCNwIBFTAvBgkqhkiG9w0BCQQxIgQgFlYOVUKP +# feFpp2ZyGIN6cbgH7sLzLcNZk6To9Qy5/jkwQgYKKwYBBAGCNwIBDDE0MDKgFIAS +# AE0AaQBjAHIAbwBzAG8AZgB0oRqAGGh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbTAN +# BgkqhkiG9w0BAQEFAASCAQASfzadUptMi09w6TyqkqH2acAq4SQ7IRAUsfgo9VZU +# keZ0yk54zc2JhMq2EdD9BodoqWUHty/Kd/ii54KlaIilcg1eu7fxI23ApMDqRyd5 +# pej24Gi7fpx/kOPedQMRITZj+2DLBWWxlGnlSqLJ88HOhQ7IUPK6n0orv6o3aoW+ +# vmIz1KVf/WpQ0Bmnuf6KvidtlXwq9Z6F6t78v3ulfFhl/rQkar/kqwKh9h2rfTbO +# NL52WccwEzk1uk/7jRY3biG7vegymoFHVgGqHirscNa0XeGXt+GgqAXo/ppXDxFW +# U/9CUSV3oQt+H+4YHoKEuTpNpJ+nRDyz84l4emm5PwWXoYIXFjCCFxIGCisGAQQB +# gjcDAwExghcCMIIW/gYJKoZIhvcNAQcCoIIW7zCCFusCAQMxDzANBglghkgBZQME +# AgEFADCCAVkGCyqGSIb3DQEJEAEEoIIBSASCAUQwggFAAgEBBgorBgEEAYRZCgMB +# MDEwDQYJYIZIAWUDBAIBBQAEIAufT8fqkLAoNnmK8tlDtjF5YfpJIAKOXej3J0eq +# YJSlAgZiF5g+l2EYEzIwMjIwMzMwMjE1MjEwLjY3NVowBIACAfSggdikgdUwgdIx +# CzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRt +# b25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLTArBgNVBAsTJE1p +# Y3Jvc29mdCBJcmVsYW5kIE9wZXJhdGlvbnMgTGltaXRlZDEmMCQGA1UECxMdVGhh +# bGVzIFRTUyBFU046RDA4Mi00QkZELUVFQkExJTAjBgNVBAMTHE1pY3Jvc29mdCBU +# aW1lLVN0YW1wIFNlcnZpY2WgghFlMIIHFDCCBPygAwIBAgITMwAAAY/zUajrWnLd +# zAABAAABjzANBgkqhkiG9w0BAQsFADB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMK +# V2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0 +# IENvcnBvcmF0aW9uMSYwJAYDVQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0Eg +# MjAxMDAeFw0yMTEwMjgxOTI3NDZaFw0yMzAxMjYxOTI3NDZaMIHSMQswCQYDVQQG +# EwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwG +# A1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMS0wKwYDVQQLEyRNaWNyb3NvZnQg +# SXJlbGFuZCBPcGVyYXRpb25zIExpbWl0ZWQxJjAkBgNVBAsTHVRoYWxlcyBUU1Mg +# RVNOOkQwODItNEJGRC1FRUJBMSUwIwYDVQQDExxNaWNyb3NvZnQgVGltZS1TdGFt +# cCBTZXJ2aWNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAmVc+/rXP +# Fx6Fk4+CpLrubDrLTa3QuAHRVXuy+zsxXwkogkT0a+XWuBabwHyqj8RRiZQQvdvb +# Oq5NRExOeHiaCtkUsQ02ESAe9Cz+loBNtsfCq846u3otWHCJlqkvDrSr7mMBqwcR +# Y7cfhAGfLvlpMSojoAnk7Rej+jcJnYxIeN34F3h9JwANY360oGYCIS7pLOosWV+b +# xug9uiTZYE/XclyYNF6XdzZ/zD/4U5pxT4MZQmzBGvDs+8cDdA/stZfj/ry+i0XU +# YNFPhuqc+UKkwm/XNHB+CDsGQl+ZS0GcbUUun4VPThHJm6mRAwL5y8zptWEIocbT +# eRSTmZnUa2iYH2EOBV7eCjx0Sdb6kLc1xdFRckDeQGR4J1yFyybuZsUP8x0dOsEE +# oLQuOhuKlDLQEg7D6ZxmZJnS8B03ewk/SpVLqsb66U2qyF4BwDt1uZkjEZ7finIo +# UgSz4B7fWLYIeO2OCYxIE0XvwsVop9PvTXTZtGPzzmHU753GarKyuM6oa/qaTzYv +# rAfUb7KYhvVQKxGUPkL9+eKiM7G0qenJCFrXzZPwRWoccAR33PhNEuuzzKZFJ4De +# aTCLg/8uK0Q4QjFRef5n4H+2KQIEibZ7zIeBX3jgsrICbzzSm0QX3SRVmZH//Aqp +# 8YxkwcoI1WCBizv84z9eqwRBdQ4HYcNbQMMCAwEAAaOCATYwggEyMB0GA1UdDgQW +# BBTzBuZ0a65JzuKhzoWb25f7NyNxvDAfBgNVHSMEGDAWgBSfpxVdAF5iXYP05dJl +# pxtTNRnpcjBfBgNVHR8EWDBWMFSgUqBQhk5odHRwOi8vd3d3Lm1pY3Jvc29mdC5j +# b20vcGtpb3BzL2NybC9NaWNyb3NvZnQlMjBUaW1lLVN0YW1wJTIwUENBJTIwMjAx +# MCgxKS5jcmwwbAYIKwYBBQUHAQEEYDBeMFwGCCsGAQUFBzAChlBodHRwOi8vd3d3 +# Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2NlcnRzL01pY3Jvc29mdCUyMFRpbWUtU3Rh +# bXAlMjBQQ0ElMjAyMDEwKDEpLmNydDAMBgNVHRMBAf8EAjAAMBMGA1UdJQQMMAoG +# CCsGAQUFBwMIMA0GCSqGSIb3DQEBCwUAA4ICAQDNf9Oo9zyhC5n1jC8iU7NJY39F +# izjhxZwJbJY/Ytwn63plMlTSaBperan566fuRojGJSv3EwZs+RruOU2T/ZRDx4VH +# esLHtclE8GmMM1qTMaZPL8I2FrRmf5Oop4GqcxNdNECBClVZmn0KzFdPMqRa5/0R +# 6CmgqJh0muvImikgHubvohsavPEyyHQa94HD4/LNKd/YIaCKKPz9SA5fAa4phQ4E +# vz2auY9SUluId5MK9H5cjWVwBxCvYAD+1CW9z7GshJlNjqBvWtKO6J0Aemfg6z28 +# g7qc7G/tCtrlH4/y27y+stuwWXNvwdsSd1lvB4M63AuMl9Yp6au/XFknGzJPF6n/ +# uWR6JhQvzh40ILgeThLmYhf8z+aDb4r2OBLG1P2B6aCTW2YQkt7TpUnzI0cKGr21 +# 3CbKtGk/OOIHSsDOxasmeGJ+FiUJCiV15wh3aZT/VT/PkL9E4hDBAwGt49G88gSC +# O0x9jfdDZWdWGbELXlSmA3EP4eTYq7RrolY04G8fGtF0pzuZu43A29zaI9lIr5ul +# KRz8EoQHU6cu0PxUw0B9H8cAkvQxaMumRZ/4fCbqNb4TcPkPcWOI24QYlvpbtT9p +# 31flYElmc5wjGplAky/nkJcT0HZENXenxWtPvt4gcoqppeJPA3S/1D57KL3667ep +# Ir0yV290E2otZbAW8DCCB3EwggVZoAMCAQICEzMAAAAVxedrngKbSZkAAAAAABUw +# DQYJKoZIhvcNAQELBQAwgYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5n +# dG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9y +# YXRpb24xMjAwBgNVBAMTKU1pY3Jvc29mdCBSb290IENlcnRpZmljYXRlIEF1dGhv +# cml0eSAyMDEwMB4XDTIxMDkzMDE4MjIyNVoXDTMwMDkzMDE4MzIyNVowfDELMAkG +# A1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx +# HjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9z +# b2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw +# ggIKAoICAQDk4aZM57RyIQt5osvXJHm9DtWC0/3unAcH0qlsTnXIyjVX9gF/bErg +# 4r25PhdgM/9cT8dm95VTcVrifkpa/rg2Z4VGIwy1jRPPdzLAEBjoYH1qUoNEt6aO +# RmsHFPPFdvWGUNzBRMhxXFExN6AKOG6N7dcP2CZTfDlhAnrEqv1yaa8dq6z2Nr41 +# JmTamDu6GnszrYBbfowQHJ1S/rboYiXcag/PXfT+jlPP1uyFVk3v3byNpOORj7I5 +# LFGc6XBpDco2LXCOMcg1KL3jtIckw+DJj361VI/c+gVVmG1oO5pGve2krnopN6zL +# 64NF50ZuyjLVwIYwXE8s4mKyzbnijYjklqwBSru+cakXW2dg3viSkR4dPf0gz3N9 +# QZpGdc3EXzTdEonW/aUgfX782Z5F37ZyL9t9X4C626p+Nuw2TPYrbqgSUei/BQOj +# 0XOmTTd0lBw0gg/wEPK3Rxjtp+iZfD9M269ewvPV2HM9Q07BMzlMjgK8QmguEOqE +# UUbi0b1qGFphAXPKZ6Je1yh2AuIzGHLXpyDwwvoSCtdjbwzJNmSLW6CmgyFdXzB0 +# kZSU2LlQ+QuJYfM2BjUYhEfb3BvR/bLUHMVr9lxSUV0S2yW6r1AFemzFER1y7435 +# UsSFF5PAPBXbGjfHCBUYP3irRbb1Hode2o+eFnJpxq57t7c+auIurQIDAQABo4IB +# 3TCCAdkwEgYJKwYBBAGCNxUBBAUCAwEAATAjBgkrBgEEAYI3FQIEFgQUKqdS/mTE +# mr6CkTxGNSnPEP8vBO4wHQYDVR0OBBYEFJ+nFV0AXmJdg/Tl0mWnG1M1GelyMFwG +# A1UdIARVMFMwUQYMKwYBBAGCN0yDfQEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly93 +# d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvRG9jcy9SZXBvc2l0b3J5Lmh0bTATBgNV +# HSUEDDAKBggrBgEFBQcDCDAZBgkrBgEEAYI3FAIEDB4KAFMAdQBiAEMAQTALBgNV +# HQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBTV9lbLj+iiXGJo +# 0T2UkFvXzpoYxDBWBgNVHR8ETzBNMEugSaBHhkVodHRwOi8vY3JsLm1pY3Jvc29m +# dC5jb20vcGtpL2NybC9wcm9kdWN0cy9NaWNSb29DZXJBdXRfMjAxMC0wNi0yMy5j +# cmwwWgYIKwYBBQUHAQEETjBMMEoGCCsGAQUFBzAChj5odHRwOi8vd3d3Lm1pY3Jv +# c29mdC5jb20vcGtpL2NlcnRzL01pY1Jvb0NlckF1dF8yMDEwLTA2LTIzLmNydDAN +# BgkqhkiG9w0BAQsFAAOCAgEAnVV9/Cqt4SwfZwExJFvhnnJL/Klv6lwUtj5OR2R4 +# sQaTlz0xM7U518JxNj/aZGx80HU5bbsPMeTCj/ts0aGUGCLu6WZnOlNN3Zi6th54 +# 2DYunKmCVgADsAW+iehp4LoJ7nvfam++Kctu2D9IdQHZGN5tggz1bSNU5HhTdSRX +# ud2f8449xvNo32X2pFaq95W2KFUn0CS9QKC/GbYSEhFdPSfgQJY4rPf5KYnDvBew +# VIVCs/wMnosZiefwC2qBwoEZQhlSdYo2wh3DYXMuLGt7bj8sCXgU6ZGyqVvfSaN0 +# DLzskYDSPeZKPmY7T7uG+jIa2Zb0j/aRAfbOxnT99kxybxCrdTDFNLB62FD+Cljd +# QDzHVG2dY3RILLFORy3BFARxv2T5JL5zbcqOCb2zAVdJVGTZc9d/HltEAY5aGZFr +# DZ+kKNxnGSgkujhLmm77IVRrakURR6nxt67I6IleT53S0Ex2tVdUCbFpAUR+fKFh +# bHP+CrvsQWY9af3LwUFJfn6Tvsv4O+S3Fb+0zj6lMVGEvL8CwYKiexcdFYmNcP7n +# tdAoGokLjzbaukz5m/8K6TT4JDVnK+ANuOaMmdbhIurwJ0I9JZTmdHRbatGePu1+ +# oDEzfbzL6Xu/OHBE0ZDxyKs6ijoIYn/ZcGNTTY3ugm2lBRDBcQZqELQdVTNYs6Fw +# ZvKhggLUMIICPQIBATCCAQChgdikgdUwgdIxCzAJBgNVBAYTAlVTMRMwEQYDVQQI +# EwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3Nv +# ZnQgQ29ycG9yYXRpb24xLTArBgNVBAsTJE1pY3Jvc29mdCBJcmVsYW5kIE9wZXJh +# dGlvbnMgTGltaXRlZDEmMCQGA1UECxMdVGhhbGVzIFRTUyBFU046RDA4Mi00QkZE +# LUVFQkExJTAjBgNVBAMTHE1pY3Jvc29mdCBUaW1lLVN0YW1wIFNlcnZpY2WiIwoB +# ATAHBgUrDgMCGgMVAD5NL4IEdudIBwdGoCaV0WBbQZpqoIGDMIGApH4wfDELMAkG +# A1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx +# HjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9z +# b2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwDQYJKoZIhvcNAQEFBQACBQDl7ubRMCIY +# DzIwMjIwMzMwMjIyNTIxWhgPMjAyMjAzMzEyMjI1MjFaMHQwOgYKKwYBBAGEWQoE +# ATEsMCowCgIFAOXu5tECAQAwBwIBAAICCl0wBwIBAAICET4wCgIFAOXwOFECAQAw +# NgYKKwYBBAGEWQoEAjEoMCYwDAYKKwYBBAGEWQoDAqAKMAgCAQACAwehIKEKMAgC +# AQACAwGGoDANBgkqhkiG9w0BAQUFAAOBgQBjidsY/frY7jVCC5L43gm9MoaMnxjT +# 8gVLXcdbhJzGYftD84JlTWvw/WyGSHpoeg+oCe01IIgdTicq0MKjxoca+LefqaS8 +# vlAf9s1JdIa2Je7u5CzOt2Gru9C00znmx6hI8XCkV+Gj+ZopC4kESoaSGiyaqt+S +# YZHTJ1hNVg79dTGCBA0wggQJAgEBMIGTMHwxCzAJBgNVBAYTAlVTMRMwEQYDVQQI +# EwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3Nv +# ZnQgQ29ycG9yYXRpb24xJjAkBgNVBAMTHU1pY3Jvc29mdCBUaW1lLVN0YW1wIFBD +# QSAyMDEwAhMzAAABj/NRqOtact3MAAEAAAGPMA0GCWCGSAFlAwQCAQUAoIIBSjAa +# BgkqhkiG9w0BCQMxDQYLKoZIhvcNAQkQAQQwLwYJKoZIhvcNAQkEMSIEIH26YOfE +# UVgRTz6SOkQa9frVJcK+7EUHy9BNy3DCqIG2MIH6BgsqhkiG9w0BCRACLzGB6jCB +# 5zCB5DCBvQQgl3IFT+LGxguVjiKm22ItmO6dFDWW8nShu6O6g8yFxx8wgZgwgYCk +# fjB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMH +# UmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSYwJAYDVQQD +# Ex1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0EgMjAxMAITMwAAAY/zUajrWnLdzAAB +# AAABjzAiBCB0UdAt+5LFhsYAoTd2lnVnE0JExPii63XeZzU2N7NElDANBgkqhkiG +# 9w0BAQsFAASCAgCSm1motOpztHnppo7OFCG/NumEpmOgH4Ma58pjV7mgxfoLQllg +# lLpGzBwlXfHSdOLg/q0ip6REZrSnvPw3rffeLl7oTgfAnUZTyGCQbXZgYKmHyqBN +# ys7PaaULzR4UrsyhJ+lEQwY3aombMshmo/rwolFsgUCauvCpVPiPhpHy8+2Wqm4r +# 9Xj1X7H9THSzFJmD3Qu6bT9yburwrSZNEtnYybO+SYYgzjy3CiTfAUag/iETGj4k +# C5K3dfxuz6qWfe0Qr3bT7sLlA0FjQn3ZSNyjPqHr3/1Uf2S6VYKipYvdvLezbJ8X +# 9SE5QUJPc+WWHDMd7LW+EEak/CF/N+I77bHuMN1iyiG7DRGIbOge3jKtD9XgBb25 +# N2+4ilsoN3GYe63bMGsL+525ApITbcnhxbpd35UiZP6Nw9ab9WKYIUILI4vdjSyx +# LX+HZZV1cpqU4d5HjPS9exHgDS6RwJvYtvx9N0moBJYz8X+C4HDJKO6EAFY1i8tT +# HKu3TGsqofehtTtlc9QCEimSTBSmeGxEiPmSDjwfaO2erTzwnJcZL5UqDNHoEouN +# Z5+u1f2LfIidCBznb4tRlG9GNe1JKF3bp16tsNwD6GFuKfcDaP8/+ee14qzHPUJm +# niaVz5RlKUh2M0Uphl+hmnHzIWHOjhUQsUSaoyXy0n+Wz01P1TJ+CBiA1w== +# SIG # End signature block diff --git a/external_imported/vcpkg/scripts/azure-pipelines/analyze-test-results.ps1 b/external_imported/vcpkg/scripts/azure-pipelines/analyze-test-results.ps1 deleted file mode 100755 index 29cf01cc3..000000000 --- a/external_imported/vcpkg/scripts/azure-pipelines/analyze-test-results.ps1 +++ /dev/null @@ -1,453 +0,0 @@ -# Copyright (c) Microsoft Corporation. -# SPDX-License-Identifier: MIT -# - -<# -.SYNOPSIS -Analyze the test results as output by the CI system. - -.DESCRIPTION -Takes the set of port test results from $logDir, -and the baseline from $baselineFile, and makes certain that the set -of failures we expected are exactly the set of failures we got. -Then, uploads the logs from any unexpected failures. - -.PARAMETER logDir -Directory of xml test logs to analyze. - -.PARAMETER allResults -Include tests that have no change from the baseline in the output. - -.PARAMETER triplet -The triplet to analyze. - -.PARAMETER baselineFile -The path to the ci.baseline.txt file in the vcpkg repository. - -.PARAMETER passingIsPassing -Indicates that 'Passing, remove from fail list' results should not be emitted as failures. (For example, this is used -when using vcpkg to test a prerelease MSVC++ compiler) -#> -[CmdletBinding()] -Param( - [Parameter(Mandatory = $true)] - [string]$logDir, - [switch]$allResults, - [Parameter(Mandatory = $true)] - [string]$triplet, - [Parameter(Mandatory = $true)] - [string]$baselineFile, - [switch]$passingIsPassing = $false -) - -$ErrorActionPreference = 'Stop' - -if ( -not (Test-Path $logDir) ) { - [System.Console]::Error.WriteLine("Log directory does not exist: $logDir") - exit -} - -<# -.SYNOPSIS -Creates an object the represents the test run. - -.DESCRIPTION -build_test_results takes an XML file of results from the CI run, -and constructs an object based on that XML file for further -processing. - -.OUTPUTS -An object with the following elements: - assemblyName: - assemblyStartDate: - assemblyStartTime: - assemblyTime: - collectionName: - collectionTime: - allTests: A hashtable with an entry for each port tested - The key is the name of the port - The value is an object with the following elements: - name: Name of the port (Does not include the triplet name) - result: Pass/Fail/Skip result from xunit - time: Test time in seconds - originalResult: Result as defined by Build.h in vcpkg source code - abi_tag: The port hash - features: The features installed - -.PARAMETER xmlFilename -The path to the XML file to parse. -#> -function build_test_results { - [CmdletBinding()] - Param - ( - [string]$xmlFilename - ) - if ( ($xmlFilename.Length -eq 0) -or ( -not( Test-Path $xmlFilename))) { - #write-error "Missing file: $xmlFilename" - return $null - } - - Write-Verbose "building test hash for $xmlFilename" - - [xml]$xmlContents = Get-Content $xmlFilename - - # This currently only supports one collection per assembly, which is the way - # the vcpkg tests are designed to run in the pipeline. - $xmlAssembly = $xmlContents.assemblies.assembly - $assemblyName = $xmlAssembly.name - $assemblyStartDate = $xmlAssembly."run-date" - $assemblyStartTime = $xmlAssembly."run-time" - $assemblyTime = $xmlAssembly.time - $xmlCollection = $xmlAssembly.collection - $collectionName = $xmlCollection.name - $collectionTime = $xmlCollection.time - - $allTestResults = @{ } - foreach ( $test in $xmlCollection.test) { - if (!$test.name.endswith(":$triplet")) - { - continue - } - $name = ($test.name -replace ":.*$") - - # Reconstruct the original BuildResult enumeration (defined in Build.h) - # failure.message - why the test failed (valid only on test failure) - # reason - why the test was skipped (valid only when the test is skipped) - # case BuildResult::POST_BUILD_CHECKS_FAILED: - # case BuildResult::FILE_CONFLICTS: - # case BuildResult::BUILD_FAILED: - # case BuildResult::EXCLUDED: - # case BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES: - $originalResult = "NULLVALUE" - switch ($test.result) { - "Skip" { - $originalResult = $test.reason.InnerText - } - "Fail" { - $originalResult = $test.failure.message.InnerText - } - "Pass" { - $originalResult = "SUCCEEDED" - } - } - - $abi_tag = "" - $features = "" - foreach ( $trait in $test.traits.trait) { - switch ( $trait.name ) { - "abi_tag" { $abi_tag = $trait.value } - "features" { $features = $trait.value } - } - } - - # If additional fields get saved in the XML, then they should be added to this hash - # also consider using a PSCustomObject here instead of a hash - $testHash = @{ name = $name; result = $test.result; time = $test.time; originalResult = $originalResult; abi_tag = $abi_tag; features = $features } - $allTestResults[$name] = $testHash - } - - return @{ - assemblyName = $assemblyName; - assemblyStartDate = $assemblyStartDate; - assemblyStartTime = $assemblyStartTime; - assemblyTime = $assemblyTime; - collectionName = $collectionName; - collectionTime = $collectionTime; - allTests = $allTestResults - } -} - -<# -.SYNOPSIS -Creates an object that represents the baseline expectations. - -.DESCRIPTION -build_baseline_results converts the baseline file to an object representing -the expectations set up by the baseline file. It records four states: - 1) fail - 2) skip - 3) ignore - 4) pass -- this is represented by not being recorded -In other words, if a port is not contained in the object returned by this -cmdlet, expect it to pass. - -.OUTPUTS -An object containing the following fields: - collectionName: the triplet - fail: ports marked as fail - skip: ports marked as skipped - ignore: ports marked as ignore - -.PARAMETER baselineFile -The path to vcpkg's ci.baseline.txt. - -.PARAMETER triplet -The triplet to create the result object for. -#> -function build_baseline_results { - [CmdletBinding()] - Param( - $baselineFile, - $triplet - ) - #read in the file, strip out comments and blank lines and spaces, leave only the current triplet - #remove comments, remove empty lines, remove whitespace, then keep only those lines for $triplet - $baseline_list_raw = Get-Content -Path $baselineFile ` - | Where-Object { -not ($_ -match "\s*#") } ` - | Where-Object { -not ( $_ -match "^\s*$") } ` - | ForEach-Object { $_ -replace "\s" } ` - | Where-Object { $_ -match ":$triplet=" } - - #filter to skipped and trim the triplet - $skip_hash = @{ } - foreach ( $port in $baseline_list_raw | ? { $_ -match "=skip$" } | % { $_ -replace ":.*$" }) { - if ($skip_hash[$port] -ne $null) { - [System.Console]::Error.WriteLine("$($port):$($triplet) has multiple definitions in $baselineFile") - } - $skip_hash[$port] = $true - } - $fail_hash = @{ } - $baseline_list_raw | ? { $_ -match "=fail$" } | % { $_ -replace ":.*$" } | ? { $fail_hash[$_] = $true } | Out-Null - $ignore_hash = @{ } - $baseline_list_raw | ? { $_ -match "=ignore$" } | % { $_ -replace ":.*$" } | ? { $ignore_hash[$_] = $true } | Out-Null - - return @{ - collectionName = $triplet; - skip = $skip_hash; - fail = $fail_hash; - ignore = $ignore_hash - } -} - -<# -.SYNOPSIS -Analyzes the results of the current run against the baseline. - -.DESCRIPTION -combine_results compares the results to the baselie, and generates the results -for the CI -- whether it should pass or fail. - -.OUTPUTS -An object containing the following: -(Note that this is not the same data structure as build_test_results) - assemblyName: - assemblyStartDate: - assemblyStartTime: - assemblyTime: - collectionName: - collectionTime: - allTests: A hashtable of each port with a different status from the baseline - The key is the name of the port - The value is an object with the following data members: - name: The name of the port - result: xunit test result Pass/Fail/Skip - message: Human readable message describing the test result - time: time the current test results took to run. - baselineResult: - currentResult: - features: - ignored: list of ignored tests - -.PARAMETER baseline -The baseline object to use from build_baseline_results. - -.PARAMETER current -The results object to use from build_test_results. -#> -function combine_results { - [CmdletBinding()] - Param - ( - $baseline, - $current - ) - - if ($baseline.collectionName -ne $current.collectionName) { - Write-Warning "Comparing mismatched collections $($baseline.collectionName) and $($current.collectionName)" - } - - $currentTests = $current.allTests - - # lookup table with the results of all of the tests - $allTestResults = @{ } - - $ignoredList = @() - - Write-Verbose "analyzing $($currentTests.count) tests" - - foreach ($key in $currentTests.keys) { - Write-Verbose "analyzing $key" - - $message = $null - $result = $null - $time = $null - $currentResult = $null - $features = $currentTest.features - - $baselineResult = "Pass" - if ($baseline.fail[$key] -ne $null) { - Write-Verbose "$key is failing" - $baselineResult = "Fail" - } - elseif ( $baseline.skip[$key] -ne $null) { - Write-Verbose "$key is skipped" - $baselineResult = "Skip" - } - elseif ( $baseline.ignore[$key] -ne $null) { - $baselineResult = "ignore" - } - - $currentTest = $currentTests[$key] - - if ( $currentTest.result -eq $baselineResult) { - Write-Verbose "$key has no change from baseline" - $currentResult = $currentTest.result - if ($allResults) { - # Only marking regressions as failures but keep the skipped status - if ($currentResult -eq "Skip") { - $result = "Skip" - } - else { - $result = "Pass" - } - $message = "No change from baseline" - $time = $currentTest.time - } - } - elseif ( $baselineResult -eq "ignore") { - if ( $currentTest.result -eq "Fail" ) { - Write-Verbose "ignoring failure on $key" - $ignoredList += $key - } - } - else { - Write-Verbose "$key had a change from the baseline" - - $currentResult = $currentTest.result - # Test exists in both test runs but does not match. Determine if this is a regression - # Pass -> Fail = Fail (Regression) - # Pass -> Skip = Skip - # Fail -> Pass = Fail (need to update baseline) - # Fail -> Skip = Skip - # Skip -> Fail = Fail (Should not happen) - # Skip -> Pass = Fail (should not happen) - - $lookupTable = @{ - 'Pass' = @{ - 'Fail' = @('Fail', "Test passes in baseline but fails in current run. If expected update ci.baseline.txt with '$($key):$($current.collectionName)=fail'"); - 'Skip' = @($null, 'Test was skipped due to missing dependencies') - }; - 'Fail' = @{ - 'Pass' = @('Fail', "Test fails in baseline but now passes. Update ci.baseline.txt with '$($key):$($current.collectionName)=pass'"); - 'Skip' = @($null, 'Test fails in baseline but is skipped in current run') - }; - 'Skip' = @{ - 'Fail' = @('Skip', "Test is skipped in baseline but fails in current run. Results are ignored") - 'Pass' = @('Skip', "Test is skipped in baseline but passes in current run. Results are ignored") - } - } - $resultList = $lookupTable[$baselineResult][$currentResult] - $result = $resultList[0] - $message = $resultList[1] - $time = $currentTest.time - Write-Verbose ">$key $message" - } - - if ($result -ne $null) { - Write-Verbose "Adding $key to result list" - $allTestResults[$key] = @{ name = $key; result = $result; message = $message; time = $time; abi_tag = $currentTest.abi_tag; baselineResult = $baselineResult; currentResult = $currentResult; features = $features } - } - } - - return @{ - assemblyName = $current.assemblyName; - assemblyStartDate = $current.assemblyStartDate; - assemblyStartTime = $current.assemblyStartTime; - assemblyTime = $current.assemblyTime; - collectionName = $current.collectionName; - collectionTime = $current.collectionTime; - allTests = $allTestResults; - ignored = $ignoredList - } -} - -<# -.SYNOPSIS -Writes short errors to the CI logs. - -.DESCRIPTION -write_errors_for_summary takes a hashtable from triplets to combine_results -objects, and writes short errors to the CI logs. - -.PARAMETER complete_results -A hashtable from triplets to combine_results objects. -#> -function write_errors_for_summary { - [CmdletBinding()] - Param( - $complete_results - ) - - $failure_found = $false - - Write-Verbose "preparing error output for Azure Devops" - - foreach ($triplet in $complete_results.Keys) { - $triplet_results = $complete_results[$triplet] - - Write-Verbose "searching $triplet triplet" - - # add each port results - foreach ($testName in $triplet_results.allTests.Keys) { - $test = $triplet_results.allTests[$testName] - - Write-Verbose "checking $($testName):$triplet $($test.result)" - - if ($test.result -eq 'Fail') { - if (($test.currentResult) -eq "pass" -and $passingIsPassing) { - continue; - } - - $failure_found = $true - if ($test.currentResult -eq "pass") { - [System.Console]::Error.WriteLine( ` - "PASSING, REMOVE FROM FAIL LIST: $($test.name):$triplet ($baselineFile)" ` - ) - } - else { - [System.Console]::Error.WriteLine( ` - "REGRESSION: $($test.name):$triplet. If expected, add $($test.name):$triplet=fail to $baselineFile." ` - ) - } - } - } - } -} - - -$complete_results = @{ } -Write-Verbose "looking for $triplet logs" - -# The standard name for logs is: -# .xml -# for example: -# x64-linux.xml - -$current_test_hash = build_test_results( Convert-Path "$logDir\$($triplet).xml" ) -$baseline_results = build_baseline_results -baselineFile $baselineFile -triplet $triplet - -if ($current_test_hash -eq $null) { - [System.Console]::Error.WriteLine("Missing $triplet test results in current test run") - $missing_triplets[$triplet] = "test" -} -else { - Write-Verbose "combining results..." - $complete_results[$triplet] = combine_results -baseline $baseline_results -current $current_test_hash -} - -Write-Verbose "done analyzing results" - -# emit error last. Unlike the table output this is going to be seen in the "status" section of the pipeline -# and needs to be formatted for a single line. -write_errors_for_summary -complete_results $complete_results diff --git a/external_imported/vcpkg/scripts/azure-pipelines/azure-pipelines-osx.yml b/external_imported/vcpkg/scripts/azure-pipelines/azure-pipelines-osx.yml deleted file mode 100644 index d2aa2ad92..000000000 --- a/external_imported/vcpkg/scripts/azure-pipelines/azure-pipelines-osx.yml +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (c) Microsoft Corporation. -# SPDX-License-Identifier: MIT -# -variables: - osx-pool: 'PrOsx-2021-07-27' - -jobs: -- template: osx/azure-pipelines.yml - parameters: - poolName: $(osx-pool) diff --git a/external_imported/vcpkg/scripts/azure-pipelines/azure-pipelines.yml b/external_imported/vcpkg/scripts/azure-pipelines/azure-pipelines.yml index 300a80a9c..4ef04aa9b 100644 --- a/external_imported/vcpkg/scripts/azure-pipelines/azure-pipelines.yml +++ b/external_imported/vcpkg/scripts/azure-pipelines/azure-pipelines.yml @@ -2,9 +2,9 @@ # SPDX-License-Identifier: MIT # variables: - windows-pool: 'PrWin-2021-12-14' - linux-pool: 'PrLin-2021-12-13' - osx-pool: 'PrOsx-2021-07-27' + windows-pool: 'PrWin-2022-03-09-1' + linux-pool: 'PrLin-2022-03-09-1' + osx-pool: 'PrOsx-2022-02-04' jobs: - template: windows/azure-pipelines.yml @@ -49,10 +49,9 @@ jobs: jobName: arm_uwp poolName: $(windows-pool) -- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: - - template: osx/azure-pipelines.yml - parameters: - poolName: $(osx-pool) +- template: osx/azure-pipelines.yml + parameters: + poolName: $(osx-pool) - template: linux/azure-pipelines.yml parameters: diff --git a/external_imported/vcpkg/scripts/azure-pipelines/generate-skip-list.ps1 b/external_imported/vcpkg/scripts/azure-pipelines/generate-skip-list.ps1 deleted file mode 100755 index 84b78b338..000000000 --- a/external_imported/vcpkg/scripts/azure-pipelines/generate-skip-list.ps1 +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright (c) Microsoft Corporation. -# SPDX-License-Identifier: MIT -# - -<# -.SYNOPSIS -Generates a list of ports to skip in the CI. - -.DESCRIPTION -generate-skip-list takes a triplet, and the path to the ci.baseline.txt -file, and generates a skip list string to pass to vcpkg. - -.PARAMETER Triplet -The triplet to find skipped ports for. - -.PARAMETER BaselineFile -The path to the ci.baseline.txt file. -#> -[CmdletBinding()] -Param( - [string]$Triplet, - [string]$BaselineFile, - [switch]$SkipFailures = $false -) - -$ErrorActionPreference = 'Stop' - -if (-not (Test-Path -Path $BaselineFile)) { - Write-Error "Unable to find baseline file $BaselineFile" - throw -} - -#read in the file, strip out comments and blank lines and spaces -$baselineListRaw = Get-Content -Path $BaselineFile ` - | Where-Object { -not ($_ -match "\s*#") } ` - | Where-Object { -not ( $_ -match "^\s*$") } ` - | ForEach-Object { $_ -replace "\s" } - -############################################################### -# This script is running at the beginning of the CI test, so do a little extra -# checking so things can fail early. - -#verify everything has a valid value -$missingValues = $baselineListRaw | Where-Object { -not ($_ -match "=\w") } - -if ($missingValues) { - Write-Error "The following are missing values: $missingValues" - throw -} - -$invalidValues = $baselineListRaw ` - | Where-Object { -not ($_ -match "=(skip|pass|fail|ignore)$") } - -if ($invalidValues) { - Write-Error "The following have invalid values: $invalidValues" - throw -} - -$baselineForTriplet = $baselineListRaw ` - | Where-Object { $_ -match ":$Triplet=" } - -# Verify there are no duplicates (redefinitions are not allowed) -$file_map = @{ } -foreach ($port in $baselineForTriplet | ForEach-Object { $_ -replace ":.*$" }) { - if ($null -ne $file_map[$port]) { - Write-Error ` - "$($port):$($Triplet) has multiple definitions in $baselineFile" - throw - } - $file_map[$port] = $true -} - -# Format the skip list for the command line -if ($SkipFailures) { - $targetRegex = "=(?:skip|fail)$" -} else { - $targetRegex = "=skip$" -} - -$skip_list = $baselineForTriplet ` - | Where-Object { $_ -match $targetRegex } ` - | ForEach-Object { $_ -replace ":.*$" } -[string]::Join(",", $skip_list) 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 0025750ee..5c50454b4 100644 --- a/external_imported/vcpkg/scripts/azure-pipelines/linux/azure-pipelines.yml +++ b/external_imported/vcpkg/scripts/azure-pipelines/linux/azure-pipelines.yml @@ -41,7 +41,7 @@ jobs: inputs: filePath: bootstrap-vcpkg.sh - task: PowerShell@2 - displayName: '*** Test Modified Ports and Prepare Test Logs ***' + displayName: '*** Test Modified Ports for x64-linux' inputs: failOnStderr: true filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' diff --git a/external_imported/vcpkg/scripts/azure-pipelines/linux/create-image.ps1 b/external_imported/vcpkg/scripts/azure-pipelines/linux/create-image.ps1 index 5eacd2b8c..d19bb673f 100644 --- a/external_imported/vcpkg/scripts/azure-pipelines/linux/create-image.ps1 +++ b/external_imported/vcpkg/scripts/azure-pipelines/linux/create-image.ps1 @@ -23,7 +23,7 @@ $ProtoVMName = 'PROTOTYPE' $ErrorActionPreference = 'Stop' $ProgressActivity = 'Creating Linux Image' -$TotalProgress = 9 +$TotalProgress = 11 $CurrentProgress = 1 Import-Module "$PSScriptRoot/../create-vmss-helpers.psm1" -DisableNameChecking @@ -104,6 +104,22 @@ New-AzVm ` -Location $Location ` -VM $VM +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Waiting 1 minute to let Azure VM customizations be applied' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +Start-Sleep -Seconds 60 + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Restarting VM' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +Restart-AzVm -ResourceGroupName $ResourceGroupName -Name $ProtoVMName + #################################################################################################### Write-Progress ` -Activity $ProgressActivity ` diff --git a/external_imported/vcpkg/scripts/azure-pipelines/linux/provision-image.sh b/external_imported/vcpkg/scripts/azure-pipelines/linux/provision-image.sh index 3abc8cb0f..d72c669cc 100755 --- a/external_imported/vcpkg/scripts/azure-pipelines/linux/provision-image.sh +++ b/external_imported/vcpkg/scripts/azure-pipelines/linux/provision-image.sh @@ -3,8 +3,10 @@ # SPDX-License-Identifier: MIT # -sudo apt -y update -sudo apt -y dist-upgrade +export DEBIAN_FRONTEND=noninteractive + +apt-get -y update +apt-get -y dist-upgrade # Install common build dependencies APT_PACKAGES="at curl unzip tar libxt-dev gperf libxaw7-dev cifs-utils \ build-essential g++ gfortran zip libx11-dev libxkbcommon-x11-dev libxi-dev \ @@ -54,7 +56,7 @@ APT_PACKAGES="$APT_PACKAGES libxdamage-dev" # Additionally required/installed by Azure DevOps Scale Set Agents APT_PACKAGES="$APT_PACKAGES liblttng-ust0 libkrb5-3 zlib1g libicu66" -sudo apt -y install $APT_PACKAGES +apt-get -y install $APT_PACKAGES # Install newer version of nasm than the apt package, required by intel-ipsec mkdir /tmp/nasm @@ -63,24 +65,24 @@ curl -O https://www.nasm.us/pub/nasm/releasebuilds/2.15.05/nasm-2.15.05.tar.gz tar -xf nasm-2.15.05.tar.gz cd nasm-2.15.05/ ./configure --prefix=/usr && make -j -sudo make install +make install cd ~ # Install the latest Haskell stack -curl -sSL https://get.haskellstack.org/ | sudo sh +curl -sSL https://get.haskellstack.org/ | sh # Install CUDA wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-ubuntu2004.pin -sudo mv cuda-ubuntu2004.pin /etc/apt/preferences.d/cuda-repository-pin-600 -sudo apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/7fa2af80.pub -sudo add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/ /" -sudo apt -y update -sudo apt install -y --no-install-recommends cuda-compiler-11-3 cuda-libraries-dev-11-3 cuda-driver-dev-11-3 \ - cuda-cudart-dev-11-3 libcublas-11-3 libcurand-dev-11-3 libcudnn8-dev libnccl2 libnccl-dev +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 # Install PowerShell wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb -sudo dpkg -i packages-microsoft-prod.deb -sudo apt update -sudo add-apt-repository universe -sudo apt install -y powershell +dpkg -i packages-microsoft-prod.deb +apt-get update +add-apt-repository universe +apt-get install -y powershell diff --git a/external_imported/vcpkg/scripts/azure-pipelines/osx/Get-InternalBaseBox.ps1 b/external_imported/vcpkg/scripts/azure-pipelines/osx/Get-InternalBaseBox.ps1 deleted file mode 100755 index 5264d2ecb..000000000 --- a/external_imported/vcpkg/scripts/azure-pipelines/osx/Get-InternalBaseBox.ps1 +++ /dev/null @@ -1,68 +0,0 @@ -#!pwsh -#Requires -Version 6.0 - -<# -.SYNOPSIS -Installs the base box at the specified version from the share. - -.PARAMETER FileshareMachine -The machine which is acting as a fileshare - -.PARAMETER BoxVersion -The version of the box to add. Defaults to latest if nothing is passed. -#> -[CmdletBinding()] -Param( - [Parameter(Mandatory=$True)] - [String]$FileshareMachine, - - [Parameter()] - [String]$BoxVersion -) - -Set-StrictMode -Version 2 - -if (-not $IsMacOS) { - throw 'This script should only be run on a macOS host' -} - -$mountPoint = '/Users/vcpkg/vagrant/share' - -if (mount | grep "on $mountPoint (") { - umount $mountPoint - if (-not $?) { - Write-Error "umount $mountPoint failed with return code $LASTEXITCODE." - throw - } -} - -sshfs "fileshare@${FileshareMachine}:/Users/fileshare/share" $mountPoint -if ($LASTEXITCODE -eq 1) { - Write-Error 'sshfs returned 1. -This means that the osxfuse kernel extension was not allowed to load. -You may need to force un/reinstall osxfuse and/or sshfs with - brew uninstall osxfuse - brew uninstall sshfs - brew install osxfuse - brew install sshfs -Then, rerun this script. - -If you''ve already done that, Please open -System Preferences > Security & Privacy > General, -and allow the kernel extension to load. -Then, rerun this script. - -If you''ve already done this, you probably need to add your ssh keys to the fileshare machine.' - throw -} elseif (-not $?) { - Write-Error "sshfs failed with return code $LASTEXITCODE." - throw -} - -if (-not [String]::IsNullOrEmpty($BoxVersion)) { - $versionArgs = @("--box-version", $BoxVersion) -} else { - $versionArgs = @() -} - -vagrant box add "$mountPoint/vcpkg-boxes/macos-ci.json" @versionArgs diff --git a/external_imported/vcpkg/scripts/azure-pipelines/osx/Install-Prerequisites.ps1 b/external_imported/vcpkg/scripts/azure-pipelines/osx/Install-Prerequisites.ps1 index 120202583..979c41a74 100755 --- a/external_imported/vcpkg/scripts/azure-pipelines/osx/Install-Prerequisites.ps1 +++ b/external_imported/vcpkg/scripts/azure-pipelines/osx/Install-Prerequisites.ps1 @@ -65,8 +65,19 @@ Installing anyways." Get-RemoteFile -OutFile $pathToDmg -Uri $_.DmgUrl -Sha256 $_.Sha256 hdiutil attach $pathToDmg -mountpoint /Volumes/setup-installer - sudo installer -pkg "/Volumes/setup-installer/$($_.InstallerPath)" -target / - hdiutil detach /Volumes/setup-installer + + if ($null -ne (Get-Member -InputObject $_ -Name 'InstallationCommands')) { + $_.InstallationCommands | % { + Write-Host "> $($_ -join ' ')" + & $_[0] $_[1..$_.Length] | Write-Host + } + } elseif ($null -ne (Get-Member -InputObject $_ -Name 'InstallerPath')) { + sudo installer -pkg "/Volumes/setup-installer/$($_.InstallerPath)" -target / + hdiutil detach /Volumes/setup-installer + } else { + Write-Error "$($_.Name) installer object has a DmgUrl, but neither an InstallerPath nor an InstallationCommands" + throw + } } elseif ($null -ne (Get-Member -InputObject $_ -Name 'PkgUrl')) { $pathToPkg = "~/Downloads/$($_.Name).pkg" Get-RemoteFile -OutFile $pathToPkg -Uri $_.PkgUrl -Sha256 $_.Sha256 @@ -78,21 +89,6 @@ Installing anyways." } } -$Installables.Brew | ForEach-Object { - $installable = $_ - if ($null -eq (Get-Member -InputObject $installable -Name 'Kind')) { - brew install $installable.Name - } else { - switch ($installable.Kind) { - 'cask' { brew install --cask $installable.Name } - default { - Write-Error "Invalid kind: $_. Expected either empty, or 'cask'." - } - } - } -} -brew upgrade - $installedVagrantPlugins = @{} vagrant plugin list --machine-readable | ForEach-Object { $timestamp, $target, $type, $data = $_ -split ',' diff --git a/external_imported/vcpkg/scripts/azure-pipelines/osx/README.md b/external_imported/vcpkg/scripts/azure-pipelines/osx/README.md index 9d6fb40b7..9dffe7249 100644 --- a/external_imported/vcpkg/scripts/azure-pipelines/osx/README.md +++ b/external_imported/vcpkg/scripts/azure-pipelines/osx/README.md @@ -5,102 +5,30 @@ - [`vcpkg-eg-mac` VMs](#vcpkg-eg-mac-vms) - [Table of Contents](#table-of-contents) - [Basic Usage](#basic-usage) + - [Creating a new Vagrant box](#creating-a-new-vagrant-box) + - [VM Software Versions](#vm-software-versions) + - [Creating a New Azure Agent Pool](#creating-a-new-azure-agent-pool) + - [Running the VM](#running-the-vm) + - [Getting an Azure Pipelines PAT](#getting-an-azure-pipelines-pat) - [Setting up a new macOS machine](#setting-up-a-new-macos-machine) - - [Troubleshooting](#troubleshooting) - - [Creating a new Vagrant box](#creating-a-new-vagrant-box) - - [VM Software Versions](#vm-software-versions) - - [(Internal) Accessing the macOS fileshare](#internal-accessing-the-macos-fileshare) + - [Troubleshooting](#troubleshooting) + - [(Internal) Accessing the macOS fileshare](#internal-accessing-the-macos-fileshare) ## Basic Usage -The simplest usage, and one which should be used for when spinning up -new VMs, and when restarting old ones, is a simple: +The most common operation here is to set up a new VM for Azure +pipelines; we try to make that operation as easy as possible. +It should take all of three steps, assuming the machine is +already set up (or read [these instructions] for how to set up a machine): -``` -$ cd ~/vagrant/vcpkg-eg-mac -$ vagrant up -``` - -Any modifications to the machines should be made in `configuration/Vagrantfile` -and `Setup-VagrantMachines.ps1`, and make sure to push any changes! - -## Setting up a new macOS machine - -Before anything else, one must download `brew` and `powershell`. - -```sh -$ /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" -$ brew cask install powershell -``` - -Then, we need to download the `vcpkg` repository: - -```sh -$ git clone https://github.com/microsoft/vcpkg -``` - -Then, we need to mint an SSH key: - -```sh -$ ssh-keygen -$ cat .ssh/id_rsa.pub -``` - -Add that SSH key to `authorized_keys` on the file share machine with the base box. - -Next, install prerequisites and grab the current base box with: -```sh -$ cd vcpkg/scripts/azure-pipelines/osx -$ ./Install-Prerequisites.ps1 -Force -$ ./Get-InternalBaseBox.ps1 -FileshareMachine vcpkgmm-01.guest.corp.microsoft.com -BoxVersion 2020-09-28 -``` - -... where -BoxVersion is the version you want to use. - -Getting the base box will fail due to missing kernel modules for osxfuse, sshfs, and/or VirtualBox. -Log in to the machine, open System Preferences > Security & Privacy > General, and allow the kernel -extensions for VirtualBox and sshfs to load. Then, again: - -```sh -$ ./Get-InternalBaseBox.ps1 -FileshareMachine vcpkgmm-01.guest.corp.microsoft.com -BoxVersion 2020-09-28 -``` - -Replace `XX` with the number of -the virtual machine. Generally, that should be the same as the number -for the physical machine; i.e., vcpkgmm-04 would use 04. - -```sh - # NOTE: you may get an error about CoreCLR; see the following paragraph if you do -$ ./Setup-VagrantMachines.ps1 \ - -MachineId XX \ - -DevopsPat '' \ - -Date -$ cd ~/vagrant/vcpkg-eg-mac -$ vagrant up -``` - -If you see the following error: - -``` -Failed to initialize CoreCLR, HRESULT: 0x8007001F -``` - -You have to reboot the machine; run - -```sh -$ sudo shutdown -r now -``` - -and wait for the machine to start back up. Then, start again from where the error was emitted. - -### Troubleshooting - -The following are issues that we've run into: +1. [Create a new vagrant box](#creating-a-new-vagrant-box) +2. [Create a new agent pool](#creating-a-new-azure-agent-pool) +3. [Setup and run the vagrant VM](#running-the-vm) +4. Update `azure-pipelines.yml` and `azure-pipelines-osx.yml` to point to the new macOS pool. -- (with a Parallels box) `vagrant up` doesn't work, and vagrant gives the error that the VM is `'stopped'`. - - Try logging into the GUI with the KVM, and retrying `vagrant up`. +[these instructions]: #setting-up-a-new-macos-machine -## Creating a new Vagrant box +### Creating a new Vagrant box Whenever we want to install updated versions of the command line tools, or of macOS, we need to create a new vagrant box. @@ -111,15 +39,17 @@ you can set up your own vagrant boxes that are the same as ours by doing the fol You'll need some prerequisites: -- vagrant - found at - - The vagrant-parallels plugin - `vagrant plugin install vagrant-parallels` -- Parallels - found at - An Xcode installer - you can get this from Apple's developer website, although you'll need to sign in first: +- The software installed by `Install-Prerequisites.ps1` + +If you're updating the CI pool, make sure you update macOS. First, you'll need to create a base VM; this is where you determine what version of macOS is installed. -Just follow the Parallels process for creating a macOS VM. +Follow the Parallels process for creating a macOS VM; this involves +updating to whatever version, and then scrolling right until you find +"Install macOS from recovery partition". Once you've done this, you can run through the installation of macOS onto a new VM. You should set the username to `vagrant`. @@ -191,39 +121,138 @@ Once you've done that, add the software versions under [VM Software Versions](#v [base-box-instructions]: https://parallels.github.io/vagrant-parallels/docs/boxes/base.html -### VM Software Versions +#### VM Software Versions -* 2020-09-28: - * macOS: 10.15.6 - * Xcode CLTs: 12 -* 2021-04-16: - * macOS: 11.2.3 - * Xcode CLTs: 12.4 +* 2022-02-04 (minor update to 2022-01-03) + * macOS: 12.1 + * Xcode CLTs: 13.2 +* 2022-01-03: + * macOS: 12.1 + * Xcode CLTs: 13.2 * 2021-07-27: * macOS: 11.5.1 * Xcode CLTs: 12.5.1 +* 2021-04-16: + * macOS: 11.2.3 + * Xcode CLTs: 12.4 +* 2020-09-28: + * macOS: 10.15.6 + * Xcode CLTs: 12 -### (Internal) Accessing the macOS fileshare +### Creating a New Azure Agent Pool -The fileshare is located on `vcpkgmm-01`, under the `fileshare` user, in the `share` directory. -In order to get `sshfs` working on the physical machine, -You can run `Install-Prerequisites.ps1` to grab the right software, then either: +When updating the macOS machines to a new version, you'll need to create +a new agent pool for the machines to join. The standard for this is to +name it `PrOsx-YYYY-MM-DD`, with `YYYY-MM-DD` the day that the process +is started. + +In order to create a new agent pool, go to the `vcpkg/public` project; +go to `Project settings`, then go to `Agent pools` under `Pipelines`. +Add a new self-hosted pool, name it as above, and make certain to check +the box for "Grant access permission to all pipelines". + +Once you've done this, you are done; you can start adding new machines +to the pool! + +### Running the VM + +First, make sure that your software is up to date: +```sh +$ cd ~/vcpkg +$ git fetch +$ git switch -d origin/master +$ ./scripts/azure-pipelines/osx/Install-Prerequisites.ps1 +``` + +as well as checking to make sure macOS is up to date. + +Then, follow the instructions for [accessing ~/vagrant/share][access-fileshare]. + +And finally, [grab a PAT], update the vagrant box, set up the VM, and run it: +```sh +$ vagrant box remove -f vcpkg/macos-ci # This won't do anything if the machine never had a box before +$ vagrant box add ~/vagrant/share/boxes/macos-ci.json +$ ~/vcpkg/scripts/azure-pipelines/osx/Setup-VagrantMachines.ps1 -Date -DevopsPat +$ cd ~/vagrant/vcpkg-eg-mac +$ vagrant up # if this fails, reboot through the kvm and/or log in interactively, then come back here +``` + +[grab a PAT]: #getting-an-azure-pipelines-pat + +## Getting an Azure Pipelines PAT + +Personal Access Tokens are an important part of this process, +and they are fairly easy to generate. +On ADO, under the correct project (in vcpkg's case, "vcpkg"), +click on the "User Settings" icon, then go to "Personal access tokens". +It is the icon to the left of your user icon, in the top right corner. + +Then, create a new token, give it a name, make sure it expires quickly, +and give it a custom defined scope that includes the +"Agent pools: Read & manage" permission (you'll need to "Show all scopes" +to access this). +You can now copy this token and use it to allow machines to join. + +## Setting up a new macOS machine + +Before anything else, one must download `brew` and `powershell`. + +```sh +$ /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" +$ brew cask install powershell +``` + +Then, we need to download the `vcpkg` repository: + +```sh +$ git clone https://github.com/microsoft/vcpkg +``` + +Then, we need to mint an SSH key: ```sh -$ mkdir vagrant/share -$ sshfs fileshare@:/Users/fileshare/share vagrant/share +$ ssh-keygen +$ cat .ssh/id_rsa.pub ``` -or you can just run +Add that SSH key to `authorized_keys` on the file share machine with the base box. +Next, install prerequisites: ```sh -$ ./Get-InternalBaseBox.ps1 +$ cd vcpkg/scripts/azure-pipelines/osx +$ ./Install-Prerequisites.ps1 -Force ``` -which will do the thing automatically. +And finally, make sure you can [access ~/vagrant/share][access-fileshare]. + +## Troubleshooting + +The following are issues that we've run into: + +- (with a Parallels box) `vagrant up` doesn't work, and vagrant gives the error that the VM is `'stopped'`. + - Try logging into the GUI with the KVM, and retrying `vagrant up`. +- (when running a powershell script) The error `Failed to initialize CoreCLR, HRESULT: 0x8007001F` is printed. + - Reboot the machine; run + ```sh + $ sudo shutdown -r now + ``` + and wait for the machine to start back up. Then, start again from where the error was emitted. + +## (Internal) Accessing the macOS fileshare + +The fileshare is located on `vcpkgmm-01`, under the `fileshare` user, in the `share` directory. +In order to get `sshfs` working on the physical machine, +You can run `Install-Prerequisites.ps1` to grab the right software, then either: + +```sh +$ mkdir -p ~/vagrant/share +$ sshfs fileshare@vcpkgmm-01:share ~/vagrant/share +``` If you get an error, that means that gatekeeper has prevented the kernel extension from loading, so you'll need to access the GUI of the machine, go to System Preferences, Security & Privacy, General, unlock the settings, and allow system extensions from the osxfuse developer to run. -Then, you'll be able to add the fileshare as an sshfs. +Then, you'll be able to add ~/vagrant/share as an sshfs. + +[access-fileshare]: #internal-accessing-the-macos-fileshare diff --git a/external_imported/vcpkg/scripts/azure-pipelines/osx/Setup-VagrantMachines.ps1 b/external_imported/vcpkg/scripts/azure-pipelines/osx/Setup-VagrantMachines.ps1 index 88b64594a..eb978d42c 100755 --- a/external_imported/vcpkg/scripts/azure-pipelines/osx/Setup-VagrantMachines.ps1 +++ b/external_imported/vcpkg/scripts/azure-pipelines/osx/Setup-VagrantMachines.ps1 @@ -92,14 +92,16 @@ if ([String]::IsNullOrEmpty($MachineId)) { } if (Test-Path '~/vagrant/vcpkg-eg-mac') { + Write-Host 'Deleting existing directories' + Push-Location '~/vagrant/vcpkg-eg-mac' - try { - Write-Host 'Deleting existing directories' - vagrant destroy -f - Remove-Item -Recurse -Force -LiteralPath '~/vagrant/vcpkg-eg-mac' | Out-Null - } finally { - Pop-Location + vagrant destroy -f + if (-not $?) { + throw "Failed to destroy vagrant VM." } + Pop-Location + + Remove-Item -Recurse -Force -LiteralPath '~/vagrant/vcpkg-eg-mac' | Out-Null } Write-Host 'Creating new directories' 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 874982618..ce5c095d2 100644 --- a/external_imported/vcpkg/scripts/azure-pipelines/osx/azure-pipelines.yml +++ b/external_imported/vcpkg/scripts/azure-pipelines/osx/azure-pipelines.yml @@ -35,11 +35,11 @@ jobs: exit 0 displayName: 'Create ${{ variables.VCPKG_DOWNLOADS }}' - task: Bash@3 - displayName: 'Build vcpkg' + displayName: 'Bootstrap vcpkg' inputs: filePath: bootstrap-vcpkg.sh - task: PowerShell@2 - displayName: '*** Test Modified Ports and Prepare Test Logs ***' + displayName: '*** Test Modified Ports for x64-osx' inputs: failOnStderr: true filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' diff --git a/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/Vagrantfile-vm.rb b/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/Vagrantfile-vm.rb index ed689ab7b..0b2df0219 100644 --- a/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/Vagrantfile-vm.rb +++ b/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/Vagrantfile-vm.rb @@ -3,14 +3,14 @@ configuration = JSON.parse(File.read("#{__dir__}/vagrant-configuration.json")) server = { - :hostname => configuration['machine_name'], + :machine_name => configuration['machine_name'], :box => configuration['box_name'], :box_version => configuration['box_version'], - :ram => 12000, + :ram => 24000, :cpu => 11 } -azure_agent_url = 'https://vstsagentpackage.azureedge.net/agent/2.185.1/vsts-agent-osx-x64-2.185.1.tar.gz' +azure_agent_url = 'https://vstsagentpackage.azureedge.net/agent/2.198.3/vsts-agent-osx-x64-2.198.3.tar.gz' devops_url = configuration['devops_url'] agent_pool = configuration['agent_pool'] pat = configuration['pat'] @@ -18,7 +18,6 @@ Vagrant.configure('2') do |config| config.vm.box = server[:box] config.vm.box_version = server[:box_version] - config.vm.hostname = server[:hostname] config.vm.synced_folder '.', '/vagrant', disabled: true config.vm.provider 'parallels' do |prl| @@ -53,7 +52,7 @@ --work ~/Data/work \ --auth pat --token #{pat} \ --pool #{agent_pool} \ - --agent `hostname` \ + --agent #{server[:machine_name]} \ --replace \ --acceptTeeEula", privileged: false diff --git a/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/installables.json b/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/installables.json index 179b03f15..3ae97f355 100644 --- a/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/installables.json +++ b/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/installables.json @@ -6,18 +6,33 @@ "Name": "vagrant", "VersionCommand": [ "vagrant", "-v" ], "VersionRegex": "Vagrant (.*)", - "Version": "2.2.18", - "DmgUrl": "https://releases.hashicorp.com/vagrant/2.2.18/vagrant_2.2.18_x86_64.dmg", - "Sha256": "B4E8103AABDF29F18F592CD6DE4FA03BF182FBC192A0757B5E18156CB18FA672", + "Version": "2.2.19", + "DmgUrl": "https://releases.hashicorp.com/vagrant/2.2.19/vagrant_2.2.19_x86_64.dmg", + "Sha256": "6307BE217813A11C9E106448BF232803031E434A08C8B2DF8C62FDC9E8543845", "InstallerPath": "vagrant.pkg" }, + { + "Name": "Parallels", + "VersionCommand": [ "cat", "/Applications/Parallels Desktop.app/Contents/Info.plist" ], + "VersionRegex": "CFBundleShortVersionString[\\n\\t ]*([0-9.]+)", + "Version": "17.1.1", + "DmgUrl": "https://download.parallels.com/desktop/v17/17.1.1-51537/ParallelsDesktop-17.1.1-51537.dmg", + "Sha256": "BD7BE2DF4D1B3508C127CF1D9C1EF93CDDA63384BCF3893A77FBC9F1169765A9", + "InstallationCommands": [ + [ "bash", "-c", "ps x | grep 'Parallels Desktop' | grep -v 'grep' | sed -E 's/^ *([0-9]+).*(\\/Applications.*)$/\\1: \\2/'" ], + [ "bash", "-c", "ps x | grep 'Parallels Desktop' | grep -v 'grep' | sed -E 's/^ *([0-9]+).*$/\\1/' | xargs -p kill" ], + [ "sudo", "rm", "-rf", "/Applications/Parallels Desktop.app" ], + [ "sudo", "cp", "-r", "/Volumes/setup-installer/Parallels Desktop.app", "/Applications" ], + [ "sudo", "/Applications/Parallels Desktop.app/Contents/MacOS/inittool2", "init", "-b", "/Applications/Parallels Desktop.app" ] + ] + }, { "Name": "osxfuse", "VersionCommand": [ "cat", "/Library/Filesystems/macfuse.fs/Contents/version.plist" ], "VersionRegex": "CFBundleVersion[\\n\\t ]*([0-9.]+)", - "Version": "4.1.2", - "DmgUrl": "https://github.com/osxfuse/osxfuse/releases/download/macfuse-4.1.2/macfuse-4.1.2.dmg", - "Sha256": "9FF344DE38BAD5AC5ECA5194DA00A2BA35DD6AFDB9039133B5446168F8EDAFDB", + "Version": "4.2.4", + "DmgUrl": "https://github.com/osxfuse/osxfuse/releases/download/macfuse-4.2.4/macfuse-4.2.4.dmg", + "Sha256": "82A2C30B3A7BF56AA2755C0C192FB50D9EECC3FE42505AB4E8679B50306188BD", "InstallerPath": "Install macFUSE.pkg" }, { @@ -29,12 +44,10 @@ "Sha256": "F8F4F71814273EA42DBE6CD92199F7CFF418571FFD1B10C0608878D3472D2162" } ], - "Brew": [ - ], "VagrantPlugins": [ { "Name": "vagrant-parallels", - "Version": "2.2.3" + "Version": "2.2.4" } ] } diff --git a/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/installables.schema.json b/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/installables.schema.json index b7ec7ae80..6237243c2 100644 --- a/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/installables.schema.json +++ b/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/installables.schema.json @@ -9,7 +9,6 @@ }, "required": [ "Applications", - "Brew", "VagrantPlugins" ], "properties": { @@ -48,22 +47,6 @@ } } }, - "Brew": { - "type": "array", - "items": { - "type": "object", - "required": [ "Name" ], - "properties": { - "Name": { - "type": "string" - }, - "Kind": { - "type": "string", - "enum": [ "cask" ] - } - } - } - }, "VagrantPlugins": { "type": "array", "items": { 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 d800c257a..45917784a 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,7 +1,8 @@ { - "$schema": "./vagrant-vm-configuration.schema.json", + "$schema": "./vagrant-box-configuration.schema.json", "brew": [ "autoconf", + "autoconf-archive", "automake", "bison", "gettext", @@ -13,6 +14,7 @@ "mono", "nasm", "pkg-config", + "texinfo", "yasm" ], "brew-cask": [ 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 5126c9080..4fb4a180b 100755 --- a/external_imported/vcpkg/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/external_imported/vcpkg/scripts/azure-pipelines/test-modified-ports.ps1 @@ -83,7 +83,7 @@ $commonArgs = @( ) $cachingArgs = @() -$skipFailures = $false +$skipFailuresArg = @() if ([string]::IsNullOrWhiteSpace($BinarySourceStub)) { $cachingArgs = @('--no-binarycaching') } else { @@ -94,7 +94,7 @@ if ([string]::IsNullOrWhiteSpace($BinarySourceStub)) { } elseif ($BuildReason -eq 'PullRequest') { Write-Host 'Build reason was Pull Request, using binary caching in read write mode, skipping failures.' - $skipFailures = $true + $skipFailuresArg = @('--skip-failures') } else { Write-Host "Build reason was $BuildReason, using binary caching in write only mode." @@ -136,39 +136,37 @@ if ($LASTEXITCODE -ne 0) throw "vcpkg clean failed" } -$skipList = . "$PSScriptRoot/generate-skip-list.ps1" ` - -Triplet $Triplet ` - -BaselineFile "$PSScriptRoot/../ci.baseline.txt" ` - -SkipFailures:$skipFailures - -$hostArgs = @() -if ($Triplet -in @('x64-windows', 'x64-osx', 'x64-linux')) -{ - # WORKAROUND: These triplets are native-targetting which triggers an issue in how vcpkg handles the skip list. - # The workaround is to pass the skip list as host-excludes as well. - $hostArgs = @("--host-exclude=$skipList") -} - $parentHashes = @() if (($BuildReason -eq 'PullRequest') -and -not $NoParentHashes) { # Prefetch tools for better output - & "./vcpkg$executableExtension" fetch cmake - & "./vcpkg$executableExtension" fetch ninja - & "./vcpkg$executableExtension" fetch git + foreach ($tool in @('cmake', 'ninja', 'git')) { + & "./vcpkg$executableExtension" fetch $tool + if ($LASTEXITCODE -ne 0) + { + throw "Failed to fetch $tool" + } + } Write-Host "Determining parent hashes using HEAD~1" - $parentHashesFile = Join-Path $WorkingRoot 'parent-hashes.json' + $parentHashesFile = Join-Path $ArtifactStagingDirectory 'parent-hashes.json' $parentHashes = @("--parent-hashes=$parentHashesFile") - & git revert -n -m 1 HEAD - & "./vcpkg$executableExtension" ci $Triplet --dry-run --exclude=$skipList @hostArgs @commonArgs --no-binarycaching "--output-hashes=$parentHashesFile" ` - | ForEach-Object { if ($_ -match ' dependency information| determine pass') { Write-Host $_ } } - & git reset --hard HEAD + & git revert -n -m 1 HEAD | Out-Null + # The vcpkg.cmake toolchain file is not part of ABI hashing, + # but changes must trigger at least some testing. + Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake" + Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake-user" + & "./vcpkg$executableExtension" ci "--triplet=$Triplet" --dry-run "--ci-baseline=$PSScriptRoot/../ci.baseline.txt" @commonArgs --no-binarycaching "--output-hashes=$parentHashesFile" Write-Host "Running CI using parent hashes" + & git reset --hard HEAD } -& "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --failure-logs=$failureLogs @hostArgs @commonArgs @cachingArgs @parentHashes +# The vcpkg.cmake toolchain file is not part of ABI hashing, +# but changes must trigger at least some testing. +Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake" +Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake-user" +& "./vcpkg$executableExtension" ci "--triplet=$Triplet" --x-xunit=$xmlFile --failure-logs=$failureLogs "--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" @@ -177,8 +175,3 @@ if ($LASTEXITCODE -ne 0) { throw "vcpkg ci failed" } - -& "$PSScriptRoot/analyze-test-results.ps1" -logDir $xmlResults ` - -triplet $Triplet ` - -baselineFile .\scripts\ci.baseline.txt ` - -passingIsPassing:$PassingIsPassing 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 346e2bcf3..bac59834b 100644 --- a/external_imported/vcpkg/scripts/azure-pipelines/windows-unstable/job.yml +++ b/external_imported/vcpkg/scripts/azure-pipelines/windows-unstable/job.yml @@ -86,18 +86,3 @@ jobs: PathtoPublish: '$(Build.ArtifactStagingDirectory)\failure-logs' ArtifactName: 'failure logs for ${{ parameters.triplet }}' condition: always() - - task: PowerShell@2 - displayName: 'Build a file list for all packages' - condition: always() - inputs: - targetType: inline - script: | - ./vcpkg.exe fetch python3 - & $(.\vcpkg fetch python3) .\scripts\file_script.py D:\installed\vcpkg\info\ - pwsh: true - - task: PublishBuildArtifacts@1 - displayName: 'Publish Artifact: file lists for ${{ parameters.triplet }}' - condition: always() - inputs: - PathtoPublish: scripts/list_files - ArtifactName: 'file lists for ${{ parameters.triplet }}' diff --git a/external_imported/vcpkg/scripts/azure-pipelines/windows-unstable/rearrange-msvc-drop-layout.ps1 b/external_imported/vcpkg/scripts/azure-pipelines/windows-unstable/rearrange-msvc-drop-layout.ps1 index d409bc208..53692532e 100644 --- a/external_imported/vcpkg/scripts/azure-pipelines/windows-unstable/rearrange-msvc-drop-layout.ps1 +++ b/external_imported/vcpkg/scripts/azure-pipelines/windows-unstable/rearrange-msvc-drop-layout.ps1 @@ -20,7 +20,7 @@ param( Set-StrictMode -Version Latest -$MSVCRoot = "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC" +$MSVCRoot = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC" $ErrorActionPreference = "Stop" @@ -54,7 +54,7 @@ Move-Item "$DropRoot\binaries.x86$BuildType\atlmfc\include" "$tempRoot\atlmfc\in Move-Item "$DropRoot\binaries.x86$BuildType\atlmfc\lib\i386" "$tempRoot\atlmfc\lib\x86" Move-Item "$DropRoot\binaries.amd64$BuildType\atlmfc\lib\amd64" "$tempRoot\atlmfc\lib\x64" -$toolsets = Get-ChildItem -Path $MSVCRoot -Directory | Sort-Object -Descending +[string[]]$toolsets = Get-ChildItem -Path $MSVCRoot -Directory | Sort-Object -Descending if ($toolsets.Length -eq 0) { throw "Could not find Visual Studio toolset!" } 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 60ba6fa1b..de254db64 100644 --- a/external_imported/vcpkg/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/external_imported/vcpkg/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -8,7 +8,7 @@ jobs: name: ${{ parameters.poolName }} workspace: clean: resources - timeoutInMinutes: 1440 # 1 day + timeoutInMinutes: 2880 # 2 days variables: - name: WORKING_ROOT value: D:\ @@ -62,7 +62,7 @@ jobs: PathtoPublish: '$(DiffFile)' ArtifactName: 'format.diff' - task: PowerShell@2 - displayName: '*** Test Modified Ports and Prepare Test Logs ***' + displayName: '*** Test Modified Ports for ${{ parameters.triplet }}' inputs: failOnStderr: true filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' 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 21fb8c19a..5d07c5994 100644 --- a/external_imported/vcpkg/scripts/azure-pipelines/windows/create-image.ps1 +++ b/external_imported/vcpkg/scripts/azure-pipelines/windows/create-image.ps1 @@ -21,7 +21,7 @@ $VMSize = 'Standard_D32as_v4' $ProtoVMName = 'PROTOTYPE' $WindowsServerSku = '2022-datacenter-g2' $ErrorActionPreference = 'Stop' -$CudnnBaseUrl = 'https://vcpkgimageminting.blob.core.windows.net/assets/cudnn-11.2-windows-x64-v8.1.1.33.zip' +$CudnnBaseUrl = 'https://vcpkgimageminting.blob.core.windows.net/assets/cudnn-windows-x86_64-8.3.2.44_cuda11.5-archive.zip' $ProgressActivity = 'Creating Windows Image' $TotalProgress = 18 diff --git a/external_imported/vcpkg/scripts/azure-pipelines/windows/deploy-cuda.ps1 b/external_imported/vcpkg/scripts/azure-pipelines/windows/deploy-cuda.ps1 index ab1cc1c54..6a53c479c 100644 --- a/external_imported/vcpkg/scripts/azure-pipelines/windows/deploy-cuda.ps1 +++ b/external_imported/vcpkg/scripts/azure-pipelines/windows/deploy-cuda.ps1 @@ -7,17 +7,17 @@ # REPLACE WITH $CudnnUrl -$CudnnLocalZipPath = "$PSScriptRoot\cudnn-11.2-windows-x64-v8.1.1.33.zip" +$CudnnLocalZipPath = "$PSScriptRoot\cudnn-windows-x86_64-8.3.2.44_cuda11.5-archive.zip" -$CudaUrl = 'https://developer.download.nvidia.com/compute/cuda/11.3.0/network_installers/cuda_11.3.0_win10_network.exe' +$CudaUrl = 'https://developer.download.nvidia.com/compute/cuda/11.6.0/network_installers/cuda_11.6.0_windows_network.exe' -$CudaFeatures = 'nvcc_11.3 cuobjdump_11.3 nvprune_11.3 cupti_11.3 memcheck_11.3 nvdisasm_11.3 nvprof_11.3 ' + ` - 'visual_studio_integration_11.3 visual_profiler_11.3 visual_profiler_11.3 cublas_11.3 cublas_dev_11.3 ' + ` - 'cudart_11.3 cufft_11.3 cufft_dev_11.3 curand_11.3 curand_dev_11.3 cusolver_11.3 cusolver_dev_11.3 ' + ` - 'cusparse_11.3 cusparse_dev_11.3 npp_11.3 npp_dev_11.3 nvrtc_11.3 nvrtc_dev_11.3 nvml_dev_11.3 ' + ` - 'occupancy_calculator_11.3 thrust_11.3 ' +$CudaFeatures = 'nvcc_11.6 cuobjdump_11.6 nvprune_11.6 cupti_11.6 memcheck_11.6 nvdisasm_11.6 nvprof_11.6 ' + ` + 'visual_studio_integration_11.6 visual_profiler_11.6 visual_profiler_11.6 cublas_11.6 cublas_dev_11.6 ' + ` + 'cudart_11.6 cufft_11.6 cufft_dev_11.6 curand_11.6 curand_dev_11.6 cusolver_11.6 cusolver_dev_11.6 ' + ` + 'cusparse_11.6 cusparse_dev_11.6 npp_11.6 npp_dev_11.6 nvrtc_11.6 nvrtc_dev_11.6 nvml_dev_11.6 ' + ` + 'occupancy_calculator_11.6 thrust_11.6 ' -$destination = "$env:ProgramFiles\NVIDIA GPU Computing Toolkit\CUDA\v11.3" +$destination = "$env:ProgramFiles\NVIDIA GPU Computing Toolkit\CUDA\v11.6" try { Write-Host 'Downloading CUDA...' 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 45d8db3c1..a0b32cebb 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/17762/w_HPCKit_p_2021.2.0.2901_offline.exe' +$oneAPIHPCUrl = 'https://registrationcenter-download.intel.com/akdlm/irc_nas/18417/w_HPCKit_p_2022.1.0.93_offline.exe' # Possible oneAPI Base components: #intel.oneapi.win.vtune 2021.1.1-68 true Intel® VTune(TM) Profiler @@ -55,7 +55,7 @@ Function InstallInteloneAPI { Write-Host 'Extracting Intel oneAPI...to folder: ' $extractionPath $proc = Start-Process -FilePath $installerPath -ArgumentList @('-s ', '-x ', '-f ' + $extractionPath , '--log extract.log') -Wait -PassThru Write-Host 'Install Intel oneAPI...from folder: ' $extractionPath - $proc = Start-Process -FilePath $extractionPath/bootstrapper.exe -ArgumentList @('-s ', '--action install', "--components=$Components" , '--eula=accept', '--continue-with-optional-error=yes', '-p=NEED_VS2017_INTEGRATION=0', '-p=NEED_VS2019_INTEGRATION=0', '--log-dir=.') -Wait -PassThru + $proc = Start-Process -FilePath $extractionPath/bootstrapper.exe -ArgumentList @('-s ', '--action install', "--components=$Components" , '--eula=accept', '-p=NEED_VS2017_INTEGRATION=0', '-p=NEED_VS2019_INTEGRATION=0', '-p=NEED_VS2022_INTEGRATION=0', '--log-dir=.') -Wait -PassThru $exitCode = $proc.ExitCode if ($exitCode -eq 0) { Write-Host 'Installation successful!' 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 ecd8b5b41..332d68f92 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.0/PowerShell-7.2.0-win-x64.msi' +$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/PowerShell-7.2.1-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 c8f019605..2567d4c11 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 @@ -5,7 +5,7 @@ # REPLACE WITH UTILITY-PREFIX.ps1 -$VisualStudioBootstrapperUrl = 'https://aka.ms/vs/16/release/vs_enterprise.exe' +$VisualStudioBootstrapperUrl = 'https://aka.ms/vs/17/release/vs_enterprise.exe' $Workloads = @( 'Microsoft.VisualStudio.Workload.NativeDesktop', 'Microsoft.VisualStudio.Workload.Universal', @@ -14,7 +14,6 @@ $Workloads = @( 'Microsoft.VisualStudio.Component.VC.Tools.ARM64', 'Microsoft.VisualStudio.Component.VC.ATL', 'Microsoft.VisualStudio.Component.VC.ATLMFC', - 'Microsoft.VisualStudio.Component.VC.v141.x86.x64.Spectre', 'Microsoft.VisualStudio.Component.Windows10SDK.18362', 'Microsoft.VisualStudio.Component.Windows10SDK.19041', 'Microsoft.Net.Component.4.8.SDK', @@ -22,8 +21,6 @@ $Workloads = @( 'Microsoft.Component.NetFX.Native', 'Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset', 'Microsoft.VisualStudio.Component.VC.Llvm.Clang', - 'Microsoft.VisualStudio.Component.VC.v141.x86.x64', - 'Microsoft.VisualStudio.Component.VC.140', 'Microsoft.VisualStudio.ComponentGroup.UWP.VC.BuildTools' ) diff --git a/external_imported/vcpkg/scripts/boost/generate-ports.ps1 b/external_imported/vcpkg/scripts/boost/generate-ports.ps1 index 2c1ffb6f3..7c71e7ba2 100644 --- a/external_imported/vcpkg/scripts/boost/generate-ports.ps1 +++ b/external_imported/vcpkg/scripts/boost/generate-ports.ps1 @@ -24,6 +24,7 @@ else { # Clear this array when moving to a new boost version $portVersions = @{ #e.g. "boost-asio" = 1; + "boost-vcpkg-helpers" = 1; } $portData = @{ @@ -598,7 +599,7 @@ if ($updateServicePorts) { $files_with_boost_version = @( "$portsDir/boost-build/portfile.cmake", "$portsDir/boost-modular-build-helper/boost-modular-build.cmake", - "$portsDir/boost-vcpkg-helpers/boost-modular-headers.cmake" + "$portsDir/boost-vcpkg-helpers/portfile.cmake" ) $files_with_boost_version | % { $content = Get-Content -LiteralPath $_ ` diff --git a/external_imported/vcpkg/scripts/bootstrap.ps1 b/external_imported/vcpkg/scripts/bootstrap.ps1 index 6c98a9853..ea1edb8e8 100644 --- a/external_imported/vcpkg/scripts/bootstrap.ps1 +++ b/external_imported/vcpkg/scripts/bootstrap.ps1 @@ -45,9 +45,9 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root")) Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" -$versionDate = '2021-12-09' -if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64') { - & "$scriptsDir/tls12-download-arm64.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg-arm64.exe" "$vcpkgRootDir\vcpkg.exe" +$versionDate = '2022-03-30' +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 { & "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg.exe" "$vcpkgRootDir\vcpkg.exe" } diff --git a/external_imported/vcpkg/scripts/bootstrap.sh b/external_imported/vcpkg/scripts/bootstrap.sh index 846f297b6..474d56cfe 100644 --- a/external_imported/vcpkg/scripts/bootstrap.sh +++ b/external_imported/vcpkg/scripts/bootstrap.sh @@ -76,6 +76,8 @@ vcpkgCheckRepoTool() echo " sudo yum install curl zip unzip tar" echo "On SUSE Linux and derivatives:" echo " sudo zypper install curl zip unzip tar" + echo "On Arch Linux and derivatives:" + echo " sudo pacman -S curl zip unzip tar cmake ninja" echo "On Alpine:" echo " apk add build-base cmake ninja zip unzip curl git" echo " (and export VCPKG_FORCE_SYSTEM_BINARIES=1)" @@ -124,23 +126,23 @@ fi # Choose the vcpkg binary to download vcpkgDownloadTool="ON" -vcpkgToolReleaseTag="2021-12-09" +vcpkgToolReleaseTag="2022-03-30" if [ "$UNAME" = "Darwin" ]; then echo "Downloading vcpkg-macos..." - vcpkgToolReleaseSha="1b4870fb9215d2523f0e77ef6b26560213df455e5c7e31945e686ca5c9f97c44a29a4456906ab67184634b5ddc8d078de338770a092aa713e4664ae926a72369" + vcpkgToolReleaseSha="8bf65bc52b48c0c048c465036dfab60c0d6b84d2c61bf36c948b58d2da0a6f9f21b00dbc888fe5b163c275e901a0014482e50895ee607408cf533057b66a4e73" vcpkgToolName="vcpkg-macos" elif [ "$vcpkgUseMuslC" = "ON" ]; then echo "Downloading vcpkg-muslc..." - vcpkgToolReleaseSha="f9cf11ff8ce5c0e8d293c3b728c7936389a4fbc8f28ac84f65e4bc61e2983ec2ea46124b50848eec1e46d50fd8d3a104cd57b119e3e927c6527d2e3cad8bb5e9" + vcpkgToolReleaseSha="d5a0a67ef966b1db5ded37986ccabd8a6dc2531209e07945c32679faab45c0f001b95eef342e41f8937234e8efa6b038847b78f77c19d949a7d2aa7857b6a019" vcpkgToolName="vcpkg-muslc" elif [ "$ARCH" = "x86_64" ]; then echo "Downloading vcpkg-glibc..." - vcpkgToolReleaseSha="9a752ed38334a0a51ee1608d4acb57979ae788f09e884548b32e8c548e2da7d898783c7e86839ddbf2b83941ace231f4df77bd18879103548ec25541353c5832" + vcpkgToolReleaseSha="14dae353ce576e688cd93f0607f4eb7d724fb34f4c78c62d90db0c0fc4806e21c0da2b4fbe0b2a776ac3e8c669685e8d26990b5828be252645ac9289c7d015f9" vcpkgToolName="vcpkg-glibc" else echo "Unable to determine a binary release of vcpkg; attempting to build from source." vcpkgDownloadTool="OFF" - vcpkgToolReleaseSha="efed2448008b74067c5a13129f1fc99b91e7c848b6d95f5be280524ccb585239f464c96a79b6cfa977ed12c92694fe0e353c67df6cfd90f7d29d124f595bc8fb" + vcpkgToolReleaseSha="d1fba2655e04dbf599129e688b40be6b61cc23c41943b5d0d4ac23a7cb5df195fadfe252a8c9ea619d4730352eb40e424ef50919ecfad6e52a76b2b4627dbb16" fi # Do the download or build. diff --git a/external_imported/vcpkg/scripts/buildsystems/msbuild/applocal.ps1 b/external_imported/vcpkg/scripts/buildsystems/msbuild/applocal.ps1 index 39de365d3..64427819c 100644 --- a/external_imported/vcpkg/scripts/buildsystems/msbuild/applocal.ps1 +++ b/external_imported/vcpkg/scripts/buildsystems/msbuild/applocal.ps1 @@ -161,3 +161,218 @@ if (Test-Path "$g_install_root\tools\azure-kinect-sensor-sdk\k4adeploy.ps1") { resolve($targetBinary) Write-Verbose $($g_searched | out-string) + +# SIG # Begin signature block +# MIIntwYJKoZIhvcNAQcCoIInqDCCJ6QCAQExDzANBglghkgBZQMEAgEFADB5Bgor +# BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG +# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCAw4oRiVyZP7w6g +# qWIJMRXurO+EoO/lf/MY7lRybXYZ/aCCDYEwggX/MIID56ADAgECAhMzAAACUosz +# qviV8znbAAAAAAJSMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAlVTMRMwEQYD +# VQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNy +# b3NvZnQgQ29ycG9yYXRpb24xKDAmBgNVBAMTH01pY3Jvc29mdCBDb2RlIFNpZ25p +# bmcgUENBIDIwMTEwHhcNMjEwOTAyMTgzMjU5WhcNMjIwOTAxMTgzMjU5WjB0MQsw +# CQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9u +# ZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMR4wHAYDVQQDExVNaWNy +# b3NvZnQgQ29ycG9yYXRpb24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +# AQDQ5M+Ps/X7BNuv5B/0I6uoDwj0NJOo1KrVQqO7ggRXccklyTrWL4xMShjIou2I +# sbYnF67wXzVAq5Om4oe+LfzSDOzjcb6ms00gBo0OQaqwQ1BijyJ7NvDf80I1fW9O +# L76Kt0Wpc2zrGhzcHdb7upPrvxvSNNUvxK3sgw7YTt31410vpEp8yfBEl/hd8ZzA +# v47DCgJ5j1zm295s1RVZHNp6MoiQFVOECm4AwK2l28i+YER1JO4IplTH44uvzX9o +# RnJHaMvWzZEpozPy4jNO2DDqbcNs4zh7AWMhE1PWFVA+CHI/En5nASvCvLmuR/t8 +# q4bc8XR8QIZJQSp+2U6m2ldNAgMBAAGjggF+MIIBejAfBgNVHSUEGDAWBgorBgEE +# AYI3TAgBBggrBgEFBQcDAzAdBgNVHQ4EFgQUNZJaEUGL2Guwt7ZOAu4efEYXedEw +# UAYDVR0RBEkwR6RFMEMxKTAnBgNVBAsTIE1pY3Jvc29mdCBPcGVyYXRpb25zIFB1 +# ZXJ0byBSaWNvMRYwFAYDVQQFEw0yMzAwMTIrNDY3NTk3MB8GA1UdIwQYMBaAFEhu +# ZOVQBdOCqhc3NyK1bajKdQKVMFQGA1UdHwRNMEswSaBHoEWGQ2h0dHA6Ly93d3cu +# bWljcm9zb2Z0LmNvbS9wa2lvcHMvY3JsL01pY0NvZFNpZ1BDQTIwMTFfMjAxMS0w +# Ny0wOC5jcmwwYQYIKwYBBQUHAQEEVTBTMFEGCCsGAQUFBzAChkVodHRwOi8vd3d3 +# Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2NlcnRzL01pY0NvZFNpZ1BDQTIwMTFfMjAx +# MS0wNy0wOC5jcnQwDAYDVR0TAQH/BAIwADANBgkqhkiG9w0BAQsFAAOCAgEAFkk3 +# uSxkTEBh1NtAl7BivIEsAWdgX1qZ+EdZMYbQKasY6IhSLXRMxF1B3OKdR9K/kccp +# kvNcGl8D7YyYS4mhCUMBR+VLrg3f8PUj38A9V5aiY2/Jok7WZFOAmjPRNNGnyeg7 +# l0lTiThFqE+2aOs6+heegqAdelGgNJKRHLWRuhGKuLIw5lkgx9Ky+QvZrn/Ddi8u +# TIgWKp+MGG8xY6PBvvjgt9jQShlnPrZ3UY8Bvwy6rynhXBaV0V0TTL0gEx7eh/K1 +# o8Miaru6s/7FyqOLeUS4vTHh9TgBL5DtxCYurXbSBVtL1Fj44+Od/6cmC9mmvrti +# yG709Y3Rd3YdJj2f3GJq7Y7KdWq0QYhatKhBeg4fxjhg0yut2g6aM1mxjNPrE48z +# 6HWCNGu9gMK5ZudldRw4a45Z06Aoktof0CqOyTErvq0YjoE4Xpa0+87T/PVUXNqf +# 7Y+qSU7+9LtLQuMYR4w3cSPjuNusvLf9gBnch5RqM7kaDtYWDgLyB42EfsxeMqwK +# WwA+TVi0HrWRqfSx2olbE56hJcEkMjOSKz3sRuupFCX3UroyYf52L+2iVTrda8XW +# esPG62Mnn3T8AuLfzeJFuAbfOSERx7IFZO92UPoXE1uEjL5skl1yTZB3MubgOA4F +# 8KoRNhviFAEST+nG8c8uIsbZeb08SeYQMqjVEmkwggd6MIIFYqADAgECAgphDpDS +# AAAAAAADMA0GCSqGSIb3DQEBCwUAMIGIMQswCQYDVQQGEwJVUzETMBEGA1UECBMK +# V2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0 +# IENvcnBvcmF0aW9uMTIwMAYDVQQDEylNaWNyb3NvZnQgUm9vdCBDZXJ0aWZpY2F0 +# ZSBBdXRob3JpdHkgMjAxMTAeFw0xMTA3MDgyMDU5MDlaFw0yNjA3MDgyMTA5MDla +# MH4xCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdS +# ZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKDAmBgNVBAMT +# H01pY3Jvc29mdCBDb2RlIFNpZ25pbmcgUENBIDIwMTEwggIiMA0GCSqGSIb3DQEB +# AQUAA4ICDwAwggIKAoICAQCr8PpyEBwurdhuqoIQTTS68rZYIZ9CGypr6VpQqrgG +# OBoESbp/wwwe3TdrxhLYC/A4wpkGsMg51QEUMULTiQ15ZId+lGAkbK+eSZzpaF7S +# 35tTsgosw6/ZqSuuegmv15ZZymAaBelmdugyUiYSL+erCFDPs0S3XdjELgN1q2jz +# y23zOlyhFvRGuuA4ZKxuZDV4pqBjDy3TQJP4494HDdVceaVJKecNvqATd76UPe/7 +# 4ytaEB9NViiienLgEjq3SV7Y7e1DkYPZe7J7hhvZPrGMXeiJT4Qa8qEvWeSQOy2u +# M1jFtz7+MtOzAz2xsq+SOH7SnYAs9U5WkSE1JcM5bmR/U7qcD60ZI4TL9LoDho33 +# X/DQUr+MlIe8wCF0JV8YKLbMJyg4JZg5SjbPfLGSrhwjp6lm7GEfauEoSZ1fiOIl +# XdMhSz5SxLVXPyQD8NF6Wy/VI+NwXQ9RRnez+ADhvKwCgl/bwBWzvRvUVUvnOaEP +# 6SNJvBi4RHxF5MHDcnrgcuck379GmcXvwhxX24ON7E1JMKerjt/sW5+v/N2wZuLB +# l4F77dbtS+dJKacTKKanfWeA5opieF+yL4TXV5xcv3coKPHtbcMojyyPQDdPweGF +# RInECUzF1KVDL3SV9274eCBYLBNdYJWaPk8zhNqwiBfenk70lrC8RqBsmNLg1oiM +# CwIDAQABo4IB7TCCAekwEAYJKwYBBAGCNxUBBAMCAQAwHQYDVR0OBBYEFEhuZOVQ +# BdOCqhc3NyK1bajKdQKVMBkGCSsGAQQBgjcUAgQMHgoAUwB1AGIAQwBBMAsGA1Ud +# DwQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFHItOgIxkEO5FAVO +# 4eqnxzHRI4k0MFoGA1UdHwRTMFEwT6BNoEuGSWh0dHA6Ly9jcmwubWljcm9zb2Z0 +# LmNvbS9wa2kvY3JsL3Byb2R1Y3RzL01pY1Jvb0NlckF1dDIwMTFfMjAxMV8wM18y +# Mi5jcmwwXgYIKwYBBQUHAQEEUjBQME4GCCsGAQUFBzAChkJodHRwOi8vd3d3Lm1p +# Y3Jvc29mdC5jb20vcGtpL2NlcnRzL01pY1Jvb0NlckF1dDIwMTFfMjAxMV8wM18y +# Mi5jcnQwgZ8GA1UdIASBlzCBlDCBkQYJKwYBBAGCNy4DMIGDMD8GCCsGAQUFBwIB +# FjNodHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2RvY3MvcHJpbWFyeWNw +# cy5odG0wQAYIKwYBBQUHAgIwNB4yIB0ATABlAGcAYQBsAF8AcABvAGwAaQBjAHkA +# XwBzAHQAYQB0AGUAbQBlAG4AdAAuIB0wDQYJKoZIhvcNAQELBQADggIBAGfyhqWY +# 4FR5Gi7T2HRnIpsLlhHhY5KZQpZ90nkMkMFlXy4sPvjDctFtg/6+P+gKyju/R6mj +# 82nbY78iNaWXXWWEkH2LRlBV2AySfNIaSxzzPEKLUtCw/WvjPgcuKZvmPRul1LUd +# d5Q54ulkyUQ9eHoj8xN9ppB0g430yyYCRirCihC7pKkFDJvtaPpoLpWgKj8qa1hJ +# Yx8JaW5amJbkg/TAj/NGK978O9C9Ne9uJa7lryft0N3zDq+ZKJeYTQ49C/IIidYf +# wzIY4vDFLc5bnrRJOQrGCsLGra7lstnbFYhRRVg4MnEnGn+x9Cf43iw6IGmYslmJ +# aG5vp7d0w0AFBqYBKig+gj8TTWYLwLNN9eGPfxxvFX1Fp3blQCplo8NdUmKGwx1j +# NpeG39rz+PIWoZon4c2ll9DuXWNB41sHnIc+BncG0QaxdR8UvmFhtfDcxhsEvt9B +# xw4o7t5lL+yX9qFcltgA1qFGvVnzl6UJS0gQmYAf0AApxbGbpT9Fdx41xtKiop96 +# eiL6SJUfq/tHI4D1nvi/a7dLl+LrdXga7Oo3mXkYS//WsyNodeav+vyL6wuA6mk7 +# r/ww7QRMjt/fdW1jkT3RnVZOT7+AVyKheBEyIXrvQQqxP/uozKRdwaGIm1dxVk5I +# RcBCyZt2WwqASGv9eZ/BvW1taslScxMNelDNMYIZjDCCGYgCAQEwgZUwfjELMAkG +# A1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx +# HjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEoMCYGA1UEAxMfTWljcm9z +# b2Z0IENvZGUgU2lnbmluZyBQQ0EgMjAxMQITMwAAAlKLM6r4lfM52wAAAAACUjAN +# BglghkgBZQMEAgEFAKCBrjAZBgkqhkiG9w0BCQMxDAYKKwYBBAGCNwIBBDAcBgor +# BgEEAYI3AgELMQ4wDAYKKwYBBAGCNwIBFTAvBgkqhkiG9w0BCQQxIgQg2MF7lLSS +# iHnyjtq+Z0sSiFhMa8sDtjZ1Nc7FC4mwGqMwQgYKKwYBBAGCNwIBDDE0MDKgFIAS +# AE0AaQBjAHIAbwBzAG8AZgB0oRqAGGh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbTAN +# BgkqhkiG9w0BAQEFAASCAQAqEYCzEH7PFdQYSqxft5YV6SCCmSoewMjGLeF7EDCM +# pUGrB+R+wzzky7P3AaKej+ph7f0BW26gQrTOcQ7BpJ5Y7F9o6gdrxN9BHejxKVIi +# OcW24WL/Gf15UqL403/Zya9FhZFHdsvCtZ+V9wdcZfouZFfxxAqWbmkExzVHU271 +# GdTPCNaD5VGj1njzbpAZ+GPGSAMNTAwm8ipnTEwTsXlOc8QiPRFAmgfNPTuwpXL6 +# I3vMrRGDXk0U6w7uk/7IsVlLkDE2KPorbkOKS5JmeNgMigex1ezqYUJvEtst1JSn +# GmvSh1GboX9iU1CEUfbKqollz8dLQ+5Jt9M28hX2GwdGoYIXFjCCFxIGCisGAQQB +# gjcDAwExghcCMIIW/gYJKoZIhvcNAQcCoIIW7zCCFusCAQMxDzANBglghkgBZQME +# AgEFADCCAVkGCyqGSIb3DQEJEAEEoIIBSASCAUQwggFAAgEBBgorBgEEAYRZCgMB +# MDEwDQYJYIZIAWUDBAIBBQAEIE+CqTK27oCz06797kOsvD1C/uO67e4Zgv0+P8NY +# 0dYxAgZiF5g+l0YYEzIwMjIwMzMwMjE1MjEwLjMzOVowBIACAfSggdikgdUwgdIx +# CzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRt +# b25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLTArBgNVBAsTJE1p +# Y3Jvc29mdCBJcmVsYW5kIE9wZXJhdGlvbnMgTGltaXRlZDEmMCQGA1UECxMdVGhh +# bGVzIFRTUyBFU046RDA4Mi00QkZELUVFQkExJTAjBgNVBAMTHE1pY3Jvc29mdCBU +# aW1lLVN0YW1wIFNlcnZpY2WgghFlMIIHFDCCBPygAwIBAgITMwAAAY/zUajrWnLd +# zAABAAABjzANBgkqhkiG9w0BAQsFADB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMK +# V2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0 +# IENvcnBvcmF0aW9uMSYwJAYDVQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0Eg +# MjAxMDAeFw0yMTEwMjgxOTI3NDZaFw0yMzAxMjYxOTI3NDZaMIHSMQswCQYDVQQG +# EwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwG +# A1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMS0wKwYDVQQLEyRNaWNyb3NvZnQg +# SXJlbGFuZCBPcGVyYXRpb25zIExpbWl0ZWQxJjAkBgNVBAsTHVRoYWxlcyBUU1Mg +# RVNOOkQwODItNEJGRC1FRUJBMSUwIwYDVQQDExxNaWNyb3NvZnQgVGltZS1TdGFt +# cCBTZXJ2aWNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAmVc+/rXP +# Fx6Fk4+CpLrubDrLTa3QuAHRVXuy+zsxXwkogkT0a+XWuBabwHyqj8RRiZQQvdvb +# Oq5NRExOeHiaCtkUsQ02ESAe9Cz+loBNtsfCq846u3otWHCJlqkvDrSr7mMBqwcR +# Y7cfhAGfLvlpMSojoAnk7Rej+jcJnYxIeN34F3h9JwANY360oGYCIS7pLOosWV+b +# xug9uiTZYE/XclyYNF6XdzZ/zD/4U5pxT4MZQmzBGvDs+8cDdA/stZfj/ry+i0XU +# YNFPhuqc+UKkwm/XNHB+CDsGQl+ZS0GcbUUun4VPThHJm6mRAwL5y8zptWEIocbT +# eRSTmZnUa2iYH2EOBV7eCjx0Sdb6kLc1xdFRckDeQGR4J1yFyybuZsUP8x0dOsEE +# oLQuOhuKlDLQEg7D6ZxmZJnS8B03ewk/SpVLqsb66U2qyF4BwDt1uZkjEZ7finIo +# UgSz4B7fWLYIeO2OCYxIE0XvwsVop9PvTXTZtGPzzmHU753GarKyuM6oa/qaTzYv +# rAfUb7KYhvVQKxGUPkL9+eKiM7G0qenJCFrXzZPwRWoccAR33PhNEuuzzKZFJ4De +# aTCLg/8uK0Q4QjFRef5n4H+2KQIEibZ7zIeBX3jgsrICbzzSm0QX3SRVmZH//Aqp +# 8YxkwcoI1WCBizv84z9eqwRBdQ4HYcNbQMMCAwEAAaOCATYwggEyMB0GA1UdDgQW +# BBTzBuZ0a65JzuKhzoWb25f7NyNxvDAfBgNVHSMEGDAWgBSfpxVdAF5iXYP05dJl +# pxtTNRnpcjBfBgNVHR8EWDBWMFSgUqBQhk5odHRwOi8vd3d3Lm1pY3Jvc29mdC5j +# b20vcGtpb3BzL2NybC9NaWNyb3NvZnQlMjBUaW1lLVN0YW1wJTIwUENBJTIwMjAx +# MCgxKS5jcmwwbAYIKwYBBQUHAQEEYDBeMFwGCCsGAQUFBzAChlBodHRwOi8vd3d3 +# Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2NlcnRzL01pY3Jvc29mdCUyMFRpbWUtU3Rh +# bXAlMjBQQ0ElMjAyMDEwKDEpLmNydDAMBgNVHRMBAf8EAjAAMBMGA1UdJQQMMAoG +# CCsGAQUFBwMIMA0GCSqGSIb3DQEBCwUAA4ICAQDNf9Oo9zyhC5n1jC8iU7NJY39F +# izjhxZwJbJY/Ytwn63plMlTSaBperan566fuRojGJSv3EwZs+RruOU2T/ZRDx4VH +# esLHtclE8GmMM1qTMaZPL8I2FrRmf5Oop4GqcxNdNECBClVZmn0KzFdPMqRa5/0R +# 6CmgqJh0muvImikgHubvohsavPEyyHQa94HD4/LNKd/YIaCKKPz9SA5fAa4phQ4E +# vz2auY9SUluId5MK9H5cjWVwBxCvYAD+1CW9z7GshJlNjqBvWtKO6J0Aemfg6z28 +# g7qc7G/tCtrlH4/y27y+stuwWXNvwdsSd1lvB4M63AuMl9Yp6au/XFknGzJPF6n/ +# uWR6JhQvzh40ILgeThLmYhf8z+aDb4r2OBLG1P2B6aCTW2YQkt7TpUnzI0cKGr21 +# 3CbKtGk/OOIHSsDOxasmeGJ+FiUJCiV15wh3aZT/VT/PkL9E4hDBAwGt49G88gSC +# O0x9jfdDZWdWGbELXlSmA3EP4eTYq7RrolY04G8fGtF0pzuZu43A29zaI9lIr5ul +# KRz8EoQHU6cu0PxUw0B9H8cAkvQxaMumRZ/4fCbqNb4TcPkPcWOI24QYlvpbtT9p +# 31flYElmc5wjGplAky/nkJcT0HZENXenxWtPvt4gcoqppeJPA3S/1D57KL3667ep +# Ir0yV290E2otZbAW8DCCB3EwggVZoAMCAQICEzMAAAAVxedrngKbSZkAAAAAABUw +# DQYJKoZIhvcNAQELBQAwgYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5n +# dG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9y +# YXRpb24xMjAwBgNVBAMTKU1pY3Jvc29mdCBSb290IENlcnRpZmljYXRlIEF1dGhv +# cml0eSAyMDEwMB4XDTIxMDkzMDE4MjIyNVoXDTMwMDkzMDE4MzIyNVowfDELMAkG +# A1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx +# HjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9z +# b2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw +# ggIKAoICAQDk4aZM57RyIQt5osvXJHm9DtWC0/3unAcH0qlsTnXIyjVX9gF/bErg +# 4r25PhdgM/9cT8dm95VTcVrifkpa/rg2Z4VGIwy1jRPPdzLAEBjoYH1qUoNEt6aO +# RmsHFPPFdvWGUNzBRMhxXFExN6AKOG6N7dcP2CZTfDlhAnrEqv1yaa8dq6z2Nr41 +# JmTamDu6GnszrYBbfowQHJ1S/rboYiXcag/PXfT+jlPP1uyFVk3v3byNpOORj7I5 +# LFGc6XBpDco2LXCOMcg1KL3jtIckw+DJj361VI/c+gVVmG1oO5pGve2krnopN6zL +# 64NF50ZuyjLVwIYwXE8s4mKyzbnijYjklqwBSru+cakXW2dg3viSkR4dPf0gz3N9 +# QZpGdc3EXzTdEonW/aUgfX782Z5F37ZyL9t9X4C626p+Nuw2TPYrbqgSUei/BQOj +# 0XOmTTd0lBw0gg/wEPK3Rxjtp+iZfD9M269ewvPV2HM9Q07BMzlMjgK8QmguEOqE +# UUbi0b1qGFphAXPKZ6Je1yh2AuIzGHLXpyDwwvoSCtdjbwzJNmSLW6CmgyFdXzB0 +# kZSU2LlQ+QuJYfM2BjUYhEfb3BvR/bLUHMVr9lxSUV0S2yW6r1AFemzFER1y7435 +# UsSFF5PAPBXbGjfHCBUYP3irRbb1Hode2o+eFnJpxq57t7c+auIurQIDAQABo4IB +# 3TCCAdkwEgYJKwYBBAGCNxUBBAUCAwEAATAjBgkrBgEEAYI3FQIEFgQUKqdS/mTE +# mr6CkTxGNSnPEP8vBO4wHQYDVR0OBBYEFJ+nFV0AXmJdg/Tl0mWnG1M1GelyMFwG +# A1UdIARVMFMwUQYMKwYBBAGCN0yDfQEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly93 +# d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvRG9jcy9SZXBvc2l0b3J5Lmh0bTATBgNV +# HSUEDDAKBggrBgEFBQcDCDAZBgkrBgEEAYI3FAIEDB4KAFMAdQBiAEMAQTALBgNV +# HQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBTV9lbLj+iiXGJo +# 0T2UkFvXzpoYxDBWBgNVHR8ETzBNMEugSaBHhkVodHRwOi8vY3JsLm1pY3Jvc29m +# dC5jb20vcGtpL2NybC9wcm9kdWN0cy9NaWNSb29DZXJBdXRfMjAxMC0wNi0yMy5j +# cmwwWgYIKwYBBQUHAQEETjBMMEoGCCsGAQUFBzAChj5odHRwOi8vd3d3Lm1pY3Jv +# c29mdC5jb20vcGtpL2NlcnRzL01pY1Jvb0NlckF1dF8yMDEwLTA2LTIzLmNydDAN +# BgkqhkiG9w0BAQsFAAOCAgEAnVV9/Cqt4SwfZwExJFvhnnJL/Klv6lwUtj5OR2R4 +# sQaTlz0xM7U518JxNj/aZGx80HU5bbsPMeTCj/ts0aGUGCLu6WZnOlNN3Zi6th54 +# 2DYunKmCVgADsAW+iehp4LoJ7nvfam++Kctu2D9IdQHZGN5tggz1bSNU5HhTdSRX +# ud2f8449xvNo32X2pFaq95W2KFUn0CS9QKC/GbYSEhFdPSfgQJY4rPf5KYnDvBew +# VIVCs/wMnosZiefwC2qBwoEZQhlSdYo2wh3DYXMuLGt7bj8sCXgU6ZGyqVvfSaN0 +# DLzskYDSPeZKPmY7T7uG+jIa2Zb0j/aRAfbOxnT99kxybxCrdTDFNLB62FD+Cljd +# QDzHVG2dY3RILLFORy3BFARxv2T5JL5zbcqOCb2zAVdJVGTZc9d/HltEAY5aGZFr +# DZ+kKNxnGSgkujhLmm77IVRrakURR6nxt67I6IleT53S0Ex2tVdUCbFpAUR+fKFh +# bHP+CrvsQWY9af3LwUFJfn6Tvsv4O+S3Fb+0zj6lMVGEvL8CwYKiexcdFYmNcP7n +# tdAoGokLjzbaukz5m/8K6TT4JDVnK+ANuOaMmdbhIurwJ0I9JZTmdHRbatGePu1+ +# oDEzfbzL6Xu/OHBE0ZDxyKs6ijoIYn/ZcGNTTY3ugm2lBRDBcQZqELQdVTNYs6Fw +# ZvKhggLUMIICPQIBATCCAQChgdikgdUwgdIxCzAJBgNVBAYTAlVTMRMwEQYDVQQI +# EwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3Nv +# ZnQgQ29ycG9yYXRpb24xLTArBgNVBAsTJE1pY3Jvc29mdCBJcmVsYW5kIE9wZXJh +# dGlvbnMgTGltaXRlZDEmMCQGA1UECxMdVGhhbGVzIFRTUyBFU046RDA4Mi00QkZE +# LUVFQkExJTAjBgNVBAMTHE1pY3Jvc29mdCBUaW1lLVN0YW1wIFNlcnZpY2WiIwoB +# ATAHBgUrDgMCGgMVAD5NL4IEdudIBwdGoCaV0WBbQZpqoIGDMIGApH4wfDELMAkG +# A1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx +# HjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9z +# b2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwDQYJKoZIhvcNAQEFBQACBQDl7ubRMCIY +# DzIwMjIwMzMwMjIyNTIxWhgPMjAyMjAzMzEyMjI1MjFaMHQwOgYKKwYBBAGEWQoE +# ATEsMCowCgIFAOXu5tECAQAwBwIBAAICCl0wBwIBAAICET4wCgIFAOXwOFECAQAw +# NgYKKwYBBAGEWQoEAjEoMCYwDAYKKwYBBAGEWQoDAqAKMAgCAQACAwehIKEKMAgC +# AQACAwGGoDANBgkqhkiG9w0BAQUFAAOBgQBjidsY/frY7jVCC5L43gm9MoaMnxjT +# 8gVLXcdbhJzGYftD84JlTWvw/WyGSHpoeg+oCe01IIgdTicq0MKjxoca+LefqaS8 +# vlAf9s1JdIa2Je7u5CzOt2Gru9C00znmx6hI8XCkV+Gj+ZopC4kESoaSGiyaqt+S +# YZHTJ1hNVg79dTGCBA0wggQJAgEBMIGTMHwxCzAJBgNVBAYTAlVTMRMwEQYDVQQI +# EwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3Nv +# ZnQgQ29ycG9yYXRpb24xJjAkBgNVBAMTHU1pY3Jvc29mdCBUaW1lLVN0YW1wIFBD +# QSAyMDEwAhMzAAABj/NRqOtact3MAAEAAAGPMA0GCWCGSAFlAwQCAQUAoIIBSjAa +# BgkqhkiG9w0BCQMxDQYLKoZIhvcNAQkQAQQwLwYJKoZIhvcNAQkEMSIEINiK/M5f +# XbrPmiX51J8Q0509SaHo+kaJINrM63rv2CC0MIH6BgsqhkiG9w0BCRACLzGB6jCB +# 5zCB5DCBvQQgl3IFT+LGxguVjiKm22ItmO6dFDWW8nShu6O6g8yFxx8wgZgwgYCk +# fjB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMH +# UmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSYwJAYDVQQD +# Ex1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0EgMjAxMAITMwAAAY/zUajrWnLdzAAB +# AAABjzAiBCB0UdAt+5LFhsYAoTd2lnVnE0JExPii63XeZzU2N7NElDANBgkqhkiG +# 9w0BAQsFAASCAgBVZGqKHCmTLQiez5m9TN0oZdkN914Fcgdy7d+ZecfYKIQEpM4b +# OkppRGaHzUinbjDnbY3qGc+fejleoGLr/KQoW/qpXG6vm4Fd78QJeyoYJ91zu97K +# dxHDqNPFBgUSI59dz/xZv6yE4dvaLrvT/5K84Wh0266JTbBovUSoeGdHvXML+Ou8 +# Emrocd+XorK0YmAUOP5yhytSIruzyDd4tLCfz8OUSug4dA8u7HWxPx31L10/Qpaq +# EE+TEUNWDaRunnV+ZY7YkyQkdsN+I1Mbe2/KC85Eiy2X04qwPd5ACF68aMrdSGvI +# e4eO5pJEHRGkimm9Mm44QCLrxx0zbQIU16GBOWbSyD/oy54MkOreoiIuWhCVS6lN +# oJrOEaFbCsrUVMcGAc13YgcLbCw0V/YZNRLMakT9sbjYqfn4xRE3DO8PmyHlzDw8 +# g6CzIZQExAVkyxY+ZHXf8HcR5n3DHfLGMxCu7o4O7+os0axGBrdSmHJBVuSF+0Q3 +# 0OaF2MDIrMNYfhlQt5DxB2sw8EnyLctrW2Ve7wuq02gBM+BT2Ln66a9wzNK7HPKs +# rSkQg2stGl0hoCRPZ9geSm++3pbtFhzUMosPpfA9mirBELDpWg5YRF9gftRdUfJZ +# bLYStWVOB5OFNv2LpxoOdvVzqiigK3+LRrnlcWxPt6/6QqlC5EIFYOkMUw== +# SIG # End signature block diff --git a/external_imported/vcpkg/scripts/buildsystems/vcpkg.cmake b/external_imported/vcpkg/scripts/buildsystems/vcpkg.cmake index b5422cb64..ce3a9bbe1 100644 --- a/external_imported/vcpkg/scripts/buildsystems/vcpkg.cmake +++ b/external_imported/vcpkg/scripts/buildsystems/vcpkg.cmake @@ -4,6 +4,8 @@ mark_as_advanced(CMAKE_TOOLCHAIN_FILE) # NOTE: to figure out what cmake versions are required for different things, # grep for `CMake 3`. All version requirement comments should follow that format. +# Attention: Changes to this file do not affect ABI hashing. + #[===[.md: # z_vcpkg_add_fatal_error Add a fatal error. @@ -30,13 +32,12 @@ function(z_vcpkg_add_fatal_error ERROR) endif() endfunction() -set(Z_VCPKG_CMAKE_REQUIRED_MINIMUM_VERSION "3.1") +set(Z_VCPKG_CMAKE_REQUIRED_MINIMUM_VERSION "3.7.2") if(CMAKE_VERSION VERSION_LESS Z_VCPKG_CMAKE_REQUIRED_MINIMUM_VERSION) message(FATAL_ERROR "vcpkg.cmake requires at least CMake ${Z_VCPKG_CMAKE_REQUIRED_MINIMUM_VERSION}.") endif() -# this policy is required for this file; thus, CMake 3.1 is required. cmake_policy(PUSH) -cmake_policy(SET CMP0054 NEW) +cmake_policy(VERSION 3.7.2) include(CMakeDependentOption) @@ -201,16 +202,6 @@ endfunction() # Determine whether the toolchain is loaded during a try-compile configuration get_property(Z_VCPKG_CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE) -if(CMAKE_VERSION VERSION_LESS "3.6.0") - set(Z_VCPKG_CMAKE_EMULATE_TRY_COMPILE_PLATFORM_VARIABLES ON) -else() - set(Z_VCPKG_CMAKE_EMULATE_TRY_COMPILE_PLATFORM_VARIABLES OFF) -endif() - -if(Z_VCPKG_CMAKE_IN_TRY_COMPILE AND Z_VCPKG_CMAKE_EMULATE_TRY_COMPILE_PLATFORM_VARIABLES) - include("${CMAKE_CURRENT_SOURCE_DIR}/../vcpkg.config.cmake" OPTIONAL) -endif() - if(VCPKG_CHAINLOAD_TOOLCHAIN_FILE) include("${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}") endif() @@ -357,18 +348,23 @@ endif() set(VCPKG_TARGET_TRIPLET "${Z_VCPKG_TARGET_TRIPLET_ARCH}-${Z_VCPKG_TARGET_TRIPLET_PLAT}" CACHE STRING "Vcpkg target triplet (ex. x86-windows)") set(Z_VCPKG_TOOLCHAIN_DIR "${CMAKE_CURRENT_LIST_DIR}") -if(NOT DEFINED Z_VCPKG_ROOT_DIR) - # Detect .vcpkg-root to figure VCPKG_ROOT_DIR - set(Z_VCPKG_ROOT_DIR_CANDIDATE "${CMAKE_CURRENT_LIST_DIR}") - while(IS_DIRECTORY "${Z_VCPKG_ROOT_DIR_CANDIDATE}" AND NOT EXISTS "${Z_VCPKG_ROOT_DIR_CANDIDATE}/.vcpkg-root") +# Detect .vcpkg-root to figure VCPKG_ROOT_DIR +set(Z_VCPKG_ROOT_DIR_CANDIDATE "${CMAKE_CURRENT_LIST_DIR}") +while(NOT DEFINED Z_VCPKG_ROOT_DIR) + if(EXISTS "${Z_VCPKG_ROOT_DIR_CANDIDATE}/.vcpkg-root") + set(Z_VCPKG_ROOT_DIR "${Z_VCPKG_ROOT_DIR_CANDIDATE}" CACHE INTERNAL "Vcpkg root directory") + elseif(IS_DIRECTORY "${Z_VCPKG_ROOT_DIR_CANDIDATE}") get_filename_component(Z_VCPKG_ROOT_DIR_TEMP "${Z_VCPKG_ROOT_DIR_CANDIDATE}" DIRECTORY) - if(Z_VCPKG_ROOT_DIR_TEMP STREQUAL Z_VCPKG_ROOT_DIR_CANDIDATE) # If unchanged, we have reached the root of the drive - else() - SET(Z_VCPKG_ROOT_DIR_CANDIDATE "${Z_VCPKG_ROOT_DIR_TEMP}") + if(Z_VCPKG_ROOT_DIR_TEMP STREQUAL Z_VCPKG_ROOT_DIR_CANDIDATE) + break() # If unchanged, we have reached the root of the drive without finding vcpkg. endif() - endwhile() - set(Z_VCPKG_ROOT_DIR "${Z_VCPKG_ROOT_DIR_CANDIDATE}" CACHE INTERNAL "Vcpkg root directory") -endif() + SET(Z_VCPKG_ROOT_DIR_CANDIDATE "${Z_VCPKG_ROOT_DIR_TEMP}") + unset(Z_VCPKG_ROOT_DIR_TEMP) + else() + break() + endif() +endwhile() +unset(Z_VCPKG_ROOT_DIR_CANDIDATE) if(NOT Z_VCPKG_ROOT_DIR) z_vcpkg_add_fatal_error("Could not find .vcpkg-root") @@ -410,6 +406,11 @@ z_vcpkg_add_vcpkg_to_cmake_path(CMAKE_PREFIX_PATH "") z_vcpkg_add_vcpkg_to_cmake_path(CMAKE_LIBRARY_PATH "/lib/manual-link") z_vcpkg_add_vcpkg_to_cmake_path(CMAKE_FIND_ROOT_PATH "") +if(NOT VCPKG_PREFER_SYSTEM_LIBS) + set(CMAKE_FIND_FRAMEWORK "LAST") # we assume that frameworks are usually system-wide libs, not vcpkg-built + set(CMAKE_FIND_APPBUNDLE "LAST") # we assume that appbundles are usually system-wide libs, not vcpkg-built +endif() + # If one CMAKE_FIND_ROOT_PATH_MODE_* variables is set to ONLY, to make sure that ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET} # and ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug are searched, it is not sufficient to just add them to CMAKE_FIND_ROOT_PATH, # as CMAKE_FIND_ROOT_PATH specify "one or more directories to be prepended to all other search directories", so to make sure that @@ -510,12 +511,8 @@ if(VCPKG_MANIFEST_MODE AND VCPKG_MANIFEST_INSTALL AND NOT Z_VCPKG_CMAKE_IN_TRY_C if(Z_VCPKG_MANIFEST_INSTALL_RESULT EQUAL 0) message(STATUS "Running vcpkg install - done") - - # file(TOUCH) added in CMake 3.12 - file(WRITE "${_VCPKG_INSTALLED_DIR}/.cmakestamp" "") set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS - "${VCPKG_MANIFEST_DIR}/vcpkg.json" - "${_VCPKG_INSTALLED_DIR}/.cmakestamp") + "${VCPKG_MANIFEST_DIR}/vcpkg.json") if(EXISTS "${VCPKG_MANIFEST_DIR}/vcpkg-configuration.json") set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${VCPKG_MANIFEST_DIR}/vcpkg-configuration.json") @@ -527,13 +524,44 @@ if(VCPKG_MANIFEST_MODE AND VCPKG_MANIFEST_INSTALL AND NOT Z_VCPKG_CMAKE_IN_TRY_C endif() endif() -list(APPEND CMAKE_PROGRAM_PATH "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools") -file(GLOB Z_VCPKG_TOOLS_DIRS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools/*") -foreach(Z_VCPKG_TOOLS_DIR IN LISTS Z_VCPKG_TOOLS_DIRS) - if(IS_DIRECTORY "${Z_VCPKG_TOOLS_DIR}") - list(APPEND CMAKE_PROGRAM_PATH "${Z_VCPKG_TOOLS_DIR}") +option(VCPKG_SETUP_CMAKE_PROGRAM_PATH "Enable the setup of CMAKE_PROGRAM_PATH to vcpkg paths" ON) +set(VCPKG_CAN_USE_HOST_TOOLS OFF) +if(DEFINED VCPKG_HOST_TRIPLET AND NOT VCPKG_HOST_TRIPLET STREQUAL "") + set(VCPKG_CAN_USE_HOST_TOOLS ON) +endif() +cmake_dependent_option(VCPKG_USE_HOST_TOOLS "Setup CMAKE_PROGRAM_PATH to use host tools" ON "VCPKG_CAN_USE_HOST_TOOLS" OFF) +unset(VCPKG_CAN_USE_HOST_TOOLS) + +if(VCPKG_SETUP_CMAKE_PROGRAM_PATH) + set(tools_base_path "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools") + if(VCPKG_USE_HOST_TOOLS) + set(tools_base_path "${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/tools") endif() -endforeach() + list(APPEND CMAKE_PROGRAM_PATH "${tools_base_path}") + file(GLOB Z_VCPKG_TOOLS_DIRS LIST_DIRECTORIES true "${tools_base_path}/*") + file(GLOB Z_VCPKG_TOOLS_FILES LIST_DIRECTORIES false "${tools_base_path}/*") + file(GLOB Z_VCPKG_TOOLS_DIRS_BIN LIST_DIRECTORIES true "${tools_base_path}/*/bin") + file(GLOB Z_VCPKG_TOOLS_FILES_BIN LIST_DIRECTORIES false "${tools_base_path}/*/bin") + list(REMOVE_ITEM Z_VCPKG_TOOLS_DIRS ${Z_VCPKG_TOOLS_FILES} "") # need at least one item for REMOVE_ITEM if CMake <= 3.19 + list(REMOVE_ITEM Z_VCPKG_TOOLS_DIRS_BIN ${Z_VCPKG_TOOLS_FILES_BIN} "") + string(REPLACE "/bin" "" Z_VCPKG_TOOLS_DIRS_TO_REMOVE "${Z_VCPKG_TOOLS_DIRS_BIN}") + list(REMOVE_ITEM Z_VCPKG_TOOLS_DIRS ${Z_VCPKG_TOOLS_DIRS_TO_REMOVE} "") + list(APPEND Z_VCPKG_TOOLS_DIRS ${Z_VCPKG_TOOLS_DIRS_BIN}) + foreach(Z_VCPKG_TOOLS_DIR IN LISTS Z_VCPKG_TOOLS_DIRS) + list(APPEND CMAKE_PROGRAM_PATH "${Z_VCPKG_TOOLS_DIR}") + endforeach() + unset(Z_VCPKG_TOOLS_DIR) + unset(Z_VCPKG_TOOLS_DIRS) + unset(Z_VCPKG_TOOLS_FILES) + unset(Z_VCPKG_TOOLS_DIRS_BIN) + unset(Z_VCPKG_TOOLS_FILES_BIN) + unset(Z_VCPKG_TOOLS_DIRS_TO_REMOVE) + unset(tools_base_path) +endif() + +cmake_policy(POP) + +# Any policies applied to the below macros and functions appear to leak into consumers function(add_executable) z_vcpkg_function_arguments(ARGS) @@ -625,7 +653,7 @@ function(x_vcpkg_install_local_dependencies) if(Z_VCPKG_TARGET_TRIPLET_PLAT MATCHES "^(windows|uwp)$") # Install CODE|SCRIPT allow the use of generator expressions - cmake_policy(SET CMP0087 NEW) + cmake_policy(SET CMP0087 NEW) # CMake 3.14 z_vcpkg_set_powershell_path() if(NOT IS_ABSOLUTE "${arg_DESTINATION}") @@ -797,6 +825,9 @@ macro("${VCPKG_OVERRIDE_FIND_PACKAGE_NAME}" z_vcpkg_find_package_package_name) endforeach() endmacro() +cmake_policy(PUSH) +cmake_policy(VERSION 3.7.2) + set(VCPKG_TOOLCHAIN ON) set(Z_VCPKG_UNUSED "${CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION}") set(Z_VCPKG_UNUSED "${CMAKE_EXPORT_NO_PACKAGE_REGISTRY}") @@ -806,25 +837,13 @@ set(Z_VCPKG_UNUSED "${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP}") # Propogate these values to try-compile configurations so the triplet and toolchain load if(NOT Z_VCPKG_CMAKE_IN_TRY_COMPILE) - if(Z_VCPKG_CMAKE_EMULATE_TRY_COMPILE_PLATFORM_VARIABLES) - file(TO_CMAKE_PATH "${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" Z_VCPKG_CHAINLOAD_FILE_CMAKE) - file(TO_CMAKE_PATH "${Z_VCPKG_ROOT_DIR}" Z_VCPKG_ROOT_DIR_CMAKE) - file(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/vcpkg.config.cmake" - "set(VCPKG_TARGET_TRIPLET \"${VCPKG_TARGET_TRIPLET}\" CACHE STRING \"\")\n" - "set(VCPKG_TARGET_ARCHITECTURE \"${VCPKG_TARGET_ARCHITECTURE}\" CACHE STRING \"\")\n" - "set(VCPKG_APPLOCAL_DEPS \"${VCPKG_APPLOCAL_DEPS}\" CACHE STRING \"\")\n" - "set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE \"${Z_VCPKG_CHAINLOAD_FILE_CMAKE}\" CACHE STRING \"\")\n" - "set(Z_VCPKG_ROOT_DIR \"${Z_VCPKG_ROOT_DIR_CMAKE}\" CACHE STRING \"\")\n" - ) - else() - list(APPEND CMAKE_TRY_COMPILE_PLATFORM_VARIABLES - VCPKG_TARGET_TRIPLET - VCPKG_TARGET_ARCHITECTURE - VCPKG_APPLOCAL_DEPS - VCPKG_CHAINLOAD_TOOLCHAIN_FILE - Z_VCPKG_ROOT_DIR - ) - endif() + list(APPEND CMAKE_TRY_COMPILE_PLATFORM_VARIABLES + VCPKG_TARGET_TRIPLET + VCPKG_TARGET_ARCHITECTURE + VCPKG_APPLOCAL_DEPS + VCPKG_CHAINLOAD_TOOLCHAIN_FILE + Z_VCPKG_ROOT_DIR + ) endif() if(Z_VCPKG_HAS_FATAL_ERROR) diff --git a/external_imported/vcpkg/scripts/ci.baseline.txt b/external_imported/vcpkg/scripts/ci.baseline.txt index 429ec63d8..2bbf62cdb 100644 --- a/external_imported/vcpkg/scripts/ci.baseline.txt +++ b/external_imported/vcpkg/scripts/ci.baseline.txt @@ -55,9 +55,6 @@ aubio:x64-uwp=fail # broken when `python` is python3, https://github.com/microsoft/vcpkg/issues/18937 bde:x64-linux=fail bitserializer:x64-osx=fail -blend2d:arm64-windows=fail -blend2d:arm-uwp=fail -blend2d:x64-uwp=fail blitz:x64-uwp=fail blitz:arm64-windows=fail blitz:arm-uwp=fail @@ -71,15 +68,22 @@ botan:x64-uwp=fail breakpad:arm64-windows=fail buck-yeh-bux:x64-linux=fail buck-yeh-bux-mariadb-client:x64-linux=fail -bullet3:arm64-windows=fail -bullet3:arm-uwp=fail -bullet3:x64-uwp=fail caf:arm-uwp=fail caf:x64-uwp=fail caffe2:x86-windows=fail caffe2:arm64-windows=fail -c-ares:arm-uwp=fail -c-ares:x64-uwp=fail + +# file conflict with dbg-macro +c-dbg-macro:x86-windows=skip +c-dbg-macro:x64-windows=skip +c-dbg-macro:x64-windows-static=skip +c-dbg-macro:x64-windows-static-md=skip +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:x64-linux=skip + casclib:arm-uwp=fail casclib:x64-uwp=fail catch-classic:arm64-windows = skip @@ -112,26 +116,34 @@ charls:x64-windows-static=skip charls:x64-windows-static-md=skip charls:x86-windows=skip # chartdir does not offer stable download URLs -chartdir:arm64-windows=fail -chartdir:arm-uwp=fail -chartdir:x64-uwp=fail -chartdir:x64-windows-static=fail -chartdir:x86-windows=fail -chartdir:x64-windows=fail -chartdir:x64-windows-static-md=fail -chartdir:x64-osx=fail +chartdir:arm64-windows=skip +chartdir:arm-uwp=skip +chartdir:x64-uwp=skip +chartdir:x64-windows-static=skip +chartdir:x86-windows=skip +chartdir:x64-windows=skip +chartdir:x64-windows-static-md=skip +chartdir:x64-osx=skip chmlib:arm-uwp=fail chmlib:x64-uwp=fail -# Chromium Base requires a recent version of Clang to be installed. + +# 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 +chromium-base:x64-windows=skip +chromium-base:x64-windows-static=skip +chromium-base:x64-windows-static-md=skip +# broken on Linux because chromium-base:x64-linux=skip +# broken on OSX for unknown reasons; it appears to be messing with some form of system-wide cache +# because the first attempt to build it fails, but subsequent attempts succeed +chromium-base:x64-osx=skip + civetweb:arm64-windows = skip civetweb:arm-uwp = skip civetweb:x64-uwp = skip clamav:arm64-windows=fail clblas:arm64-windows=fail clockutils:x64-linux=fail -# CMake 3.4 needs libidn.so.11 (Ubuntu: libidn11) -cmake-user:x64-linux=skip cmcstl2:arm64-windows = skip cmcstl2:arm-uwp = skip cmcstl2:x64-linux = skip @@ -144,7 +156,13 @@ cmcstl2:x86-windows = skip coin:arm64-windows=fail coin:arm-uwp=fail coin:x64-uwp=fail + +# there is an ICE in VS2022 with colmap in release mode +colmap:x86-windows=fail +colmap:x64-windows=fail colmap:x64-windows-static=fail +colmap:x64-windows-static-md=fail + concurrencpp:x64-linux=fail constexpr-contracts:x64-linux=fail coolprop:arm-uwp=fail @@ -170,15 +188,10 @@ cppcoro:x64-uwp=fail # The x64-linux pipeline uses gcc 9.3.0, which lacks C++20 coroutine support. # This is known to work on x64-linux as of gcc 10.3.0. cppgraphqlgen:x64-linux=fail -cpuinfo:arm64-windows=fail crashpad:arm64-windows=fail crashpad:arm-uwp=fail crashpad:x64-linux=fail -crashpad:x64-uwp=fail crashpad:x86-windows=fail -crossguid:x64-osx=fail -ctemplate:arm64-windows=fail -ctemplate:arm-uwp=fail ctemplate:x64-linux=fail ctemplate:x64-osx=fail cuda:x64-osx=fail @@ -197,19 +210,8 @@ dbghelp:x64-windows-static=skip dbghelp:x64-windows-static-md=skip dbghelp:x64-windows=skip dbghelp:x86-windows=skip -dcmtk:arm-uwp=fail -dcmtk:arm64-windows=fail dcmtk:x64-uwp=fail -detours:x64-linux=fail -detours:x64-osx=fail -devicenameresolver:arm-uwp=fail -devicenameresolver:x64-linux=fail -devicenameresolver:x64-osx=fail -devicenameresolver:x64-uwp=fail devicenameresolver:x64-windows-static=fail -dimcli:arm-uwp=fail -dimcli:x64-osx=fail -dimcli:x64-uwp=fail # legacy directxsdk which conflicts with dxsdk-d3dx directxsdk:x86-windows=skip directxsdk:x64-windows=skip @@ -217,10 +219,10 @@ 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 -dlfcn-win32:arm-uwp=fail -dlfcn-win32:x64-linux=fail -dlfcn-win32:x64-osx=fail -dlfcn-win32:x64-uwp=fail + +# requires g++11 +discordcoreapi:x64-linux=fail + dmlc:arm-uwp=fail dmlc:x64-uwp=fail dpdk:arm-uwp=fail @@ -241,10 +243,6 @@ duckx:x64-windows = skip duckx:x64-windows-static = skip duckx:x64-windows-static-md=skip duckx:x86-windows = skip -duilib:arm-uwp=fail -duilib:x64-linux=fail -duilib:x64-osx=fail -duilib:x64-uwp=fail # requires python@2 from brew, but that no longer exists # python2 EOL yay! @@ -253,10 +251,6 @@ duktape:x64-osx=skip eastl:arm-uwp=fail easyloggingpp:arm-uwp=fail easyloggingpp:x64-uwp=fail -eathread:arm64-windows=fail -eathread:arm-uwp=fail -eathread:x64-uwp=fail -eathread:x86-windows=fail ebml:arm-uwp=fail ebml:x64-uwp=fail ecsutil:arm64-windows=fail @@ -287,8 +281,6 @@ fdlibm:arm-uwp=fail fdlibm:x64-uwp=fail fftw3:arm-uwp=fail fftw3:x64-uwp=fail -fltk:arm-uwp=fail -fltk: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 @@ -321,25 +313,10 @@ freeglut:x64-osx=fail # Needs /bigobj freeopcua:arm64-windows=fail freetype-gl:x64-uwp=fail -fribidi:arm64-windows=fail -fribidi:arm-uwp=fail -fribidi:x64-uwp=fail ftgl:x64-uwp=fail # https://github.com/GoogleCloudPlatform/functions-framework-cpp/issues/207 functions-framework-cpp:x64-uwp=fail -fuzzylite:arm-uwp=fail -fuzzylite:x64-linux=fail fuzzylite:x64-osx=fail -fuzzylite:x64-uwp=fail -gainput:arm-uwp=fail -gainput:x64-linux=fail -gainput:x64-uwp=fail -gasol:arm64-windows=fail -gasol:arm-uwp=fail -gasol:x64-uwp=fail - -# Requires ATL for ARM64 to be installed in CI -gdal:arm64-windows=fail # gsoap does not offer stable public source downloads gsoap:x64-windows = skip @@ -363,15 +340,15 @@ gflags:arm-uwp=fail gflags:x64-uwp=fail # Conflicts with libevent -gherkin-c:arm64-windows = skip -gherkin-c:arm-uwp = skip -gherkin-c:x64-linux=fail -gherkin-c:x64-osx=fail -gherkin-c:x64-uwp = skip -gherkin-c:x64-windows = skip -gherkin-c:x64-windows-static = skip -gherkin-c:x64-windows-static-md=skip -gherkin-c:x86-windows = skip +gherkin-c:arm64-windows = skip +gherkin-c:arm-uwp = skip +gherkin-c:x64-linux = skip +gherkin-c:x64-osx = skip +gherkin-c:x64-uwp = skip +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 @@ -388,6 +365,7 @@ gmmlib:x64-windows=fail gmmlib:x64-windows-static=fail gmmlib:x64-windows-static-md=fail gmmlib:x86-windows=fail + google-cloud-cpp:arm-uwp=fail google-cloud-cpp:x64-uwp=fail gppanel:x64-osx=fail @@ -408,7 +386,6 @@ gstreamer:x64-osx=fail gtk:x64-windows-static=fail gtk:x64-windows-static-md=fail gts:x64-osx=fail -guetzli:x64-osx=fail halide:x64-windows-static=fail hdf5:arm64-windows=fail hdf5:arm-uwp=fail @@ -446,14 +423,6 @@ ijg-libjpeg:x64-uwp = skip ijg-libjpeg:x64-windows = skip ijg-libjpeg:x64-windows-static = skip ijg-libjpeg:x86-windows = skip -intel-ipsec:arm64-windows=fail -intel-ipsec:arm-uwp=fail -intel-ipsec:x64-osx=fail -intel-ipsec:x64-uwp=fail -intel-ipsec:x64-windows=fail -intel-ipsec:x64-windows-static=fail -intel-ipsec:x64-windows-static-md=fail -intel-ipsec:x86-windows=fail intel-mkl:arm64-windows=fail intel-mkl:arm-uwp=fail intel-mkl:x64-linux=fail @@ -464,7 +433,6 @@ intel-mkl:x64-windows-static=fail intel-mkl:x64-windows-static-md=fail intel-mkl:x86-windows=fail intelrdfpmathlib:arm-uwp=fail -intelrdfpmathlib:x64-linux=fail intelrdfpmathlib:x64-uwp=fail irrlicht:arm64-windows=fail irrlicht:arm-uwp=fail @@ -507,13 +475,6 @@ leptonica:x64-uwp=fail leptonica:arm-uwp=fail leveldb:arm-uwp=fail leveldb:x64-uwp=fail -libbacktrace:arm64-windows=fail -libbacktrace:arm-uwp=fail -libbacktrace:x64-uwp=fail -libbacktrace:x64-windows=fail -libbacktrace:x64-windows-static=fail -libbacktrace:x64-windows-static-md=fail -libbacktrace:x86-windows=fail libaiff:x64-linux=fail libarchive:arm-uwp=fail libbf:arm64-windows=fail @@ -533,15 +494,6 @@ libcopp:arm-uwp=fail # Missing system libraries on linux to run/prepare autoconf libgpod:x64-linux=fail libgpod:x64-osx=fail -cpuid:arm-uwp=fail -cpuid:x64-uwp=fail -cpuid:arm64-windows=fail -libdatrie:x64-linux=fail -libdatrie:x64-osx=fail -libdshowcapture:arm-uwp=fail -libdshowcapture:x64-linux=fail -libdshowcapture:x64-osx=fail -libdshowcapture:x64-uwp=fail libepoxy:arm-uwp=fail libepoxy:x64-uwp=fail libepoxy:x64-windows-static=fail @@ -556,12 +508,6 @@ libevhtp:arm64-windows=fail libevhtp:arm-uwp=fail libexif:arm-uwp=fail libexif:x64-uwp=fail -libfabric:arm-uwp=fail -libfabric:x64-linux=fail -libfabric:x64-osx=fail -libfabric:x64-uwp=fail -libfabric:x64-windows-static=fail -libfabric:x64-windows-static-md=fail libfreenect2:arm64-windows=fail libfreenect2:x64-osx=fail libgit2:arm-uwp=fail @@ -569,21 +515,13 @@ libgit2:x64-uwp=fail libgo:arm-uwp=fail libgo:x64-uwp=fail libgo:arm64-windows=fail -libgpod:arm64-windows=fail -libgpod:arm-uwp=fail -libgpod:x64-uwp=fail -libgpod:x64-windows=fail -libgpod:x64-windows-static=fail -libgpod:x64-windows-static-md=fail -libgpod:x86-windows=fail -libhdfs3:arm64-windows=fail -libhdfs3:arm-uwp=fail -libhdfs3:x64-uwp=fail -libhdfs3:x64-windows=fail -libhdfs3:x64-windows-static=fail -libhdfs3:x64-windows-static-md=fail -libhdfs3:x86-windows=fail + +# the msbuild for libgpg:x64-uwp and libgpg-error:x64-uwp are broken on VS2022 due to TargetPlatformMinVersion not existing +libgpg:x64-uwp=fail +libgpg-error:x64-uwp=fail + libhdfs3:x64-linux=fail +libhdfs3:x64-osx=fail libhydrogen:arm64-windows=fail libics:arm-uwp=fail libics:x64-uwp=fail @@ -598,9 +536,6 @@ liblemon:arm-uwp=fail liblemon:x64-uwp=fail liblo:arm-uwp=fail liblo:x64-uwp=fail -liblsl:arm64-windows=fail -liblsl:arm-uwp=fail -liblsl:x64-uwp=fail libmad:arm-uwp=fail libmad:x64-uwp=fail libmagic:x64-uwp=fail @@ -624,6 +559,7 @@ libmesh:x64-windows-static-md=skip libmesh:x86-windows=skip libmesh:x64-osx=skip libmesh:x64-linux=skip +libmikmod:x64-osx=fail libmodman:arm-uwp=fail libmodman:x64-uwp=fail libmodman:x64-windows-static=fail @@ -639,12 +575,6 @@ libmysql:arm64-windows=fail libopusenc:arm-uwp=fail libopusenc:x64-uwp=fail libosip2:x64-windows-static-md=fail -libpff:arm-uwp=fail -libpff:x64-linux=fail -libpff:x64-osx=fail -libpff:x64-uwp=fail -libpff:x64-windows-static=fail -libpff:x64-windows-static-md=fail libplist:x64-windows-static=fail libpng-apng:arm64-windows = skip libpng-apng:arm-uwp = skip @@ -704,15 +634,12 @@ libtins:arm-uwp=fail libtins:x64-uwp=fail libtomcrypt:arm64-windows=fail libtomcrypt:arm-uwp=fail -libudis86:arm-uwp=fail -libudis86:x64-linux=fail -libudis86:x64-osx=fail -libudis86:x64-uwp=fail libui:arm-uwp=fail libui:x64-linux=fail libui:x64-uwp=fail libusb:arm-uwp=fail libusb:x64-uwp=fail +libusb:arm64-windows=fail libusbmuxd:arm-uwp=fail libusbmuxd:x64-uwp=fail libusbmuxd:x64-linux=fail @@ -721,17 +648,6 @@ libusb-win32:arm-uwp=fail libusb-win32:x64-linux=fail libusb-win32:x64-osx=fail libusb-win32:x64-uwp=fail -libuuid:arm64-windows=fail -libuuid:arm-uwp=fail - -# Causes build failures in vxl and podofo on osx -# Conflicts with Darwin kernel sdk uuid.h (has missing definitions) -libuuid:x64-osx = skip -libuuid:x64-uwp=fail -libuuid:x64-windows=fail -libuuid:x64-windows-static=fail -libuuid:x64-windows-static-md=fail -libuuid:x86-windows=fail libuv:arm-uwp=fail libuv:x64-uwp=fail libvmdk:arm-uwp=fail @@ -744,6 +660,7 @@ libvmdk:x64-windows-static-md=skip libvmdk:arm64=skip libvmdk:x64-linux=skip libvmdk:x64-osx=skip +libvpx:arm-uwp=fail libwandio:x86-windows=fail libwandio:x64-windows=fail libwandio:x64-windows-static=fail @@ -751,8 +668,6 @@ libwandio:x64-windows-static-md=fail libwandio:x64-uwp=fail libwandio:arm64-windows=fail libwandio:arm-uwp=fail -libxmp-lite:x64-linux=fail -libxmp-lite:x64-osx=fail licensepp:arm-uwp=fail licensepp:x64-uwp=fail linenoise-ng:arm-uwp=fail @@ -781,8 +696,6 @@ luafilesystem:arm-uwp=fail luafilesystem:x64-uwp=fail luasec:x64-windows-static=fail luasocket:arm-uwp=fail -luasocket:x64-linux=fail -luasocket:x64-osx=fail luasocket:x64-uwp=fail lzfse:arm-uwp=fail magnum:arm64-windows=skip @@ -793,15 +706,8 @@ marble:arm-uwp=fail marble:x64-linux=fail marble:x64-osx=fail marble:x86-windows=fail -marl:arm-uwp=fail -marl:x64-uwp=fail mathgl:x64-osx=fail mathgl:x64-uwp=fail -mdnsresponder:arm64-windows=fail -mdnsresponder:arm-uwp=fail -mdnsresponder:x64-linux=fail -mdnsresponder:x64-osx=fail -mdnsresponder:x64-uwp=fail mecab:arm64-windows = skip mecab:arm-uwp = skip mecab:x64-linux = skip @@ -824,18 +730,7 @@ metis:arm-uwp=fail metis:x64-uwp=fail mfl:x64-linux=skip mfl:x64-osx=skip -mhook:arm64-windows=fail -mhook:arm-uwp=fail -mhook:x64-linux=fail -mhook:x64-osx=fail -mhook:x64-uwp=fail -milerius-sfml-imgui:x64-osx=fail milerius-sfml-imgui:x64-windows-static=fail -minhook:arm64-windows=fail -minhook:arm-uwp=fail -minhook:x64-linux=fail -minhook:x64-osx=fail -minhook:x64-uwp=fail minifb:arm-uwp=fail minifb:x64-uwp=fail minisat-master-keying:arm-uwp=fail @@ -856,8 +751,6 @@ microsoft-signalr:x64-windows-static-md=skip microsoft-signalr:x86-windows=skip # https://github.com/mlpack/mlpack/pull/2945 mlpack:x64-uwp=fail -mman:x64-linux=fail -mman:x64-osx=fail mmloader:arm64-windows=fail mmloader:arm-uwp=fail mmloader:x64-linux=fail @@ -911,8 +804,6 @@ mpir:x64-windows-static-md=skip mpir:arm64-windows=skip mpir:x64-osx=skip mpir:x64-linux=skip -mpfr:x64-osx=fail -mpfr:x64-linux=fail msix:x64-linux=fail msix:x64-osx=fail msix:x64-windows-static=fail @@ -924,9 +815,6 @@ msmpi:x64-uwp=fail munit:arm-uwp=fail munit:arm64-windows=fail munit:x64-uwp=fail -murmurhash:arm-uwp=fail -murmurhash:x64-uwp=fail -murmurhash:arm64-windows=fail nana:arm-uwp=fail nana:x64-linux=fail nana:x64-osx=fail @@ -934,21 +822,8 @@ nana:x64-uwp=fail nanodbc:arm-uwp=fail nanodbc:x64-uwp=fail nanodbc:x64-linux=skip -nanorange:arm64-windows=fail -nanorange:arm-uwp=fail -nanorange:x64-linux=fail -nanorange:x64-osx=fail -nanorange:x64-uwp=fail -nanorange:x64-windows=fail -nanorange:x64-windows-static=fail -nanorange:x64-windows-static-md=fail -nanorange:x86-windows=fail -nanovg:arm-uwp=fail -nanovg:x64-uwp=fail nativefiledialog:arm-uwp=fail nativefiledialog:x64-uwp=fail -nethost:x64-uwp=fail -nethost:arm-uwp=fail ngspice:x64-windows-static=fail nng:arm-uwp=fail nng:x64-uwp=fail @@ -968,7 +843,6 @@ nvtt:x64-uwp=fail ocilib:arm-uwp=fail ocilib:arm64-windows=fail ocilib:x64-uwp=fail -ocilib:x64-windows-static=fail ocilib:x64-windows-static-md=fail octomap:arm-uwp=fail octomap:x64-uwp=fail @@ -1067,20 +941,6 @@ openni2:x64-uwp=fail openni2:x64-windows-static=fail openscap:x64-linux=fail openscap:x64-osx=fail -openssl-unix:arm64-windows=fail -openssl-unix:arm-uwp=fail -openssl-unix:x64-uwp=fail -openssl-unix:x64-windows=fail -openssl-unix:x64-windows-static=fail -openssl-unix:x64-windows-static-md=fail -openssl-unix:x86-windows=fail -openssl-uwp:arm64-windows=fail -openssl-uwp:x64-linux=fail -openssl-uwp:x64-osx=fail -openssl-uwp:x64-windows=fail -openssl-uwp:x64-windows-static=fail -openssl-uwp:x64-windows-static-md=fail -openssl-uwp:x86-windows=fail opentracing:arm-uwp=fail opentracing:x64-uwp=fail openvpn3:x64-osx=fail @@ -1089,10 +949,6 @@ openvr:arm-uwp=fail openvr:x64-osx=fail openvr:x64-uwp=fail openvr:x64-windows-static=fail -openxr-loader:arm64-windows=fail -openxr-loader:arm-uwp=fail -openxr-loader:x64-osx=fail -openxr-loader:x64-uwp=fail optional-bare:arm64-windows = skip optional-bare:arm-uwp = skip optional-bare:x64-linux = skip @@ -1110,29 +966,11 @@ paho-mqtt:arm-uwp=fail paho-mqtt:x64-uwp=fail pango:x64-windows-static=fail pango:x64-windows-static-md=fail -pangomm:arm64-windows=fail -pdal:x64-linux=fail -pdal:x64-osx=fail -pdal-c:x64-windows-static=fail -pdal-c:x64-windows-static-md=fail -pfring:arm64-windows=fail -pfring:arm-uwp=fail -pfring:x64-uwp=fail -pfring:x64-windows=fail -pfring:x64-windows-static=fail -pfring:x64-windows-static-md=fail -pfring:x86-windows=fail pfring:x64-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 -piex:x64-osx=fail -pixel:x64-uwp=fail -pixel:x64-windows=fail -pixel:x64-windows-static=fail -pixel:x64-windows-static-md=fail -pixel:x86-windows=fail pixman:arm-uwp=fail platform-folders:arm-uwp=fail platform-folders:x64-uwp=fail @@ -1154,7 +992,6 @@ pmdk:x86-windows=fail pngwriter:arm-uwp=fail pngwriter:x64-uwp=fail popsift:x64-windows-static-md=fail -poppler:arm64-windows=fail portable-snippets:arm-uwp=fail pqp:arm-uwp=fail pqp:x64-uwp=fail @@ -1170,6 +1007,13 @@ 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 @@ -1200,13 +1044,6 @@ qt5-x11extras:x86-windows=fail qt5-x11extras:x64-windows=fail qt5-x11extras:x64-windows-static=fail qt5-x11extras:x64-windows-static-md=fail -quickfix:arm-uwp=fail -quickfix:arm64-windows=fail -quickfix:x64-uwp=fail -quickfix:x64-windows-static=fail -quickfix:x64-windows-static-md=fail -quickfix:x64-windows=fail -quickfix:x86-windows=fail qwt:x64-osx=fail qwt-qt6:x64-osx=fail qwtw:x64-windows=fail @@ -1245,10 +1082,6 @@ rbdl-orb:x64-linux=skip rbdl-orb:x64-osx=skip readline:arm-uwp=fail readline:x64-uwp=fail -readline-win32:arm-uwp=fail -readline-win32:x64-linux=fail -readline-win32:x64-osx=fail -readline-win32:x64-uwp=fail realsense2:arm64-windows=fail realsense2:arm-uwp=fail realsense2:x64-uwp=fail @@ -1296,12 +1129,12 @@ rtlsdr:x64-linux=fail rtlsdr:x64-osx=fail rttr:arm-uwp=fail rttr:x64-uwp=fail -ryu:arm-uwp=fail -ryu:x64-uwp=fail + +# ryu does not support VS2022 yet +ryu:x64-windows=fail ryu:x64-windows-static=fail ryu:x64-windows-static-md=fail -ryu:x86-windows=fail -ryu::arm64-windows=fail + sciter:arm64-windows=fail sciter:arm-uwp=fail sciter:x64-linux=fail @@ -1313,11 +1146,6 @@ sciter:x64-windows-static-md=fail sciter:x86-windows=fail scnlib:arm-uwp=fail scnlib:x64-uwp=fail -scylla-wrapper:arm-uwp=fail -scylla-wrapper:x64-linux=fail -scylla-wrapper:x64-osx=fail -scylla-wrapper:x64-uwp=fail -scylla-wrapper:x64-windows-static=fail sdformat10:x64-windows-static-md=fail sdformat6:arm-uwp=fail sdformat6:arm64-windows=fail @@ -1330,8 +1158,6 @@ sdformat9:x64-windows-static-md=fail sdl1:arm-uwp=fail sdl1:x64-uwp=fail sdl1:x64-osx=fail -sdl2-image:arm-uwp=fail -sdl2-image:x64-uwp=fail sdl2-mixer:arm-uwp=fail sdl2-mixer:x64-uwp=fail sdl2-net:arm-uwp=fail @@ -1339,11 +1165,6 @@ sdl2-net:x64-uwp=fail # https://github.com/microsoft/vcpkg/issues/10918 seal:arm-uwp=fail seal:x64-uwp=fail -sentencepiece:arm64-windows=fail -sentencepiece:arm-uwp=fail -sentencepiece:x64-uwp=fail -sentencepiece:x64-windows=fail -sentencepiece:x86-windows=fail septag-sx:arm64-windows=fail septag-sx:arm-uwp=fail septag-sx:x64-uwp=fail @@ -1366,7 +1187,6 @@ shogun:x64-windows-static-md=skip shogun:x86-windows = skip signalrclient:x64-uwp=fail signalrclient:arm-uwp=fail -skia:arm64-windows=fail skia:arm-uwp=fail skia:x64-linux=fail skia:x64-uwp=fail @@ -1408,14 +1228,6 @@ spdk-ipsec:x64-windows=fail spdk-ipsec:x64-windows-static=fail spdk-ipsec:x64-windows-static-md=fail spdk-ipsec:x86-windows=fail -spdk-isal:arm64-windows=fail -spdk-isal:arm-uwp=fail -spdk-isal:x64-osx=fail -spdk-isal:x64-uwp=fail -spdk-isal:x64-windows=fail -spdk-isal:x64-windows-static=fail -spdk-isal:x64-windows-static-md=fail -spdk-isal:x86-windows=fail spirv-tools:arm-uwp=fail spirv-tools:x64-uwp=fail stormlib:arm-uwp=fail @@ -1427,7 +1239,6 @@ stxxl:x86-windows=skip stxxl:x64-windows=skip stxxl:x64-windows-static=skip stxxl:x64-windows-static-md=skip -symengine:arm64-windows=fail symengine:arm-uwp=fail systemc:arm64-windows=fail systemc:arm-uwp=fail @@ -1440,6 +1251,18 @@ tcl:arm64-windows=fail tcl:x64-uwp=fail telnetpp:arm-uwp=fail telnetpp:x64-uwp=fail + +# tensorflow does not support VS2022 +tensorflow:x64-windows=fail +tensorflow:x64-windows-static=fail +tensorflow:x64-windows-static-md=fail +tensorflow-cc:x64-windows=fail +tensorflow-cc:x64-windows-static=fail +tensorflow-cc:x64-windows-static-md=fail + +tensorflow:x64-osx=fail +tensorflow-cc:x64-osx=fail + theia:arm64-windows = skip theia:arm-uwp = skip theia:x64-uwp = skip @@ -1451,8 +1274,6 @@ tidy-html5:arm-uwp=fail tidy-html5:x64-uwp=fail tinkerforge:arm-uwp=fail tinkerforge:x64-uwp=fail -tinyexif:arm-uwp=fail -tinyexif:x64-uwp=fail tiny-process-library:arm-uwp=fail tiny-process-library:x64-uwp=fail tmxparser:arm64-windows=fail @@ -1469,18 +1290,6 @@ torch-th:x64-windows-static=fail tre:x64-osx=fail treehopper:x64-windows-static=fail treehopper:x64-linux=fail -turbobase64:arm64-windows=fail -turbobase64:arm-uwp=fail -turbobase64:x64-uwp=fail -turbobase64:x64-windows=fail -turbobase64:x64-windows-static=fail -turbobase64:x64-windows-static-md=fail -turbobase64:x86-windows=fail -unicorn:arm64-windows=fail -unicorn:arm-uwp=fail -unicorn:x64-linux=fail -unicorn:x64-osx=fail -unicorn:x64-uwp=fail unicorn-lib:arm-uwp=fail unicorn-lib:x64-uwp=fail unittest-cpp:arm64-windows=fail @@ -1493,12 +1302,6 @@ unixodbc:x64-windows=fail unixodbc:x64-windows-static=fail unixodbc:x64-windows-static-md=fail unixodbc:x86-windows=fail -unrar:arm64-windows=fail -unrar:arm-uwp=fail -unrar:x64-linux=fail -unrar:x64-osx=fail -unrar:x64-uwp=fail -unrar:x64-windows-static=fail urdfdom:x64-windows-static=fail usd:x86-windows=fail uthenticode:arm-uwp=fail @@ -1509,7 +1312,6 @@ v8:x64-osx=fail v8:x64-uwp=fail vectorclass:arm64-windows=fail vectorclass:arm-uwp=fail -vlpp:x64-osx=fail vulkan:arm64-windows=fail vulkan:arm-uwp=fail vulkan:x64-linux=fail @@ -1530,13 +1332,8 @@ vxl:x64-windows = skip vxl:x64-windows-static = skip vxl:x64-windows-static-md=skip vxl:x86-windows = skip -wampcc:arm64-windows=fail -wincrypt:x64-linux=fail -wincrypt:x64-osx=fail winpcap:arm64-windows = skip winpcap:arm-uwp = skip -winpcap:x64-linux=fail -winpcap:x64-osx=fail winpcap:x64-uwp = skip winpcap:x64-windows = skip winpcap:x64-windows-static = skip @@ -1544,12 +1341,6 @@ winpcap:x64-windows-static-md=skip winpcap:x86-windows = skip winreg:x64-linux=fail winreg:x64-osx=fail -winsock2:x64-linux=fail -winsock2:x64-osx=fail -wintoast:arm-uwp=fail -wintoast:x64-linux=fail -wintoast:x64-osx=fail -wintoast:x64-uwp=fail wpilib:arm64-windows=fail wpilib:x64-osx=fail wxchartdir:x64-osx=fail @@ -1566,33 +1357,12 @@ xerces-c:arm-uwp=fail xerces-c:x64-uwp=fail xmlsec:arm-uwp=fail xmlsec:x64-uwp=fail -# The xmsh upstream repository is gone, if we find no replacement before -# 2021-01-01 we will remove the port outright. -xmsh:arm-uwp=skip -xmsh:arm64-windows=skip -xmsh:x64-linux=skip -xmsh:x64-osx=skip -xmsh:x64-uwp=skip -xmsh:x64-windows-static=skip -xmsh:x64-windows-static-md=skip -xmsh:x64-windows=skip -xmsh:x86-windows=skip yajl:arm-uwp=fail yajl:x64-uwp=fail yara:arm-uwp=fail yara:x64-uwp=fail -yato:arm64-windows=fail -yato:arm-uwp=fail -yato:x64-uwp=fail z3:arm-uwp=fail z3:x64-uwp=fail -zkpp:x86-windows=fail -zkpp:x64-windows=fail -zkpp:x64-windows-static=fail -zkpp:x64-windows-static-md=fail -zkpp:arm64-windows=fail -zkpp:x64-uwp=fail -zkpp:arm-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 @@ -1615,22 +1385,18 @@ clapack:x64-windows-static=skip clapack:x64-windows-static-md=skip clapack:x64-windows=skip clapack:x86-windows=skip -clapack:x64-uwp=skip lapack-reference:arm64-windows=skip lapack-reference:arm-uwp=skip +lapack-reference:x64-uwp=skip # failures for x64-windows-static-md ace:x64-windows-static-md=fail akali:x64-windows-static-md=fail -chromium-base:x64-windows-static-md=fail -clockutils:x64-windows-static-md=fail fastcgi:x64-windows-static-md=fail -gmp:x64-windows-static-md=fail ijg-libjpeg:x64-windows-static-md=fail libcerf:x64-windows-static-md=fail libmicrohttpd:x64-windows-static-md=fail linenoise-ng:x64-windows-static-md=fail -mmloader:x64-windows-static-md=fail netcdf-cxx4:x64-windows-static-md=fail open62541:x64-windows-static-md=fail openscap:x64-windows-static-md=fail @@ -1638,19 +1404,18 @@ quantlib:x64-windows-static-md=fail sentencepiece:x64-windows-static-md=fail symengine:x64-windows-static-md=fail unicorn:x64-windows-static-md=fail + +# the version of v8 we have in the repo doesn't support VS2022 +v8:x86-windows=fail +v8:x64-windows=fail +v8:x64-windows-static=fail v8:x64-windows-static-md=fail -yato:x64-windows-static-md=fail + zyre:x64-windows-static-md=fail usbmuxd:x64-windows-static-md=fail workflow:x64-uwp=fail workflow:arm-uwp=fail -# wangle triggers an internal compiler error -# https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1269468 -wangle:x64-windows=fail -wangle:x64-windows-static=fail -wangle:x64-windows-static-md=fail - # VS2019 version 16.9.4's project system changes where PDBs are placed in a way that breaks the # upstream build script of this port. # See https://developercommunity.visualstudio.com/t/Toolset-169-regression-vcxproj-producin/1356639 diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_acquire_msys.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_acquire_msys.cmake index b7b0fc3e9..dcd93ed4f 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_acquire_msys.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_acquire_msys.cmake @@ -188,31 +188,31 @@ function(vcpkg_acquire_msys out_msys_root) DEPS libbz2 ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/libbz2-1.0.8-2-x86_64.pkg.tar.xz" - SHA512 d128bd1792d0f5750e6a63a24db86a791e7ee457db8c0bef68d217099be4a6eef27c85caf6ad09b0bcd5b3cdac6fc0a2b9842cc58d381a4035505906cc4803ec + URL "https://repo.msys2.org/msys/x86_64/libbz2-1.0.8-3-x86_64.pkg.tar.zst" + SHA512 955420cabd45a02f431f5b685d8dc8acbd07a8dcdda5fdf8b9de37d3ab02d427bdb0a6d8b67c448e307f21094e405e916fd37a8e9805abd03610f45c02d64b9e ) z_vcpkg_acquire_msys_declare_package( URL "https://repo.msys2.org/msys/x86_64/patch-2.7.6-1-x86_64.pkg.tar.xz" SHA512 04d06b9d5479f129f56e8290e0afe25217ffa457ec7bed3e576df08d4a85effd80d6e0ad82bd7541043100799b608a64da3c8f535f8ea173d326da6194902e8c ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/gzip-1.10-1-x86_64.pkg.tar.xz" - SHA512 2d0a60f2c384e3b9e2bed2212867c85333545e51ee0f583a33914e488e43c265ed0017cd4430a6e3dafdca99c0414b3756a4b9cc92a6f04d5566eff8b68def75 + URL "https://repo.msys2.org/msys/x86_64/gzip-1.11-1-x86_64.pkg.tar.zst" + SHA512 bcd9d7839aef5f2b73c4d39b51838e62626c201c808d512806ba0a1619aee83c7deddb0d499fd93f9815fe351d7ab656c31c9dc7ee1171d77ad6d598e04dfcbe DEPS msys2-runtime ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/texinfo-6.7-3-x86_64.pkg.tar.zst" - SHA512 d8bcce1a338d45a8c2350af3edee1d021a76524b767d465d3f7fd9cb03c8799d9cd3454526c10e4a2b4d58f75ae26a1a8177c50079dfdb4299129e0d45b093bc + URL "https://repo.msys2.org/msys/x86_64/texinfo-6.8-3-x86_64.pkg.tar.zst" + SHA512 5cc16d3b3c3b9859fe61233fa27f2146526e2b4d6e626814d283b35bfd77bc15eb4ffaec00bde6c10df93466d9155a06854a7ecf2e0d9af746dd56c4d88d192e DEPS bash perl ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/bash-4.4.023-2-x86_64.pkg.tar.xz" - SHA512 1cf2a07022113010e00e150e7004732013a793d49e7a6ac7c2be27a0b2c0ce3366150584b9974e30df042f8876a84d6a77c1a46f0607e38ebe18f8a25f51c32d + URL "https://repo.msys2.org/msys/x86_64/bash-5.1.008-1-x86_64.pkg.tar.zst" + SHA512 a2ab8c958615134dc666254baca8cb13ed773036954e458de74ffb3bfe661bb33149082d38b677024da451755098a9201ab7dd435ced6e7f6b4e94c3ae368daf DEPS msys2-runtime ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/autoconf-2.71-1-any.pkg.tar.zst" - SHA512 c5683bdf72bb3ba28ec0cb6a211ae1f9eebc79d03f17fc8a55d78a35dc6499209936e099d3725573255a48578b71fac6b7b17afb933fd22fe1204daf50689609 + URL "https://repo.msys2.org/msys/x86_64/autoconf-2.71-3-any.pkg.tar.zst" + SHA512 f639deac9b2191c2096584cf374103bbb1e9d2476dd0ebec94b1e80da59be25b88e362ac5280487a89f0bb0ed57f99b66e314f36b7de9cda03c0974806a3a4e2 DEPS m4 perl ) z_vcpkg_acquire_msys_declare_package( @@ -221,13 +221,13 @@ function(vcpkg_acquire_msys out_msys_root) DEPS m4 perl ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/diffutils-3.7-1-x86_64.pkg.tar.xz" - SHA512 0c39837a26b2111bb6310cdfe0bc14656e3d57456ad8023f59c9386634a8f1f236915c79a57348b64c508897c73ed88d8abce2b9ac512a427e9a3956939f2040 + URL "https://repo.msys2.org/msys/x86_64/diffutils-3.8-2-x86_64.pkg.tar.zst" + SHA512 ee74e457c417d6978b3185f2fb8e15c9c30ecfc316c2474d69c978e7eb2282a3bd050d68dbf43d694cb5ab6f159b0e7ca319d01f8192071d82a224dde87d69b5 DEPS msys2-runtime ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/binutils-2.34-4-x86_64.pkg.tar.zst" - SHA512 5271288d11489879082bc1f2298bb8bedbcfcf6ee19f8a9b3b552b6a4395543d9385bb833e3c32b1560bff1b411d2be503e2c12a7201bf37b85cfacc5f5baba3 + URL "https://repo.msys2.org/msys/x86_64/binutils-2.37-5-x86_64.pkg.tar.zst" + SHA512 32129cf97b53d5f6d87b42f17643e9dfc2e41b9ab4e4dfdc10e69725a9349bb25e57e0937e7504798cae91f7a88e0f4f5814e9f6a021bb68779d023176d2f311 DEPS libiconv libintl ) z_vcpkg_acquire_msys_declare_package( @@ -236,8 +236,8 @@ function(vcpkg_acquire_msys out_msys_root) DEPS grep sed coreutils file findutils ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/file-5.39-1-x86_64.pkg.tar.zst" - SHA512 be51dd0f6143a2f34f2a3e7d412866eb12511f25daaf3a5478240537733a67d7797a3a55a8893e5638589c06bca5af20aed5ded7db0bf19fbf52b30fae08cadd + URL "https://repo.msys2.org/msys/x86_64/file-5.41-2-x86_64.pkg.tar.zst" + SHA512 124c3983608879362acea7d487bf23690f371b3cfe0355385f0e643263b2a5568abe5cebda92ef9bc534e81f850138f589e75982f36a53f509676056d71de642 DEPS gcc-libs zlib libbz2 ) z_vcpkg_acquire_msys_declare_package( @@ -246,18 +246,18 @@ function(vcpkg_acquire_msys out_msys_root) DEPS gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/bzip2-1.0.8-2-x86_64.pkg.tar.xz" - SHA512 336f5b59eb9cf4e93b537a212509d84f72cd9b8a97bf8ac0596eff298f3c0979bdea6c605244d5913670b9d20b017e5ee327f1e606f546a88e177a03c589a636 + URL "https://repo.msys2.org/msys/x86_64/bzip2-1.0.8-3-x86_64.pkg.tar.zst" + SHA512 9d03e8fc5677dd1386454bd27a683667e829ad5b1b87fc0879027920b2e79b25a2d773ab2556cd29844b18dd25b26fef5a57bf89e35ca318e39443dcaf0ca3ba DEPS gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/libbz2-1.0.8-2-x86_64.pkg.tar.xz" - SHA512 d128bd1792d0f5750e6a63a24db86a791e7ee457db8c0bef68d217099be4a6eef27c85caf6ad09b0bcd5b3cdac6fc0a2b9842cc58d381a4035505906cc4803ec + URL "https://repo.msys2.org/msys/x86_64/libbz2-1.0.8-3-x86_64.pkg.tar.zst" + SHA512 955420cabd45a02f431f5b685d8dc8acbd07a8dcdda5fdf8b9de37d3ab02d427bdb0a6d8b67c448e307f21094e405e916fd37a8e9805abd03610f45c02d64b9e DEPS gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/coreutils-8.32-1-x86_64.pkg.tar.xz" - SHA512 1a2ae4f296954421ce36f764b9b1c77ca72fc8583c46060b817677d0ad6adc7d7e3c2bbe1ae0179afd116a3d62f28e59eae2f7c84c1c8ffb7d22d2f2b40c0cdc + URL "https://repo.msys2.org/msys/x86_64/coreutils-8.32-2-x86_64.pkg.tar.zst" + SHA512 0719e8d3683711453ff77496cad11583e877ea52806e5ea3f470444705705db20a8a9fe99987166b02c6bd240c06c7d86faa979a7bc5536c9c804d800b60b7be DEPS libiconv libintl gmp ) z_vcpkg_acquire_msys_declare_package( @@ -266,28 +266,28 @@ function(vcpkg_acquire_msys out_msys_root) DEPS libiconv libintl libpcre ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/sed-4.8-1-x86_64.pkg.tar.xz" - SHA512 b6e7ed0af9e04aba4992ee26d8616f7ac675c8137bb28558c049d50709afb571b33695ce21d01e5b7fe8e188c008dd2e8cbafc72a7e2a919c2d678506095132b + URL "https://repo.msys2.org/msys/x86_64/sed-4.8-2-x86_64.pkg.tar.zst" + SHA512 8391be777239e0bfc19dc477995ee581ea9dbb1ba34fc27f57ba9d858e7489ac9b7200479d405712b43fa88434dd597be71d161fa8c05606e7ef991711bfc4c1 DEPS libintl ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/libpcre-8.44-1-x86_64.pkg.tar.xz" - SHA512 e9e56386fc5cca0f3c36cee21eda91300d9a13a962ec2f52eeea00f131915daea1cfeb0e1b30704bf3cc4357d941d356e0d72192bab3006c2548e18cd96dad77 + URL "https://repo.msys2.org/msys/x86_64/libpcre-8.45-1-x86_64.pkg.tar.zst" + SHA512 b10a69380c44ea35367f310a7400eae26beacf347ddbb5da650b54924b80ffd791f12a9d70923567e5081e3c7098f042e47bcff1328d95b0b27ce63bcd762e88 DEPS gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/m4-1.4.19-1-x86_64.pkg.tar.zst" - SHA512 8f100fef907ae6668af68538cae559a531761b51bb556d345b752c698fee938a503818cbd2003722d449f6c9a080c7ddabe12dddbee4d407377ca1e96e7d08b1 + URL "https://repo.msys2.org/msys/x86_64/m4-1.4.19-2-x86_64.pkg.tar.zst" + SHA512 7471099ba7e3b47e5b019dc0e563165a8660722f2bbd337fb579e6d1832c0e7dcab0ca9297c4692b18add92c4ad49e94391c621cf38874e2ff63d4f926bac38c DEPS msys2-runtime ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/automake-wrapper-11-1-any.pkg.tar.xz" - SHA512 0fcfc80c31fd0bda5a46c55e9100a86d2fc788a92c7e2ca4fd281e551375c62eb5b9cc9ad9338bb44a815bf0b1d1b60b882c8e68ca3ea529b442f2d03d1d3e1f + URL "https://repo.msys2.org/msys/x86_64/automake-wrapper-11-4-any.pkg.tar.zst" + SHA512 175940ebccb490c25d2c431dd025f24a7d0c930a7ee8cb81a44a4989c1d07f4b5a8134e1d05a7a1b206f8e19a2308ee198b1295e31b2e139f5d9c1c077252c94 DEPS gawk ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/gawk-5.1.0-1-x86_64.pkg.tar.xz" - SHA512 4e2be747b184f27945df6fb37d52d56fd8117d2fe4b289370bcdb5b15a4cf90cbeaea98cf9e64bcbfa2c13db50d8bd14cbd719c5f31b420842da903006dbc959 + URL "https://repo.msys2.org/msys/x86_64/gawk-5.1.0-2-x86_64.pkg.tar.zst" + SHA512 d4b00e2b53ce99ddd3ee8e41c41add5ab36d26a54107acf7f5a5bf4a0033d72465cdab86f5b2eb8b7aca2cb5027a3e35cb194794c3bf563c0075ca3dbcad6987 DEPS libintl libreadline mpfr ) z_vcpkg_acquire_msys_declare_package( @@ -296,8 +296,8 @@ function(vcpkg_acquire_msys out_msys_root) DEPS gmp gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/gmp-6.2.0-1-x86_64.pkg.tar.xz" - SHA512 1389a443e775bb255d905665dd577bef7ed71d51a8c24d118097f8119c08c4dfe67505e88ddd1e9a3764dd1d50ed8b84fa34abefa797d257e90586f0cbf54de8 + URL "https://repo.msys2.org/msys/x86_64/gmp-6.2.1-1-x86_64.pkg.tar.zst" + SHA512 c5c8009ef069d05c2209b69c8e87094b09aac4b5c3dfdbea474d8262e55d286b400f1360c6a9778fd5eb87fb76a6463c21188286a1a1919ad79153eae3c44b0f ) z_vcpkg_acquire_msys_declare_package( URL "https://repo.msys2.org/msys/x86_64/xz-5.2.5-1-x86_64.pkg.tar.xz" # this seems to require immediate updating on version bumps. @@ -309,23 +309,23 @@ function(vcpkg_acquire_msys out_msys_root) SHA512 8d5c04354fdc7309e73abce679a4369c0be3dc342de51cef9d2a932b7df6a961c8cb1f7e373b1b8b2be40343a95fbd57ac29ebef63d4a2074be1d865e28ca6ad ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/libreadline-8.0.004-1-x86_64.pkg.tar.xz" - SHA512 42760bddedccc8d93507c1e3a7a81595dc6392b5e4319d24a85275eb04c30eb79078e4247eb2cdd00ff3884d932639130c89bf1b559310a17fa4858062491f97 + URL "https://repo.msys2.org/msys/x86_64/libreadline-8.1.001-1-x86_64.pkg.tar.zst" + SHA512 4104eb0c18b8c06ab3bd4ba6420e3464df8293bec673c88da49e2f74cf1d583c922e9ead5691271fe593d424f92d1fd8668a3002174d756993d5b18337459bab DEPS ncurses ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/ncurses-6.2-1-x86_64.pkg.tar.xz" - SHA512 d4dc566d3dbd32e7646e328cb350689ede7eaa7008c8ed971072f8869a2986fe3935e7df1700851b52716af7ef20c49f9e6628d3163a5e9208a8872b5014eaea + URL "https://repo.msys2.org/msys/x86_64/ncurses-6.2-2-x86_64.pkg.tar.zst" + SHA512 4bf744a21ab2030ea9d65eb4d824ec5bed4532b7a489859e5e19bba11b5ba9be08613de48acb38baacfd2a7295722e4d858d7c577565f1999d2583defbbb58f2 DEPS msys2-runtime ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/automake1.16-1.16.3-1-any.pkg.tar.zst" - SHA512 174e6b9d1512eb710d48cda5bb4fef2b5d9b32071f425c76ea32c48081da0281f9fde1aa185845fa68a881233937f8cfd3ebda640d55764c1d48ec50e4de3390 + URL "https://repo.msys2.org/msys/x86_64/automake1.16-1.16.3-3-any.pkg.tar.zst" + SHA512 77a195a9fe8680bee55c04b8ecc0e9ee43e2d89607c745098dfac4687f4f853885cabbb005202d70e9a9cdf9facf6849cc47c6b2f25573b5af8201696d926c72 DEPS perl ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/perl-5.32.1-1-x86_64.pkg.tar.zst" - SHA512 600b919c7299566aa6abf9a432c166fdd81be5ed052ad4062cc54ee952ea556992e8aba25a44757965d66827dc6e98fddb492867399be3bbed44803e17367cb8 + URL "https://repo.msys2.org/msys/x86_64/perl-5.32.1-2-x86_64.pkg.tar.zst" + SHA512 ad21734c05bc7faa809bc4ba761fb41a3b448d31794d1fd3d430cf4afe05ae991aabece4ec9a25718c01cc323d507bf97530533f0a20aabc18a7a2ccc0ae02b1 DEPS libcrypt ) z_vcpkg_acquire_msys_declare_package( @@ -339,43 +339,43 @@ function(vcpkg_acquire_msys out_msys_root) DEPS libiconv ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/make-4.3-1-x86_64.pkg.tar.xz" - SHA512 7306dec7859edc27d70a24ab4b396728481484a426c5aa2f7e9fed2635b3b25548b05b7d37a161a86a8edaa5922948bee8c99b1e8a078606e69ca48a433fe321 + URL "https://repo.msys2.org/msys/x86_64/make-4.3-3-x86_64.pkg.tar.zst" + SHA512 1d991bfc2f076c8288023c7dd71c65470ad852e0744870368a4ab56644f88c7f6bbeca89dbeb7ac8b2719340cfec737a8bceae49569bbe4e75b6b8ffdcfe76f1 DEPS libintl msys2-runtime ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/gettext-devel-0.19.8.1-1-x86_64.pkg.tar.xz" - SHA512 648f74c23e4f92145cdd0d45ff5285c2df34e855a9e75e5463dd6646967f8cf34a18ce357c6f498a4680e6d7b84e2d1697ba9deee84da8ea6bb14bbdb594ee22 + URL "https://repo.msys2.org/msys/x86_64/gettext-devel-0.21-1-x86_64.pkg.tar.zst" + SHA512 44444064b9860dbd3cb886812fb20ee97ab04a65616cca497be69c592d5507e7bc66bfe8dbd060a4df9c5d9bb44cb0f231584d65cb04351146d54d15852227af DEPS gettext ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/gettext-0.19.8.1-1-x86_64.pkg.tar.xz" - SHA512 c8c42d084c297746548963f7ec7a7df46241886f3e637e779811ee4a8fee6058f892082bb2658f6777cbffba2de4bcdfd68e846ba63c6a6552c9efb0c8c1de50 + URL "https://repo.msys2.org/msys/x86_64/gettext-0.21-1-x86_64.pkg.tar.zst" + SHA512 6ef5f4094c4a174550a898cac4f60215d22de09f7e5f72bdb297d18a6f027e6122b4a519aa8d5781f9b0201dcae14ad7910b181b1499d6d8bbeb5a35b3a08581 DEPS libintl libgettextpo libasprintf tar ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/tar-1.32-1-x86_64.pkg.tar.xz" - SHA512 379525f4b8a3f21d67d6506647aec8367724e1b4c896039f46845d9e834298280381e7261a87440925ee712794d43074f4ffb5e09e67a5195af810bbc107ad9a + URL "https://repo.msys2.org/msys/x86_64/tar-1.34-2-x86_64.pkg.tar.zst" + SHA512 127a971f5c087500ec4858697205b36ae76dba82307f1bcaaa44e746337d85d97360e46e55ef7fecbfa2a4af428ee26d804fa7d7c2b8ce6de1b86328dd14ef2d DEPS libiconv libintl ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/libgettextpo-0.19.8.1-1-x86_64.pkg.tar.xz" - SHA512 480b782a79b0ce71ed9939ae3a6821fc2f5a63358733965c62cee027d0e6c88e255df1d62379ee47f5a7f8ffe163e554e318dba22c67dc67469b10aa3248edf7 + URL "https://repo.msys2.org/msys/x86_64/libgettextpo-0.21-1-x86_64.pkg.tar.zst" + SHA512 bb217639deadb36734bafb8db5217e654d00b93a3ef366116cc6c9b8b8951abef9a7e9b04be3fae09074cf68576f18575a0d09f3d2f344985606c1449a17222e DEPS gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/libasprintf-0.19.8.1-1-x86_64.pkg.tar.xz" - SHA512 a2e8027b9bbee20f8cf60851130ca2af436641b1fb66054f8deba118da7ebecb1cd188224dcf08e4c5b7cde85b412efab058afef2358e843c9de8eb128ca448c + URL "https://repo.msys2.org/msys/x86_64/libasprintf-0.21-1-x86_64.pkg.tar.zst" + SHA512 62dde7bfcfea75ea9adb463807d7c128019ffeec0fb23e73bc39f760e45483c61f4f29e89cdbfab1e317d520c83fe3b65306fbd7258fe11ea951612dbee479fe DEPS gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/findutils-4.7.0-1-x86_64.pkg.tar.xz" - SHA512 fd09a24562b196ff252f4b5de86ed977280306a8c628792930812f146fcf7355f9d87434bbabe25e6cc17d8bd028f6bc68fc02e5bea83137a49cf5cc6f509e10 + URL "https://repo.msys2.org/msys/x86_64/findutils-4.8.0-1-x86_64.pkg.tar.zst" + SHA512 74f8750636becefd3675c89957dfb8a244d2db6fec80bf352998edfef93f66d0e2a37d7f2869a79dd197acf2057ccd6aefd12c58e94154765896a432831ab49c DEPS libintl libiconv ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/libintl-0.19.8.1-1-x86_64.pkg.tar.xz" - SHA512 4e54c252b828c862f376d8f5a2410ee623a43d70cbb07d0b8ac20c25096f59fb3ae8dcd011d1792bec76f0b0b9411d0e184ee23707995761dc50eb76f9fc6b92 + URL "https://repo.msys2.org/msys/x86_64/libintl-0.21-1-x86_64.pkg.tar.zst" + SHA512 be0242eed25793e86e0560868f76cf06a358ffc0b2beb357e776d6c7819e545ac90f9358b17a85aa598584babe3ab4bb4544e360a28f5cec965f314178b930d1 DEPS libiconv ) z_vcpkg_acquire_msys_declare_package( @@ -384,8 +384,8 @@ function(vcpkg_acquire_msys out_msys_root) DEPS gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/gcc-libs-9.3.0-1-x86_64.pkg.tar.xz" - SHA512 2816afbf45aa0ff47f94a623ad083d9421bca5284dc55683c2f1bc09ea0eadfe720afb75aafef60c2ff6384d051c4fbe2a744bb16a20acf34c04dc59b17c3d8c + URL "https://repo.msys2.org/msys/x86_64/gcc-libs-11.2.0-3-x86_64.pkg.tar.zst" + SHA512 be7bb61d1b87eafbb91cf9d0fee3270b9d5e2420c403ea394967941195d52ae248ce4ffde20af41a05310527a920269018f49487be617211a5e340486babd0f8 DEPS msys2-runtime ) z_vcpkg_acquire_msys_declare_package( @@ -394,23 +394,23 @@ function(vcpkg_acquire_msys out_msys_root) ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-numpy-1.19.0-1-any.pkg.tar.zst" - SHA512 15791fff23deda17a4452c9ca3f23210ed77ee20dcdd6e0c31d0e626a63aeb93d15ed814078729101f1cce96129b4b5e3c898396b003d794a52d7169dd027465 + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-numpy-1.20.3-1-any.pkg.tar.zst" + SHA512 ce73d4270942f61963e8307f6bec945d14e3774455684842b8fde836b19a4e9cbf8efd0663ffb28ad872493db70fa3a4e14bd0b248c2067199f4fee94e80e77e DEPS mingw-w64-x86_64-openblas mingw-w64-x86_64-python ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-openblas-0.3.10-2-any.pkg.tar.zst" - SHA512 3cf15ef191ceb303a7e40ad98aca94c56211b245617c17682379b5606a1a76e12d04fa1a83c6109e89620200a74917bcd981380c7749dda12fa8e79f0b923877 + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-openblas-0.3.19-1-any.pkg.tar.zst" + SHA512 0d18a93d7804d6469b8566cf4ad3a7efbdf8a4a4b05d191b23a30e107586423c6338b9f4a5ea2cc93052e6c0336dc82a43c26189c410263a6e705e6f3ebe261a DEPS mingw-w64-x86_64-gcc-libgfortran mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libwinpthread ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libgfortran-10.2.0-1-any.pkg.tar.zst" - SHA512 c2dee2957356fa51aae39d907d0cc07f966028b418f74a1ea7ea551ff001c175d86781f980c0cf994207794322dcd369fa122ab78b6c6d0f0ab01e39a754e780 + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libgfortran-11.2.0-8-any.pkg.tar.zst" + SHA512 8537b55633bc83d81d528378590e417ffe8c26b6c327d8b6d7ba50a8b5f4e090fbe2dc500deb834120edf25ac3c493055f4de2dc64bde061be23ce0f625a8893 DEPS mingw-w64-x86_64-gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-3.8.5-1-any.pkg.tar.zst" - SHA512 49bbcaa9479ff95fd21b473a1bc286886b204ec3e2e0d9466322e96a9ee07ccd8116024b54b967a87e4752057004475cac5060605e87bd5057de45efe5122a25 + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-3.8.9-2-any.pkg.tar.zst" + SHA512 8a45b28b2b0471718bd1ab096958872b18ae3b25f06c30718c54d1edaf04214397330a51776f3e4eee556ac47d9e3aa5e1b211c5df0cf6be3046a6f3a79cfa7d DEPS mingw-w64-x86_64-bzip2 mingw-w64-x86_64-expat mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libffi mingw-w64-x86_64-mpdecimal mingw-w64-x86_64-ncurses mingw-w64-x86_64-openssl mingw-w64-x86_64-sqlite3 mingw-w64-x86_64-tcl mingw-w64-x86_64-tk mingw-w64-x86_64-xz mingw-w64-x86_64-zlib ) z_vcpkg_acquire_msys_declare_package( @@ -419,13 +419,13 @@ function(vcpkg_acquire_msys out_msys_root) DEPS mingw-w64-x86_64-gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpdecimal-2.5.0-1-any.pkg.tar.zst" - SHA512 48130ff676c0235bad4648527021e597ee00aa49a4443740a134005877e2ff2ca27b30a0ac86b923192a65348b36de4e8d3f9c57d76ab42b2e21d1a92dbf7ccf + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpdecimal-2.5.1-1-any.pkg.tar.zst" + SHA512 1204c31367f9268ffd6658be04af7687c01f984c9d6be8c7a20ee0ebde1ca9a03b766ef1aeb1fa7aaa97b88a57f7a73afa7f7a7fed9c6b895a032db11e6133bf DEPS mingw-w64-x86_64-gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-ncurses-6.2-1-any.pkg.tar.xz" - SHA512 1cbffe0e181a3d4ceaa8f39b2a649584b2c7d689e6a057d85cb9f84edece2cf60eddc220127c7fa4f29e4aa6e8fb4f568ef9d73582d08168607135af977407e0 + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-ncurses-6.3-3-any.pkg.tar.zst" + SHA512 888c155d878651dc31c9a01455ab689d7b644cec759521b69b8399c20b6ddc77c90f3ee4ddeed8857084335335b4b30e182d826fb5b78719b704f13a1dfdbd54 DEPS mingw-w64-x86_64-libsystre ) z_vcpkg_acquire_msys_declare_package( @@ -440,33 +440,33 @@ function(vcpkg_acquire_msys out_msys_root) DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-gettext ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-openssl-1.1.1.g-1-any.pkg.tar.xz" - SHA512 81681089a19cae7dbdee1bc9d3148f03458fa7a1d2fd105be39299b3a0c91b34450bcfe2ad86622bc6819da1558d7217deb0807b4a7bed942a9a7a786fcd54a3 + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-openssl-1.1.1.m-1-any.pkg.tar.zst" + SHA512 9471b0e5b01453f6ee5c92be6e259446c6b5be45d1da8985a4735b3e54c835d9b86286b2af126546419bf968df096442bd4f60f30efa1a901316e3c02b98525f DEPS mingw-w64-x86_64-ca-certificates mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-zlib ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-ca-certificates-20200601-1-any.pkg.tar.zst" - SHA512 21a81e1529a3ad4f6eceb3b7d4e36400712d3a690d3991131573d4aae8364965757f9b02054d93c853eb75fbb7f6173a278b122450c800b2c9a1e8017dd35e28 + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-ca-certificates-20210119-1-any.pkg.tar.zst" + SHA512 5590ca116d73572eb336ad73ea5df9da34286d8ff8f6b162b38564d0057aa23b74a30858153013324516af26671046addd6bcade221e94e7b8ed5e8f886e1c58 DEPS mingw-w64-x86_64-p11-kit ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-p11-kit-0.23.20-2-any.pkg.tar.xz" - SHA512 c441c4928465a98aa53917df737b728275bc0f6e9b41e13de7c665a37d2111b46f057bb652a1d5a6c7cdf8a74ea15e365a727671b698f5bbb5a7cfd0b889935e + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-p11-kit-0.24.1-1-any.pkg.tar.zst" + SHA512 6437919cd61c8b1a59b346bbd93d960adb7f11206e8c0010311d71d0fe9aa03f950ecf08f19a5555b27f481cc0d61b88650b165ae9336ac1a1a0a9be553239b9 DEPS mingw-w64-x86_64-gettext mingw-w64-x86_64-libffi mingw-w64-x86_64-libtasn1 ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libtasn1-4.16.0-1-any.pkg.tar.xz" - SHA512 c450cd49391b46af552a89f2f6e2c21dd5da7d40e7456b380290c514a0f06bcbd63f0f972b3c173c4237bec7b652ff22d2d330e8fdf5c888558380bd2667be64 + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libtasn1-4.18.0-1-any.pkg.tar.zst" + SHA512 2584a6e0bc2b7d145f026487951b8690e3d8e79f475a7b77f95fc27ca9a9f1887fe9303e340ba2635353c4a6f6a2f10a907dd8778e54be7506a15459f616d4a4 DEPS mingw-w64-x86_64-gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-sqlite3-3.33.0-1-any.pkg.tar.zst" - SHA512 eae319f87c9849049347f132efc2ecc46e9ac1ead55542e31a3ea216932a4fa5c5bae8d468d2f050e1e22068ac9fbe9d8e1aa7612cc0110cafe6605032adeb0f + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-sqlite3-3.37.2-1-any.pkg.tar.zst" + SHA512 0f83f10b0c8f4699a6b84deb6986fcd471cb80b995561ad793e827f9dd66110d555744918ed91982aec8d9743f6064726dd5eba3e695aa9ab5381ea4f8e76dbe DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-readline mingw-w64-x86_64-tcl ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-readline-8.0.004-1-any.pkg.tar.xz" - SHA512 e3fb3030a50f677697bec0da39ba2eb979dc28991ad0e29012cbf1bda82723176148510bf924b7fce7a0b79e7b078232d69e07f3fbb7d657b8ee631841730120 + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-readline-8.1.001-1-any.pkg.tar.zst" + SHA512 b38aef9216ea2ba7edd82ce57a48dbc913b9bdcb44b96b9800342fe097d706ba39c9d5ba08d793d2c3388722479258bb05388ae09d74a1edcaaf9002e9d71853 DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-termcap ) z_vcpkg_acquire_msys_declare_package( @@ -475,13 +475,13 @@ function(vcpkg_acquire_msys out_msys_root) DEPS mingw-w64-x86_64-gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-tk-8.6.10-2-any.pkg.tar.zst" - SHA512 a2d05ce3070d3a3bdf823fa5c790b124aa7493e60758e2911d3f9651899cf58328044f9b06edd82060d8a4b5efb5c4cb32085d827aecd796dbb5e42441da305f + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-tk-8.6.11.1-2-any.pkg.tar.zst" + SHA512 15fd4e085fabe2281f33c8f36f4b1b0be132e5b100f6d4eaf54688842791aa2cf4e6d38a855f74f42be3f86c52e20044518f5843f8e9ca13c54a6ea4adb973a8 DEPS mingw-w64-x86_64-tcl ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-tcl-8.6.10-1-any.pkg.tar.xz" - SHA512 c3f21588e19725598878ef13145fbe7a995c2a0c678ef0a4782e28fd64d65fe3271178369bf0c54e92123eba82f2d3da6ae2fc34acd3b20150d1e173be1c0f8f + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-tcl-8.6.11-5-any.pkg.tar.zst" + SHA512 9db75ff47260ea3652d1abf60cd44649d0e8cbe5c4d26c316b99a6edb08252fb87ed017c856f151da99bcaa0bd90c0bebae28234035b008c5bd6508511639852 DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-zlib ) z_vcpkg_acquire_msys_declare_package( @@ -490,18 +490,18 @@ function(vcpkg_acquire_msys out_msys_root) DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-gettext ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gettext-0.19.8.1-10-any.pkg.tar.zst" - SHA512 ebe948028942738918930b1f3b7aa0314ce0fb617dbd36dcfaf3980958555c7c476f2b50c21d272d01fd3b0bb87ac4f800e485a5b7f8fcc7b30aacdf76740348 + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gettext-0.21-3-any.pkg.tar.zst" + SHA512 38daa0edd1a2c1efdd56baeb6805d10501a57e0c8ab98942e4a16f8b021908dac315513ea85f5278adf300bce3052a44a3f8b473adb0d5d3656aa4a48fe61081 DEPS mingw-w64-x86_64-expat mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libiconv ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libs-10.2.0-9-any.pkg.tar.zst" - SHA512 b2952015e0b27c51219fe15d7550a349e6d73032bbe328f00d6654008c4bda28766d75ce8898d765879ec5f4815695d0f047d01811d8253ed2d433cd5c77d5a9 + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libs-11.2.0-8-any.pkg.tar.zst" + SHA512 2481f7c8db7cca549911bc71715af86ca287ffed6d673c9a6c3a4c792b68899a129dd959214af7067f434e74fc518c43749e7d928cbd2232ab4fbc65880dad98 DEPS mingw-w64-x86_64-gmp mingw-w64-x86_64-libwinpthread mingw-w64-x86_64-mpc mingw-w64-x86_64-mpfr ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpc-1.2.0-2-any.pkg.tar.zst" - SHA512 f094b3ec407382018b3454afa07ea82b94acf3b92c094c46ab6d27e56cd2647cf5bc4986ecb18f8a5da721fd267dceba25353822e7cac33d9107604ac5d429bc + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpc-1.2.1-1-any.pkg.tar.zst" + SHA512 f2c137dbb0b6feea68dde9739c38b44dcb570324e3947adf991028e8f63c9ff50a11f47be15b90279ff40bcac7f320d952cfc14e69ba8d02cf8190c848d976a1 DEPS mingw-w64-x86_64-mpfr ) z_vcpkg_acquire_msys_declare_package( @@ -510,16 +510,16 @@ function(vcpkg_acquire_msys out_msys_root) DEPS mingw-w64-x86_64-gmp ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gmp-6.2.0-3-any.pkg.tar.zst" - SHA512 2736ba40bd7cac4ed12aae3d677aa0b788b161d2488976fbbae0fc6cff9ab154a09c903c1eec38ffe408a41abc62fd6106b55e17d7826b6dc10e720053685b1f + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gmp-6.2.1-3-any.pkg.tar.zst" + SHA512 d0d4ed1a046b64f437e72bbcf722b30311dde5f5e768a520141423fc0a3127b116bd62cfd4b5cf5c01a71ee0f9cf6479fcc31277904652d8f6ddbf16e33e0b72 ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-expat-2.2.10-1-any.pkg.tar.zst" - SHA512 ea3069abd7b9809186d1204479a49d605797535e5d618c5c4fc068511134ef9a277facd67fc47fa9a00da2018db90291190fdb2187cb6a7bd99331a1c0c7e119 + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-expat-2.4.4-1-any.pkg.tar.zst" + SHA512 479e6591d06eee2686591d7232a60d4092540deb40cf0c2c418de861b1da6b21fb4be82e603dd4a3b88f5a1b1d21cdb4f016780dda8131e32be5c3dec85dfc4d ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libffi-3.3-3-any.pkg.tar.zst" - SHA512 6d7700e218018454e406737108c40328038deb8d159b147b4159192d01fb72f8df90a81cf769c0b452fdab1f2ff110ead2e1894e3804f7e827fa2770349c63f8 + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libffi-3.3-4-any.pkg.tar.zst" + SHA512 1d7be396ef132289be0c33792c4e81dea6cb7b1eafa249fb3e8abc0b393d14e5114905c0c0262b6a7aed8f196ae4d7a10fbafd342b08ec76c9196921332747b5 ) z_vcpkg_acquire_msys_declare_package( URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libiconv-1.16-2-any.pkg.tar.zst" @@ -531,8 +531,8 @@ function(vcpkg_acquire_msys out_msys_root) ) z_vcpkg_acquire_msys_declare_package( NAME "mingw-w64-x86_64-libwinpthread" - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libwinpthread-git-8.0.0.5906.c9a21571-1-any.pkg.tar.zst" - SHA512 a6969a5db1c55ba458c1a047d0a2a9d2db6cc24266ea47f740598b149a601995d2de734a0984ac5e57ee611d5982cbc03fd6fc0f498435e8d6401bf15724caad + URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libwinpthread-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" + SHA512 a2c9e60d23b1310a6cec1fadd2b15a8c07223f3fe90d41b1579e9fc27ee2b0b408456291a55fad54a156e6a247efc20f6fcc247cc567e64fe190938aa3b672e9 ) if(NOT Z_VCPKG_MSYS_PACKAGES STREQUAL "") diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_build_make.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_build_make.cmake index 787471e19..dd5b061ee 100755 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_build_make.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_build_make.cmake @@ -121,9 +121,12 @@ function(vcpkg_build_make) endif() # Since includes are buildtype independent those are setup by vcpkg_configure_make - vcpkg_backup_env_variables(VARS LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH) + vcpkg_backup_env_variables(VARS LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH CPPFLAGS CFLAGS CXXFLAGS RCFLAGS) foreach(buildtype IN ITEMS "debug" "release") + if (buildtype STREQUAL "debug" AND _VCPKG_MAKE_NO_DEBUG) + continue() + endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "${buildtype}") if("${buildtype}" STREQUAL "debug") set(short_buildtype "-dbg") @@ -142,15 +145,21 @@ function(vcpkg_build_make) z_vcpkg_extract_cpp_flags_and_set_cflags_and_cxxflags("${cmake_buildtype}") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(LINKER_FLAGS_${cmake_buildtype} "${VCPKG_DETECTED_STATIC_LINKER_FLAGS_${cmake_buildtype}}") + set(LINKER_FLAGS_${cmake_buildtype} "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${cmake_buildtype}}") else() # dynamic - set(LINKER_FLAGS_${cmake_buildtype} "${VCPKG_DETECTED_SHARED_LINKER_FLAGS_${cmake_buildtype}}") + set(LINKER_FLAGS_${cmake_buildtype} "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${cmake_buildtype}}") + endif() + set(LDFLAGS_${cmake_buildtype} "") + if(EXISTS "${Z_VCPKG_INSTALLED}${path_suffix}/lib") + string(APPEND LDFLAGS_${cmake_buildtype} " -L${Z_VCPKG_INSTALLED}${path_suffix}/lib") + endif() + if(EXISTS "${Z_VCPKG_INSTALLED}${path_suffix}/lib/manual-link") + string(APPEND LDFLAGS_${cmake_buildtype} " -L${Z_VCPKG_INSTALLED}${path_suffix}/lib/manual-link") endif() if (CMAKE_HOST_WIN32 AND VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "cl.exe") - set(LDFLAGS_${cmake_buildtype} "-L${Z_VCPKG_INSTALLED}${path_suffix}/lib -L${Z_VCPKG_INSTALLED}${path_suffix}/lib/manual-link") set(LINK_ENV_${cmake_buildtype} "$ENV{_LINK_} ${LINKER_FLAGS_${cmake_buildtype}}") else() - set(LDFLAGS_${cmake_buildtype} "-L${Z_VCPKG_INSTALLED}${path_suffix}/lib -L${Z_VCPKG_INSTALLED}${path_suffix}/lib/manual-link ${LINKER_FLAGS_${cmake_buildtype}}") + string(APPEND LDFLAGS_${cmake_buildtype} " ${LINKER_FLAGS_${cmake_buildtype}}") endif() # Setup environment @@ -159,14 +168,20 @@ function(vcpkg_build_make) set(ENV{CXXFLAGS} "${CXXFLAGS_${cmake_buildtype}}") set(ENV{RCFLAGS} "${VCPKG_DETECTED_CMAKE_RC_FLAGS_${cmake_buildtype}}") set(ENV{LDFLAGS} "${LDFLAGS_${cmake_buildtype}}") - vcpkg_host_path_list(PREPEND ENV{LIB} "${Z_VCPKG_INSTALLED}${path_suffix}/lib/" "${Z_VCPKG_INSTALLED}${path_suffix}/lib/manual-link/") - vcpkg_host_path_list(PREPEND ENV{LIBPATH} "${Z_VCPKG_INSTALLED}${path_suffix}/lib/" "${Z_VCPKG_INSTALLED}${path_suffix}/lib/manual-link/") - vcpkg_host_path_list(PREPEND ENV{LIBRARY_PATH} "${Z_VCPKG_INSTALLED}${path_suffix_${buildtype}}/lib/" "${Z_VCPKG_INSTALLED}${path_suffix}/lib/manual-link/") - #vcpkg_host_path_list(PREPEND ENV{LD_LIBRARY_PATH} "${Z_VCPKG_INSTALLED}${path_suffix}/lib/" "${Z_VCPKG_INSTALLED}${path_suffix_${buildtype}}/lib/manual-link/") - - if(LINK_ENV_${_VAR_SUFFIX}) + vcpkg_list(APPEND lib_env_vars LIB LIBPATH LIBRARY_PATH) # LD_LIBRARY_PATH) + foreach(lib_env_var IN LISTS lib_env_vars) + if(EXISTS "${Z_VCPKG_INSTALLED}${path_suffix}/lib") + vcpkg_host_path_list(PREPEND ENV{${lib_env_var}} "${Z_VCPKG_INSTALLED}${path_suffix}/lib") + endif() + if(EXISTS "${Z_VCPKG_INSTALLED}${path_suffix}/lib/manual-link") + vcpkg_host_path_list(PREPEND ENV{${lib_env_var}} "${Z_VCPKG_INSTALLED}${path_suffix}/lib/manual-link") + endif() + endforeach() + unset(lib_env_vars) + + if(LINK_ENV_${cmake_buildtype}) set(config_link_backup "$ENV{_LINK_}") - set(ENV{_LINK_} "${LINK_ENV_${_VAR_SUFFIX}}") + set(ENV{_LINK_} "${LINK_ENV_${cmake_buildtype}}") endif() if(arg_ADD_BIN_TO_PATH) @@ -238,5 +253,6 @@ function(vcpkg_build_make) set(ENV{PATH} "${path_backup}") endif() - vcpkg_restore_env_variables(VARS LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH) + vcpkg_restore_env_variables(VARS LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH CPPFLAGS CFLAGS CXXFLAGS RCFLAGS) + unset(_VCPKG_MAKE_NO_DEBUG PARENT_SCOPE) endfunction() diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_check_features.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_check_features.cmake index 7679b0d11..5f4c5339b 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_check_features.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_check_features.cmake @@ -55,9 +55,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS secure MI_SECURE ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS # Expands to "-DMI_SEE_ASM=ON;-DMI_OVERRIDE=OFF;-DMI_SECURE=ON" ${FEATURE_OPTIONS} @@ -76,9 +75,8 @@ vcpkg_check_features( websockets CPPREST_EXCLUDE_WEBSOCKETS ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS # Expands to "-DCPPREST_EXCLUDE_BROTLI=ON;-DCPPREST_EXCLUDE_WEBSOCKETS=OFF" ${FEATURE_OPTIONS} @@ -98,9 +96,8 @@ vcpkg_check_features( cuda BUILD_GPU ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS # Expands to "-DWITH_CUDA=ON;-DBUILD_CUDA=ON;-DBUILD_GPU=ON" ${FEATURE_OPTIONS} @@ -120,9 +117,8 @@ vcpkg_check_features( tbb ROCKSDB_IGNORE_PACKAGE_TBB ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS # Expands to "-DWITH_TBB=ON;-DROCKSDB_IGNORE_PACKAGE_TBB=OFF" ${FEATURE_OPTIONS} diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_configure_cmake.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_configure_cmake.cmake index 84a8d1e27..7f139a4b9 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_configure_cmake.cmake @@ -98,6 +98,68 @@ function(z_vcpkg_configure_cmake_build_cmakecache out_var whereat build_type) set("${out_var}" "${${out_var}}${line}\"\n\n" PARENT_SCOPE) endfunction() +function(z_vcpkg_get_visual_studio_generator) + cmake_parse_arguments(PARSE_ARGV 0 arg "" "OUT_GENERATOR;OUT_ARCH" "") + + if (NOT DEFINED arg_OUT_GENERATOR) + message(FATAL_ERROR "OUT_GENERATOR must be defined.") + endif() + if(NOT DEFINED arg_OUT_ARCH) + message(FATAL_ERROR "OUT_ARCH must be defined.") + endif() + 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") + endif() + + if("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "x86") + set(generator_arch "Win32") + elseif("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "x64") + set(generator_arch "x64") + elseif("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm") + set(generator_arch "ARM") + elseif("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64") + set(generator_arch "ARM64") + endif() + set(${arg_OUT_GENERATOR} "${generator}" PARENT_SCOPE) + set(${arg_OUT_ARCH} "${generator_arch}" PARENT_SCOPE) +endfunction() + +function(z_vcpkg_select_default_vcpkg_chainload_toolchain) + # Try avoiding adding more defaults here. + # Set VCPKG_CHAINLOAD_TOOLCHAIN_FILE explicitly in the triplet. + if(DEFINED Z_VCPKG_CHAINLOAD_TOOLCHAIN_FILE) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${Z_VCPKG_CHAINLOAD_TOOLCHAIN_FILE}") + elseif(VCPKG_TARGET_IS_MINGW) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/mingw.cmake") + elseif(VCPKG_TARGET_IS_WINDOWS) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake") + elseif(VCPKG_TARGET_IS_LINUX) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/linux.cmake") + elseif(VCPKG_TARGET_IS_ANDROID) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/android.cmake") + elseif(VCPKG_TARGET_IS_OSX) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/osx.cmake") + elseif(VCPKG_TARGET_IS_IOS) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/ios.cmake") + elseif(VCPKG_TARGET_IS_FREEBSD) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/freebsd.cmake") + elseif(VCPKG_TARGET_IS_OPENBSD) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/openbsd.cmake") + endif() + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE ${VCPKG_CHAINLOAD_TOOLCHAIN_FILE} PARENT_SCOPE) +endfunction() + function(vcpkg_configure_cmake) cmake_parse_arguments(PARSE_ARGV 0 arg @@ -142,6 +204,10 @@ function(vcpkg_configure_cmake) set(ninja_can_be_used ON) # Ninja as generator set(ninja_host ON) # Ninja as parallel configurator + if(NOT arg_PREFER_NINJA AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(ninja_can_be_used OFF) + endif() + if(VCPKG_HOST_IS_WINDOWS) if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) set(host_arch "$ENV{PROCESSOR_ARCHITEW6432}") @@ -159,38 +225,13 @@ function(vcpkg_configure_cmake) endif() endif() - set(generator "") + set(generator "Ninja") # the default generator is always ninja! set(generator_arch "") if(DEFINED arg_GENERATOR) set(generator "${arg_GENERATOR}") - elseif(arg_PREFER_NINJA AND ninja_can_be_used) - set(generator "Ninja") - elseif(VCPKG_CHAINLOAD_TOOLCHAIN_FILE OR NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) - set(generator "Ninja") - - else() - 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") - endif() - - if("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "x86") - set(generator_arch "Win32") - elseif("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "x64") - set(generator_arch "x64") - elseif("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm") - set(generator_arch "ARM") - elseif("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64") - set(generator_arch "ARM64") - endif() - + elseif(NOT ninja_can_be_used) + set(generator "") + z_vcpkg_get_visual_studio_generator(OUT_GENERATOR generator OUT_ARCH generator_arch) if("${generator}" STREQUAL "" OR "${generator_arch}" STREQUAL "") message(FATAL_ERROR "Unable to determine appropriate generator for triplet ${TARGET_TRIPLET}: @@ -244,23 +285,7 @@ function(vcpkg_configure_cmake) endif() if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE) - if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake") - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/linux.cmake") - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android") - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/android.cmake") - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/osx.cmake") - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "iOS") - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/ios.cmake") - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/freebsd.cmake") - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/openbsd.cmake") - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "MinGW") - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/mingw.cmake") - endif() + z_vcpkg_select_default_vcpkg_chainload_toolchain() endif() vcpkg_list(APPEND arg_OPTIONS diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_configure_make.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_configure_make.cmake index aa054222c..3e9c43787 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_configure_make.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_configure_make.cmake @@ -228,11 +228,15 @@ 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;USE_WRAPPERS;DETERMINE_BUILD_TRIPLET" + "AUTOCONFIG;SKIP_CONFIGURE;COPY_SOURCE;DISABLE_VERBOSE_FLAGS;NO_ADDITIONAL_PATHS;ADD_BIN_TO_PATH;NO_DEBUG;USE_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" ) + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + z_vcpkg_get_cmake_vars(cmake_vars_file) debug_message("Including cmake vars from: ${cmake_vars_file}") include("${cmake_vars_file}") @@ -465,6 +469,21 @@ function(vcpkg_configure_make) endif() endif() + # Linux - cross-compiling support + if(VCPKG_TARGET_IS_LINUX) + if (requires_autoconfig AND NOT arg_BUILD_TRIPLET OR arg_DETERMINE_BUILD_TRIPLET) + # The regex below takes the prefix from the resulting CMAKE_C_COMPILER variable eg. arm-linux-gnueabihf-gcc + # set in the common toolchains/linux.cmake + # This is used via --host as a prefix for all other bin tools as well. + # Setting the compiler directly via CC=arm-linux-gnueabihf-gcc does not work acording to: + # https://www.gnu.org/software/autoconf/manual/autoconf-2.65/html_node/Specifying-Target-Triplets.html + if(VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "([^\/]*)-gcc$" AND CMAKE_MATCH_1) + set(arg_BUILD_TRIPLET "--host=${CMAKE_MATCH_1}") # (Host activates crosscompilation; The name given here is just the prefix of the host tools for the target) + endif() + debug_message("Using make triplet: ${arg_BUILD_TRIPLET}") + endif() + endif() + # Cleanup previous build dirs file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" @@ -773,13 +792,13 @@ function(vcpkg_configure_make) endif() set(ENV{PKG_CONFIG} "${PKGCONFIG}") - vcpkg_list(APPEND lib_env_vars LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH) + vcpkg_list(APPEND lib_env_vars LIB LIBPATH LIBRARY_PATH) # LD_LIBRARY_PATH) foreach(lib_env_var IN LISTS lib_env_vars) if(EXISTS "${CURRENT_INSTALLED_DIR}${path_suffix_${current_buildtype}}/lib") vcpkg_host_path_list(PREPEND ENV{${lib_env_var}} "${CURRENT_INSTALLED_DIR}${path_suffix_${current_buildtype}}/lib") endif() if(EXISTS "${CURRENT_INSTALLED_DIR}${path_suffix_${current_buildtype}}/lib/manual-link") - vcpkg_host_path_list(PREPEND ENV{${lib_env_var}} "${CURRENT_INSTALLED_DIR}" "${path_suffix_${current_buildtype}}/lib/manual-link") + vcpkg_host_path_list(PREPEND ENV{${lib_env_var}} "${CURRENT_INSTALLED_DIR}${path_suffix_${current_buildtype}}/lib/manual-link") endif() endforeach() unset(lib_env_vars) @@ -851,4 +870,5 @@ function(vcpkg_configure_make) set(_VCPKG_PROJECT_SOURCE_PATH ${arg_SOURCE_PATH} PARENT_SCOPE) set(_VCPKG_PROJECT_SUBPATH ${arg_PROJECT_SUBPATH} PARENT_SCOPE) + set(_VCPKG_MAKE_NO_DEBUG ${arg_NO_DEBUG} PARENT_SCOPE) endfunction() diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_configure_meson.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_configure_meson.cmake index 02e189b31..2dc8bd206 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_configure_meson.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_configure_meson.cmake @@ -179,6 +179,17 @@ function(z_vcpkg_meson_generate_flags_properties_string out_var config_type) set(linker_flags "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${config_type}}") endif() z_vcpkg_meson_convert_compiler_flags_to_list(linker_flags "${linker_flags}") + if(VCPKG_TARGET_IS_OSX) + # macOS - append arch and isysroot if cross-compiling + if(NOT "${VCPKG_OSX_ARCHITECTURES}" STREQUAL "${VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR}") + foreach(arch IN LISTS VCPKG_OSX_ARCHITECTURES) + vcpkg_list(APPEND linker_flags -arch "${arch}") + endforeach() + endif() + if(VCPKG_DETECTED_CMAKE_OSX_SYSROOT) + vcpkg_list(APPEND linker_flags -isysroot "${VCPKG_DETECTED_CMAKE_OSX_SYSROOT}") + endif() + endif() vcpkg_list(APPEND linker_flags "${libpath}") z_vcpkg_meson_convert_list_to_python_array(linker_flags ${linker_flags}) string(APPEND result "c_link_args = ${linker_flags}\n") @@ -188,30 +199,12 @@ endfunction() function(z_vcpkg_meson_generate_native_file_config config_type) #https://mesonbuild.com/Native-environments.html set(native_file "[properties]\n") #https://mesonbuild.com/Builtin-options.html - z_vcpkg_meson_generate_flags_properties_string(native_properties "${config_type}") - string(APPEND native_file "${native_properties}") #Setup CMake properties string(APPEND native_file "cmake_toolchain_file = '${SCRIPTS}/buildsystems/vcpkg.cmake'\n") string(APPEND native_file "[cmake]\n") if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE) - if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake") - elseif(VCPKG_TARGET_IS_LINUX) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/linux.cmake") - elseif(VCPKG_TARGET_IS_ANDROID) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/android.cmake") - elseif(VCPKG_TARGET_IS_OSX) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/osx.cmake") - elseif(VCPKG_TARGET_IS_IOS) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/ios.cmake") - elseif(VCPKG_TARGET_IS_FREEBSD) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/freebsd.cmake") - elseif(VCPKG_TARGET_IS_OPENBSD) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/openbsd.cmake") - elseif(VCPKG_TARGET_IS_MINGW) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/mingw.cmake") - endif() + z_vcpkg_select_default_vcpkg_chainload_toolchain() endif() string(APPEND native_file "VCPKG_TARGET_TRIPLET = '${TARGET_TRIPLET}'\n") @@ -219,6 +212,8 @@ function(z_vcpkg_meson_generate_native_file_config config_type) #https://mesonbu string(APPEND native_file "VCPKG_CRT_LINKAGE = '${VCPKG_CRT_LINKAGE}'\n") string(APPEND native_file "[built-in options]\n") + z_vcpkg_meson_generate_flags_properties_string(native_properties "${config_type}") + string(APPEND native_file "${native_properties}") if(VCPKG_TARGET_IS_WINDOWS) if(VCPKG_CRT_LINKAGE STREQUAL "static") set(crt_type mt) @@ -348,9 +343,9 @@ endfunction() function(z_vcpkg_meson_generate_cross_file_config config_type) #https://mesonbuild.com/Native-environments.html set(cross_${config_type}_log "[properties]\n") #https://mesonbuild.com/Builtin-options.html + string(APPEND cross_${config_type}_log "[built-in options]\n") z_vcpkg_meson_generate_flags_properties_string(cross_properties ${config_type}) string(APPEND cross_${config_type}_log "${cross_properties}") - string(APPEND cross_${config_type}_log "[built-in options]\n") if(VCPKG_TARGET_IS_WINDOWS) if(VCPKG_CRT_LINKAGE STREQUAL "static") set(crt_type mt) @@ -464,16 +459,6 @@ function(vcpkg_configure_meson) set(suffix_${buildname} "rel") endif() - if(VCPKG_TARGET_IS_OSX) - vcpkg_backup_env_variables(VARS SDKROOT MACOSX_DEPLOYMENT_TARGET) - - set(ENV{SDKROOT} "${VCPKG_DETECTED_CMAKE_OSX_SYSROOT}") - set(VCPKG_DETECTED_CMAKE_OSX_SYSROOT "${VCPKG_DETECTED_CMAKE_OSX_SYSROOT}" PARENT_SCOPE) - - set(ENV{MACOSX_DEPLOYMENT_TARGET} "${VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET}") - set(VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET "${VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET}" PARENT_SCOPE) - endif() - vcpkg_backup_env_variables(VARS INCLUDE) vcpkg_host_path_list(APPEND ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include") # configure build @@ -512,8 +497,5 @@ function(vcpkg_configure_meson) vcpkg_restore_env_variables(VARS PKG_CONFIG PKG_CONFIG_PATH) endforeach() - if(VCPKG_TARGET_IS_OSX) - vcpkg_restore_env_variables(VARS SDKROOT MACOSX_DEPLOYMENT_TARGET) - endif() vcpkg_restore_env_variables(VARS INCLUDE) endfunction() diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_download_distfile.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_download_distfile.cmake index 405533939..d9339e059 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_download_distfile.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_download_distfile.cmake @@ -97,7 +97,7 @@ function(z_vcpkg_download_distfile_show_proxy_and_fail error_code) " Workaround is open Windows 10 Settings App, and search for Proxy Configuration page,\n" " Change `http=address:port;https=address:port` to `address`, and fill the port number.\n" " \n" - " 3. You proxy's remote server is out of service.\n" + " 3. Your proxy's remote server is out of service.\n" " \n" " In future vcpkg releases, if you are using Windows, you no longer need to set\n" " HTTP(S)_PROXY environment variables. Vcpkg will simply apply Windows IE Proxy\n" 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 914c07e0d..921196cc2 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_execute_build_process.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_execute_build_process.cmake @@ -41,6 +41,8 @@ set(Z_VCPKG_EXECUTE_BUILD_PROCESS_RETRY_ERROR_MESSAGES "LINK : fatal error LNK1318:" "LINK : fatal error LNK1104:" "LINK : fatal error LNK1201:" + "ld terminated with signal 9" + "Killed signal terminated program" # Multiple threads using the same directory at the same time cause conflicts, will try again. "Cannot create parent directory" "Cannot write file" @@ -84,12 +86,13 @@ function(vcpkg_execute_build_process) file(READ "${log_err}" err_contents) set(all_contents "${out_contents}${err_contents}") if(all_contents MATCHES "${Z_VCPKG_EXECUTE_BUILD_PROCESS_RETRY_ERROR_MESSAGES}") - message(STATUS "Restarting Build without parallelism because memory exceeded") + message(WARNING "Please ensure your system has sufficient memory.") set(log_out "${log_prefix}-out-1.log") set(log_err "${log_prefix}-err-1.log") list(APPEND all_logs "${log_out}" "${log_err}") if(DEFINED arg_NO_PARALLEL_COMMAND) + message(STATUS "Restarting build without parallelism") execute_process( COMMAND ${arg_NO_PARALLEL_COMMAND} WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}" @@ -98,6 +101,7 @@ function(vcpkg_execute_build_process) RESULT_VARIABLE error_code ) else() + message(STATUS "Restarting build") execute_process( COMMAND ${arg_COMMAND} WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}" @@ -134,8 +138,6 @@ function(vcpkg_execute_build_process) break() endif() endforeach() - elseif(all_contents MATCHES "fatal error: ld terminated with signal 9 [Killed]") - message(WARNING "ld was terminated with signal 9 [killed], please ensure your system has sufficient hard disk space and memory.") endif() endif() @@ -149,6 +151,7 @@ function(vcpkg_execute_build_process) if(NOT log_size EQUAL "0") file(TO_NATIVE_PATH "${log}" native_log) string(APPEND stringified_logs " ${native_log}\n") + file(APPEND "${Z_VCPKG_ERROR_LOG_COLLECTION_FILE}" "${native_log}\n") endif() endforeach() z_vcpkg_prettify_command_line(pretty_command ${arg_COMMAND}) 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 27024fecf..cc18c4102 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_execute_required_process.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_execute_required_process.cmake @@ -120,6 +120,7 @@ Halting portfile execution. if(NOT log_size EQUAL "0") file(TO_NATIVE_PATH "${log}" native_log) string(APPEND stringified_logs " ${native_log}\n") + file(APPEND "${Z_VCPKG_ERROR_LOG_COLLECTION_FILE}" "${native_log}\n") endif() endforeach() 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 59daac7d9..e389d7a12 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_extract_source_archive.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_extract_source_archive.cmake @@ -18,6 +18,7 @@ The latter is suggested to use for all future `vcpkg_extract_source_archive`s. vcpkg_extract_source_archive( ARCHIVE [NO_REMOVE_ONE_LEVEL] + [SKIP_PATCH_CHECK] [PATCHES ...] [SOURCE_BASE ] [BASE_DIRECTORY | WORKING_DIRECTORY ] @@ -58,6 +59,10 @@ 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`. @@ -221,7 +226,7 @@ function(vcpkg_extract_source_archive) endif() endif() - if (arg_Z_SKIP_PATCH_CHECK) + if (arg_SKIP_PATCH_CHECK) set(quiet_param QUIET) else() set(quiet_param "") @@ -239,4 +244,3 @@ function(vcpkg_extract_source_archive) set("${out_source_path}" "${source_path}" PARENT_SCOPE) message(STATUS "Using source at ${source_path}") endfunction() - 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 a7e876d06..4b760e9a0 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_fail_port_install.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_fail_port_install.cmake @@ -1,3 +1,5 @@ +# DEPRECATED: in favor of the `supports` field in [`manifest file`](manifest-files.md#supports) et al. + #[===[.md: # vcpkg_fail_port_install @@ -40,6 +42,8 @@ Library linkage for which the build should fail early. #]===] 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") + set(multi_args "ON_TARGET;ON_ARCH;ON_CRT_LINKAGE;ON_LIBRARY_LINKAGE") cmake_parse_arguments(PARSE_ARGV 0 "arg" "ALWAYS" "MESSAGE" "${multi_args}") if(DEFINED arg_UNPARSED_ARGUMENTS) 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 55e64feb3..c85932dc7 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -247,17 +247,17 @@ function(vcpkg_find_acquire_program program) elseif(program STREQUAL "PYTHON3") if(CMAKE_HOST_WIN32) set(program_name python) - set(program_version 3.10.1) + set(program_version 3.10.2) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") set(tool_subdirectory "python-${program_version}-x86") set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}-embed-win32.zip") set(download_filename "python-${program_version}-embed-win32.zip") - set(download_sha512 47bf00e4de74f33fe3d0c4f97773b221cf78c29f02257f43368f0414c88be1bdffc914e4e6516870c23cba84f4618edb8fe5a3ee43e41f492d812a90d93c1ea8) + set(download_sha512 d647d7141d1b13c899671b882e686a1b1cc6f759e5b7428ec858cdffd9ef019c78fb0b989174b98f30cb696297bfeff3d171f7eaabb339f5154886c030b8e4d9) else() set(tool_subdirectory "python-${program_version}-x64") set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}-embed-amd64.zip") set(download_filename "python-${program_version}-embed-amd64.zip") - set(download_sha512 cb67b15c312cf6e157b5023106b52129998f0cc214fc79e53ffa8b7ef9f34200690d9ab6798401c47be4e6c22bfbfcb3c0fd17e71d9253c53d4572b1d4931029) + set(download_sha512 e04e14f3b5e96f120a3b0d5fac07b2982b9f3394aef4591b140e84ff97c8532e1f8bf3e613bdf5aec6afeac108b975e754bf9727354bcfaa6673fc89826eac37) endif() set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}") vcpkg_list(SET post_install_command "${CMAKE_COMMAND}" -E rm python310._pth) @@ -270,18 +270,22 @@ function(vcpkg_find_acquire_program program) if(CMAKE_HOST_WIN32) set(program_name python) set(program_version 2.7.18) - if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86) - set(tool_subdirectory "python-${program_version}-x86") - set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}.msi") - set(download_filename "python-${program_version}.msi") - set(download_sha512 2c112733c777ddbf189b0a54047a9d5851ebce0564cc38b9687d79ce6c7a09006109dbad8627fb1a60c3ad55e261db850d9dfa454af0533b460b2afc316fe115) - else() - set(tool_subdirectory "python-${program_version}-x64") - set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}.amd64.msi") - set(download_filename "python-${program_version}.amd64.msi") - set(download_sha512 6a81a413b80fd39893e7444fd47efa455d240cbb77a456c9d12f7cf64962b38c08cfa244cd9c50a65947c40f936c6c8c5782f7236d7b92445ab3dd01e82af23e) + if(EXISTS "${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-tool-python2/details.cmake") + include("${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-tool-python2/details.cmake") + else() # Old behavior + if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86) + set(tool_subdirectory "python-${program_version}-x86") + set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}.msi") + set(download_filename "python-${program_version}.msi") + set(download_sha512 2c112733c777ddbf189b0a54047a9d5851ebce0564cc38b9687d79ce6c7a09006109dbad8627fb1a60c3ad55e261db850d9dfa454af0533b460b2afc316fe115) + else() + set(tool_subdirectory "python-${program_version}-x64") + set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}.amd64.msi") + set(download_filename "python-${program_version}.amd64.msi") + set(download_sha512 6a81a413b80fd39893e7444fd47efa455d240cbb77a456c9d12f7cf64962b38c08cfa244cd9c50a65947c40f936c6c8c5782f7236d7b92445ab3dd01e82af23e) + endif() + set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}") endif() - set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}") elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") # macOS includes Python 2.7 built-in as `python` set(program_name python) @@ -371,19 +375,17 @@ function(vcpkg_find_acquire_program program) endif() elseif(program STREQUAL "FLEX" OR program STREQUAL "BISON") if(CMAKE_HOST_WIN32) - vcpkg_list(SET sourceforge_args - REPO winflexbison - FILENAME winflexbison-2.5.16.zip - SHA512 0a14154bff5d998feb23903c46961528f8ccb4464375d5384db8c4a7d230c0c599da9b68e7a32f3217a0a0735742242eaf3769cb4f03e00931af8640250e9123 - NO_REMOVE_ONE_LEVEL - WORKING_DIRECTORY "${DOWNLOADS}/tools/winflexbison" - ) + set(program_version 2.5.25) + set(download_urls "https://github.com/lexxmark/winflexbison/releases/download/v${program_version}/win_flex_bison-${program_version}.zip") + set(download_filename "win_flex_bison-${program_version}.zip") + set(download_sha512 2a829eb05003178c89f891dd0a67add360c112e74821ff28e38feb61dac5b66e9d3d5636ff9eef055616aaf282ee8d6be9f14c6ae4577f60bdcec96cec9f364e) + set(tool_subdirectory "${program_version}") if(program STREQUAL "FLEX") set(program_name win_flex) else() set(program_name win_bison) endif() - set(paths_to_search ${DOWNLOADS}/tools/winflexbison/0a14154bff-a8cf65db07) + set(paths_to_search ${DOWNLOADS}/tools/win_flex/${program_version}) if(NOT EXISTS "${paths_to_search}/data/m4sugar/m4sugar.m4") file(REMOVE_RECURSE "${paths_to_search}") endif() @@ -546,16 +548,16 @@ function(vcpkg_find_acquire_program program) set(version_command --version) elseif(CMAKE_HOST_WIN32) if(NOT EXISTS "${PKGCONFIG}") - set(VERSION 0.29.2-2) - set(program_version git-8.0.0.5906.c9a21571-1) + set(VERSION 0.29.2-3) + set(program_version git-9.0.0.6373.5be8fcd83-1) vcpkg_acquire_msys( PKGCONFIG_ROOT NO_DEFAULT_PACKAGES DIRECT_PACKAGES "https://repo.msys2.org/mingw/i686/mingw-w64-i686-pkg-config-${VERSION}-any.pkg.tar.zst" - 54f8dad3b1a36a4515db47825a3214fbd2bd82f604aec72e7fb8d79068095fda3c836fb2296acd308522d6e12ce15f69e0c26dcf4eb0681fd105d057d912cdb7 + 0c086bf306b6a18988cc982b3c3828c4d922a1b60fd24e17c3bead4e296ee6de48ce148bc6f9214af98be6a86cb39c37003d2dcb6561800fdf7d0d1028cf73a4 "https://repo.msys2.org/mingw/i686/mingw-w64-i686-libwinpthread-${program_version}-any.pkg.tar.zst" - 2c3d9e6b2eee6a4c16fd69ddfadb6e2dc7f31156627d85845c523ac85e5c585d4cfa978659b1fe2ec823d44ef57bc2b92a6127618ff1a8d7505458b794f3f01c + c89c27b5afe4cf5fdaaa354544f070c45ace5e9d2f2ebb4b956a148f61681f050e67976894e6f52e42e708dadbf730fee176ac9add3c9864c21249034c342810 ) endif() set("${program}" "${PKGCONFIG_ROOT}/mingw32/bin/pkg-config.exe" CACHE INTERNAL "") diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_find_fortran.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_find_fortran.cmake index c50497629..0e82c7d36 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_find_fortran.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_find_fortran.cmake @@ -14,7 +14,7 @@ vcpkg_find_fortran() ```cmake vcpkg_find_fortran(fortran_args) # ... -vcpkg_configure_cmake(... +vcpkg_cmake_configure(... OPTIONS ${fortran_args} ) @@ -43,76 +43,76 @@ function(vcpkg_find_fortran out_var) set(machine_flag -m32) vcpkg_acquire_msys(msys_root DIRECT_PACKAGES - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-fortran-10.2.0-1-any.pkg.tar.zst" - ddbdaf9ea865181e16a0931b2ec88c2dcef8add34628e479c7b9de4fa2ccb22e09c7239442e58702e0acd3adabc920565e976984f2bcd90a3668bf7f48a245f1 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-libgfortran-10.2.0-1-any.pkg.tar.zst" - 150f355085fcf4c54e8bce8f7f08b90fea9ca7e1f32cff0a2e495faa63cf7723f4bf935f0f4ec77c8dd2ba710ceaed88694cb3da71def5e2088dd65e13c9b002 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-libs-10.2.0-1-any.pkg.tar.zst" - 113d8b3b155ea537be8b99688d454f781d70c67c810c2643bc02b83b332d99bfbf3a7fcada6b927fda67ef02cf968d4fdf930466c5909c4338bda64f1f3f483e - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gmp-6.2.0-1-any.pkg.tar.xz" - 37747f3f373ebff1a493f5dec099f8cd6d5abdc2254d9cd68a103ad7ba44a81a9a97ccaba76eaee427b4d67b2becb655ee2c379c2e563c8051b6708431e3c588 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-libwinpthread-git-8.0.0.5906.c9a21571-1-any.pkg.tar.zst" - 2c3d9e6b2eee6a4c16fd69ddfadb6e2dc7f31156627d85845c523ac85e5c585d4cfa978659b1fe2ec823d44ef57bc2b92a6127618ff1a8d7505458b794f3f01c - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-winpthreads-git-8.0.0.5906.c9a21571-1-any.pkg.tar.zst" - e87ad4f4071c6b5bba3b13a85abf6657bb494b73c57ebe65bc5a92e2cef1d9de354e6858d1338ee72809e3dc742ba69ce090aaad4560ae1d3479a61dbebf03c6 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-mpc-1.1.0-1-any.pkg.tar.xz" - d236b815ec3cf569d24d96a386eca9f69a2b1e8af18e96c3f1e5a4d68a3598d32768c7fb3c92207ecffe531259822c1a421350949f2ffabd8ee813654f1af864 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-mpfr-4.1.0-2-any.pkg.tar.zst" - caac5cb73395082b479597a73c7398bf83009dbc0051755ef15157dc34996e156d4ed7881ef703f9e92861cfcad000888c4c32e4bf38b2596c415a19aafcf893 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-10.2.0-1-any.pkg.tar.zst" - 3085e744e716301ba8e4c8a391ab09c2d51e587e0a2df5dab49f83b403a32160f8d713cf1a42c1d962885b4c6ee3b6ed36ef40de15c4be2b69dbc3f12f974c3c - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-binutils-2.34-3-any.pkg.tar.zst" - ff06b2adebe6e9b278b63ca5638ff704750a346faad1cdc40089431b0a308edb6f2a131815e0577673a19878ec1bd8d5a4fa592aa227de769496c1fd3aedbc85 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-crt-git-8.0.0.5966.f5da805f-1-any.pkg.tar.zst" - 120c943ce173719e48400fa18299f3458bc9db4cf18bb5a4dda8a91cc3f816510b337a92f7388077c65b50bbbeae9078793891ceaad631d780b10fde19ad3649 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-headers-git-8.0.0.5966.f5da805f-1-any.pkg.tar.zst" - dbb9f8258da306a3441f9882faa472c3665a67b2ea68657f3e8a1402dcfacf9787a886a3daf0eefe4946f04557bc166eb15b21c1093ad85c909002daadba1923 + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-fortran-11.2.0-8-any.pkg.tar.zst" + 9337dafdeb4f5eaf41bf13441c345b999dd0561b4fc757a67b4e362c3e0afea5828cd68b35d2823c545d74ea81b2c34bd1624f97817690a2931f3a890b5273bd + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-libgfortran-11.2.0-8-any.pkg.tar.zst" + 3e6396eb4dcbe730bb63f4534e25b654008be49f0e113cf34cfb640dba3f67b508a6f5c78f7ab1cc57686936e709bc37a1fdbc20df5ee17fd708a21c1b844af4 + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-libs-11.2.0-8-any.pkg.tar.zst" + bdf253bb627cfc108407ea0d1f5fc643da0b229a8f7fcc346fcdf7709e0ffbf8d1f75bdea755116c6b30834d1c764496a23c0546ef1048075d312136c6ebe9d9 + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gmp-6.2.1-3-any.pkg.tar.zst" + 10787443380a89a3491596946354645899daad07bc159ffcee96243cb51637dfbc163d52751ffd14682b66be8fd65c0379c642df16132f16a80709c4af921bac + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-libwinpthread-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" + c89c27b5afe4cf5fdaaa354544f070c45ace5e9d2f2ebb4b956a148f61681f050e67976894e6f52e42e708dadbf730fee176ac9add3c9864c21249034c342810 + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-winpthreads-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" + 85980183879da0d0ea74b9ad1fdfb09e5ed9d2e2212877d47d0f621ce721566e205be0b1913a643d0a95b256441e0bafd803fa9c848a8203dffd7d72109e32c2 + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-mpc-1.2.1-1-any.pkg.tar.zst" + f4cda83c26bf4225a8c387e0710ea086896e9c89e7863b9a2947982636664b64ffa880cbddfe6d85f8cf7cb3be18296b04874026cdf8b1b702a2820dad135ba4 + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-mpfr-4.1.0.p13-1-any.pkg.tar.zst" + 038a1cc6bb080d415b9fc19965a1f1c9419f5c42023e29c87f97b4f630c152602abb706036aa3e0f02e337e9d7ab3a43bd7b1234b3775a43ffceb348e79bac1a + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-11.2.0-8-any.pkg.tar.zst" + a6183f0fc80c2e37316b6eb60fdbdccc30b865053dad270c9c96e93cd6fdb2af28a75f981ac1de2fdc22a47494cdb54b8d41d4ecffdf1b1d3a54e85437c20dcf + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-binutils-2.37-4-any.pkg.tar.zst" + 1c2fbb8b94778c562aed01010c06c804d1cc2c446837879e4f1187470259adaecd86699b084c69e254d98201333db69a55126ea2cd0c188e55c9af849c37315a + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-crt-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" + 495834d72313021b7553d92a897932f5efc66a0f6f79ebeec574ecd7ddd23e0eed9aacb32601007606abb10b44ba7c7c1ccf6d3437a4338839b2d7b1792327f9 + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-headers-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" + 7959ae9267306c862b8b23be2ab21498f6e7890c936feae3ec9cf5607434e87e446f7c75ff7bd975f23aa24eb1c23d6068957f6af4e8c358f5f4861db64248b8 "https://repo.msys2.org/mingw/i686/mingw-w64-i686-libiconv-1.16-2-any.pkg.tar.zst" fe48d0d3c582fee1edb178425c6daf619d86362442c729047b3c356be26491164f92be1d87950429d2faca4ed3cf76cb4aafef1af3c87b780eee85ee85a4b4c5 "https://repo.msys2.org/mingw/i686/mingw-w64-i686-windows-default-manifest-6.4-3-any.pkg.tar.xz" 5b99abc55eaa74cf85ca64a9c91542554cb5c1098bc71effba9bd36242694cfd348503fcd3507fb9ba97486108c092c925e2f38cd744493386b3dc9ab28bc526 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-zlib-1.2.11-8-any.pkg.tar.zst" - 46bbf0f28d9faf047221def19e6f94b9556fc6c951cad9c4fb657fde9d15303b9cb64aad11eaa57892cde49eafb43fbe2ec6da6b612449a20ae49dc8233e945b - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-zstd-1.4.5-1-any.pkg.tar.zst" - 68f431073717b59549ab0fd26be8df8afcb43f3dd85be2ffcbc7d1a629999eed924656a7fc3f50937b2e6605a5067542d016181106b7bc3408b89b268ced5d23 + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-zlib-1.2.11-9-any.pkg.tar.zst" + 3e461e835641a2a755a42221011871f8a1ed5fa4b6b23c74db286e29bbcfa2fcd30d4a7c41216728df62c9131dbc1e554720da633ed6b2ba3d6f2b6d5d50a300 + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-zstd-1.5.2-1-any.pkg.tar.zst" + 8e27911a2a5884faa95e1c55058ca15f233d432ed8aa607b04a019758aa21f1357bd5de5ce8709fa47f4fbed6eb00fdfd94e7e2d82023bbc1f1653e95f439e0a ) elseif("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "x64") set(mingw_path mingw64) set(machine_flag -m64) vcpkg_acquire_msys(msys_root DIRECT_PACKAGES - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-fortran-10.2.0-1-any.pkg.tar.zst" - 0de02db791e978ae21577e675ee9676f741336c9a5ceb5614dbdfc793e2c1c4749b394f41362af7b069e970302fddf8c6772ebd8445fe1c360861606b1784b4d - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libgfortran-10.2.0-1-any.pkg.tar.zst" - c2dee2957356fa51aae39d907d0cc07f966028b418f74a1ea7ea551ff001c175d86781f980c0cf994207794322dcd369fa122ab78b6c6d0f0ab01e39a754e780 - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libs-10.2.0-1-any.pkg.tar.zst" - d17eff08c83d08ef020d999a2ead0d25036ada1c1bf6ed7c02bad9b56840ee5a3304acd790d86f52b83b09c1e788f0cecdf7254dc6760c3c7e478f65882cd32d - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gmp-6.2.0-1-any.pkg.tar.xz" - 0b22b7363e27cec706eb79ee0c45b5fe7088a5ca69e0868e7366481ed2ea9b3f6623d340cebba0b5ed3d79e4dfc7cf15f53530eb260c6d4057bfc3d92eb8c7bc - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libwinpthread-git-8.0.0.5906.c9a21571-1-any.pkg.tar.zst" - a6969a5db1c55ba458c1a047d0a2a9d2db6cc24266ea47f740598b149a601995d2de734a0984ac5e57ee611d5982cbc03fd6fc0f498435e8d6401bf15724caad - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-winpthreads-git-8.0.0.5906.c9a21571-1-any.pkg.tar.zst" - 87ae090a8de855de5580f158f4007f88d6dad341429620685dc736be55b1f060487552040327a76003618e214a11c1f8e5105ca2c7abe164908121627449d679 - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpc-1.1.0-1-any.pkg.tar.xz" - db075a1406690935db5780af293660385f56699881a1b2cd25ab252183643d71d646b0dadf1e34174df8f0744d51ce8b56dccd719e049efcaf9b7e08e80a7ef6 - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpfr-4.1.0-2-any.pkg.tar.zst" - 14739667242b8852f0d26547eb3297899a51fd1edafc7101b4e7489273e1efb9cb8422fc067361e3c3694c2afcc6c49fc89537f9f811ad5b9b595873112ee890 - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-10.2.0-1-any.pkg.tar.zst" - 7a08c7923f688ca8f06d55e1e91b9059a933ee56e27075ea073e6e58ae220310fb5f79869886a61b6987ab08993c9f962a4bfc50b6ea80473e933ce5551f3930 - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-binutils-2.34-3-any.pkg.tar.zst" - 4efd5586c344802110ea0061867469a23571df88529d66a943f86add1287f85ef53b6a9a9b16af2cb67bd09e0760a6f290c3b04ba70c0d5861d8a9f79f0ac209 - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-crt-git-8.0.0.5966.f5da805f-1-any.pkg.tar.zst" - 0142e4a44c59d17380a4fc7b101a2152486781621d5f9f930045b8f9c4bb2c93ea88211e7d8f8f233e0ae09595c6c8bc948ae80b9673f231e715b0d04c8a1e54 - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-headers-git-8.0.0.5966.f5da805f-1-any.pkg.tar.zst" - b547091a45ea7df8182b627edc9a7c91a23f01c0d4e02634a590c02f24311741cad92ceb67b7e4432ffbe4266f135a5289eb3560cc90ffa5c57612c8537a1588 + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-fortran-11.2.0-8-any.pkg.tar.zst" + d56483e090f86410b87526dda7774e010d0bd6beda97edcaeb1dead1128fd5ad870bc761a8a190759c48d58c2526b6975fb849f9c03a6be193741a0fd0bf2812 + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libgfortran-11.2.0-8-any.pkg.tar.zst" + 8537b55633bc83d81d528378590e417ffe8c26b6c327d8b6d7ba50a8b5f4e090fbe2dc500deb834120edf25ac3c493055f4de2dc64bde061be23ce0f625a8893 + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libs-11.2.0-8-any.pkg.tar.zst" + 2481f7c8db7cca549911bc71715af86ca287ffed6d673c9a6c3a4c792b68899a129dd959214af7067f434e74fc518c43749e7d928cbd2232ab4fbc65880dad98 + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gmp-6.2.1-3-any.pkg.tar.zst" + d0d4ed1a046b64f437e72bbcf722b30311dde5f5e768a520141423fc0a3127b116bd62cfd4b5cf5c01a71ee0f9cf6479fcc31277904652d8f6ddbf16e33e0b72 + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libwinpthread-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" + a2c9e60d23b1310a6cec1fadd2b15a8c07223f3fe90d41b1579e9fc27ee2b0b408456291a55fad54a156e6a247efc20f6fcc247cc567e64fe190938aa3b672e9 + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-winpthreads-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" + be03433e6006166e5b4794f2a01730cdb6c9f19fa96bd10a8bc50cf06ad389cbc66d44ea3eda46f53c3b2c89e2fc86aec21a372828e9527b24480c87ed88348c + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpc-1.2.1-1-any.pkg.tar.zst" + f2c137dbb0b6feea68dde9739c38b44dcb570324e3947adf991028e8f63c9ff50a11f47be15b90279ff40bcac7f320d952cfc14e69ba8d02cf8190c848d976a1 + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpfr-4.1.0.p13-1-any.pkg.tar.zst" + a1425169c1570dbd736c31d50bedfab88636bf9565376e2da566be67fcc771e6c76f95895f382d81097e7c0580acb42aa49e34dec5d7a868d73a5dc6a7461c95 + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-11.2.0-8-any.pkg.tar.zst" + 26ab2cab684206978a254f1e1595b1ce688e6db12e57ed1d243a5f1b3b21b314f640c7c6fe90eedccb6b9788e1886415ca3290d03b1e71f67f8a99108068336a + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-binutils-2.37-4-any.pkg.tar.zst" + f09ea70810fb337d7f3ec673342ab90df511e6af451e273fe88fe41a2f30bd972b79c830b61bb5388743d00a0ba7885503e143987413db5170c4befffef66303 + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-crt-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" + 63d081fedd1f70e8d58670d4d0698535a67f04c31caf02d0b23026ac23fc5064e9423d73c79854bbce41cc99dd0b70e4137af3a609e05cdd867fdcea120d356e + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-headers-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" + 05860f2bcfacf54089b750099f9ddc52d9b4b8ae8f69028a198dfb51fab09c37a941ae551e5d361a2a11302d48bd4fa95c44131ddee4c1df5a14f28013398f63 "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libiconv-1.16-2-any.pkg.tar.zst" 542ed5d898a57a79d3523458f8f3409669b411f87d0852bb566d66f75c96422433f70628314338993461bcb19d4bfac4dadd9d21390cb4d95ef0445669288658 "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-windows-default-manifest-6.4-3-any.pkg.tar.xz" 77d02121416e42ff32a702e21266ce9031b4d8fc9ecdb5dc049d92570b658b3099b65d167ca156367d17a76e53e172ca52d468e440c2cdfd14701da210ffea37 - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-zlib-1.2.11-8-any.pkg.tar.zst" - f40dde3216185e945baf51c29bbf8d1947220593901f982c711a663bb5a303efe434a4f6cf0c885817812fdc81183bcc1a240b96c29abb24a4c83202fd15016e - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-zstd-1.4.5-1-any.pkg.tar.zst" - dc2c7289fb206966829c98f6bf4389b423784415532ca3d627a22ae9d756a4fe2faf9844994b3093d814d129d20b2b79897e702aa9569978f58431ea66b55feb + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-zlib-1.2.11-9-any.pkg.tar.zst" + f386d3a8d8c169a62a4580af074b7fdc0760ef0fde22ef7020a349382dd374a9e946606c757d12da1c1fe68baf5e2eaf459446e653477035a63e0e20df8f4aa0 + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-zstd-1.5.2-1-any.pkg.tar.zst" + 38ec5ca99c5b955bf8a892a3edaf4e18572977736809b7671c554526b13cb4e53d45c5b83e37e0fb7628483ba98831b3203e3e404dac720d5b2ed95cfe4505c4 ) else() message(FATAL_ERROR "Unknown architecture '${VCPKG_TARGET_ARCHITECTURE}' for MinGW Fortran build!") diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_from_git.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_from_git.cmake index 0983bf7eb..142cae70e 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_from_git.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_from_git.cmake @@ -79,30 +79,38 @@ function(vcpkg_from_git) vcpkg_list(SET git_fetch_shallow_param --depth 1) vcpkg_list(SET extract_working_directory_param) + vcpkg_list(SET skip_patch_check_param) set(git_working_directory "${DOWNLOADS}/git-tmp") - if(VCPKG_USE_HEAD_VERSION) - if(DEFINED arg_HEAD_REF) - vcpkg_list(SET working_directory_param "WORKING_DIRECTORY" "${CURRENT_BUILDTREES_DIR}/src/head") - vcpkg_list(SET git_fetch_shallow_param --depth 1) - set(ref_to_use "${arg_HEAD_REF}") - set(git_working_directory "${CURRENT_BUILDTREES_DIR}/src/git-tmp") - else() - message(STATUS "Package does not specify HEAD_REF. Falling back to non-HEAD version.") + set(do_download OFF) + + if(VCPKG_USE_HEAD_VERSION AND DEFINED arg_HEAD_REF) + vcpkg_list(SET working_directory_param "WORKING_DIRECTORY" "${CURRENT_BUILDTREES_DIR}/src/head") + vcpkg_list(SET git_fetch_shallow_param --depth 1) + vcpkg_list(SET skip_patch_check_param SKIP_PATCH_CHECK) + set(ref_to_fetch "${arg_HEAD_REF}") + set(git_working_directory "${CURRENT_BUILDTREES_DIR}/src/git-tmp") + string(REPLACE "/" "_-" sanitized_ref "${arg_HEAD_REF}") + + if(NOT _VCPKG_NO_DOWNLOADS) + set(do_download ON) endif() else() if(NOT DEFINED arg_REF) message(FATAL_ERROR "Package does not specify REF. It must be built using --head.") endif() + if(VCPKG_USE_HEAD_VERSION) + message(STATUS "Package does not specify HEAD_REF. Falling back to non-HEAD version.") + endif() if(DEFINED arg_FETCH_REF) - set(ref_to_use "${arg_FETCH_REF}") + set(ref_to_fetch "${arg_FETCH_REF}") vcpkg_list(SET git_fetch_shallow_param) else() - set(ref_to_use "${arg_REF}") + set(ref_to_fetch "${arg_REF}") endif() + string(REPLACE "/" "_-" sanitized_ref "${arg_REF}") endif() - string(REPLACE "/" "_-" sanitized_ref "${ref_to_use}") set(temp_archive "${DOWNLOADS}/temp/${PORT}-${sanitized_ref}.tar.gz") set(archive "${DOWNLOADS}/${PORT}-${sanitized_ref}.tar.gz") @@ -110,7 +118,11 @@ function(vcpkg_from_git) if(_VCPKG_NO_DOWNLOADS) message(FATAL_ERROR "Downloads are disabled, but '${archive}' does not exist.") endif() - message(STATUS "Fetching ${arg_URL} ${ref_to_use}...") + set(do_download ON) + endif() + + if(do_download) + message(STATUS "Fetching ${arg_URL} ${ref_to_fetch}...") find_program(GIT NAMES git git.cmd) file(MAKE_DIRECTORY "${DOWNLOADS}") # Note: git init is safe to run multiple times @@ -122,7 +134,7 @@ function(vcpkg_from_git) ) vcpkg_execute_required_process( ALLOW_IN_DOWNLOAD_MODE - COMMAND "${GIT}" fetch "${arg_URL}" "${ref_to_use}" ${git_fetch_shallow_param} -n + COMMAND "${GIT}" fetch "${arg_URL}" "${ref_to_fetch}" ${git_fetch_shallow_param} -n WORKING_DIRECTORY "${git_working_directory}" LOGNAME "git-fetch-${TARGET_TRIPLET}" ) @@ -179,6 +191,7 @@ function(vcpkg_from_git) PATCHES ${arg_PATCHES} NO_REMOVE_ONE_LEVEL ${extract_working_directory_param} + ${skip_patch_check_param} ) set("${arg_OUT_SOURCE_PATH}" "${SOURCE_PATH}" PARENT_SCOPE) diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_from_github.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_from_github.cmake index 56cfcbf6a..5313db3db 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_from_github.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_from_github.cmake @@ -123,54 +123,61 @@ function(vcpkg_from_github) set(org_name "${CMAKE_MATCH_1}") set(repo_name "${CMAKE_MATCH_2}") - set(redownload_param "") - set(working_directory_param "") - set(sha512_param "SHA512" "${arg_SHA512}") - set(ref_to_use "${arg_REF}") - if(VCPKG_USE_HEAD_VERSION) - if(DEFINED arg_HEAD_REF) - set(redownload_param "ALWAYS_REDOWNLOAD") - set(sha512_param "SKIP_SHA512") - set(working_directory_param "WORKING_DIRECTORY" "${CURRENT_BUILDTREES_DIR}/src/head") - set(ref_to_use "${arg_HEAD_REF}") - else() - message(STATUS "Package does not specify HEAD_REF. Falling back to non-HEAD version.") - endif() - elseif(NOT DEFINED arg_REF) + if(VCPKG_USE_HEAD_VERSION AND NOT DEFINED arg_HEAD_REF) + message(STATUS "Package does not specify HEAD_REF. Falling back to non-HEAD version.") + set(VCPKG_USE_HEAD_VERSION OFF) + elseif(NOT VCPKG_USE_HEAD_VERSION AND NOT DEFINED arg_REF) message(FATAL_ERROR "Package does not specify REF. It must be built using --head.") endif() - # avoid using either - or _, to allow both `foo/bar` and `foo-bar` to coexist - # we assume that no one will name a ref "foo_-bar" - string(REPLACE "/" "_-" sanitized_ref "${ref_to_use}") - if(DEFINED arg_FILE_DISAMBIGUATOR AND NOT VCPKG_USE_HEAD_VERSION) - set(downloaded_file_name "${org_name}-${repo_name}-${sanitized_ref}-${arg_FILE_DISAMBIGUATOR}.tar.gz") - else() - set(downloaded_file_name "${org_name}-${repo_name}-${sanitized_ref}.tar.gz") - endif() - - # exports VCPKG_HEAD_VERSION to the caller. This will get picked up by ports.cmake after the build. if(VCPKG_USE_HEAD_VERSION) + string(REPLACE "/" "_-" sanitized_head_ref "${arg_HEAD_REF}") vcpkg_download_distfile(archive_version URLS "${github_api_url}/repos/${org_name}/${repo_name}/git/refs/heads/${arg_HEAD_REF}" - FILENAME "${downloaded_file_name}.version" + FILENAME "${org_name}-${repo_name}-${sanitized_head_ref}.version" ${headers_param} SKIP_SHA512 ALWAYS_REDOWNLOAD ) # Parse the github refs response with regex. - # TODO: add json-pointer support to vcpkg file(READ "${archive_version}" version_contents) - if(NOT version_contents MATCHES [["sha":(\ *)"([a-f0-9]+)"]]) + string(JSON head_version + ERROR_VARIABLE head_version_err + GET "${version_contents}" + "object" + "sha" + ) + if(NOT "${head_version_err}" STREQUAL "NOTFOUND") message(FATAL_ERROR "Failed to parse API response from '${version_url}': - ${version_contents} + +Error was: ${head_version_err} ") endif() - set(VCPKG_HEAD_VERSION "${CMAKE_MATCH_1}" PARENT_SCOPE) + + set(VCPKG_HEAD_VERSION "${head_version}" PARENT_SCOPE) + set(ref_to_use "${head_version}") + + vcpkg_list(SET redownload_param ALWAYS_REDOWNLOAD) + vcpkg_list(SET sha512_param SKIP_SHA512) + vcpkg_list(SET working_directory_param WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src/head") + vcpkg_list(SET skip_patch_check_param SKIP_PATCH_CHECK) + else() + set(ref_to_use "${arg_REF}") + + vcpkg_list(SET redownload_param) + vcpkg_list(SET working_directory_param) + vcpkg_list(SET skip_patch_check_param) + vcpkg_list(SET sha512_param SHA512 "${arg_SHA512}") endif() + string(REPLACE "/" "_-" sanitized_ref "${ref_to_use}") + if(DEFINED arg_FILE_DISAMBIGUATOR AND NOT VCPKG_USE_HEAD_REF) + set(downloaded_file_name "${org_name}-${repo_name}-${sanitized_ref}-${arg_FILE_DISAMBIGUATOR}.tar.gz") + else() + set(downloaded_file_name "${org_name}-${repo_name}-${sanitized_ref}.tar.gz") + endif() # Try to download the file information from github vcpkg_download_distfile(archive URLS "${github_host}/${org_name}/${repo_name}/archive/${ref_to_use}.tar.gz" @@ -185,6 +192,7 @@ ${version_contents} REF "${sanitized_ref}" PATCHES ${arg_PATCHES} ${working_directory_param} + ${skip_patch_check_param} ) set("${arg_OUT_SOURCE_PATH}" "${SOURCE_PATH}" PARENT_SCOPE) endfunction() 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 64eb6aa1b..9743981c8 100644 --- a/external_imported/vcpkg/scripts/cmake/z_vcpkg_apply_patches.cmake +++ b/external_imported/vcpkg/scripts/cmake/z_vcpkg_apply_patches.cmake @@ -57,8 +57,12 @@ function(z_vcpkg_apply_patches) ) file(WRITE "${CURRENT_BUILDTREES_DIR}/${logname}-err.log" "${error}") - if(error_code AND NOT arg_QUIET) - message(FATAL_ERROR "Applying patch failed: ${error}") + if(error_code) + if(arg_QUIET) + message(STATUS "Applying patch ${patch} - failure silenced") + else() + message(FATAL_ERROR "Applying patch failed: ${error}") + endif() endif() math(EXPR patchnum "${patchnum} + 1") 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 f50b1db26..bbe88a6db 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 @@ -39,8 +39,15 @@ function(z_vcpkg_get_cmake_vars out_file) message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") endif() - if(NOT DEFINED CACHE{Z_VCPKG_GET_CMAKE_VARS_FILE}) - set(Z_VCPKG_GET_CMAKE_VARS_FILE "${CURRENT_BUILDTREES_DIR}/cmake-vars-${TARGET_TRIPLET}.cmake.log" + if(DEFINED VCPKG_BUILD_TYPE) + set(cmake_vars_file "${CURRENT_BUILDTREES_DIR}/cmake-vars-${TARGET_TRIPLET}-${VCPKG_BUILD_TYPE}.cmake.log") + set(cache_var "Z_VCPKG_GET_CMAKE_VARS_FILE_${VCPKG_BUILD_TYPE}") + else() + set(cmake_vars_file "${CURRENT_BUILDTREES_DIR}/cmake-vars-${TARGET_TRIPLET}.cmake.log") + set(cache_var Z_VCPKG_GET_CMAKE_VARS_FILE) + endif() + if(NOT DEFINED CACHE{${cache_var}}) + set(${cache_var} "${cmake_vars_file}" CACHE PATH "The file to include to access the CMake variables from a generated project.") vcpkg_configure_cmake( SOURCE_PATH "${SCRIPTS}/get_cmake_vars" @@ -58,8 +65,8 @@ function(z_vcpkg_get_cmake_vars out_file) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") string(APPEND include_string "include(\"\${CMAKE_CURRENT_LIST_DIR}/cmake-vars-${TARGET_TRIPLET}-dbg.cmake.log\")\n") endif() - file(WRITE "${Z_VCPKG_GET_CMAKE_VARS_FILE}" "${include_string}") + file(WRITE "${cmake_vars_file}" "${include_string}") endif() - set("${out_file}" "${Z_VCPKG_GET_CMAKE_VARS_FILE}" PARENT_SCOPE) + set("${out_file}" "${${cache_var}}" PARENT_SCOPE) endfunction() diff --git a/external_imported/vcpkg/scripts/detect_compiler/CONTROL b/external_imported/vcpkg/scripts/detect_compiler/CONTROL deleted file mode 100644 index d76f041f0..000000000 --- a/external_imported/vcpkg/scripts/detect_compiler/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: detect-compiler -Version: 0 -Description: None diff --git a/external_imported/vcpkg/scripts/detect_compiler/vcpkg.json b/external_imported/vcpkg/scripts/detect_compiler/vcpkg.json new file mode 100644 index 000000000..64979dffe --- /dev/null +++ b/external_imported/vcpkg/scripts/detect_compiler/vcpkg.json @@ -0,0 +1,5 @@ +{ + "name": "detect-compiler", + "version": "0", + "description": "None" +} diff --git a/external_imported/vcpkg/scripts/get_cmake_vars/CMakeLists.txt b/external_imported/vcpkg/scripts/get_cmake_vars/CMakeLists.txt index b6d5f0e41..23b7d64e7 100644 --- a/external_imported/vcpkg/scripts/get_cmake_vars/CMakeLists.txt +++ b/external_imported/vcpkg/scripts/get_cmake_vars/CMakeLists.txt @@ -101,7 +101,10 @@ macro(_vcpkg_adjust_flags flag_var) foreach(arch IN LISTS CMAKE_OSX_ARCHITECTURES) string(APPEND ${flag_var} " -arch ${arch}") endforeach() - string(APPEND ${flag_var} " -isysroot ${CMAKE_OSX_SYSROOT}") + endif() + string(APPEND ${flag_var} " -isysroot ${CMAKE_OSX_SYSROOT}") + if (CMAKE_OSX_DEPLOYMENT_TARGET) + string(APPEND ${flag_var} " -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}") endif() endif() endif() diff --git a/external_imported/vcpkg/scripts/ports.cmake b/external_imported/vcpkg/scripts/ports.cmake index 7cc7afcb9..4d11521b4 100644 --- a/external_imported/vcpkg/scripts/ports.cmake +++ b/external_imported/vcpkg/scripts/ports.cmake @@ -139,6 +139,9 @@ if(CMD MATCHES "^BUILD$") set(TRIPLET_SYSTEM_ARCH "${VCPKG_TARGET_ARCHITECTURE}") include("${SCRIPTS}/cmake/vcpkg_common_definitions.cmake") + set(Z_VCPKG_ERROR_LOG_COLLECTION_FILE "${CURRENT_BUILDTREES_DIR}/error-logs-${TARGET_TRIPLET}.txt") + file(REMOVE "${Z_VCPKG_ERROR_LOG_COLLECTION_FILE}") + include("${CURRENT_PORT_DIR}/portfile.cmake") if(DEFINED PORT) include("${SCRIPTS}/build_info.cmake") diff --git a/external_imported/vcpkg/scripts/posh-vcpkg/0.0.1/posh-vcpkg.psm1 b/external_imported/vcpkg/scripts/posh-vcpkg/0.0.1/posh-vcpkg.psm1 index 25ef99609..1c142c84f 100644 --- a/external_imported/vcpkg/scripts/posh-vcpkg/0.0.1/posh-vcpkg.psm1 +++ b/external_imported/vcpkg/scripts/posh-vcpkg/0.0.1/posh-vcpkg.psm1 @@ -37,3 +37,218 @@ $exportModuleMemberParams = @{ } Export-ModuleMember @exportModuleMemberParams + +# SIG # Begin signature block +# MIInugYJKoZIhvcNAQcCoIInqzCCJ6cCAQExDzANBglghkgBZQMEAgEFADB5Bgor +# BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG +# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCDHZjpMevSjAPcs +# /aTP8aVTWBuPE0L4AxomP0cA936m/KCCDYEwggX/MIID56ADAgECAhMzAAACUosz +# qviV8znbAAAAAAJSMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAlVTMRMwEQYD +# VQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNy +# b3NvZnQgQ29ycG9yYXRpb24xKDAmBgNVBAMTH01pY3Jvc29mdCBDb2RlIFNpZ25p +# bmcgUENBIDIwMTEwHhcNMjEwOTAyMTgzMjU5WhcNMjIwOTAxMTgzMjU5WjB0MQsw +# CQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9u +# ZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMR4wHAYDVQQDExVNaWNy +# b3NvZnQgQ29ycG9yYXRpb24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +# AQDQ5M+Ps/X7BNuv5B/0I6uoDwj0NJOo1KrVQqO7ggRXccklyTrWL4xMShjIou2I +# sbYnF67wXzVAq5Om4oe+LfzSDOzjcb6ms00gBo0OQaqwQ1BijyJ7NvDf80I1fW9O +# L76Kt0Wpc2zrGhzcHdb7upPrvxvSNNUvxK3sgw7YTt31410vpEp8yfBEl/hd8ZzA +# v47DCgJ5j1zm295s1RVZHNp6MoiQFVOECm4AwK2l28i+YER1JO4IplTH44uvzX9o +# RnJHaMvWzZEpozPy4jNO2DDqbcNs4zh7AWMhE1PWFVA+CHI/En5nASvCvLmuR/t8 +# q4bc8XR8QIZJQSp+2U6m2ldNAgMBAAGjggF+MIIBejAfBgNVHSUEGDAWBgorBgEE +# AYI3TAgBBggrBgEFBQcDAzAdBgNVHQ4EFgQUNZJaEUGL2Guwt7ZOAu4efEYXedEw +# UAYDVR0RBEkwR6RFMEMxKTAnBgNVBAsTIE1pY3Jvc29mdCBPcGVyYXRpb25zIFB1 +# ZXJ0byBSaWNvMRYwFAYDVQQFEw0yMzAwMTIrNDY3NTk3MB8GA1UdIwQYMBaAFEhu +# ZOVQBdOCqhc3NyK1bajKdQKVMFQGA1UdHwRNMEswSaBHoEWGQ2h0dHA6Ly93d3cu +# bWljcm9zb2Z0LmNvbS9wa2lvcHMvY3JsL01pY0NvZFNpZ1BDQTIwMTFfMjAxMS0w +# Ny0wOC5jcmwwYQYIKwYBBQUHAQEEVTBTMFEGCCsGAQUFBzAChkVodHRwOi8vd3d3 +# Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2NlcnRzL01pY0NvZFNpZ1BDQTIwMTFfMjAx +# MS0wNy0wOC5jcnQwDAYDVR0TAQH/BAIwADANBgkqhkiG9w0BAQsFAAOCAgEAFkk3 +# uSxkTEBh1NtAl7BivIEsAWdgX1qZ+EdZMYbQKasY6IhSLXRMxF1B3OKdR9K/kccp +# kvNcGl8D7YyYS4mhCUMBR+VLrg3f8PUj38A9V5aiY2/Jok7WZFOAmjPRNNGnyeg7 +# l0lTiThFqE+2aOs6+heegqAdelGgNJKRHLWRuhGKuLIw5lkgx9Ky+QvZrn/Ddi8u +# TIgWKp+MGG8xY6PBvvjgt9jQShlnPrZ3UY8Bvwy6rynhXBaV0V0TTL0gEx7eh/K1 +# o8Miaru6s/7FyqOLeUS4vTHh9TgBL5DtxCYurXbSBVtL1Fj44+Od/6cmC9mmvrti +# yG709Y3Rd3YdJj2f3GJq7Y7KdWq0QYhatKhBeg4fxjhg0yut2g6aM1mxjNPrE48z +# 6HWCNGu9gMK5ZudldRw4a45Z06Aoktof0CqOyTErvq0YjoE4Xpa0+87T/PVUXNqf +# 7Y+qSU7+9LtLQuMYR4w3cSPjuNusvLf9gBnch5RqM7kaDtYWDgLyB42EfsxeMqwK +# WwA+TVi0HrWRqfSx2olbE56hJcEkMjOSKz3sRuupFCX3UroyYf52L+2iVTrda8XW +# esPG62Mnn3T8AuLfzeJFuAbfOSERx7IFZO92UPoXE1uEjL5skl1yTZB3MubgOA4F +# 8KoRNhviFAEST+nG8c8uIsbZeb08SeYQMqjVEmkwggd6MIIFYqADAgECAgphDpDS +# AAAAAAADMA0GCSqGSIb3DQEBCwUAMIGIMQswCQYDVQQGEwJVUzETMBEGA1UECBMK +# V2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0 +# IENvcnBvcmF0aW9uMTIwMAYDVQQDEylNaWNyb3NvZnQgUm9vdCBDZXJ0aWZpY2F0 +# ZSBBdXRob3JpdHkgMjAxMTAeFw0xMTA3MDgyMDU5MDlaFw0yNjA3MDgyMTA5MDla +# MH4xCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdS +# ZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKDAmBgNVBAMT +# H01pY3Jvc29mdCBDb2RlIFNpZ25pbmcgUENBIDIwMTEwggIiMA0GCSqGSIb3DQEB +# AQUAA4ICDwAwggIKAoICAQCr8PpyEBwurdhuqoIQTTS68rZYIZ9CGypr6VpQqrgG +# OBoESbp/wwwe3TdrxhLYC/A4wpkGsMg51QEUMULTiQ15ZId+lGAkbK+eSZzpaF7S +# 35tTsgosw6/ZqSuuegmv15ZZymAaBelmdugyUiYSL+erCFDPs0S3XdjELgN1q2jz +# y23zOlyhFvRGuuA4ZKxuZDV4pqBjDy3TQJP4494HDdVceaVJKecNvqATd76UPe/7 +# 4ytaEB9NViiienLgEjq3SV7Y7e1DkYPZe7J7hhvZPrGMXeiJT4Qa8qEvWeSQOy2u +# M1jFtz7+MtOzAz2xsq+SOH7SnYAs9U5WkSE1JcM5bmR/U7qcD60ZI4TL9LoDho33 +# X/DQUr+MlIe8wCF0JV8YKLbMJyg4JZg5SjbPfLGSrhwjp6lm7GEfauEoSZ1fiOIl +# XdMhSz5SxLVXPyQD8NF6Wy/VI+NwXQ9RRnez+ADhvKwCgl/bwBWzvRvUVUvnOaEP +# 6SNJvBi4RHxF5MHDcnrgcuck379GmcXvwhxX24ON7E1JMKerjt/sW5+v/N2wZuLB +# l4F77dbtS+dJKacTKKanfWeA5opieF+yL4TXV5xcv3coKPHtbcMojyyPQDdPweGF +# RInECUzF1KVDL3SV9274eCBYLBNdYJWaPk8zhNqwiBfenk70lrC8RqBsmNLg1oiM +# CwIDAQABo4IB7TCCAekwEAYJKwYBBAGCNxUBBAMCAQAwHQYDVR0OBBYEFEhuZOVQ +# BdOCqhc3NyK1bajKdQKVMBkGCSsGAQQBgjcUAgQMHgoAUwB1AGIAQwBBMAsGA1Ud +# DwQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFHItOgIxkEO5FAVO +# 4eqnxzHRI4k0MFoGA1UdHwRTMFEwT6BNoEuGSWh0dHA6Ly9jcmwubWljcm9zb2Z0 +# LmNvbS9wa2kvY3JsL3Byb2R1Y3RzL01pY1Jvb0NlckF1dDIwMTFfMjAxMV8wM18y +# Mi5jcmwwXgYIKwYBBQUHAQEEUjBQME4GCCsGAQUFBzAChkJodHRwOi8vd3d3Lm1p +# Y3Jvc29mdC5jb20vcGtpL2NlcnRzL01pY1Jvb0NlckF1dDIwMTFfMjAxMV8wM18y +# Mi5jcnQwgZ8GA1UdIASBlzCBlDCBkQYJKwYBBAGCNy4DMIGDMD8GCCsGAQUFBwIB +# FjNodHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2RvY3MvcHJpbWFyeWNw +# cy5odG0wQAYIKwYBBQUHAgIwNB4yIB0ATABlAGcAYQBsAF8AcABvAGwAaQBjAHkA +# XwBzAHQAYQB0AGUAbQBlAG4AdAAuIB0wDQYJKoZIhvcNAQELBQADggIBAGfyhqWY +# 4FR5Gi7T2HRnIpsLlhHhY5KZQpZ90nkMkMFlXy4sPvjDctFtg/6+P+gKyju/R6mj +# 82nbY78iNaWXXWWEkH2LRlBV2AySfNIaSxzzPEKLUtCw/WvjPgcuKZvmPRul1LUd +# d5Q54ulkyUQ9eHoj8xN9ppB0g430yyYCRirCihC7pKkFDJvtaPpoLpWgKj8qa1hJ +# Yx8JaW5amJbkg/TAj/NGK978O9C9Ne9uJa7lryft0N3zDq+ZKJeYTQ49C/IIidYf +# wzIY4vDFLc5bnrRJOQrGCsLGra7lstnbFYhRRVg4MnEnGn+x9Cf43iw6IGmYslmJ +# aG5vp7d0w0AFBqYBKig+gj8TTWYLwLNN9eGPfxxvFX1Fp3blQCplo8NdUmKGwx1j +# NpeG39rz+PIWoZon4c2ll9DuXWNB41sHnIc+BncG0QaxdR8UvmFhtfDcxhsEvt9B +# xw4o7t5lL+yX9qFcltgA1qFGvVnzl6UJS0gQmYAf0AApxbGbpT9Fdx41xtKiop96 +# eiL6SJUfq/tHI4D1nvi/a7dLl+LrdXga7Oo3mXkYS//WsyNodeav+vyL6wuA6mk7 +# r/ww7QRMjt/fdW1jkT3RnVZOT7+AVyKheBEyIXrvQQqxP/uozKRdwaGIm1dxVk5I +# RcBCyZt2WwqASGv9eZ/BvW1taslScxMNelDNMYIZjzCCGYsCAQEwgZUwfjELMAkG +# A1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx +# HjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEoMCYGA1UEAxMfTWljcm9z +# b2Z0IENvZGUgU2lnbmluZyBQQ0EgMjAxMQITMwAAAlKLM6r4lfM52wAAAAACUjAN +# BglghkgBZQMEAgEFAKCBrjAZBgkqhkiG9w0BCQMxDAYKKwYBBAGCNwIBBDAcBgor +# BgEEAYI3AgELMQ4wDAYKKwYBBAGCNwIBFTAvBgkqhkiG9w0BCQQxIgQgXfYXu2P9 +# Xl5soetYGYSmu5lwyqTv6FS3BnPtgTQd11AwQgYKKwYBBAGCNwIBDDE0MDKgFIAS +# AE0AaQBjAHIAbwBzAG8AZgB0oRqAGGh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbTAN +# BgkqhkiG9w0BAQEFAASCAQB0AjnChoWv+UO2eEgknT4P1WMsswzSKL9O1ucsOUJ2 +# TIE8ioVKds7PwtQY5YfxAbjgWl2NF/B6dEZjIBvvJB3B6qGvXyU6APj+yE6LRFnm +# YX4Z/u8MXWuDnMX6HF/UMDFlzFpmK5hee585P5sJzVJpVkviMKDNK3mNNg6jMSI1 +# k0MB2tN7oJViiS/9S7l81p/9mulUKlTcyoy3lzZLSH1iXbF80oT2vv18AT6bCOAP +# TFVW0E6pjatJdjL40WHN+MZ076QhdzYMhiCD/rOPBAaO5ymcT7i94gp43GlkjcVb +# x2jNCCP4NGF4Zd3OujlwIyNc/I50upsaZMXmcuYbKm42oYIXGTCCFxUGCisGAQQB +# gjcDAwExghcFMIIXAQYJKoZIhvcNAQcCoIIW8jCCFu4CAQMxDzANBglghkgBZQME +# AgEFADCCAVkGCyqGSIb3DQEJEAEEoIIBSASCAUQwggFAAgEBBgorBgEEAYRZCgMB +# MDEwDQYJYIZIAWUDBAIBBQAEIINYetTs4pGQvctdg51u+7aIG0JApdU1hE1hgt0m +# co6dAgZiF5hMAQQYEzIwMjIwMzMwMjE1MjEwLjY2OVowBIACAfSggdikgdUwgdIx +# CzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRt +# b25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLTArBgNVBAsTJE1p +# Y3Jvc29mdCBJcmVsYW5kIE9wZXJhdGlvbnMgTGltaXRlZDEmMCQGA1UECxMdVGhh +# bGVzIFRTUyBFU046RkM0MS00QkQ0LUQyMjAxJTAjBgNVBAMTHE1pY3Jvc29mdCBU +# aW1lLVN0YW1wIFNlcnZpY2WgghFoMIIHFDCCBPygAwIBAgITMwAAAY5Z20YAqBCU +# zAABAAABjjANBgkqhkiG9w0BAQsFADB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMK +# V2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0 +# IENvcnBvcmF0aW9uMSYwJAYDVQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0Eg +# MjAxMDAeFw0yMTEwMjgxOTI3NDVaFw0yMzAxMjYxOTI3NDVaMIHSMQswCQYDVQQG +# EwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwG +# A1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMS0wKwYDVQQLEyRNaWNyb3NvZnQg +# SXJlbGFuZCBPcGVyYXRpb25zIExpbWl0ZWQxJjAkBgNVBAsTHVRoYWxlcyBUU1Mg +# RVNOOkZDNDEtNEJENC1EMjIwMSUwIwYDVQQDExxNaWNyb3NvZnQgVGltZS1TdGFt +# cCBTZXJ2aWNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAqiMCq6OM +# zLa5wrtcf7Bf9f1WXW9kpqbOBzgPJvaGLrZG7twgwqTRWf1FkjpJKBOG5QPIRy7a +# 6IFVAy0W+tBaFX4In4DbBf2tGubyY9+hRU+hRewPJH5CYOvpPh77FfGM63+OlwRX +# p5YER6tC0WRKn3mryWpt4CwADuGv0LD2QjnhhgtRVidsiDnn9+aLjMuNapUhstGq +# Cr7JcQZt0ZrPUHW/TqTJymeU1eqgNorEbTed6UQyLaTVAmhXNQXDChfa526nW7RQ +# 7L4tXX9Lc0oguiCSkPlu5drNA6NM8z+UXQOAHxVfIQXmi+Y3SV2hr2dcxby9nlTz +# Yvf4ZDr5Wpcwt7tTdRIJibXHsXWMKrmOziliGDToLx34a/ctZE4NOLnlrKQWN9ZG +# +Ox5zRarK1EhShahM0uQNhb6BJjp3+c0eNzMFJ2qLZqDp2/3Yl5Q+4k+MDHLTipP +# 6VBdxcdVfd4mgrVTx3afO5KNfgMngGGfhSawGraRW28EhrLOspmIxii92E7vjncJ +# 2tcjhLCjBArVpPh3cZG5g3ZVy5iiAaoDaswpNgnMFAK5Un1reK+MFhPi9iMnvUPw +# tTDDJt5YED5DAT3mBUxp5QH3t7RhZwAJNLWLtpTeGF7ub81sSKYv2ardazAe9XLS +# 10tV2oOPrcniGJzlXW7VPvxqQNxe8lCDA20CAwEAAaOCATYwggEyMB0GA1UdDgQW +# BBTsQfkz9gT44N/5G8vNHayep+aV5DAfBgNVHSMEGDAWgBSfpxVdAF5iXYP05dJl +# pxtTNRnpcjBfBgNVHR8EWDBWMFSgUqBQhk5odHRwOi8vd3d3Lm1pY3Jvc29mdC5j +# b20vcGtpb3BzL2NybC9NaWNyb3NvZnQlMjBUaW1lLVN0YW1wJTIwUENBJTIwMjAx +# MCgxKS5jcmwwbAYIKwYBBQUHAQEEYDBeMFwGCCsGAQUFBzAChlBodHRwOi8vd3d3 +# Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2NlcnRzL01pY3Jvc29mdCUyMFRpbWUtU3Rh +# bXAlMjBQQ0ElMjAyMDEwKDEpLmNydDAMBgNVHRMBAf8EAjAAMBMGA1UdJQQMMAoG +# CCsGAQUFBwMIMA0GCSqGSIb3DQEBCwUAA4ICAQA1UK9xzIeTlKhSbLn0bekR5gYh +# 6bB1XQpluCqCA15skZ37UilaFJw8+GklDLzlNhSP2mOiOzVyCq8kkpqnfUc01ZaB +# ezQxg77qevj2iMyg39YJfeiCIhxYOFugwepYrPO8MlB/oue/VhIiDb1eNYTlPSmv +# 3palsgtkrb0oo0F0uWmX4EQVGKRo0UENtZetVIxa0J9DpUdjQWPeEh9cEM+RgE26 +# 5w5WAVb+WNx0iWiF4iTbCmrWaVEOX92dNqBm9bT1U7nGwN5CygpNAgEaYnrTMx1N +# 4AjxObACDN5DdvGlu/O0DfMWVc6qk6iKDFC6WpXQSkMlrlXII/Nhp+0+noU6tfEp +# HKLt7fYm9of5i/QomcCwo/ekiOCjYktp393ovoC1O2uLtbLnMVlE5raBLBNSbINZ +# 6QLxiA41lXnVVLIzDihUL8MU9CMvG4sdbhk2FX8zvrsP5PeBIw1faenMZuz0V3UX +# CtU5Okx5fmioWiiLZSCi1ljaxX+BEwQiinCi+vE59bTYI5FbuR8tDuGLiVu/JSpV +# FXrzWMP2Kn11sCLAGEjqJYUmO1tRY29Kd7HcIj2niSB0PQOCjYlnCnywnDinqS1C +# XvRsisjVlS1Rp4Tmuks+pGxiMGzF58zcb+hoFKyONuL3b+tgxTAz3sF3BVX9uk9M +# 5F+OEoeyLyGfLekNAjCCB3EwggVZoAMCAQICEzMAAAAVxedrngKbSZkAAAAAABUw +# DQYJKoZIhvcNAQELBQAwgYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5n +# dG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9y +# YXRpb24xMjAwBgNVBAMTKU1pY3Jvc29mdCBSb290IENlcnRpZmljYXRlIEF1dGhv +# cml0eSAyMDEwMB4XDTIxMDkzMDE4MjIyNVoXDTMwMDkzMDE4MzIyNVowfDELMAkG +# A1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx +# HjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9z +# b2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw +# ggIKAoICAQDk4aZM57RyIQt5osvXJHm9DtWC0/3unAcH0qlsTnXIyjVX9gF/bErg +# 4r25PhdgM/9cT8dm95VTcVrifkpa/rg2Z4VGIwy1jRPPdzLAEBjoYH1qUoNEt6aO +# RmsHFPPFdvWGUNzBRMhxXFExN6AKOG6N7dcP2CZTfDlhAnrEqv1yaa8dq6z2Nr41 +# JmTamDu6GnszrYBbfowQHJ1S/rboYiXcag/PXfT+jlPP1uyFVk3v3byNpOORj7I5 +# LFGc6XBpDco2LXCOMcg1KL3jtIckw+DJj361VI/c+gVVmG1oO5pGve2krnopN6zL +# 64NF50ZuyjLVwIYwXE8s4mKyzbnijYjklqwBSru+cakXW2dg3viSkR4dPf0gz3N9 +# QZpGdc3EXzTdEonW/aUgfX782Z5F37ZyL9t9X4C626p+Nuw2TPYrbqgSUei/BQOj +# 0XOmTTd0lBw0gg/wEPK3Rxjtp+iZfD9M269ewvPV2HM9Q07BMzlMjgK8QmguEOqE +# UUbi0b1qGFphAXPKZ6Je1yh2AuIzGHLXpyDwwvoSCtdjbwzJNmSLW6CmgyFdXzB0 +# kZSU2LlQ+QuJYfM2BjUYhEfb3BvR/bLUHMVr9lxSUV0S2yW6r1AFemzFER1y7435 +# UsSFF5PAPBXbGjfHCBUYP3irRbb1Hode2o+eFnJpxq57t7c+auIurQIDAQABo4IB +# 3TCCAdkwEgYJKwYBBAGCNxUBBAUCAwEAATAjBgkrBgEEAYI3FQIEFgQUKqdS/mTE +# mr6CkTxGNSnPEP8vBO4wHQYDVR0OBBYEFJ+nFV0AXmJdg/Tl0mWnG1M1GelyMFwG +# A1UdIARVMFMwUQYMKwYBBAGCN0yDfQEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly93 +# d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvRG9jcy9SZXBvc2l0b3J5Lmh0bTATBgNV +# HSUEDDAKBggrBgEFBQcDCDAZBgkrBgEEAYI3FAIEDB4KAFMAdQBiAEMAQTALBgNV +# HQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBTV9lbLj+iiXGJo +# 0T2UkFvXzpoYxDBWBgNVHR8ETzBNMEugSaBHhkVodHRwOi8vY3JsLm1pY3Jvc29m +# dC5jb20vcGtpL2NybC9wcm9kdWN0cy9NaWNSb29DZXJBdXRfMjAxMC0wNi0yMy5j +# cmwwWgYIKwYBBQUHAQEETjBMMEoGCCsGAQUFBzAChj5odHRwOi8vd3d3Lm1pY3Jv +# c29mdC5jb20vcGtpL2NlcnRzL01pY1Jvb0NlckF1dF8yMDEwLTA2LTIzLmNydDAN +# BgkqhkiG9w0BAQsFAAOCAgEAnVV9/Cqt4SwfZwExJFvhnnJL/Klv6lwUtj5OR2R4 +# sQaTlz0xM7U518JxNj/aZGx80HU5bbsPMeTCj/ts0aGUGCLu6WZnOlNN3Zi6th54 +# 2DYunKmCVgADsAW+iehp4LoJ7nvfam++Kctu2D9IdQHZGN5tggz1bSNU5HhTdSRX +# ud2f8449xvNo32X2pFaq95W2KFUn0CS9QKC/GbYSEhFdPSfgQJY4rPf5KYnDvBew +# VIVCs/wMnosZiefwC2qBwoEZQhlSdYo2wh3DYXMuLGt7bj8sCXgU6ZGyqVvfSaN0 +# DLzskYDSPeZKPmY7T7uG+jIa2Zb0j/aRAfbOxnT99kxybxCrdTDFNLB62FD+Cljd +# QDzHVG2dY3RILLFORy3BFARxv2T5JL5zbcqOCb2zAVdJVGTZc9d/HltEAY5aGZFr +# DZ+kKNxnGSgkujhLmm77IVRrakURR6nxt67I6IleT53S0Ex2tVdUCbFpAUR+fKFh +# bHP+CrvsQWY9af3LwUFJfn6Tvsv4O+S3Fb+0zj6lMVGEvL8CwYKiexcdFYmNcP7n +# tdAoGokLjzbaukz5m/8K6TT4JDVnK+ANuOaMmdbhIurwJ0I9JZTmdHRbatGePu1+ +# oDEzfbzL6Xu/OHBE0ZDxyKs6ijoIYn/ZcGNTTY3ugm2lBRDBcQZqELQdVTNYs6Fw +# ZvKhggLXMIICQAIBATCCAQChgdikgdUwgdIxCzAJBgNVBAYTAlVTMRMwEQYDVQQI +# EwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3Nv +# ZnQgQ29ycG9yYXRpb24xLTArBgNVBAsTJE1pY3Jvc29mdCBJcmVsYW5kIE9wZXJh +# dGlvbnMgTGltaXRlZDEmMCQGA1UECxMdVGhhbGVzIFRTUyBFU046RkM0MS00QkQ0 +# LUQyMjAxJTAjBgNVBAMTHE1pY3Jvc29mdCBUaW1lLVN0YW1wIFNlcnZpY2WiIwoB +# ATAHBgUrDgMCGgMVAD1iK+pPThHqgpa5xsPmiYruWVuMoIGDMIGApH4wfDELMAkG +# A1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx +# HjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9z +# b2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwDQYJKoZIhvcNAQEFBQACBQDl7udOMCIY +# DzIwMjIwMzMwMjIyNzI2WhgPMjAyMjAzMzEyMjI3MjZaMHcwPQYKKwYBBAGEWQoE +# ATEvMC0wCgIFAOXu504CAQAwCgIBAAICEPsCAf8wBwIBAAICH6MwCgIFAOXwOM4C +# AQAwNgYKKwYBBAGEWQoEAjEoMCYwDAYKKwYBBAGEWQoDAqAKMAgCAQACAwehIKEK +# MAgCAQACAwGGoDANBgkqhkiG9w0BAQUFAAOBgQDRvkQ+8tl/rST6Q19W3HCLiL76 +# 5jAlwfOPE9qK2auMHZnHWlcofAenCxyLoB0QAqj3UFflJ0bGic1xRb+OsKq+X/dz +# CPN2ik0cRkqUh8p3qjwRLquQ3HQp5BNxlyvdMNKSk+YdcK8SAGiO2HsnNE3LWwXP +# lko3/5Oq0+Oz7mdtpDGCBA0wggQJAgEBMIGTMHwxCzAJBgNVBAYTAlVTMRMwEQYD +# VQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNy +# b3NvZnQgQ29ycG9yYXRpb24xJjAkBgNVBAMTHU1pY3Jvc29mdCBUaW1lLVN0YW1w +# IFBDQSAyMDEwAhMzAAABjlnbRgCoEJTMAAEAAAGOMA0GCWCGSAFlAwQCAQUAoIIB +# SjAaBgkqhkiG9w0BCQMxDQYLKoZIhvcNAQkQAQQwLwYJKoZIhvcNAQkEMSIEIL3n +# o4olI1N5U/f6eBrubu/yvZtoslP7/FdMYNVskLVDMIH6BgsqhkiG9w0BCRACLzGB +# 6jCB5zCB5DCBvQQgvQWPITvigaUuV5+f/lWs3BXZwJ/l1mf+yelu5nXmxCUwgZgw +# gYCkfjB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UE +# BxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSYwJAYD +# VQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0EgMjAxMAITMwAAAY5Z20YAqBCU +# zAABAAABjjAiBCDoji5HoyFgeYnb2i9yFZjrBiELTJNC0CmqBLawXNEDPjANBgkq +# hkiG9w0BAQsFAASCAgCgDJqUfA65UksIsoC921eUPYQZsrbCZS1SpU7D6Pyn/xQ4 +# zbNu8vgxPpYqUz5/wdl0GnNMU6HkJWpYW0oT9PzsSIquvXlisaydTrEl6Q2t8z1c +# +kpJ0+Hm+ULHl1iRQc1sVfl7Zfzl2jy4OMZCO2lCLybDHMqeLSjx4bcRceTjPT0P +# TmFspYmlGxzh4V2snGcR4vkXYp3G7k7vcKgkI5rePj5re5Pp1AytGSK6AyNJ+Tm3 +# T6TWjaeiN+uzapzvbThNEwFMhad5yHe0xaTCYACT0XE9rULziUJk22kZrJ9UucNj +# s3GBxsLyv3T5RhNwpwGtMWhahc1lM01Xggw/bpodaRf2hWhl3ngJzEUysXPz4H+h +# HV713DUGIvfY5P6J1MA50Nufjv2MXeGKVbdD7jeEye0KFiz8uCin3uS5v4lny0t6 +# wddkWe4faFc0lPscDewubi2hQqUucGMVRt/lj120Bq0OUiLUNlQ0pucTC9NhQmCx +# eqlxR3tDVleAq5WI/VDUSVaNp9MBqT2RBpA3Ur1+kzE7lHL+WT/vmfcuoeXxsn9e +# 5tq9KwsTXctJWJrRrE9j9O94VR1G6isOYthtNOFXcN8kdT7vK/eyVJrQYKEj71xH +# efYWPLvRhkzisRAiYfC/cTlbkR2y8BvPhjtXTjcyFyyA57rsnpLb7IEvQbqn7g== +# SIG # End signature block diff --git a/external_imported/vcpkg/scripts/templates/portfile.in.cmake b/external_imported/vcpkg/scripts/templates/portfile.in.cmake index 5cd363ddc..3ceac93d1 100644 --- a/external_imported/vcpkg/scripts/templates/portfile.in.cmake +++ b/external_imported/vcpkg/scripts/templates/portfile.in.cmake @@ -29,9 +29,6 @@ # # See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md -# # Specifies if the port install should fail immediately given a condition -# vcpkg_fail_port_install(MESSAGE "@PORT@ currently only supports Linux and Mac platforms" ON_TARGET "Windows") - vcpkg_download_distfile(ARCHIVE URLS "@URL@" FILENAME "@FILENAME@" @@ -59,19 +56,23 @@ vcpkg_extract_source_archive_ex( # tbb ROCKSDB_IGNORE_PACKAGE_TBB # ) -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 -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2 # OPTIONS_RELEASE -DOPTIMIZE=1 # OPTIONS_DEBUG -DDEBUGGABLE=1 ) -vcpkg_install_cmake() +vcpkg_cmake_install() # # Moves all .cmake files from /debug/share/@PORT@/ to /share/@PORT@/ -# # See /docs/maintainers/vcpkg_fixup_cmake_targets.md for more details -# vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/@PORT@) +# # See /docs/maintainers/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md for more details +# When you uncomment "vcpkg_cmake_config_fixup()", you need to add the following to "dependencies" vcpkg.json: +#{ +# "name": "vcpkg-cmake-config", +# "host": true +#} +# vcpkg_cmake_config_fixup(CONFIG_PATH cmake TARGET_PATH share/@PORT@) # # 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/scripts/templates/vcpkg.json.in b/external_imported/vcpkg/scripts/templates/vcpkg.json.in index 2e217387e..15fcaa167 100644 --- a/external_imported/vcpkg/scripts/templates/vcpkg.json.in +++ b/external_imported/vcpkg/scripts/templates/vcpkg.json.in @@ -3,7 +3,12 @@ "version-string": "", "homepage": "", "description": "", - "dependencies": [], + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], "default-features": [], "features": [ 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 28fb50d94..7d640a194 100644 --- a/external_imported/vcpkg/scripts/test_ports/cmake-user/portfile.cmake +++ b/external_imported/vcpkg/scripts/test_ports/cmake-user/portfile.cmake @@ -1,38 +1,41 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled) -set(cmake_version OFF) -if("cmake-3-4" IN_LIST FEATURES) - set(cmake_version 3.4.3) +set(cmake_commands "") +if("cmake-current" IN_LIST FEATURES) + list(APPEND cmake_commands "${CMAKE_COMMAND}") +endif() +if("cmake-3-7" IN_LIST FEATURES) + set(cmake_version 3.7.2) string(REGEX REPLACE "([^.]*[.][^.]*).*" "\\1" cmake_major_minor "${cmake_version}") - if(HOST_TRIPLET MATCHES "^x.*-(windows|mingw)") + if(VCPKG_HOST_IS_WINDOWS) set(name "cmake-${cmake_version}-win32-x86") vcpkg_download_distfile(legacy_cmake_archive FILENAME "${name}.zip" URLS "https://github.com/Kitware/CMake/releases/download/v${cmake_version}/${name}.zip" "https://cmake.org/files/v${cmake_major_minor}/${name}.zip" - SHA512 c74a8f85ce04a2c0f68fd315a9a7e2fee5cc98af9e8117cca6b35a4f0942cae2d101672e5936a8bfc20289c8c82da582531495308657348a1121e3f568588bd3 + SHA512 c359a22e2e688da1513db195280d6e8987bc8d570a0c543f1b1dfc8572fe4fd6c23d951ec5d5eae640fcca3bef3ae469083511474796ade8c6319d8bc4e4b38d ) set(cmake_bin_dir "/bin") - elseif(HOST_TRIPLET MATCHES "^x.*-osx") + elseif(VCPKG_HOST_IS_OSX) set(name "cmake-${cmake_version}-Darwin-x86_64") vcpkg_download_distfile(legacy_cmake_archive FILENAME "${name}.tar.gz" - URLS "https://github.com/Kitware/CMake/releases/download/v3.4.3/${name}.tar.gz" + URLS "https://github.com/Kitware/CMake/releases/download/v${cmake_version}/${name}.tar.gz" "https://cmake.org/files/v${cmake_major_minor}/${name}.tar.gz" - SHA512 c3da566a19e95b8f91bf601518b9c49304b9bb8500f5a086eb2c867514176278e51dd893952b8ab54a2839ed02c898036c7985fe0bb761db9ccb988343463ea2 + SHA512 8e41608f4dd998020acf2bd1b0dab4aec37b3ea9e228f2c4a457cd1c0339d94db38a0548b4b07a9e3605f9beb11a3f6737a72813586c4ad5f730d74038a14c2b ) set(cmake_bin_dir "/CMake.app/Contents/bin") - elseif(HOST_TRIPLET MATCHES "^x.*-linux") + elseif(VCPKG_HOST_IS_LINUX) set(name "cmake-${cmake_version}-Linux-x86_64") vcpkg_download_distfile(legacy_cmake_archive FILENAME "${name}.tar.gz" - URLS "https://github.com/Kitware/CMake/releases/download/v3.4.3/${name}.tar.gz" + URLS "https://github.com/Kitware/CMake/releases/download/v${cmake_version}/${name}.tar.gz" "https://cmake.org/files/v${cmake_major_minor}/${name}.tar.gz" - SHA512 455b8f940ccda0ba1169d3620db67c0bf89284126386408cd28b76b66c59c4c2ea5ad8def0095166e7524f6cf5202f117a2fa49e1525f93ed711657a5d2ae988 + SHA512 459909fcfb9c74993c3d4ab9db4e31ea940515b670db44d039de611d813099895e695467cc8da24824315486e38e2f3e246aa92d6236c51103822ec8a39e3168 ) set(cmake_bin_dir "/bin") else() - message(FATAL_ERROR "Unable to test feature 'cmake-3-4' for '${HOST_TRIPLET}' host.") + message(FATAL_ERROR "Unable to test feature 'cmake-3-7' for '${HOST_TRIPLET}' host.") endif() vcpkg_extract_source_archive_ex( @@ -41,7 +44,7 @@ if("cmake-3-4" IN_LIST FEATURES) REF "${cmake_version}" WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${name}" ) - set(CMAKE_COMMAND "${legacy_cmake}${cmake_bin_dir}/cmake") + list(APPEND cmake_commands "${legacy_cmake}${cmake_bin_dir}/cmake") endif() set(packages "") @@ -68,12 +71,25 @@ else() endif() function(test_cmake_project) - cmake_parse_arguments(PARSE_ARGV 0 "arg" "" "NAME" "OPTIONS") + cmake_parse_arguments(PARSE_ARGV 0 "arg" "" "CMAKE_COMMAND;NAME" "OPTIONS") if(NOT arg_NAME) message(FATAL_ERROR "The NAME argument is mandatory.") endif() + if(NOT arg_CMAKE_COMMAND) + set(arg_CMAKE_COMMAND "${CMAKE_COMMAND}") + endif() + + execute_process( + COMMAND "${arg_CMAKE_COMMAND}" --version + OUTPUT_VARIABLE cmake_version_output + RESULT_VARIABLE cmake_version_result + ) + string(REGEX MATCH "[1-9][0-9]*\\.[0-9]*\\.[0-9]*" cmake_version "${cmake_version_output}") + if(cmake_version_result OR NOT cmake_version) + message(FATAL_ERROR "Unable to determine version for '${arg_CMAKE_COMMAND}'.") + endif() - set(build_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${arg_NAME}") + set(build_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${cmake_version}-${arg_NAME}") set(base_options -G "Ninja" "-DCMAKE_MAKE_PROGRAM=${NINJA}" @@ -82,6 +98,7 @@ function(test_cmake_project) "-DCMAKE_INSTALL_PREFIX=${build_dir}/install" "-DVCPKG_TARGET_TRIPLET=${TARGET_TRIPLET}" "-DVCPKG_MANIFEST_MODE=OFF" + "-DCHECK_CMAKE_VERSION=${cmake_version}" ) if(DEFINED VCPKG_CMAKE_SYSTEM_NAME AND VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") @@ -100,22 +117,22 @@ function(test_cmake_project) list(APPEND base_options -DBUILD_SHARED_LIBS=OFF) endif() - message(STATUS "Running tests for '${arg_NAME}'") + message(STATUS "Running tests with CMake ${cmake_version} for '${arg_NAME}'") file(REMOVE_RECURSE "${build_dir}") file(MAKE_DIRECTORY "${build_dir}") vcpkg_execute_required_process( COMMAND - "${CMAKE_COMMAND}" "${CMAKE_CURRENT_LIST_DIR}/project" + "${arg_CMAKE_COMMAND}" "${CMAKE_CURRENT_LIST_DIR}/project" ${base_options} ${arg_OPTIONS} WORKING_DIRECTORY "${build_dir}" - LOGNAME "${TARGET_TRIPLET}-${arg_NAME}-config" + LOGNAME "${TARGET_TRIPLET}-${cmake_version}-${arg_NAME}-config" ) vcpkg_execute_required_process( COMMAND - "${CMAKE_COMMAND}" --build . --target install + "${arg_CMAKE_COMMAND}" --build . --target install WORKING_DIRECTORY "${build_dir}" - LOGNAME "${TARGET_TRIPLET}-${arg_NAME}-build" + LOGNAME "${TARGET_TRIPLET}-${cmake_version}-${arg_NAME}-build" ) # To produce better error messages for failing wrappers, # we run execute_process directly here, for each wrapper. @@ -130,16 +147,16 @@ function(test_cmake_project) endif() foreach(package IN LISTS packages) string(MAKE_C_IDENTIFIER "${package}" package_string) - set(find_package_build_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-find-package-${package_string}-${arg_NAME}") - set(log_out "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-find-package-${package_string}-${arg_NAME}-out.log") - set(log_err "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-find-package-${package_string}-${arg_NAME}-err.log") + set(find_package_build_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${cmake_version}-find-package-${package_string}-${arg_NAME}") + set(log_out "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${cmake_version}-find-package-${package_string}-${arg_NAME}-out.log") + set(log_err "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${cmake_version}-find-package-${package_string}-${arg_NAME}-err.log") message(STATUS " find_package(${package})") file(REMOVE_RECURSE "${find_package_build_dir}") file(MAKE_DIRECTORY "${find_package_build_dir}") execute_process( COMMAND - "${CMAKE_COMMAND}" "${CMAKE_CURRENT_LIST_DIR}/project" + "${arg_CMAKE_COMMAND}" "${CMAKE_CURRENT_LIST_DIR}/project" ${base_options} ${arg_OPTIONS} "-DFIND_PACKAGES=${package}" @@ -155,17 +172,19 @@ function(test_cmake_project) endforeach() endfunction() -test_cmake_project(NAME "release" - OPTIONS - "-DCMAKE_BUILD_TYPE=Release" - "-DCMAKE_PREFIX_PATH=SYSTEM_LIBS" # for testing VCPKG_PREFER_SYSTEM_LIBS - "-DVCPKG_PREFER_SYSTEM_LIBS=OFF" - "-DCHECK_CMAKE_VERSION=${cmake_version}" -) -test_cmake_project(NAME "debug" - OPTIONS - "-DCMAKE_BUILD_TYPE=Debug" - "-DCMAKE_PREFIX_PATH=SYSTEM_LIBS" # for testing VCPKG_PREFER_SYSTEM_LIBS - "-DVCPKG_PREFER_SYSTEM_LIBS=ON" - "-DCHECK_CMAKE_VERSION=${cmake_version}" -) +foreach(executable IN LISTS cmake_commands) + test_cmake_project(NAME "release" + 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 bd6b05dfe..9e74608ce 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 @@ -51,16 +51,47 @@ foreach(package ${FIND_PACKAGES}) set(CMAKE_FIND_DEBUG_MODE OFF) if(NOT ${package}_FOUND AND NOT ${package_upper}_FOUND) message(SEND_ERROR "find_package(${package}) check: failed") + continue() + endif() + message(STATUS "find_package(${package}) check: success") + + set(libraries_var "") + if(DEFINED ${package}_LIBRARIES) + set(libraries_var "${package}_LIBRARIES") elseif(DEFINED ${package_upper}_LIBRARIES) - message(STATUS "${package_upper}_LIBRARIES: ${${package_upper}_LIBRARIES}") - message(STATUS "find_package(${package}) check: success") - target_link_libraries(exe PRIVATE ${${package_upper}_LIBRARIES}) - elseif(DEFINED ${package}_LIBRARIES) - message(STATUS "${package}_LIBRARIES: ${${package}_LIBRARIES}") - message(STATUS "find_package(${package}) check: success") - target_link_libraries(exe PRIVATE ${${package}_LIBRARIES}) + set(libraries_var "${package_upper}_LIBRARIES") + elseif(DEFINED ${package}_LIBRARY) + set(libraries_var "${package}_LIBRARY") + elseif(DEFINED ${package_upper}_LIBRARY) + set(libraries_var "${package_upper}_LIBRARY") else() - message(STATUS "${package}_LIBRARIES: undefined") - message(STATUS "find_package(${package}) check: success") + message(STATUS "${package}_LIBRARY/IES: undefined") + continue() + endif() + set(libraries "${${libraries_var}}") + message(STATUS "${libraries_var}: ${libraries}") + + if(package STREQUAL "Intl" AND NOT Intl_LIBRARY) + continue() # using libintl.h from C runtime library + 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() + foreach(item IN LISTS libraries) + string(FIND "${item}" "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/" starts_with_vcpkg) + if(NOT starts_with_vcpkg EQUAL "0") + 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}") + endif() + endforeach() endforeach() 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 bf8ca455b..73907dfdc 100644 --- a/external_imported/vcpkg/scripts/test_ports/cmake-user/vcpkg.json +++ b/external_imported/vcpkg/scripts/test_ports/cmake-user/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cmake-user", - "version-date": "2021-07-24", + "version-date": "2022-03-18", "description": "Test port to verify the vcpkg toolchain in cmake user projects", "default-features": [ "ci" @@ -13,6 +13,7 @@ "name": "cmake-user", "default-features": false, "features": [ + "cmake-current", "find-package" ] }, @@ -20,14 +21,17 @@ "name": "cmake-user", "default-features": false, "features": [ - "cmake-3-4" + "cmake-3-7" ], "platform": "x64 & (windows | linux | osx) & !uwp" } ] }, - "cmake-3-4": { - "description": "Use CMake 3.4 to build the test project" + "cmake-3-7": { + "description": "Run the tests with CMake 3.7" + }, + "cmake-current": { + "description": "Run the tests with vcpkg's current version of CMake" }, "find-package": { "description": "Ports to be tested via find_package($package)", @@ -44,6 +48,10 @@ "$package": "Freetype", "name": "freetype" }, + { + "$package": "ICU", + "name": "icu" + }, { "$package": "Intl", "name": "gettext" @@ -52,14 +60,17 @@ "$package": "GIF", "name": "giflib" }, + { + "$package": "JPEG", + "name": "libjpeg-turbo" + }, { "$package": "LibLZMA", "name": "liblzma" }, { - "$package": "Curses", - "name": "ncurses", - "platform": "!windows & !uwp" + "$package": "TIFF", + "name": "tiff" }, { "$package": "ZLIB", diff --git a/external_imported/vcpkg/scripts/test_ports/cmake/portfile.cmake b/external_imported/vcpkg/scripts/test_ports/cmake/portfile.cmake index 3a74a2e65..3e7276e45 100644 --- a/external_imported/vcpkg/scripts/test_ports/cmake/portfile.cmake +++ b/external_imported/vcpkg/scripts/test_ports/cmake/portfile.cmake @@ -4,30 +4,34 @@ vcpkg_from_gitlab( OUT_SOURCE_PATH SOURCE_PATH REPO cmake/cmake REF - b7b0fb430397bafae4a7bd80b41d474c91a3b7f3 + 8428e39ed9cddb3b7f1a6f7a58cb8617503183d2 SHA512 - 3b0de26910bceaf4bc6546255bada4c502cd0fd32f44bc28b067f347c09d028c175a3243551bbe4bb64bcf312df9ff827e8fdbcb0b34a12e1ce4a26ba0799ee2 + 4a40656efe5854bd6b893d0b2b86eed5df42992d080edb9c0cb2da2c55ad8dd489a85072b138947933d94ef5ba90c7a59f0a4460e3722d0f898ceefbbf74d226 HEAD_REF master ) set(OPTIONS) if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP) - list(APPEND OPTIONS -DBUILD_CursesDialog=ON) + list(APPEND OPTIONS "-DBUILD_CursesDialog=ON") else() - list(APPEND OPTIONS -DBUILD_CursesDialog=OFF) + list(APPEND OPTIONS "-DBUILD_CursesDialog=OFF") endif() if(VCPKG_CROSSCOMPILING) - list(APPEND OPTIONS -DQt6CoreTools_DIR=${CURRENT_HOST_INSTALLED_DIR}/share/Qt6CoreTools) - list(APPEND OPTIONS -DQt6WidgetsTools_DIR=${CURRENT_HOST_INSTALLED_DIR}/share/Qt6WidgetsTools) - list(APPEND OPTIONS -DQt6GuiTools_DIR=${CURRENT_HOST_INSTALLED_DIR}/share/Qt6GuiTools) + list(APPEND OPTIONS "-DQt6CoreTools_DIR=${CURRENT_HOST_INSTALLED_DIR}/share/Qt6CoreTools") + list(APPEND OPTIONS "-DQt6WidgetsTools_DIR=${CURRENT_HOST_INSTALLED_DIR}/share/Qt6WidgetsTools") + list(APPEND OPTIONS "-DQt6GuiTools_DIR=${CURRENT_HOST_INSTALLED_DIR}/share/Qt6GuiTools") if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64 AND VCPKG_TARGET_IS_WINDOWS) # Remove if PR #16111 is merged list(APPEND OPTIONS -DCMAKE_CROSSCOMPILING=ON -DCMAKE_SYSTEM_PROCESSOR:STRING=ARM64 -DCMAKE_SYSTEM_NAME:STRING=Windows) endif() endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +if(VCPKG_TARGET_IS_WINDOWS AND 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() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${OPTIONS} -DBUILD_TESTING=OFF @@ -46,7 +50,7 @@ vcpkg_configure_cmake( -DCMake_QT_MAJOR_VERSION:STRING=6 ) -vcpkg_install_cmake(ADD_BIN_TO_PATH) +vcpkg_cmake_install(ADD_BIN_TO_PATH) vcpkg_copy_pdbs() if(NOT VCPKG_TARGET_IS_OSX) @@ -60,16 +64,16 @@ if(NOT VCPKG_TARGET_IS_OSX) vcpkg_copy_tools(TOOL_NAMES ${_tools} AUTO_CLEAN) else() # On OSX everything is within a CMake.app folder - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools") file(RENAME "${CURRENT_PACKAGES_DIR}/CMake.app" "${CURRENT_PACKAGES_DIR}/tools/CMake.app") if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/CMake.app") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/debug) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/debug") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/CMake.app" "${CURRENT_PACKAGES_DIR}/tools/debug/CMake.app") endif() endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") # Handle copyright -configure_file(${SOURCE_PATH}/Copyright.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/Copyright.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/external_imported/vcpkg/scripts/test_ports/cmake/vcpkg.json b/external_imported/vcpkg/scripts/test_ports/cmake/vcpkg.json index 541ea1d77..89668baef 100644 --- a/external_imported/vcpkg/scripts/test_ports/cmake/vcpkg.json +++ b/external_imported/vcpkg/scripts/test_ports/cmake/vcpkg.json @@ -1,8 +1,9 @@ { "name": "cmake", - "version-string": "3.20.0", + "version-string": "3.22.2", "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", "dependencies": [ "bzip2", "curl", @@ -17,6 +18,10 @@ }, "nghttp2", "qtbase", + { + "name": "vcpkg-cmake", + "host": true + }, "zlib", "zstd" ] diff --git a/external_imported/vcpkg/scripts/test_ports/llfio-run-tests/CONTROL b/external_imported/vcpkg/scripts/test_ports/llfio-run-tests/CONTROL deleted file mode 100644 index eeac83f91..000000000 --- a/external_imported/vcpkg/scripts/test_ports/llfio-run-tests/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: llfio-run-tests -Version: 0 -Description: Ensures that LLFIO built with vcpkg version of dependencies produces working executables. -Build-Depends: llfio[run-tests], llfio[status-code,run-tests] -Supports: x64 diff --git a/external_imported/vcpkg/scripts/test_ports/llfio-run-tests/vcpkg.json b/external_imported/vcpkg/scripts/test_ports/llfio-run-tests/vcpkg.json new file mode 100644 index 000000000..32c0cf4a2 --- /dev/null +++ b/external_imported/vcpkg/scripts/test_ports/llfio-run-tests/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "llfio-run-tests", + "version-string": "0", + "port-version": 1, + "description": "Ensures that LLFIO built with vcpkg version of dependencies produces working executables.", + "supports": "x64", + "dependencies": [ + { + "name": "llfio", + "features": [ + "run-tests" + ] + }, + { + "name": "llfio", + "features": [ + "run-tests", + "status-code" + ] + } + ] +} diff --git a/external_imported/vcpkg/scripts/test_ports/outcome-run-tests/CONTROL b/external_imported/vcpkg/scripts/test_ports/outcome-run-tests/CONTROL deleted file mode 100644 index bc289efab..000000000 --- a/external_imported/vcpkg/scripts/test_ports/outcome-run-tests/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: outcome-run-tests -Version: 0 -Description: Ensures that outcome built with vcpkg version of dependencies produces working executables. -Build-Depends: outcome[run-tests] -Supports: x64 diff --git a/external_imported/vcpkg/scripts/test_ports/outcome-run-tests/vcpkg.json b/external_imported/vcpkg/scripts/test_ports/outcome-run-tests/vcpkg.json new file mode 100644 index 000000000..8a203953a --- /dev/null +++ b/external_imported/vcpkg/scripts/test_ports/outcome-run-tests/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "outcome-run-tests", + "version-string": "0", + "port-version": 1, + "description": "Ensures that outcome built with vcpkg version of dependencies produces working executables.", + "supports": "x64", + "dependencies": [ + { + "name": "outcome", + "features": [ + "run-tests" + ] + } + ] +} 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 497cb18a3..d506ebaf6 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 @@ -145,6 +145,9 @@ endif() if("function-arguments" IN_LIST FEATURES) include("${CMAKE_CURRENT_LIST_DIR}/test-z_vcpkg_function_arguments.cmake") endif() +if("merge-libs" IN_LIST FEATURES) + include("${CMAKE_CURRENT_LIST_DIR}/test-z_vcpkg_cmake_config_fixup_merge.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-z_vcpkg_cmake_config_fixup_merge.cmake b/external_imported/vcpkg/scripts/test_ports/unit-test-cmake/test-z_vcpkg_cmake_config_fixup_merge.cmake new file mode 100644 index 000000000..8809af46f --- /dev/null +++ b/external_imported/vcpkg/scripts/test_ports/unit-test-cmake/test-z_vcpkg_cmake_config_fixup_merge.cmake @@ -0,0 +1,56 @@ +# z_vcpkg_cmake_config_fixup_merge( ) +set(release_libs namespace::C++_shared) +set(debug_libs namespace::C++_shared) +unit_test_check_variable_equal( + [[z_vcpkg_cmake_config_fixup_merge(merged release_libs debug_libs)]] + merged "namespace::C++_shared" +) + +set(release_libs A) +set(debug_libs B) +unit_test_check_variable_equal( + [[z_vcpkg_cmake_config_fixup_merge(merged release_libs debug_libs)]] + merged [[\$<\$>:A>;\$<\$:B>]] +) + +set(release_libs A B) +set(debug_libs A ) +unit_test_check_variable_equal( + [[z_vcpkg_cmake_config_fixup_merge(merged release_libs debug_libs)]] + merged [[A;\$<\$>:B>]] +) + +set(release_libs A ) +set(debug_libs A B) +unit_test_check_variable_equal( + [[z_vcpkg_cmake_config_fixup_merge(merged release_libs debug_libs)]] + merged [[A;\$<\$:B>]] +) + +set(release_libs A C) +set(debug_libs C) +unit_test_check_variable_equal( + [[z_vcpkg_cmake_config_fixup_merge(merged release_libs debug_libs)]] + merged [[\$<\$>:A>;\$<\$:C>;\$<\$>:C>]] +) + +set(release_libs [[\$<\$>:A>;\$<\$:B>]]) +set(debug_libs [[\$<\$>:A>;\$<\$:B>]]) +unit_test_check_variable_equal( + [[z_vcpkg_cmake_config_fixup_merge(merged release_libs debug_libs)]] + merged [[\$<\$>:A>;\$<\$:B>]] +) + +set(release_libs optimized o1 debug d1) +set(debug_libs optimized o2 debug d2) +unit_test_check_variable_equal( + [[z_vcpkg_cmake_config_fixup_merge(merged release_libs debug_libs)]] + merged [[\$<\$>:o1>;\$<\$:d2>]] +) + +set(release_libs debug d1 optimized o1) +set(debug_libs debug d2 optimized o2) +unit_test_check_variable_equal( + [[z_vcpkg_cmake_config_fixup_merge(merged release_libs debug_libs)]] + merged [[\$<\$:d2>;\$<\$>:o1>]] +) 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 366d1d7a9..28cacbc8f 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 @@ -18,6 +18,15 @@ "list": { "description": "Test the vcpkg_list function" }, + "merge-libs": { + "description": "Test the z_vcpkg_cmake_config_fixup_merge_lists function", + "dependencies": [ + { + "name": "vcpkg-cmake-config", + "host": true + } + ] + }, "minimum-required": { "description": "Test the vcpkg_minimum_required function" } diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-acquire-msys-test/CONTROL b/external_imported/vcpkg/scripts/test_ports/vcpkg-acquire-msys-test/CONTROL deleted file mode 100644 index 47859b076..000000000 --- a/external_imported/vcpkg/scripts/test_ports/vcpkg-acquire-msys-test/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: vcpkg-acquire-msys-test -Version: 0 -Description: Test port to exercise vcpkg_acquire_msys -Supports: x86 & windows diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-acquire-msys-test/vcpkg.json b/external_imported/vcpkg/scripts/test_ports/vcpkg-acquire-msys-test/vcpkg.json new file mode 100644 index 000000000..808294bbc --- /dev/null +++ b/external_imported/vcpkg/scripts/test_ports/vcpkg-acquire-msys-test/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "vcpkg-acquire-msys-test", + "version-string": "0", + "port-version": 1, + "description": "Test port to exercise vcpkg_acquire_msys", + "supports": "x86 & windows" +} diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-ffmpeg/CONTROL b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-ffmpeg/CONTROL deleted file mode 100644 index 78687c423..000000000 --- a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-ffmpeg/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: vcpkg-ci-ffmpeg -Version: 1 -Homepage: https://github.com/microsoft/vcpkg -Description: Port to force features of certain ports within CI -Build-Depends: ffmpeg[all-nonfree] diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json new file mode 100644 index 000000000..48c23accf --- /dev/null +++ b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json @@ -0,0 +1,145 @@ +{ + "name": "vcpkg-ci-ffmpeg", + "version-string": "1", + "port-version": 1, + "description": "Port to force features of certain ports within CI", + "homepage": "https://github.com/microsoft/vcpkg", + "dependencies": [ + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "avcodec", + "avdevice", + "avfilter", + "avformat", + "avresample", + "bzip2", + "fdk-aac", + "freetype", + "gpl", + "iconv", + "lzma", + "mp3lame", + "nonfree", + "openjpeg", + "openssl", + "opus", + "postproc", + "snappy", + "soxr", + "speex", + "swresample", + "swscale", + "theora", + "vorbis", + "vpx", + "webp", + "xml2", + "zlib" + ] + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "alsa" + ], + "platform": "linux" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "sdl2" + ], + "platform": "!osx" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "ass", + "fontconfig", + "fribidi", + "modplug", + "opencl", + "openh264" + ], + "platform": "!uwp" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "ilbc" + ], + "platform": "!(arm & uwp)" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "ssh", + "x265" + ], + "platform": "!(uwp | arm)" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "x264" + ], + "platform": "!(arm & windows)" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "aom" + ], + "platform": "!(windows & arm & !uwp)" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "dav1d" + ], + "platform": "!(uwp | arm | x86 | osx)" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "opengl" + ], + "platform": "!uwp & !(arm64 & windows)" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "avisynthplus" + ], + "platform": "windows & !arm & !uwp & !static" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "tesseract" + ], + "platform": "!(windows & arm) & !static & !uwp" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "nvcodec" + ], + "platform": "linux | (!osx & !uwp & !(arm64 & windows))" + } + ] +} 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 d04286b65..a95645225 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 @@ -2,6 +2,7 @@ "name": "vcpkg-ci-llvm", "version-string": "0", "description": "LLVM features testing within CI.", + "license": null, "supports": "!uwp & !(arm & windows)", "dependencies": [ { @@ -9,9 +10,9 @@ "default-features": false, "features": [ "clang", - "enable-abi-breaking-checks", "disable-assertions", "disable-clang-static-analyzer", + "enable-abi-breaking-checks", "enable-bindings", "enable-eh", "enable-rtti", @@ -21,18 +22,24 @@ "lld", "lldb", "polly", - "target-all", - "tools", - "utils" + "target-aarch64", + "target-amdgpu", + "target-arm", + "target-webassembly", + "target-x86", + "tools" ] }, { + "$comment": "Only for osx artifact upload in CI succeeds when these features are enabled", "name": "llvm", "default-features": false, "features": [ - "flang" + "flang", + "target-all", + "utils" ], - "platform": "!(x86 & windows)" + "platform": "osx" } ] } 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 078276b2b..7c4043010 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 @@ -17,7 +17,6 @@ "jpeg", "nonfree", "png", - "python", "quirc", "tiff", "webp" @@ -48,6 +47,7 @@ "name": "opencv", "default-features": false, "features": [ + "freetype", "gdcm", "ipp", "jasper", @@ -60,6 +60,14 @@ "vtk" ], "platform": "!uwp & !(windows & (arm | arm64))" + }, + { + "name": "opencv", + "default-features": false, + "features": [ + "python" + ], + "platform": "!uwp" } ] } diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-paraview/CONTROL b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-paraview/CONTROL deleted file mode 100644 index 137750842..000000000 --- a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-paraview/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: vcpkg-ci-paraview -Version: 1 -Port-Version: 2 -Homepage: https://github.com/microsoft/vcpkg -Description: Port to force features of certain ports within CI -Build-Depends: paraview[core,vtkm,tools](!(x86&windows)), paraview[core,tools](x86&windows) diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-paraview/vcpkg.json b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-paraview/vcpkg.json new file mode 100644 index 000000000..cc1e43306 --- /dev/null +++ b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-paraview/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "vcpkg-ci-paraview", + "version-string": "1", + "port-version": 3, + "description": "Port to force features of certain ports within CI", + "homepage": "https://github.com/microsoft/vcpkg", + "dependencies": [ + { + "name": "paraview", + "default-features": false, + "features": [ + "tools" + ], + "platform": "x86 & windows" + }, + { + "name": "paraview", + "default-features": false, + "features": [ + "tools", + "vtkm" + ], + "platform": "!(x86 & windows)" + } + ] +} diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-find-acquire-program/CONTROL b/external_imported/vcpkg/scripts/test_ports/vcpkg-find-acquire-program/CONTROL deleted file mode 100644 index 6f248be58..000000000 --- a/external_imported/vcpkg/scripts/test_ports/vcpkg-find-acquire-program/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: vcpkg-find-acquire-program -Version: 0 -Description: Test port to exercise vcpkg_find_acquire_program -Supports: windows diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-find-acquire-program/vcpkg.json b/external_imported/vcpkg/scripts/test_ports/vcpkg-find-acquire-program/vcpkg.json new file mode 100644 index 000000000..987003b4c --- /dev/null +++ b/external_imported/vcpkg/scripts/test_ports/vcpkg-find-acquire-program/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "vcpkg-find-acquire-program", + "version-string": "0", + "port-version": 1, + "description": "Test port to exercise vcpkg_find_acquire_program", + "supports": "windows" +} diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-from-git-test/portfile.cmake b/external_imported/vcpkg/scripts/test_ports/vcpkg-from-git-test/portfile.cmake new file mode 100644 index 000000000..b4c2a2243 --- /dev/null +++ b/external_imported/vcpkg/scripts/test_ports/vcpkg-from-git-test/portfile.cmake @@ -0,0 +1,193 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +set(git_remote "${CURRENT_BUILDTREES_DIR}/test-git-repo") +file(REMOVE_RECURSE "${git_remote}") + +vcpkg_find_acquire_program(GIT) +vcpkg_list(SET git_config + -c core.autocrlf=false + -c user.email=vcpkg@example.com + -c user.name=vcpkg +) + +vcpkg_list(SET git ${GIT} ${git_config}) + +vcpkg_execute_required_process( + COMMAND ${git} init "${git_remote}" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" + LOGNAME "git-init" +) +vcpkg_execute_required_process( + COMMAND ${git} config uploadpack.allowReachableSHA1InWant true + WORKING_DIRECTORY "${git_remote}" + LOGNAME "git-config" +) +vcpkg_execute_required_process( + COMMAND ${git} checkout -b main + WORKING_DIRECTORY "${git_remote}" + LOGNAME "git-new-branch" +) + +file(WRITE "${git_remote}/README.txt" "first commit") +vcpkg_execute_required_process( + COMMAND ${git} add "${git_remote}/README.txt" + WORKING_DIRECTORY "${git_remote}" + LOGNAME "git-add.1" +) +vcpkg_execute_required_process( + COMMAND ${git} commit -m "first commit" + WORKING_DIRECTORY "${git_remote}" + LOGNAME "git-commit.1" +) +vcpkg_execute_in_download_mode( + COMMAND ${git} rev-parse HEAD + OUTPUT_VARIABLE ref + RESULT_VARIABLE error_code + WORKING_DIRECTORY "${git_remote}" +) +if(NOT "${error_code}" EQUAL "0") + message(FATAL_ERROR "Failed to rev-parse HEAD: ${error_code}") +endif() +string(STRIP "${ref}" ref) + +file(WRITE "${git_remote}/README.txt" "second commit") +vcpkg_execute_required_process( + COMMAND ${git} add "${git_remote}/README.txt" + WORKING_DIRECTORY "${git_remote}" + LOGNAME "git-add.2" +) +vcpkg_execute_required_process( + COMMAND ${git} commit -m "second commit" + WORKING_DIRECTORY "${git_remote}" + LOGNAME "git-commit.2" +) +vcpkg_execute_in_download_mode( + COMMAND ${git} rev-parse HEAD + OUTPUT_VARIABLE head_ref + RESULT_VARIABLE error_code + WORKING_DIRECTORY "${git_remote}" +) +if(NOT "${error_code}" EQUAL "0") + message(FATAL_ERROR "Failed to rev-parse HEAD: ${error_code}") +endif() +string(STRIP "${head_ref}" head_ref) + +# test regular mode +set(VCPKG_USE_HEAD_VERSION OFF) +vcpkg_from_git( + OUT_SOURCE_PATH source_path + URL "${git_remote}" + REF "${ref}" + HEAD_REF main +) +file(READ "${source_path}/README.txt" contents) +if(NOT "${contents}" STREQUAL "first commit") + message(FATAL_ERROR "Failed to checkout the first commit. Contents were: +${contents} +") +endif() + +# test regular mode with FETCH_REF +vcpkg_execute_required_process( + COMMAND ${git} config uploadpack.allowReachableSHA1InWant false + WORKING_DIRECTORY "${git_remote}" + LOGNAME "git-config" +) +set(VCPKG_USE_HEAD_VERSION OFF) +vcpkg_from_git( + OUT_SOURCE_PATH source_path + URL "${git_remote}" + REF "${ref}" + FETCH_REF main + HEAD_REF main +) +file(READ "${source_path}/README.txt" contents) +if(NOT "${contents}" STREQUAL "first commit") + message(FATAL_ERROR "Failed to checkout the first commit. Contents were: +${contents} +") +endif() + +vcpkg_execute_required_process( + COMMAND ${git} config uploadpack.allowReachableSHA1InWant true + WORKING_DIRECTORY "${git_remote}" + LOGNAME "git-config" +) + +# test head mode +set(VCPKG_USE_HEAD_VERSION ON) +vcpkg_from_git( + OUT_SOURCE_PATH source_path + URL "${git_remote}" + REF "${ref}" + HEAD_REF main +) +file(READ "${source_path}/README.txt" contents) +if(NOT "${contents}" STREQUAL "second commit") + message(FATAL_ERROR "Failed to checkout the HEAD commit. Contents were: +${contents} +") +endif() +if(NOT "${VCPKG_HEAD_VERSION}" STREQUAL "${head_ref}") + message(FATAL_ERROR "Failed to checkout the right HEAD commit. + Expected: ${head_ref} + Actual : ${VCPKG_HEAD_VERSION} +") +endif() + +# test head mode + no HEAD_REF -> just uses REF +set(VCPKG_USE_HEAD_VERSION ON) +vcpkg_from_git( + OUT_SOURCE_PATH source_path + URL "${git_remote}" + REF "${ref}" +) +file(READ "${source_path}/README.txt" contents) +if(NOT "${contents}" STREQUAL "first commit") + message(FATAL_ERROR "Failed to checkout the regular commit. Contents were: +${contents} +") +endif() + +# test new head ref +file(WRITE "${git_remote}/README.txt" "third commit") +vcpkg_execute_required_process( + COMMAND ${git} add "${git_remote}/README.txt" + WORKING_DIRECTORY "${git_remote}" + LOGNAME "git.7" +) +vcpkg_execute_required_process( + COMMAND ${git} commit -m "second commit" + WORKING_DIRECTORY "${git_remote}" + LOGNAME "git.8" +) +vcpkg_execute_in_download_mode( + COMMAND ${git} rev-parse HEAD + OUTPUT_VARIABLE new_head_ref + RESULT_VARIABLE error_code + WORKING_DIRECTORY "${git_remote}" +) +if(NOT "${error_code}" EQUAL "0") + message(FATAL_ERROR "Failed to rev-parse HEAD: ${error_code}") +endif() +string(STRIP "${new_head_ref}" new_head_ref) + +set(VCPKG_USE_HEAD_VERSION ON) +vcpkg_from_git( + OUT_SOURCE_PATH source_path + URL "${git_remote}" + REF "${ref}" + HEAD_REF main +) +file(READ "${source_path}/README.txt" contents) +if(NOT "${contents}" STREQUAL "third commit") + message(FATAL_ERROR "Failed to checkout the right HEAD commit. Contents were: +${contents} +") +endif() +if(NOT "${VCPKG_HEAD_VERSION}" STREQUAL "${new_head_ref}") + message(FATAL_ERROR "Failed to checkout the right HEAD commit. + Expected: ${new_head_ref} + Actual : ${VCPKG_HEAD_VERSION} +") +endif() diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-from-git-test/vcpkg.json b/external_imported/vcpkg/scripts/test_ports/vcpkg-from-git-test/vcpkg.json new file mode 100644 index 000000000..609e7f3e4 --- /dev/null +++ b/external_imported/vcpkg/scripts/test_ports/vcpkg-from-git-test/vcpkg.json @@ -0,0 +1,4 @@ +{ + "name": "vcpkg-from-git-test", + "version": "0" +} diff --git a/external_imported/vcpkg/scripts/toolchains/android.cmake b/external_imported/vcpkg/scripts/toolchains/android.cmake index 2a826c78d..fb4e66cd6 100644 --- a/external_imported/vcpkg/scripts/toolchains/android.cmake +++ b/external_imported/vcpkg/scripts/toolchains/android.cmake @@ -9,20 +9,20 @@ else() endif() set(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION clang CACHE STRING "") -if (VCPKG_TARGET_TRIPLET MATCHES "^arm64-android") +if (VCPKG_TARGET_TRIPLET MATCHES "arm64-android") set(ANDROID_ABI arm64-v8a CACHE STRING "") -elseif(VCPKG_TARGET_TRIPLET MATCHES "^armv6-android") +elseif(VCPKG_TARGET_TRIPLET MATCHES "armv6-android") set(ANDROID_ABI armeabi CACHE STRING "") set(ANDROID_ARM_MODE arm CACHE STRING "") -elseif(VCPKG_TARGET_TRIPLET MATCHES "^arm-neon-android") +elseif(VCPKG_TARGET_TRIPLET MATCHES "arm-neon-android") set(ANDROID_ABI armeabi-v7a CACHE STRING "") set(ANDROID_ARM_NEON ON CACHE BOOL "") -elseif(VCPKG_TARGET_TRIPLET MATCHES "^arm-android") +elseif(VCPKG_TARGET_TRIPLET MATCHES "arm-android") set(ANDROID_ABI armeabi-v7a CACHE STRING "") set(ANDROID_ARM_NEON OFF CACHE BOOL "") -elseif(VCPKG_TARGET_TRIPLET MATCHES "^x64-android") +elseif(VCPKG_TARGET_TRIPLET MATCHES "x64-android") set(ANDROID_ABI x86_64 CACHE STRING "") -elseif(VCPKG_TARGET_TRIPLET MATCHES "^x86-android") +elseif(VCPKG_TARGET_TRIPLET MATCHES "x86-android") set(ANDROID_ABI x86 CACHE STRING "") else() message(FATAL_ERROR "Unknown ABI for target triplet ${VCPKG_TARGET_TRIPLET}") diff --git a/external_imported/vcpkg/scripts/vcpkgTools.xml b/external_imported/vcpkg/scripts/vcpkgTools.xml index c2d59ec5f..c3b545910 100644 --- a/external_imported/vcpkg/scripts/vcpkgTools.xml +++ b/external_imported/vcpkg/scripts/vcpkgTools.xml @@ -1,32 +1,32 @@ - 3.10.1 + 3.10.2 python.exe - https://www.python.org/ftp/python/3.10.1/python-3.10.1-embed-win32.zip - 47bf00e4de74f33fe3d0c4f97773b221cf78c29f02257f43368f0414c88be1bdffc914e4e6516870c23cba84f4618edb8fe5a3ee43e41f492d812a90d93c1ea8 - python-3.10.1-embed-win32.zip + https://www.python.org/ftp/python/3.10.2/python-3.10.2-embed-win32.zip + d647d7141d1b13c899671b882e686a1b1cc6f759e5b7428ec858cdffd9ef019c78fb0b989174b98f30cb696297bfeff3d171f7eaabb339f5154886c030b8e4d9 + python-3.10.2-embed-win32.zip - 3.21.1 - cmake-3.21.1-windows-i386\bin\cmake.exe - https://github.com/Kitware/CMake/releases/download/v3.21.1/cmake-3.21.1-windows-i386.zip - 3aa0e9c904bf8abfc9441c1f0fd571e613ade7bc12f36211cd9006b4a2226552815ec8b00c8ef43583769d9d90996e75d2e832b3718ac3b85d3f9fb4db1cd60a - cmake-3.21.1-windows-i386.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.21.1 - cmake-3.21.1-macos-universal/CMake.app/Contents/bin/cmake - https://github.com/Kitware/CMake/releases/download/v3.21.1/cmake-3.21.1-macos-universal.tar.gz - 0e5d3781101d6f54d916066719a0ff27d052b40e999dfd8e1f53d8d22d99e45cad22fc28b5d2a9e810b0cc8237e640d7747aff2a2c0896571c8a69ecdd0a9e41 - cmake-3.21.1-macos-universal.tar.gz + 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.21.1 - cmake-3.21.1-linux-x86_64/bin/cmake - https://github.com/Kitware/CMake/releases/download/v3.21.1/cmake-3.21.1-Linux-x86_64.tar.gz - deb24087315bcf01d2969846246564a352b6f77521df6b235f9ef525450db9c89b32dca4ad78f93a356dd5ab7b587374d49fc1a892354760715a5ef1f88e925f - cmake-3.21.1-linux-x86_64.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.20.4 @@ -36,11 +36,11 @@ cmake-3.20.4.txz - 2.32.0.2 + 2.7.4 mingw32\bin\git.exe - https://github.com/git-for-windows/git/releases/download/v2.32.0.windows.2/PortableGit-2.32.0.2-32-bit.7z.exe - 867d8534972cbaf7a4224e25a14d484f8d17ef186f8d79e9a758afb90cf69541375cb7615a39702311f4809cb8371ef85c2b1a15bfffe9e48f0e597ac011b348 - PortableGit-2.32.0.2-32-bit.7z.exe + https://github.com/git-for-windows/git/releases/download/v2.35.1.windows.2/PortableGit-2.35.1.2-32-bit.7z.exe + f98df16641a615bbc36c5c319c78abb780d824ff35ed5f2a095e2d5fce2acacfc7f6532c96f1c81d3d3cd8a642858cbd9de0e0e5fcde9ca11e6ad9f6598bb82f + PortableGit-2.35.1.2-32-bit.7z.exe 2.7.4 @@ -112,13 +112,20 @@ 1f3e593270d7c2a4e271fdb49c637a2de462351310ef66bba298d30f6ca23365ec6aecf2e57799a00c873267cd3f92060ecac03eb291d42903d0e0869cd17c73 QtInstallerFramework-win-x86.zip - - 19.00 + + 21.07 Files\7-Zip\7z.exe - https://www.7-zip.org/a/7z1900-x64.msi - 7837a8677a01eed9c3309923f7084bc864063ba214ee169882c5b04a7a8b198ed052c15e981860d9d7952c98f459a4fab87a72fd78e7d0303004dcb86f4324c8 - 7z1900-x64.msi + https://www.7-zip.org/a/7z2107-x64.msi + d55b44f1255d1b0e629719383a600a7e83dc6378d470096337b886ce24684d26bcc2b04f9cea39ad888179edce23ad2bd0e8e1863ddc40106c176adece8c012d + 7z2107-x64.msi + + 21.07 + 7za.exe + https://www.7-zip.org/a/7z2107-extra.7z + 648d894940bcc29951752d7a8fd18c770ee8d4fd944e17f1a52588e51ca8f58375ba48514538f2e1387786fd812bb86f75fd6bdd0892685cdcafb2989942c848 + 7z2107-extra.7z + 1.35.0 aria2-1.35.0-win-32bit-build1\aria2c.exe @@ -162,11 +169,11 @@ ninja-freebsd-1.8.2.zip - 7.2.0 + 7.2.1 pwsh.exe - https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/PowerShell-7.2.0-win-x86.zip - cd765b39559be296229f8aef4022f17f20d3bb3037944867918b3a12a901160020e250403abd15666622158eb764fa217b5e5ad9f4d6ad69906ce3c4e03a808b - PowerShell-7.2.0-win-x86.zip + 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 16.12.0 diff --git a/external_imported/vcpkg/versions/3-/3fd.json b/external_imported/vcpkg/versions/3-/3fd.json index 2a20264ea..a4398c8df 100644 --- a/external_imported/vcpkg/versions/3-/3fd.json +++ b/external_imported/vcpkg/versions/3-/3fd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3b52e6aff44ca4e11335754570701f692ea14184", + "version": "2.6.3", + "port-version": 2 + }, { "git-tree": "622078647d4fff0a51a26a4ecff2ba9109e5764d", "version": "2.6.3", diff --git a/external_imported/vcpkg/versions/7-/7zip.json b/external_imported/vcpkg/versions/7-/7zip.json index f699a2885..49dd64b19 100644 --- a/external_imported/vcpkg/versions/7-/7zip.json +++ b/external_imported/vcpkg/versions/7-/7zip.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "d60561160384264eaf45a225dcb41beccb87ecbc", + "version-string": "21.07", + "port-version": 1 + }, + { + "git-tree": "7a951689070e40d8ff0ed20b4e18bc533ef5db1f", + "version-string": "21.07", + "port-version": 0 + }, + { + "git-tree": "54b143613df50187b48517d63796569641c4eee7", + "version-string": "19.00", + "port-version": 4 + }, { "git-tree": "c49050bcc9af0a2cbd9c572386e6a8b547ebd9f7", "version-string": "19.00", diff --git a/external_imported/vcpkg/versions/a-/ace.json b/external_imported/vcpkg/versions/a-/ace.json index 7596bdc70..b9dd64eba 100644 --- a/external_imported/vcpkg/versions/a-/ace.json +++ b/external_imported/vcpkg/versions/a-/ace.json @@ -1,5 +1,30 @@ { "versions": [ + { + "git-tree": "d20fc0a9eac1744ff9fb5c5427eade58234e35c9", + "version": "7.0.6", + "port-version": 3 + }, + { + "git-tree": "0ad9c09c1663f5264f5bf5dcbe1d402618973144", + "version": "7.0.6", + "port-version": 2 + }, + { + "git-tree": "cac33553b152f59e730715fcc1bae263bb037862", + "version": "7.0.6", + "port-version": 1 + }, + { + "git-tree": "c851425112d4af710db29d482e43a15ade7ee463", + "version": "7.0.6", + "port-version": 0 + }, + { + "git-tree": "2fdbe23020728d91dbae5249ed04b42b4b882a87", + "version": "7.0.5", + "port-version": 3 + }, { "git-tree": "1801922b3e4808edcd0b55b6a800bbb1c01687a6", "version": "7.0.5", diff --git a/external_imported/vcpkg/versions/a-/activemq-cpp.json b/external_imported/vcpkg/versions/a-/activemq-cpp.json index e0d0a97d2..4869266c2 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": "ec8c68847a3d3950cec058e76a3963fac34fd682", + "version-semver": "3.9.5", + "port-version": 8 + }, { "git-tree": "531d21bab7c2d9e9e2ecb1c84e6cf9f1c6173a51", "version-semver": "3.9.5", diff --git a/external_imported/vcpkg/versions/a-/akali.json b/external_imported/vcpkg/versions/a-/akali.json index e960d28aa..210ecf510 100644 --- a/external_imported/vcpkg/versions/a-/akali.json +++ b/external_imported/vcpkg/versions/a-/akali.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "44ab167f077406e598eb19f7e48f10b638bc1547", + "version-string": "1.42", + "port-version": 3 + }, { "git-tree": "1b94b1623b0778525e405410cee7d6d069ac56ca", "version-string": "1.42", diff --git a/external_imported/vcpkg/versions/a-/alembic.json b/external_imported/vcpkg/versions/a-/alembic.json index b2a602455..8bebb133f 100644 --- a/external_imported/vcpkg/versions/a-/alembic.json +++ b/external_imported/vcpkg/versions/a-/alembic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "16bef528ef38e7426a333739878188d9ca909bc5", + "version": "1.8.3", + "port-version": 1 + }, { "git-tree": "8cb082c36da272a988b08fe0c4c638ff62cb1ad2", "version": "1.8.3", diff --git a/external_imported/vcpkg/versions/a-/alsa.json b/external_imported/vcpkg/versions/a-/alsa.json index 3da4e4546..6b2fa7973 100644 --- a/external_imported/vcpkg/versions/a-/alsa.json +++ b/external_imported/vcpkg/versions/a-/alsa.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1ce0c3410e25de5357b707dc0f800cf7c3a7f213", + "version": "1.2.6.1", + "port-version": 0 + }, { "git-tree": "03a04f17b2dfb480de15a07b58188b161dbe6dda", "version": "1.2.5.1", diff --git a/external_imported/vcpkg/versions/a-/ampl-asl.json b/external_imported/vcpkg/versions/a-/ampl-asl.json index ace12ea0a..02f6ff768 100644 --- a/external_imported/vcpkg/versions/a-/ampl-asl.json +++ b/external_imported/vcpkg/versions/a-/ampl-asl.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "2a88fb5c85a975bf5c5b49b6d87224b25504553d", + "version-date": "2020-11-11", + "port-version": 3 + }, + { + "git-tree": "024e7d3399beb537eb371c85181e48f4db51a4b0", + "version-string": "2020-11-11", + "port-version": 2 + }, { "git-tree": "823dcf0d7f897a92269faf1915322c012b281a2a", "version-string": "2020-11-11", diff --git a/external_imported/vcpkg/versions/a-/ampl-mp.json b/external_imported/vcpkg/versions/a-/ampl-mp.json index 3abf1335e..f10ce12ea 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": "d52dd1ac4a69a74bb658b52be36c7457ca6049ef", + "version-string": "2020-11-11", + "port-version": 2 + }, { "git-tree": "0363f4dd57d8729a0a6bd3e1c2ca8d424fd59eda", "version-string": "2020-11-11", diff --git a/external_imported/vcpkg/versions/a-/amqpcpp.json b/external_imported/vcpkg/versions/a-/amqpcpp.json index c16bbb5cd..ce5199977 100644 --- a/external_imported/vcpkg/versions/a-/amqpcpp.json +++ b/external_imported/vcpkg/versions/a-/amqpcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b071aaf9f29af43e9463bcc9a118f4553351eb16", + "version": "4.3.15", + "port-version": 1 + }, { "git-tree": "3f2e1a0132721d9cdb8515d40010eaba97ecc8de", "version": "4.3.15", diff --git a/external_imported/vcpkg/versions/a-/anax.json b/external_imported/vcpkg/versions/a-/anax.json index 99ff1a187..9566506ae 100644 --- a/external_imported/vcpkg/versions/a-/anax.json +++ b/external_imported/vcpkg/versions/a-/anax.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "db4b3bfeef52da822588d5bb85a4b3bf9affa80f", + "version": "2.1.0", + "port-version": 8 + }, { "git-tree": "347d15eb157a2bad09742ec97dfc417674936982", "version-string": "2.1.0", diff --git a/external_imported/vcpkg/versions/a-/antlr4.json b/external_imported/vcpkg/versions/a-/antlr4.json index 033e47010..c256005fb 100644 --- a/external_imported/vcpkg/versions/a-/antlr4.json +++ b/external_imported/vcpkg/versions/a-/antlr4.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "0a3fbd320c22b3c017fe13fb4cac5fe330c0df99", + "version": "4.9.3", + "port-version": 1 + }, + { + "git-tree": "55208ea9aa8be016d24423442ffbb2e31a7390a1", + "version": "4.9.3", + "port-version": 0 + }, + { + "git-tree": "31ac3fa20b3f7944e5ac32b7ac7883f3d976dae6", + "version": "4.9.1", + "port-version": 2 + }, { "git-tree": "0b8591ea0b8692c0c2963c468ee5b9c2e260ace4", "version-string": "4.9.1", diff --git a/external_imported/vcpkg/versions/a-/approval-tests-cpp.json b/external_imported/vcpkg/versions/a-/approval-tests-cpp.json index b43e2a01a..b2fbf56a1 100644 --- a/external_imported/vcpkg/versions/a-/approval-tests-cpp.json +++ b/external_imported/vcpkg/versions/a-/approval-tests-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "84c554ce63a6fb5ba80ecf7b3b27bf7c577471a2", + "version": "10.12.2", + "port-version": 0 + }, { "git-tree": "af4597332ca8387f85fa3eef5c853d47d8745d23", "version": "10.12.1", diff --git a/external_imported/vcpkg/versions/a-/apr-util.json b/external_imported/vcpkg/versions/a-/apr-util.json index 642c2d01f..7eaa48d20 100644 --- a/external_imported/vcpkg/versions/a-/apr-util.json +++ b/external_imported/vcpkg/versions/a-/apr-util.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d758cde4c829f6c3a66a773d517f9e9425227629", + "version": "1.6.1", + "port-version": 7 + }, + { + "git-tree": "d27be40b8f670b002604154ef5657c011b8de733", + "version": "1.6.1", + "port-version": 6 + }, { "git-tree": "dfc76280690e9d419c43ee5242466de5b4e317c2", "version-string": "1.6.1", diff --git a/external_imported/vcpkg/versions/a-/apr.json b/external_imported/vcpkg/versions/a-/apr.json index 87aaa252f..d1baaa282 100644 --- a/external_imported/vcpkg/versions/a-/apr.json +++ b/external_imported/vcpkg/versions/a-/apr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e73f548920cc5add8a47af9b8775a26c89050101", + "version": "1.7.0", + "port-version": 7 + }, { "git-tree": "bc5604f4ffbdcdaee979fccdb1fd5a85dfc7a3db", "version": "1.7.0", diff --git a/external_imported/vcpkg/versions/a-/apsi.json b/external_imported/vcpkg/versions/a-/apsi.json index 2719543e4..991bf7ddc 100644 --- a/external_imported/vcpkg/versions/a-/apsi.json +++ b/external_imported/vcpkg/versions/a-/apsi.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "08bc0f650b7fa0ef77541eb74b90d0b9fe7fec03", + "version-semver": "0.7.0", + "port-version": 2 + }, + { + "git-tree": "c2703eaa248b72c269dd22aac1e2aca49060dfba", + "version-semver": "0.7.0", + "port-version": 1 + }, { "git-tree": "652d69df44a689fa55f1b757db46c97bcb840c13", "version-semver": "0.7.0", diff --git a/external_imported/vcpkg/versions/a-/arb.json b/external_imported/vcpkg/versions/a-/arb.json index d59b40a28..f01bc86bd 100644 --- a/external_imported/vcpkg/versions/a-/arb.json +++ b/external_imported/vcpkg/versions/a-/arb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e1b560a5a2aa835d54da9fdabac5eea48255e93d", + "version": "2.21.1", + "port-version": 1 + }, { "git-tree": "06326497117fb757651649225284d2fe4100ef79", "version": "2.21.1", diff --git a/external_imported/vcpkg/versions/a-/arcus.json b/external_imported/vcpkg/versions/a-/arcus.json index 47d36bb4d..c7981fe70 100644 --- a/external_imported/vcpkg/versions/a-/arcus.json +++ b/external_imported/vcpkg/versions/a-/arcus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1edcde9d0c4a64d780c6692b017cd30137a9ab19", + "version-semver": "4.10.0", + "port-version": 2 + }, { "git-tree": "0aeec8ed7245362e90ef531d8ecaf4ca315e85e5", "version-semver": "4.10.0", diff --git a/external_imported/vcpkg/versions/a-/args.json b/external_imported/vcpkg/versions/a-/args.json index cba126cef..f011bbad0 100644 --- a/external_imported/vcpkg/versions/a-/args.json +++ b/external_imported/vcpkg/versions/a-/args.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6da2a8e30a8640e0cb9fe55decd3a634d8c42cb6", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "8f102bf551068e71d94c7d1f21295bb9bf29dcdc", "version": "6.2.7", diff --git a/external_imported/vcpkg/versions/a-/argtable3.json b/external_imported/vcpkg/versions/a-/argtable3.json index 10b5524fc..a859cfbab 100644 --- a/external_imported/vcpkg/versions/a-/argtable3.json +++ b/external_imported/vcpkg/versions/a-/argtable3.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "fe3b1c9a876237412e7ba925a3b41f62e7fc1d99", + "version": "3.2.1", + "port-version": 2 + }, + { + "git-tree": "acbbb26e54e658b8af673a112fb338274275ad6b", + "version": "3.2.1", + "port-version": 1 + }, { "git-tree": "0dc3ede1be6316bee6853f84c5f147340be70ee8", "version-string": "3.2.1", diff --git a/external_imported/vcpkg/versions/a-/armadillo.json b/external_imported/vcpkg/versions/a-/armadillo.json index ca634e759..395d93271 100644 --- a/external_imported/vcpkg/versions/a-/armadillo.json +++ b/external_imported/vcpkg/versions/a-/armadillo.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "fb3b2fb5c5daeea857a0b9952dbef5c980fa14c9", + "version": "10.6.2", + "port-version": 5 + }, + { + "git-tree": "ddc4477e6ecc2d66e429e18e9ccd96367da2ce88", + "version": "10.6.2", + "port-version": 4 + }, { "git-tree": "88bb8282f33e16f2c59856f68ed9934ff26c7e02", "version": "10.6.2", diff --git a/external_imported/vcpkg/versions/a-/arrow.json b/external_imported/vcpkg/versions/a-/arrow.json index f6404626a..66bc46896 100644 --- a/external_imported/vcpkg/versions/a-/arrow.json +++ b/external_imported/vcpkg/versions/a-/arrow.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "3d3371b4741fc81354b2033d584c48a1929373f4", + "version": "7.0.0", + "port-version": 2 + }, + { + "git-tree": "71eea8dac175d368506f19bb246b40bf4829846a", + "version": "7.0.0", + "port-version": 1 + }, + { + "git-tree": "3682e12e1b3f3aa79551877b157ff3d914cb5c90", + "version": "7.0.0", + "port-version": 0 + }, { "git-tree": "b12626f29cb0ba8a049241153af0dfeca9a810d7", "version": "6.0.1", diff --git a/external_imported/vcpkg/versions/a-/ashes.json b/external_imported/vcpkg/versions/a-/ashes.json index 0d6724fc8..62c56ba64 100644 --- a/external_imported/vcpkg/versions/a-/ashes.json +++ b/external_imported/vcpkg/versions/a-/ashes.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "365d042da082df035fb7dba0a53e1a4ac306f469", + "version-date": "2022-04-03", + "port-version": 0 + }, + { + "git-tree": "68557018b215aba6325caf97248c62955fdef397", + "version-date": "2021-06-18", + "port-version": 1 + }, { "git-tree": "3d20e63c5d3a016d41571baefa723a23113c13c3", "version-date": "2021-06-18", diff --git a/external_imported/vcpkg/versions/a-/asio-grpc.json b/external_imported/vcpkg/versions/a-/asio-grpc.json index 92bbd8c98..86b491f9a 100644 --- a/external_imported/vcpkg/versions/a-/asio-grpc.json +++ b/external_imported/vcpkg/versions/a-/asio-grpc.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "56b29ba569fb72539675ca51ecf3c83fcf8eb0ba", + "version": "1.5.1", + "port-version": 0 + }, + { + "git-tree": "895af5509d20a5f310a5fa7285bd2e8e24e75548", + "version": "1.4.0", + "port-version": 0 + }, { "git-tree": "b68efdc2a8b782df2489156675bb4a4e95c7a221", "version": "1.3.1", diff --git a/external_imported/vcpkg/versions/a-/asio.json b/external_imported/vcpkg/versions/a-/asio.json index be1048231..8ff066eac 100644 --- a/external_imported/vcpkg/versions/a-/asio.json +++ b/external_imported/vcpkg/versions/a-/asio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fbf8b87b680829fee5a422169f3d73df4392d8cf", + "version": "1.22.1", + "port-version": 0 + }, { "git-tree": "b16ad8ba502540b3b34a29552f6937951e08e5e6", "version": "1.20.0", diff --git a/external_imported/vcpkg/versions/a-/asiosdk.json b/external_imported/vcpkg/versions/a-/asiosdk.json index e29848b04..087591c2f 100644 --- a/external_imported/vcpkg/versions/a-/asiosdk.json +++ b/external_imported/vcpkg/versions/a-/asiosdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "101bbdad9205db5b4249eae8b47bf8c5f73493a8", + "version": "2.3.3", + "port-version": 4 + }, { "git-tree": "870921549ca1a681fe04ba3a0c17586995c1b567", "version": "2.3.3", diff --git a/external_imported/vcpkg/versions/a-/asmjit.json b/external_imported/vcpkg/versions/a-/asmjit.json index 9f303a291..b6222d240 100644 --- a/external_imported/vcpkg/versions/a-/asmjit.json +++ b/external_imported/vcpkg/versions/a-/asmjit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f67010904c0f2d7a1d79a647ea928aece3e66750", + "version-date": "2021-10-26", + "port-version": 1 + }, { "git-tree": "3ce58638bee35ef08b3ee8286c1e519b171c39bf", "version-date": "2021-10-26", diff --git a/external_imported/vcpkg/versions/a-/audiofile.json b/external_imported/vcpkg/versions/a-/audiofile.json index cc7517be6..f928b164c 100644 --- a/external_imported/vcpkg/versions/a-/audiofile.json +++ b/external_imported/vcpkg/versions/a-/audiofile.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa276b1ad374c2ae6034445b6655518d8f9a23de", + "version": "1.1.0", + "port-version": 0 + }, { "git-tree": "73a1d7555de8baaf7a1b34ca1410d7e9978bf75f", "version": "1.0.9", diff --git a/external_imported/vcpkg/versions/a-/avisynthplus.json b/external_imported/vcpkg/versions/a-/avisynthplus.json index c8cd5d877..eeb574694 100644 --- a/external_imported/vcpkg/versions/a-/avisynthplus.json +++ b/external_imported/vcpkg/versions/a-/avisynthplus.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "a585670d79213148e938d9f3ea7d2ccb1c784f2c", + "version-semver": "3.7.0", + "port-version": 3 + }, + { + "git-tree": "ed06319cd3b2bb9e0811743ca7f66dd9539eabef", + "version-semver": "3.7.0", + "port-version": 2 + }, { "git-tree": "747e0dd9f81ace8b2f473dc455871938d930df28", "version-semver": "3.7.0", diff --git a/external_imported/vcpkg/versions/a-/avro-c.json b/external_imported/vcpkg/versions/a-/avro-c.json index c1835d92a..35574415d 100644 --- a/external_imported/vcpkg/versions/a-/avro-c.json +++ b/external_imported/vcpkg/versions/a-/avro-c.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7b07da3abd56565c8d2e75942aab468ece0f3115", + "version": "1.11.0", + "port-version": 3 + }, + { + "git-tree": "e36456a1ada18a8020e4bb1fffa24b0dc2edfa3e", + "version": "1.11.0", + "port-version": 2 + }, { "git-tree": "75d0ed12b643fe1ed6a175c12549e9bb0ca94a1d", "version": "1.11.0", diff --git a/external_imported/vcpkg/versions/a-/aws-c-auth.json b/external_imported/vcpkg/versions/a-/aws-c-auth.json index f7f624071..4c5c0a437 100644 --- a/external_imported/vcpkg/versions/a-/aws-c-auth.json +++ b/external_imported/vcpkg/versions/a-/aws-c-auth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cdf9b6cb3b199b8ef1dec2e0d46bcfea7c8f536a", + "version": "0.6.3", + "port-version": 2 + }, { "git-tree": "be9ae25111a5c7104d7c3769fcd581ee9f5dac7a", "version": "0.6.3", diff --git a/external_imported/vcpkg/versions/a-/aws-c-cal.json b/external_imported/vcpkg/versions/a-/aws-c-cal.json index 134083182..ee01b313b 100644 --- a/external_imported/vcpkg/versions/a-/aws-c-cal.json +++ b/external_imported/vcpkg/versions/a-/aws-c-cal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a383adb52cab94b360e30cf82c1be79a45a75875", + "version": "0.5.12", + "port-version": 2 + }, { "git-tree": "33e7566ec2dc8cbc5ce91687b8627f946cdf231d", "version": "0.5.12", diff --git a/external_imported/vcpkg/versions/a-/aws-c-common.json b/external_imported/vcpkg/versions/a-/aws-c-common.json index 0126e48d1..6add7a56c 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": "56b4972c2535a4e8991826b6c595e433b0e80bf9", + "version": "0.6.9", + "port-version": 2 + }, { "git-tree": "20a16524a9cc1079486d4efd5230562c8b9bed8a", "version": "0.6.9", diff --git a/external_imported/vcpkg/versions/a-/aws-c-compression.json b/external_imported/vcpkg/versions/a-/aws-c-compression.json index 92f89d18d..fc988fb96 100644 --- a/external_imported/vcpkg/versions/a-/aws-c-compression.json +++ b/external_imported/vcpkg/versions/a-/aws-c-compression.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "107778b6c4b3c09105fcc9a08b31b252278538a4", + "version": "0.2.14", + "port-version": 2 + }, { "git-tree": "5892ebc8e23b264d832f03d4f7dfb04856dd8367", "version": "0.2.14", diff --git a/external_imported/vcpkg/versions/a-/aws-c-event-stream.json b/external_imported/vcpkg/versions/a-/aws-c-event-stream.json index 32b6e7885..d92b1f859 100644 --- a/external_imported/vcpkg/versions/a-/aws-c-event-stream.json +++ b/external_imported/vcpkg/versions/a-/aws-c-event-stream.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a9e93d6dd8799afe5f56eeeda92793ba888691e", + "version": "0.2.7", + "port-version": 2 + }, { "git-tree": "4d0b2b6a72ae5ea454dc5378f9b3bc78320174ae", "version": "0.2.7", diff --git a/external_imported/vcpkg/versions/a-/aws-c-http.json b/external_imported/vcpkg/versions/a-/aws-c-http.json index f350b9370..44db43e72 100644 --- a/external_imported/vcpkg/versions/a-/aws-c-http.json +++ b/external_imported/vcpkg/versions/a-/aws-c-http.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "845a574790e6fcd40bfc13cf0c65104d04e29350", + "version": "0.6.5", + "port-version": 2 + }, { "git-tree": "470e20b38e215a550b52c002a7cc8a7f18938bf9", "version": "0.6.5", diff --git a/external_imported/vcpkg/versions/a-/aws-c-io.json b/external_imported/vcpkg/versions/a-/aws-c-io.json index 38b5e2a1a..1ea423119 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": "7456b996bdeeeeb59fb39770d797fa2966d0a951", + "version": "0.10.7", + "port-version": 2 + }, { "git-tree": "45b959b56caa21052a67c2b3d0b493a3e401288c", "version": "0.10.7", diff --git a/external_imported/vcpkg/versions/a-/aws-c-mqtt.json b/external_imported/vcpkg/versions/a-/aws-c-mqtt.json index 5502f5872..8386463b3 100644 --- a/external_imported/vcpkg/versions/a-/aws-c-mqtt.json +++ b/external_imported/vcpkg/versions/a-/aws-c-mqtt.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "028932fcffa607cc234348c2e2df454da7c4ccad", + "version": "0.7.6", + "port-version": 3 + }, + { + "git-tree": "834a199cf4560cbdd8e6dac09074b9b5b1d57d53", + "version": "0.7.6", + "port-version": 2 + }, { "git-tree": "6dc42a5ba915723bed2997c39222b166a9f0a084", "version": "0.7.6", diff --git a/external_imported/vcpkg/versions/a-/aws-c-s3.json b/external_imported/vcpkg/versions/a-/aws-c-s3.json index ebee3021a..b556184ce 100644 --- a/external_imported/vcpkg/versions/a-/aws-c-s3.json +++ b/external_imported/vcpkg/versions/a-/aws-c-s3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c571d95b22b5f84591bf4a115ca47c522371efce", + "version": "0.1.25", + "port-version": 2 + }, { "git-tree": "620ce24ba09dd971644750eedcbb42a8f1fc2457", "version": "0.1.25", diff --git a/external_imported/vcpkg/versions/a-/aws-checksums.json b/external_imported/vcpkg/versions/a-/aws-checksums.json index ca72a34b8..e1682a125 100644 --- a/external_imported/vcpkg/versions/a-/aws-checksums.json +++ b/external_imported/vcpkg/versions/a-/aws-checksums.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aeda736d7deef9292db2e43dc8702b2ddb5d59b0", + "version": "0.1.11", + "port-version": 3 + }, { "git-tree": "e70b465c6b8ce012ed176b822471dd440f853267", "version": "0.1.11", diff --git a/external_imported/vcpkg/versions/a-/aws-crt-cpp.json b/external_imported/vcpkg/versions/a-/aws-crt-cpp.json index 1ee9a028b..fe805028e 100644 --- a/external_imported/vcpkg/versions/a-/aws-crt-cpp.json +++ b/external_imported/vcpkg/versions/a-/aws-crt-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e542ffdad6392c75909a3235d33c2a22c939c980", + "version": "0.15.1", + "port-version": 3 + }, { "git-tree": "d96290d0c6d34f9b4129e811e3b8fd2d62a699c7", "version": "0.15.1", diff --git a/external_imported/vcpkg/versions/a-/aws-lambda-cpp.json b/external_imported/vcpkg/versions/a-/aws-lambda-cpp.json index 7856f5dd9..13fa94b2e 100644 --- a/external_imported/vcpkg/versions/a-/aws-lambda-cpp.json +++ b/external_imported/vcpkg/versions/a-/aws-lambda-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "48030b34e22463cab36178bb50d3ce62257d6d56", + "version": "0.2.7", + "port-version": 1 + }, { "git-tree": "e9c58661b9a838e782997f03ee3af449260ece4f", "version-string": "0.2.7", diff --git a/external_imported/vcpkg/versions/a-/aws-sdk-cpp.json b/external_imported/vcpkg/versions/a-/aws-sdk-cpp.json index 011d30247..e25338628 100644 --- a/external_imported/vcpkg/versions/a-/aws-sdk-cpp.json +++ b/external_imported/vcpkg/versions/a-/aws-sdk-cpp.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "c7d142ac1a2667f6ba9650cab2505a71ffaddbd3", + "version": "1.9.220", + "port-version": 1 + }, + { + "git-tree": "7fc21526c4465a7e399683055a6df0096cad218e", + "version": "1.9.220", + "port-version": 0 + }, + { + "git-tree": "e1d4dde6c824e40b0a0dce27f48539dfa4f64eed", + "version": "1.9.160", + "port-version": 1 + }, { "git-tree": "e02908481470143ae86077c24e80d493d609f379", "version": "1.9.160", 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 65623e3a3..ea11d2ee5 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,30 @@ { "versions": [ + { + "git-tree": "ec45ec6a9a5b28ecab27857508355956d151a814", + "version-date": "2022-01-21", + "port-version": 3 + }, + { + "git-tree": "42be8335b113cba6ca88b9f9789b29fc7be280b4", + "version-date": "2022-01-21", + "port-version": 2 + }, + { + "git-tree": "aceee8533b4eeea6eb87371c4d37ae82859cefc7", + "version-date": "2022-01-21", + "port-version": 1 + }, + { + "git-tree": "1d0590ad121eefc3af9ff13f67996ca8c3e39508", + "version-date": "2022-01-21", + "port-version": 0 + }, + { + "git-tree": "f2f3f9c6b03d02268920eee133f660bf2fe5d946", + "version-date": "2021-09-09", + "port-version": 1 + }, { "git-tree": "6898a05e54b88637fc5a42136facc194b84e71a1", "version-date": "2021-09-09", diff --git a/external_imported/vcpkg/versions/a-/azure-core-cpp.json b/external_imported/vcpkg/versions/a-/azure-core-cpp.json index f51e6c6f3..016f38ece 100644 --- a/external_imported/vcpkg/versions/a-/azure-core-cpp.json +++ b/external_imported/vcpkg/versions/a-/azure-core-cpp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "8940f6b17c33b8076e08c931fcf2ccdafa2fe2f2", + "version-semver": "1.5.0", + "port-version": 0 + }, + { + "git-tree": "73975ac66807a0477bcaa3fa75fdfaf0f74bdb06", + "version-semver": "1.4.0", + "port-version": 0 + }, { "git-tree": "b34bd865f3d3caf5b7021d5e9048d775b3e9cfb0", "version-semver": "1.3.1", diff --git a/external_imported/vcpkg/versions/a-/azure-identity-cpp.json b/external_imported/vcpkg/versions/a-/azure-identity-cpp.json index 6fb04a828..0aaefe2b3 100644 --- a/external_imported/vcpkg/versions/a-/azure-identity-cpp.json +++ b/external_imported/vcpkg/versions/a-/azure-identity-cpp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f6de8ed7d7b299df5cee8483a4f84cb07dd57b1c", + "version-semver": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "df411f808c6dab5e59a7f378308856d803150c04", + "version-semver": "1.1.1", + "port-version": 0 + }, { "git-tree": "2742c6a31a2a3238ea97663c2b40be998c18006d", "version-semver": "1.1.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 56fd64060..3953986f7 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,20 @@ { "versions": [ + { + "git-tree": "80f1eb4e465fef817503af2c9599b2186d4922e6", + "version-date": "2022-01-21", + "port-version": 2 + }, + { + "git-tree": "0570fa462646f08bb3ed9a34ecb693082def3d3b", + "version-date": "2022-01-21", + "port-version": 1 + }, + { + "git-tree": "77b1d419b740dd9738f237a6d52b1c161e99ee9d", + "version-date": "2022-01-21", + "port-version": 0 + }, { "git-tree": "3d6dc98460c69e8690f9b20f62cf75e9e3ef7f2d", "version-date": "2021-09-09", diff --git a/external_imported/vcpkg/versions/a-/azure-kinect-sensor-sdk.json b/external_imported/vcpkg/versions/a-/azure-kinect-sensor-sdk.json index 86b166160..98ae08516 100644 --- a/external_imported/vcpkg/versions/a-/azure-kinect-sensor-sdk.json +++ b/external_imported/vcpkg/versions/a-/azure-kinect-sensor-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "379c37baf28190bb33ccf1d512c22a21c664e41e", + "version": "1.4.1", + "port-version": 4 + }, { "git-tree": "11fbd98a9560da0ad96abf61d8731778db6e5b8b", "version": "1.4.1", diff --git a/external_imported/vcpkg/versions/a-/azure-macro-utils-c.json b/external_imported/vcpkg/versions/a-/azure-macro-utils-c.json index 9b9d201e1..f0dd734cb 100644 --- a/external_imported/vcpkg/versions/a-/azure-macro-utils-c.json +++ b/external_imported/vcpkg/versions/a-/azure-macro-utils-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0c90715278e5ab77af983254bdf17571bf69c55b", + "version-date": "2022-01-21", + "port-version": 0 + }, { "git-tree": "a951ed2a9b24f8778b7c2fb2ff4e6a6577ac6472", "version-string": "2020-06-17", diff --git a/external_imported/vcpkg/versions/a-/azure-security-attestation-cpp.json b/external_imported/vcpkg/versions/a-/azure-security-attestation-cpp.json new file mode 100644 index 000000000..697ef92ba --- /dev/null +++ b/external_imported/vcpkg/versions/a-/azure-security-attestation-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9b6b2e71b9d94791a1481a40367fc5ec5607b8aa", + "version-semver": "1.0.0-beta.1", + "port-version": 0 + } + ] +} 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 b423c1eba..caf536d42 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": "bbaebc2afcade7b67f33d7d62ec680aaa0b3700d", + "version-semver": "4.0.0-beta.2", + "port-version": 0 + }, { "git-tree": "5faeb850df56edd9f4689f69f4d64e6e51dde80b", "version-semver": "4.0.0-beta.1", 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 70bd3973e..37bae1323 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": "c977a0be18a1e5f8591268d35b0a221ef9e8f7f9", + "version-semver": "4.0.0-beta.2", + "port-version": 0 + }, { "git-tree": "e0a2ec6fd19019aaf9f485eea66c5b660b1bc7a4", "version-semver": "4.0.0-beta.1", 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 1c5fba25a..1fb64da97 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,15 @@ { "versions": [ + { + "git-tree": "ff9783605f383c1f596ada3a10d2dde88a931f56", + "version-semver": "12.4.0", + "port-version": 0 + }, + { + "git-tree": "252f2edf841eb01f271d1694f3fea34e63906eba", + "version-semver": "12.3.0", + "port-version": 0 + }, { "git-tree": "6e52659aef1c9a99271c1d590eba0d37f5e472bb", "version-semver": "12.2.1", 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 3ab70e9ed..c62ed9753 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,20 @@ { "versions": [ + { + "git-tree": "c972f7321758abde4e5d5862c4abd7398f1f26a6", + "version-semver": "12.2.3", + "port-version": 0 + }, + { + "git-tree": "de5c104dfa95871220c17e4f8f97a99b5da33920", + "version-semver": "12.2.2", + "port-version": 0 + }, + { + "git-tree": "55a55770fa93d6e541d1540df78aefae2cf905cb", + "version-semver": "12.2.1", + "port-version": 0 + }, { "git-tree": "2ef80d68150017530cb50581cd6f5f03bc607859", "version-semver": "12.2.0", diff --git a/external_imported/vcpkg/versions/a-/azure-storage-cpp.json b/external_imported/vcpkg/versions/a-/azure-storage-cpp.json index 34ceb4c76..7a9f84125 100644 --- a/external_imported/vcpkg/versions/a-/azure-storage-cpp.json +++ b/external_imported/vcpkg/versions/a-/azure-storage-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8216ff9a5060864170113353495400e342d862ad", + "version-string": "7.5.0", + "port-version": 3 + }, { "git-tree": "242bb84480e51b70b53dbd9b126f600e1ea39ef6", "version-string": "7.5.0", diff --git a/external_imported/vcpkg/versions/a-/azure-storage-files-datalake-cpp.json b/external_imported/vcpkg/versions/a-/azure-storage-files-datalake-cpp.json index a3472992a..859384ca8 100644 --- a/external_imported/vcpkg/versions/a-/azure-storage-files-datalake-cpp.json +++ b/external_imported/vcpkg/versions/a-/azure-storage-files-datalake-cpp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "9a254add1b8a2c6f8d6a59760d6016af1e5c19a6", + "version-semver": "12.3.1", + "port-version": 0 + }, + { + "git-tree": "b312efdf9afad6dc09ce91eb31e19e725a8c1a7a", + "version-semver": "12.3.0", + "port-version": 0 + }, { "git-tree": "36837d18b946ad07bcb95c44450509f1d04ba4ec", "version-semver": "12.2.0", diff --git a/external_imported/vcpkg/versions/a-/azure-storage-files-shares-cpp.json b/external_imported/vcpkg/versions/a-/azure-storage-files-shares-cpp.json index 581aeff7f..19d79ba64 100644 --- a/external_imported/vcpkg/versions/a-/azure-storage-files-shares-cpp.json +++ b/external_imported/vcpkg/versions/a-/azure-storage-files-shares-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "69a5e9af5d75d9e2f33dbd89576297373a332048", + "version-semver": "12.2.1", + "port-version": 0 + }, { "git-tree": "b7c34584a28f09d204e8ab6cbcf23ea93e330653", "version-semver": "12.2.0", diff --git a/external_imported/vcpkg/versions/a-/azure-storage-queues-cpp.json b/external_imported/vcpkg/versions/a-/azure-storage-queues-cpp.json index f5e34cbe4..bafb23a67 100644 --- a/external_imported/vcpkg/versions/a-/azure-storage-queues-cpp.json +++ b/external_imported/vcpkg/versions/a-/azure-storage-queues-cpp.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "a04f50e6f79e53d47d4721529709e8e1f02462e1", + "version-semver": "12.0.0", + "port-version": 0 + }, + { + "git-tree": "a4fe64dbaeaacf8bfff69155eea6f001ebee8e15", + "version-semver": "12.0.0-beta.4", + "port-version": 0 + }, + { + "git-tree": "863a1b7f8841d14dd89ca0f70b0f78408add806d", + "version-semver": "12.0.0-beta.3", + "port-version": 0 + }, { "git-tree": "f7e146970eabbdf793a50c5b511ea458b04f579a", "version-semver": "12.0.0-beta.2", diff --git a/external_imported/vcpkg/versions/a-/azure-uamqp-c.json b/external_imported/vcpkg/versions/a-/azure-uamqp-c.json index d74b7af7a..3684f2796 100644 --- a/external_imported/vcpkg/versions/a-/azure-uamqp-c.json +++ b/external_imported/vcpkg/versions/a-/azure-uamqp-c.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d7d284a159afe6ab21ce65d5e5d96dbee83339f6", + "version-date": "2022-01-21", + "port-version": 1 + }, + { + "git-tree": "a2c6897e3392683dcce93a846b98b2c95dc41a55", + "version-date": "2022-01-21", + "port-version": 0 + }, { "git-tree": "4748ea8df9903436ad4b2b6462ca3ffdf74465d4", "version-date": "2021-09-09", diff --git a/external_imported/vcpkg/versions/a-/azure-uhttp-c.json b/external_imported/vcpkg/versions/a-/azure-uhttp-c.json index 66a7e2374..e7cf5ca1a 100644 --- a/external_imported/vcpkg/versions/a-/azure-uhttp-c.json +++ b/external_imported/vcpkg/versions/a-/azure-uhttp-c.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "28439985096cc9a714695d10830ceb2f54859c24", + "version-date": "2022-01-21", + "port-version": 1 + }, + { + "git-tree": "f614a1ac990dd4189b292fa0e6e31897ee4b7ae8", + "version-date": "2022-01-21", + "port-version": 0 + }, { "git-tree": "8dfc1d65397c35c27df08f42b2f77caf27661a9b", "version-date": "2021-09-09", diff --git a/external_imported/vcpkg/versions/a-/azure-umqtt-c.json b/external_imported/vcpkg/versions/a-/azure-umqtt-c.json index c877c9eaa..893326599 100644 --- a/external_imported/vcpkg/versions/a-/azure-umqtt-c.json +++ b/external_imported/vcpkg/versions/a-/azure-umqtt-c.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5953c7aee01e5c0972a8eb97fbb763c74b60c49c", + "version-date": "2022-01-21", + "port-version": 1 + }, + { + "git-tree": "f5b18f17519b9de8a2ab956eebc7dff6e7bf7a05", + "version-date": "2022-01-21", + "port-version": 0 + }, { "git-tree": "2a208bf94bfaf91cc20716d7ba0caac0023324b0", "version-date": "2021-09-09", diff --git a/external_imported/vcpkg/versions/b-/bddisasm.json b/external_imported/vcpkg/versions/b-/bddisasm.json index ae9d39405..897c57511 100644 --- a/external_imported/vcpkg/versions/b-/bddisasm.json +++ b/external_imported/vcpkg/versions/b-/bddisasm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3cede34b39c8ab7d83ee9f43dcb112e4d1c96104", + "version": "1.34.7", + "port-version": 1 + }, { "git-tree": "296988f2d875c4fe41506e163c5c35141c6d35f8", "version": "1.34.7", diff --git a/external_imported/vcpkg/versions/b-/bde.json b/external_imported/vcpkg/versions/b-/bde.json index f587a05e5..5d27e439a 100644 --- a/external_imported/vcpkg/versions/b-/bde.json +++ b/external_imported/vcpkg/versions/b-/bde.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7ce72f2854f44eee806e6e5f3e97d29897549787", + "version": "3.2.0.0", + "port-version": 5 + }, { "git-tree": "60082ad73e5c9fb9828041183b026fc15e453218", "version-string": "3.2.0.0", diff --git a/external_imported/vcpkg/versions/b-/bdwgc.json b/external_imported/vcpkg/versions/b-/bdwgc.json index e12434284..92dbb78c1 100644 --- a/external_imported/vcpkg/versions/b-/bdwgc.json +++ b/external_imported/vcpkg/versions/b-/bdwgc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1cf3b7a458af2eba78e5af9674e8f6d28b53e254", + "version": "8.2.0", + "port-version": 3 + }, { "git-tree": "b7ec5e3585f7f7b71988cb7379c181a1fa9461cd", "version": "8.2.0", diff --git a/external_imported/vcpkg/versions/b-/behaviortree-cpp.json b/external_imported/vcpkg/versions/b-/behaviortree-cpp.json index 642a00623..9268e1e6e 100644 --- a/external_imported/vcpkg/versions/b-/behaviortree-cpp.json +++ b/external_imported/vcpkg/versions/b-/behaviortree-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "79f662c115d97eb11ef1a08753aed0eef061d7cc", + "version": "3.5.6", + "port-version": 2 + }, { "git-tree": "96c8331bb642e665bd66a9aa82797d4db84b86fa", "version": "3.5.6", diff --git a/external_imported/vcpkg/versions/b-/benchmark.json b/external_imported/vcpkg/versions/b-/benchmark.json index 883281057..195c2a981 100644 --- a/external_imported/vcpkg/versions/b-/benchmark.json +++ b/external_imported/vcpkg/versions/b-/benchmark.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "0b248363b29630caf5f45a42d2d82c12b29979e1", + "version-semver": "1.6.1", + "port-version": 0 + }, + { + "git-tree": "7856168d2b0dcaf058c077798ca47f767c6444f5", + "version-semver": "1.6.0", + "port-version": 1 + }, { "git-tree": "4a77547715562fcaa95568226f79af88d859d2c1", "version-semver": "1.6.0", diff --git a/external_imported/vcpkg/versions/b-/berkeleydb.json b/external_imported/vcpkg/versions/b-/berkeleydb.json index e21920be6..49497baa4 100644 --- a/external_imported/vcpkg/versions/b-/berkeleydb.json +++ b/external_imported/vcpkg/versions/b-/berkeleydb.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "27ed2f8c5c5b6c5ba677703f69d9e83062ff6c86", + "version": "4.8.30", + "port-version": 8 + }, + { + "git-tree": "753782cd715f3780a1d3d75ef7655e92a414a440", + "version": "4.8.30", + "port-version": 7 + }, { "git-tree": "fdef7fa8068cc8b7443905db215bed2dcf378abf", "version-string": "4.8.30", diff --git a/external_imported/vcpkg/versions/b-/bext-di.json b/external_imported/vcpkg/versions/b-/bext-di.json index d0526b9c9..c53b8f6e1 100644 --- a/external_imported/vcpkg/versions/b-/bext-di.json +++ b/external_imported/vcpkg/versions/b-/bext-di.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8b3c494eee383a036b07453ff9b34d1be65be06d", + "version": "1.2.0", + "port-version": 1 + }, { "git-tree": "a77676231f3c6c3fe9c145bfe670cfae495fb8ac", "version-string": "1.2.0", diff --git a/external_imported/vcpkg/versions/b-/blend2d.json b/external_imported/vcpkg/versions/b-/blend2d.json index 36a07ee20..280aafcce 100644 --- a/external_imported/vcpkg/versions/b-/blend2d.json +++ b/external_imported/vcpkg/versions/b-/blend2d.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ceedb664deed987cc4e4493554ae3aa58088f08c", + "version-date": "2022-02-19", + "port-version": 0 + }, + { + "git-tree": "401153e8f3407e68e96c4ea60f8c71c633b08e1d", + "version-date": "2021-03-17", + "port-version": 1 + }, { "git-tree": "e322c9917356f15d6370ff8f2f0bd380d1f08661", "version-date": "2021-03-17", diff --git a/external_imported/vcpkg/versions/b-/blitz.json b/external_imported/vcpkg/versions/b-/blitz.json index f7d3137be..bda1fc086 100644 --- a/external_imported/vcpkg/versions/b-/blitz.json +++ b/external_imported/vcpkg/versions/b-/blitz.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "58bca2588e7ff4935893cfebdf1d9665f95f846e", + "version-date": "2020-03-25", + "port-version": 5 + }, + { + "git-tree": "694507bc15d282e3de5160a0a221abfa381e6327", + "version-string": "2020-03-25", + "port-version": 4 + }, { "git-tree": "ddf54a36a0fa345a482b66d648778c13f0008eeb", "version-string": "2020-03-25", diff --git a/external_imported/vcpkg/versions/b-/blosc.json b/external_imported/vcpkg/versions/b-/blosc.json index 9f5863b6d..e0ce0f1cf 100644 --- a/external_imported/vcpkg/versions/b-/blosc.json +++ b/external_imported/vcpkg/versions/b-/blosc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a95e4b34ff47ed69f3e644405efe80b8c46aee14", + "version-string": "1.18.1", + "port-version": 4 + }, { "git-tree": "a9ae0480271a2db8d001d389b4c62af49ea50770", "version-string": "1.18.1", diff --git a/external_imported/vcpkg/versions/b-/boinc.json b/external_imported/vcpkg/versions/b-/boinc.json index b4c6e1bc1..3b7ff3232 100644 --- a/external_imported/vcpkg/versions/b-/boinc.json +++ b/external_imported/vcpkg/versions/b-/boinc.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "47df312abbe66c9c58fd67b1deb72ec906421a68", + "version": "7.18.1", + "port-version": 5 + }, + { + "git-tree": "33d681acad2362813b5aa9e547c73741d11432d4", + "version": "7.18.1", + "port-version": 4 + }, { "git-tree": "561d297147fabda6ccd25dc8ca3de0ce854562ca", "version": "7.18.1", diff --git a/external_imported/vcpkg/versions/b-/boost-build.json b/external_imported/vcpkg/versions/b-/boost-build.json index 533afa415..140b50fd3 100644 --- a/external_imported/vcpkg/versions/b-/boost-build.json +++ b/external_imported/vcpkg/versions/b-/boost-build.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cf970c17a4bf6d59deff7ce7e7eb98cec74b544a", + "version": "1.78.0", + "port-version": 1 + }, { "git-tree": "2c0d3c35e95f99911a226c3e736c0988f1139e51", "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 a50792468..526884993 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": "73e04423bfb004c75708458688afeeb8a1806ba5", + "version": "1.78.0", + "port-version": 2 + }, + { + "git-tree": "1e23d8d78c5a33ee92fc1ec70db8125db72032a2", + "version": "1.78.0", + "port-version": 1 + }, { "git-tree": "7e240f9d647c1142b5b61c9a635e3aa186756802", "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 4796cf6f1..7abc1eca9 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,20 @@ { "versions": [ + { + "git-tree": "ee3c3c2a3ecfb2bcff50d0758da7d6c36479a3c4", + "version": "1.78.0", + "port-version": 3 + }, + { + "git-tree": "9400b3bfdc93a165b3b509a76c59107c020113a6", + "version": "1.78.0", + "port-version": 2 + }, + { + "git-tree": "11b3d243931b80a098de2d6ff74587485febf646", + "version": "1.78.0", + "port-version": 1 + }, { "git-tree": "cb8ca019590f2915f8a4a2eef170531474c35de0", "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 cbbe4c30c..652b90ee8 100644 --- a/external_imported/vcpkg/versions/b-/boost-vcpkg-helpers.json +++ b/external_imported/vcpkg/versions/b-/boost-vcpkg-helpers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b601d13ad505473bac3d555d9e543d981c46565", + "version": "1.78.0", + "port-version": 1 + }, { "git-tree": "b8003935ceb891a870f1bbef0ffd18ef4266c6f7", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boringssl.json b/external_imported/vcpkg/versions/b-/boringssl.json index 2d3b5ad08..5700899dc 100644 --- a/external_imported/vcpkg/versions/b-/boringssl.json +++ b/external_imported/vcpkg/versions/b-/boringssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ca35c06a32c83f385f840831a435c69231a7852a", + "version-date": "2021-06-23", + "port-version": 1 + }, { "git-tree": "aa2649d9a0296ed873aa8fb17c28f38baac51a26", "version-date": "2021-06-23", diff --git a/external_imported/vcpkg/versions/b-/botan.json b/external_imported/vcpkg/versions/b-/botan.json index ff0485865..70633dbd6 100644 --- a/external_imported/vcpkg/versions/b-/botan.json +++ b/external_imported/vcpkg/versions/b-/botan.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "2d7fe86d0a8a13ebddda0ac759f824fb9066b644", + "version": "2.18.1", + "port-version": 10 + }, + { + "git-tree": "a091e7d5a75af9eadbaa696b79e44d726deb47fe", + "version": "2.18.1", + "port-version": 9 + }, + { + "git-tree": "267c31f3759881d233529d28ec78e2a0c8d1e9b4", + "version": "2.18.1", + "port-version": 8 + }, + { + "git-tree": "dfbd885e94b11d3b8074d96c92e810a0f1a7be7a", + "version": "2.18.1", + "port-version": 7 + }, { "git-tree": "928c19e302d27840225477d4e4b183ca9bd76ea8", "version": "2.18.1", diff --git a/external_imported/vcpkg/versions/b-/box2d.json b/external_imported/vcpkg/versions/b-/box2d.json index c392cefea..408aa7cd3 100644 --- a/external_imported/vcpkg/versions/b-/box2d.json +++ b/external_imported/vcpkg/versions/b-/box2d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2c8a3a146971f33f497c21d6b52b756245f894e4", + "version-semver": "2.4.1", + "port-version": 2 + }, { "git-tree": "f40a0f5f20b3e546e55850df8babf2d9cd526ee8", "version-semver": "2.4.1", diff --git a/external_imported/vcpkg/versions/b-/braft.json b/external_imported/vcpkg/versions/b-/braft.json new file mode 100644 index 000000000..9744235f2 --- /dev/null +++ b/external_imported/vcpkg/versions/b-/braft.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d9afe1afea46ce35f64aaed5c2702c34113fe683", + "version-date": "2021-26-04", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/b-/brpc.json b/external_imported/vcpkg/versions/b-/brpc.json index 2049b0752..a7a9687b5 100644 --- a/external_imported/vcpkg/versions/b-/brpc.json +++ b/external_imported/vcpkg/versions/b-/brpc.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "bcff3231352f577720f51a99dbf9ecf0132ebcba", + "version": "0.9.7", + "port-version": 7 + }, + { + "git-tree": "f658cec9384935d01319d2725a039da7cb5e6c77", + "version-string": "0.9.7", + "port-version": 6 + }, + { + "git-tree": "eb37098c32016db48b15a29bd31b08087c7b5d0e", + "version-string": "0.9.7", + "port-version": 5 + }, + { + "git-tree": "7c6f7c8a882730bd20874fb5832081105a169c7a", + "version-string": "0.9.7", + "port-version": 4 + }, { "git-tree": "42b5a413e49655d73b772efa7642eefff429b4c1", "version-string": "0.9.7", diff --git a/external_imported/vcpkg/versions/b-/brynet.json b/external_imported/vcpkg/versions/b-/brynet.json index 60d187b01..1d9da2e43 100644 --- a/external_imported/vcpkg/versions/b-/brynet.json +++ b/external_imported/vcpkg/versions/b-/brynet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3a4cea82b4e937b478bd400d4a975dde33b3f741", + "version": "1.11.2", + "port-version": 0 + }, { "git-tree": "1700fdb373d8d3789f510b64aeee7d79859393f1", "version-string": "1.11.1", 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 f1fa95288..03d2c0f5d 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,10 @@ { "versions": [ + { + "git-tree": "67f2e3a599ef1a984f01e973c71ccd5e4c0ba956", + "version": "1.0.1", + "port-version": 1 + }, { "git-tree": "84453b40536c8c57162f627c28d4f3a148516ad8", "version": "1.0.1", diff --git a/external_imported/vcpkg/versions/b-/buck-yeh-bux.json b/external_imported/vcpkg/versions/b-/buck-yeh-bux.json index cde398a02..bb8b691b8 100644 --- a/external_imported/vcpkg/versions/b-/buck-yeh-bux.json +++ b/external_imported/vcpkg/versions/b-/buck-yeh-bux.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "54886a840d4c55d27047321af6de1a5a01ed888e", + "version": "1.6.3", + "port-version": 1 + }, { "git-tree": "19d56bb09ecc37268afec6a5384282e562491af4", "version": "1.6.3", diff --git a/external_imported/vcpkg/versions/b-/bullet3.json b/external_imported/vcpkg/versions/b-/bullet3.json index 111e48e1a..073216c26 100644 --- a/external_imported/vcpkg/versions/b-/bullet3.json +++ b/external_imported/vcpkg/versions/b-/bullet3.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "d196c1956b370bd43889ddf5279600092e1af718", + "version": "3.22", + "port-version": 0 + }, + { + "git-tree": "f526f9d9698251590883fcc52ac8bf0f7ef9c5a4", + "version": "3.17", + "port-version": 5 + }, + { + "git-tree": "d986cc96144fa3de5201d56a508f348db9b66e71", + "version": "3.17", + "port-version": 4 + }, { "git-tree": "88add55351bf89f89e584924663861c0a827bdf5", "version": "3.17", diff --git a/external_imported/vcpkg/versions/baseline.json b/external_imported/vcpkg/versions/baseline.json index c8cf762d4..d09df1e2f 100644 --- a/external_imported/vcpkg/versions/baseline.json +++ b/external_imported/vcpkg/versions/baseline.json @@ -2,11 +2,11 @@ "default": { "3fd": { "baseline": "2.6.3", - "port-version": 1 + "port-version": 2 }, "7zip": { - "baseline": "19.00", - "port-version": 3 + "baseline": "21.07", + "port-version": 1 }, "abseil": { "baseline": "20211102.1", @@ -17,12 +17,12 @@ "port-version": 1 }, "ace": { - "baseline": "7.0.5", - "port-version": 2 + "baseline": "7.0.6", + "port-version": 3 }, "activemq-cpp": { "baseline": "3.9.5", - "port-version": 7 + "port-version": 8 }, "ade": { "baseline": "0.1.1f", @@ -38,7 +38,7 @@ }, "akali": { "baseline": "1.42", - "port-version": 2 + "port-version": 3 }, "alac": { "baseline": "2017-11-03-c38887c5", @@ -50,7 +50,7 @@ }, "alembic": { "baseline": "1.8.3", - "port-version": 0 + "port-version": 1 }, "aliyun-oss-c-sdk": { "baseline": "3.10.0", @@ -61,24 +61,24 @@ "port-version": 2 }, "alsa": { - "baseline": "1.2.5.1", + "baseline": "1.2.6.1", "port-version": 0 }, "ampl-asl": { "baseline": "2020-11-11", - "port-version": 1 + "port-version": 3 }, "ampl-mp": { "baseline": "2020-11-11", - "port-version": 1 + "port-version": 2 }, "amqpcpp": { "baseline": "4.3.15", - "port-version": 0 + "port-version": 1 }, "anax": { "baseline": "2.1.0", - "port-version": 7 + "port-version": 8 }, "angelscript": { "baseline": "2.35.1", @@ -89,7 +89,7 @@ "port-version": 2 }, "antlr4": { - "baseline": "4.9.1", + "baseline": "4.9.3", "port-version": 1 }, "any-lite": { @@ -105,28 +105,28 @@ "port-version": 2 }, "approval-tests-cpp": { - "baseline": "10.12.1", + "baseline": "10.12.2", "port-version": 0 }, "apr": { "baseline": "1.7.0", - "port-version": 6 + "port-version": 7 }, "apr-util": { "baseline": "1.6.1", - "port-version": 5 + "port-version": 7 }, "apsi": { "baseline": "0.7.0", - "port-version": 0 + "port-version": 2 }, "arb": { "baseline": "2.21.1", - "port-version": 0 + "port-version": 1 }, "arcus": { "baseline": "4.10.0", - "port-version": 1 + "port-version": 2 }, "argagg": { "baseline": "0.4.6", @@ -141,7 +141,7 @@ "port-version": 0 }, "args": { - "baseline": "6.2.7", + "baseline": "6.3.0", "port-version": 0 }, "argtable2": { @@ -150,7 +150,7 @@ }, "argtable3": { "baseline": "3.2.1", - "port-version": 0 + "port-version": 2 }, "argumentum": { "baseline": "0.3.1", @@ -162,35 +162,35 @@ }, "armadillo": { "baseline": "10.6.2", - "port-version": 3 + "port-version": 5 }, "arrayfire": { "baseline": "3.8.0", "port-version": 0 }, "arrow": { - "baseline": "6.0.1", - "port-version": 1 + "baseline": "7.0.0", + "port-version": 2 }, "ashes": { - "baseline": "2021-06-18", + "baseline": "2022-04-03", "port-version": 0 }, "asio": { - "baseline": "1.20.0", + "baseline": "1.22.1", "port-version": 0 }, "asio-grpc": { - "baseline": "1.3.1", + "baseline": "1.5.1", "port-version": 0 }, "asiosdk": { "baseline": "2.3.3", - "port-version": 3 + "port-version": 4 }, "asmjit": { "baseline": "2021-10-26", - "port-version": 0 + "port-version": 1 }, "assimp": { "baseline": "5.0.1", @@ -225,7 +225,7 @@ "port-version": 7 }, "audiofile": { - "baseline": "1.0.9", + "baseline": "1.1.0", "port-version": 0 }, "aurora": { @@ -246,11 +246,11 @@ }, "avisynthplus": { "baseline": "3.7.0", - "port-version": 1 + "port-version": 3 }, "avro-c": { "baseline": "1.11.0", - "port-version": 1 + "port-version": 3 }, "avro-cpp": { "baseline": "2021-06-01", @@ -258,90 +258,90 @@ }, "aws-c-auth": { "baseline": "0.6.3", - "port-version": 1 + "port-version": 2 }, "aws-c-cal": { "baseline": "0.5.12", - "port-version": 1 + "port-version": 2 }, "aws-c-common": { "baseline": "0.6.9", - "port-version": 1 + "port-version": 2 }, "aws-c-compression": { "baseline": "0.2.14", - "port-version": 1 + "port-version": 2 }, "aws-c-event-stream": { "baseline": "0.2.7", - "port-version": 1 + "port-version": 2 }, "aws-c-http": { "baseline": "0.6.5", - "port-version": 1 + "port-version": 2 }, "aws-c-io": { "baseline": "0.10.7", - "port-version": 1 + "port-version": 2 }, "aws-c-mqtt": { "baseline": "0.7.6", - "port-version": 1 + "port-version": 3 }, "aws-c-s3": { "baseline": "0.1.25", - "port-version": 1 + "port-version": 2 }, "aws-checksums": { "baseline": "0.1.11", - "port-version": 2 + "port-version": 3 }, "aws-crt-cpp": { "baseline": "0.15.1", - "port-version": 2 + "port-version": 3 }, "aws-lambda-cpp": { "baseline": "0.2.7", - "port-version": 0 + "port-version": 1 }, "aws-sdk-cpp": { - "baseline": "1.9.160", - "port-version": 0 + "baseline": "1.9.220", + "port-version": 1 }, "azmq": { "baseline": "2020-03-03", "port-version": 1 }, "azure-c-shared-utility": { - "baseline": "2021-09-09", - "port-version": 0 + "baseline": "2022-01-21", + "port-version": 3 }, "azure-core-cpp": { - "baseline": "1.3.1", + "baseline": "1.5.0", "port-version": 0 }, "azure-identity-cpp": { - "baseline": "1.1.0", + "baseline": "1.2.0", "port-version": 0 }, "azure-iot-sdk-c": { - "baseline": "2021-09-09", - "port-version": 0 + "baseline": "2022-01-21", + "port-version": 2 }, "azure-kinect-sensor-sdk": { "baseline": "1.4.1", - "port-version": 3 + "port-version": 4 }, "azure-macro-utils-c": { - "baseline": "2020-06-17", - "port-version": 3 + "baseline": "2022-01-21", + "port-version": 0 }, - "azure-security-keyvault-certificates-cpp": { - "baseline": "4.0.0-beta.1", + "azure-security-attestation-cpp": { + "baseline": "1.0.0-beta.1", "port-version": 0 }, - "azure-security-keyvault-common-cpp": { - "baseline": "4.0.0-beta.3", + "azure-security-keyvault-certificates-cpp": { + "baseline": "4.0.0-beta.2", "port-version": 0 }, "azure-security-keyvault-keys-cpp": { @@ -349,44 +349,44 @@ "port-version": 0 }, "azure-security-keyvault-secrets-cpp": { - "baseline": "4.0.0-beta.1", + "baseline": "4.0.0-beta.2", "port-version": 0 }, "azure-storage-blobs-cpp": { - "baseline": "12.2.1", + "baseline": "12.4.0", "port-version": 0 }, "azure-storage-common-cpp": { - "baseline": "12.2.0", + "baseline": "12.2.3", "port-version": 0 }, "azure-storage-cpp": { "baseline": "7.5.0", - "port-version": 2 + "port-version": 3 }, "azure-storage-files-datalake-cpp": { - "baseline": "12.2.0", + "baseline": "12.3.1", "port-version": 0 }, "azure-storage-files-shares-cpp": { - "baseline": "12.2.0", + "baseline": "12.2.1", "port-version": 0 }, "azure-storage-queues-cpp": { - "baseline": "12.0.0-beta.2", + "baseline": "12.0.0", "port-version": 0 }, "azure-uamqp-c": { - "baseline": "2021-09-09", - "port-version": 0 + "baseline": "2022-01-21", + "port-version": 1 }, "azure-uhttp-c": { - "baseline": "2021-09-09", - "port-version": 0 + "baseline": "2022-01-21", + "port-version": 1 }, "azure-umqtt-c": { - "baseline": "2021-09-09", - "port-version": 0 + "baseline": "2022-01-21", + "port-version": 1 }, "b64": { "baseline": "2.0.0.1", @@ -402,15 +402,15 @@ }, "bddisasm": { "baseline": "1.34.7", - "port-version": 0 + "port-version": 1 }, "bde": { "baseline": "3.2.0.0", - "port-version": 4 + "port-version": 5 }, "bdwgc": { "baseline": "8.2.0", - "port-version": 2 + "port-version": 3 }, "beast": { "baseline": "0", @@ -418,10 +418,10 @@ }, "behaviortree-cpp": { "baseline": "3.5.6", - "port-version": 1 + "port-version": 2 }, "benchmark": { - "baseline": "1.6.0", + "baseline": "1.6.1", "port-version": 0 }, "bento4": { @@ -430,11 +430,11 @@ }, "berkeleydb": { "baseline": "4.8.30", - "port-version": 6 + "port-version": 8 }, "bext-di": { "baseline": "1.2.0", - "port-version": 0 + "port-version": 1 }, "bext-sml": { "baseline": "1.1.4", @@ -497,20 +497,20 @@ "port-version": 2 }, "blend2d": { - "baseline": "2021-03-17", + "baseline": "2022-02-19", "port-version": 0 }, "blitz": { "baseline": "2020-03-25", - "port-version": 3 + "port-version": 5 }, "blosc": { "baseline": "1.18.1", - "port-version": 3 + "port-version": 4 }, "boinc": { "baseline": "7.18.1", - "port-version": 3 + "port-version": 5 }, "bond": { "baseline": "9.0.3", @@ -574,7 +574,7 @@ }, "boost-build": { "baseline": "1.78.0", - "port-version": 0 + "port-version": 1 }, "boost-callable-traits": { "baseline": "1.78.0", @@ -770,7 +770,7 @@ }, "boost-iostreams": { "baseline": "1.78.0", - "port-version": 0 + "port-version": 2 }, "boost-iterator": { "baseline": "1.78.0", @@ -826,7 +826,7 @@ }, "boost-modular-build-helper": { "baseline": "1.78.0", - "port-version": 0 + "port-version": 3 }, "boost-move": { "baseline": "1.78.0", @@ -1102,7 +1102,7 @@ }, "boost-vcpkg-helpers": { "baseline": "1.78.0", - "port-version": 0 + "port-version": 1 }, "boost-vmd": { "baseline": "1.78.0", @@ -1126,15 +1126,19 @@ }, "boringssl": { "baseline": "2021-06-23", - "port-version": 0 + "port-version": 1 }, "botan": { "baseline": "2.18.1", - "port-version": 6 + "port-version": 10 }, "box2d": { "baseline": "2.4.1", - "port-version": 1 + "port-version": 2 + }, + "braft": { + "baseline": "2021-26-04", + "port-version": 0 }, "breakpad": { "baseline": "2020-09-14", @@ -1150,15 +1154,15 @@ }, "brpc": { "baseline": "0.9.7", - "port-version": 3 + "port-version": 7 }, "brunocodutra-metal": { "baseline": "2.1.3", "port-version": 0 }, "brynet": { - "baseline": "1.11.1", - "port-version": 1 + "baseline": "1.11.2", + "port-version": 0 }, "bshoshany-thread-pool": { "baseline": "2.0.0", @@ -1170,15 +1174,15 @@ }, "buck-yeh-bux": { "baseline": "1.6.3", - "port-version": 0 + "port-version": 1 }, "buck-yeh-bux-mariadb-client": { "baseline": "1.0.1", - "port-version": 0 + "port-version": 1 }, "bullet3": { - "baseline": "3.17", - "port-version": 3 + "baseline": "3.22", + "port-version": 0 }, "bustache": { "baseline": "1.1.0", @@ -1197,44 +1201,56 @@ "port-version": 2 }, "c-ares": { - "baseline": "1.17.2", - "port-version": 1 + "baseline": "1.18.1", + "port-version": 0 + }, + "c-dbg-macro": { + "baseline": "2020-02-29", + "port-version": 0 }, "c4core": { "baseline": "2021-07-18", "port-version": 1 }, + "c89stringutils": { + "baseline": "0.0.1", + "port-version": 0 + }, "caf": { "baseline": "0.18.5", "port-version": 0 }, "caffe2": { "baseline": "0.8.1", - "port-version": 5 + "port-version": 6 }, "cairo": { - "baseline": "1.17.4", - "port-version": 3 + "baseline": "1.17.6", + "port-version": 1 }, "cairomm": { - "baseline": "1.16.0", - "port-version": 1 + "baseline": "1.16.1", + "port-version": 0 }, "calceph": { - "baseline": "3.5.0", - "port-version": 1 + "baseline": "3.5.1", + "port-version": 0 }, "camport3": { "baseline": "1.5.3", - "port-version": 1 + "port-version": 2 }, "capnproto": { "baseline": "0.9.1", - "port-version": 1 + "port-version": 2 }, "capstone": { - "baseline": "4.0.2", - "port-version": 2 + "baseline": "5.0.0-rc2", + "port-version": 0 + }, + "cargs": { + "baseline": "1.0.3", + "port-version": 0 }, "cartographer": { "baseline": "1.0.0", @@ -1254,7 +1270,7 @@ }, "catch2": { "baseline": "2.13.8", - "port-version": 0 + "port-version": 1 }, "cccapstone": { "baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e", @@ -1282,22 +1298,22 @@ }, "cello": { "baseline": "2019-07-23", - "port-version": 1 + "port-version": 2 }, "cereal": { - "baseline": "1.3.0", - "port-version": 1 + "baseline": "1.3.1", + "port-version": 0 }, "ceres": { "baseline": "2.0.0", - "port-version": 5 + "port-version": 6 }, "cfitsio": { "baseline": "3.49", - "port-version": 1 + "port-version": 2 }, "cgal": { - "baseline": "5.3.1", + "baseline": "5.4", "port-version": 0 }, "cgicc": { @@ -1322,15 +1338,15 @@ }, "chakracore": { "baseline": "2021-04-22", - "port-version": 0 + "port-version": 2 }, "charls": { - "baseline": "2.2.0", - "port-version": 2 + "baseline": "2.3.4", + "port-version": 0 }, "chartdir": { "baseline": "7.0.0", - "port-version": 1 + "port-version": 3 }, "check": { "baseline": "0.15.2", @@ -1350,7 +1366,7 @@ }, "chromium-base": { "baseline": "86.0.4199.1", - "port-version": 2 + "port-version": 3 }, "cimg": { "baseline": "2.9.9", @@ -1362,7 +1378,7 @@ }, "civetweb": { "baseline": "1.15", - "port-version": 0 + "port-version": 1 }, "cjson": { "baseline": "1.7.15", @@ -1370,11 +1386,11 @@ }, "clamav": { "baseline": "0.103.0", - "port-version": 2 + "port-version": 3 }, "clapack": { "baseline": "3.2.1", - "port-version": 19 + "port-version": 20 }, "clara": { "baseline": "1.1.5", @@ -1386,7 +1402,7 @@ }, "clblast": { "baseline": "1.5.2", - "port-version": 0 + "port-version": 2 }, "clfft": { "baseline": "2.12.2", @@ -1409,8 +1425,8 @@ "port-version": 1 }, "clockutils": { - "baseline": "1.1.1-3651f232c27074c4ceead169e223edf5f00247c5", - "port-version": 4 + "baseline": "1.1.1", + "port-version": 1 }, "clp": { "baseline": "1.17.6", @@ -1418,7 +1434,7 @@ }, "clrng": { "baseline": "2020-12-01", - "port-version": 2 + "port-version": 3 }, "clue": { "baseline": "1.0.0", @@ -1440,17 +1456,25 @@ "baseline": "2020-08-01", "port-version": 1 }, + "cnats": { + "baseline": "3.2.0", + "port-version": 0 + }, "cnl": { "baseline": "1.1.7", "port-version": 1 }, "co": { "baseline": "2.0.3", - "port-version": 0 + "port-version": 1 + }, + "cocoyaxi": { + "baseline": "2.0.3", + "port-version": 2 }, "coin": { "baseline": "4.0.0", - "port-version": 4 + "port-version": 5 }, "coinutils": { "baseline": "2.11.4", @@ -1461,12 +1485,16 @@ "port-version": 6 }, "colmap": { - "baseline": "3.6", - "port-version": 2 + "baseline": "2022-03-14", + "port-version": 0 + }, + "color-console": { + "baseline": "2022-03-20", + "port-version": 0 }, "comms": { "baseline": "3.4.0", - "port-version": 0 + "port-version": 1 }, "comms-ublox": { "baseline": "0.20.2", @@ -1474,14 +1502,14 @@ }, "commsdsl": { "baseline": "3.6.4", - "port-version": 0 + "port-version": 1 }, "compoundfilereader": { "baseline": "0.1.0", "port-version": 0 }, "concurrencpp": { - "baseline": "0.1.3", + "baseline": "0.1.4", "port-version": 0 }, "concurrentqueue": { @@ -1510,7 +1538,7 @@ }, "coroutine": { "baseline": "1.5.0", - "port-version": 2 + "port-version": 4 }, "corrade": { "baseline": "2020.06", @@ -1521,12 +1549,12 @@ "port-version": 0 }, "cpp-httplib": { - "baseline": "0.9.7", + "baseline": "0.10.3", "port-version": 0 }, "cpp-ipc": { "baseline": "1.0.1", - "port-version": 0 + "port-version": 1 }, "cpp-jwt": { "baseline": "2021-10-18", @@ -1534,7 +1562,7 @@ }, "cpp-netlib": { "baseline": "0.13.0", - "port-version": 5 + "port-version": 6 }, "cpp-peglib": { "baseline": "0.1.0", @@ -1542,7 +1570,7 @@ }, "cpp-redis": { "baseline": "4.3.1", - "port-version": 4 + "port-version": 5 }, "cpp-taskflow": { "baseline": "2.6.0", @@ -1554,26 +1582,26 @@ }, "cppad": { "baseline": "20210000.7", - "port-version": 2 + "port-version": 3 }, "cppcms": { "baseline": "1.2.1", - "port-version": 3 + "port-version": 4 }, "cppcodec": { "baseline": "0.2", "port-version": 2 }, "cppcoro": { - "baseline": "2020-2-28", - "port-version": 2 + "baseline": "2020-02-28", + "port-version": 3 }, "cppfs": { "baseline": "1.3.0", "port-version": 1 }, "cppgraphqlgen": { - "baseline": "4.0.0", + "baseline": "4.1.1", "port-version": 0 }, "cppitertools": { @@ -1598,7 +1626,7 @@ }, "cppunit": { "baseline": "1.15.1", - "port-version": 1 + "port-version": 3 }, "cpputest": { "baseline": "2019-9-16", @@ -1608,24 +1636,28 @@ "baseline": "windows-sdk", "port-version": 0 }, + "cppxaml": { + "baseline": "0.0.16", + "port-version": 0 + }, "cppzmq": { "baseline": "4.8.1", "port-version": 0 }, "cpr": { - "baseline": "1.7.2", + "baseline": "1.8.1", "port-version": 0 }, "cpu-features": { "baseline": "0.6.0", - "port-version": 0 + "port-version": 1 }, "cpuid": { "baseline": "0.5.1", - "port-version": 2 + "port-version": 3 }, "cpuinfo": { - "baseline": "2021-04-04", + "baseline": "2022-04-02", "port-version": 0 }, "cr": { @@ -1634,11 +1666,11 @@ }, "crashpad": { "baseline": "2020-03-18", - "port-version": 1 + "port-version": 2 }, "crashrpt": { "baseline": "1.4.3", - "port-version": 1 + "port-version": 2 }, "crc32c": { "baseline": "1.1.2", @@ -1646,27 +1678,27 @@ }, "crfsuite": { "baseline": "2019-07-21", - "port-version": 1 + "port-version": 3 }, "croncpp": { "baseline": "2020-09-04", - "port-version": 2 + "port-version": 3 }, "crossguid": { "baseline": "2021-10-22", - "port-version": 1 + "port-version": 2 }, "crow": { - "baseline": "0.3.3", + "baseline": "1.0-1", "port-version": 0 }, "cryptopp": { - "baseline": "8.5.0", - "port-version": 1 + "baseline": "8.6.0", + "port-version": 0 }, "cspice": { - "baseline": "66", - "port-version": 5 + "baseline": "67", + "port-version": 2 }, "ctbignum": { "baseline": "2019-08-02", @@ -1674,7 +1706,7 @@ }, "ctemplate": { "baseline": "2020-09-14", - "port-version": 2 + "port-version": 3 }, "ctp": { "baseline": "6.6.1_P1_20210406_se", @@ -1685,28 +1717,28 @@ "port-version": 0 }, "cub": { - "baseline": "1.12.0", + "baseline": "1.16.0", "port-version": 0 }, "cuda": { "baseline": "10.1", - "port-version": 8 + "port-version": 10 }, "cudnn": { "baseline": "7.6.5", - "port-version": 4 + "port-version": 5 }, "cunit": { "baseline": "2.1.3", "port-version": 7 }, "curl": { - "baseline": "7.80.0", + "baseline": "7.82.0", "port-version": 0 }, "curlpp": { "baseline": "2018-06-15", - "port-version": 6 + "port-version": 7 }, "cute-headers": { "baseline": "2019-09-20", @@ -1737,8 +1769,8 @@ "port-version": 0 }, "darknet": { - "baseline": "2021-04-16", - "port-version": 1 + "baseline": "2022-03-06", + "port-version": 0 }, "darts-clone": { "baseline": "1767ab87cffe", @@ -1754,11 +1786,11 @@ }, "date": { "baseline": "3.0.1", - "port-version": 1 + "port-version": 2 }, "dav1d": { "baseline": "0.8.2", - "port-version": 2 + "port-version": 3 }, "daw-header-libraries": { "baseline": "1.29.7", @@ -1777,8 +1809,8 @@ "port-version": 0 }, "dbghelp": { - "baseline": "0.0", - "port-version": 1 + "baseline": "0", + "port-version": 2 }, "dbow2": { "baseline": "2019-08-05", @@ -1790,7 +1822,7 @@ }, "dcmtk": { "baseline": "3.6.6", - "port-version": 2 + "port-version": 3 }, "debug-assert": { "baseline": "1.3.3", @@ -1802,11 +1834,11 @@ }, "detours": { "baseline": "4.0.1", - "port-version": 4 + "port-version": 5 }, "devicenameresolver": { "baseline": "2016-06-26-0850d88fa6", - "port-version": 2 + "port-version": 3 }, "devil": { "baseline": "1.8.0", @@ -1814,34 +1846,34 @@ }, "dimcli": { "baseline": "5.0.2", - "port-version": 2 + "port-version": 3 }, "directx-headers": { "baseline": "1.4.9", - "port-version": 0 + "port-version": 1 }, "directxmath": { - "baseline": "jan2021", - "port-version": 1 + "baseline": "2022-01-18", + "port-version": 0 }, "directxmesh": { - "baseline": "2021-11-08", + "baseline": "2022-03-24", "port-version": 0 }, "directxsdk": { "baseline": "jun10", - "port-version": 4 + "port-version": 5 }, "directxtex": { - "baseline": "2021-11-08", + "baseline": "2022-03-24", "port-version": 0 }, "directxtk": { - "baseline": "2021-11-08", + "baseline": "2022-03-24", "port-version": 0 }, "directxtk12": { - "baseline": "2021-11-08", + "baseline": "2022-03-24", "port-version": 0 }, "dirent": { @@ -1850,12 +1882,16 @@ }, "discord-game-sdk": { "baseline": "2.5.6", - "port-version": 3 + "port-version": 4 }, "discord-rpc": { "baseline": "3.4.0", "port-version": 1 }, + "discordcoreapi": { + "baseline": "2022-03-30", + "port-version": 0 + }, "discount": { "baseline": "2.2.6", "port-version": 1 @@ -1870,27 +1906,27 @@ }, "dlfcn-win32": { "baseline": "1.1.1", - "port-version": 5 + "port-version": 6 }, "dlib": { - "baseline": "19.22", + "baseline": "19.23", "port-version": 0 }, "dmlc": { "baseline": "2019-08-12", - "port-version": 6 + "port-version": 7 }, "docopt": { "baseline": "2018-11-01", "port-version": 1 }, "doctest": { - "baseline": "2.4.6", + "baseline": "2.4.8", "port-version": 0 }, "double-conversion": { - "baseline": "3.1.5", - "port-version": 1 + "baseline": "3.2.0", + "port-version": 0 }, "dpdk": { "baseline": "19.02", @@ -1901,11 +1937,15 @@ "port-version": 0 }, "drlibs": { - "baseline": "2021-11-02", + "baseline": "2022-04-03", "port-version": 0 }, "drogon": { - "baseline": "1.7.4", + "baseline": "1.7.5", + "port-version": 0 + }, + "dstorage": { + "baseline": "1.0.0", "port-version": 0 }, "dtl": { @@ -1917,8 +1957,8 @@ "port-version": 1 }, "duilib": { - "baseline": "2019-4-28", - "port-version": 4 + "baseline": "2019-04-28", + "port-version": 5 }, "duktape": { "baseline": "2.5.0", @@ -1930,19 +1970,23 @@ }, "dxsdk-d3dx": { "baseline": "9.29.952.8", - "port-version": 1 + "port-version": 3 }, "dxut": { "baseline": "11.26", - "port-version": 0 + "port-version": 1 }, "eabase": { "baseline": "2.09.12", "port-version": 2 }, + "earcut-hpp": { + "baseline": "2.2.3", + "port-version": 0 + }, "eastl": { "baseline": "3.18.00", - "port-version": 1 + "port-version": 2 }, "easycl": { "baseline": "0.3", @@ -1950,7 +1994,7 @@ }, "easyhook": { "baseline": "2.7.7097.0", - "port-version": 3 + "port-version": 5 }, "easyloggingpp": { "baseline": "9.97.0", @@ -1958,11 +2002,11 @@ }, "eathread": { "baseline": "1.32.09", - "port-version": 2 + "port-version": 3 }, "ebml": { "baseline": "1.4.2", - "port-version": 0 + "port-version": 1 }, "ecm": { "baseline": "5.89.0", @@ -1974,7 +2018,7 @@ }, "ecsutil": { "baseline": "1.0.7.15", - "port-version": 1 + "port-version": 2 }, "edlib": { "baseline": "1.2.7", @@ -1982,7 +2026,7 @@ }, "effects11": { "baseline": "11.26", - "port-version": 1 + "port-version": 2 }, "effolkronium-random": { "baseline": "1.4.0", @@ -1990,27 +2034,27 @@ }, "efsw": { "baseline": "2020-06-08", - "port-version": 2 + "port-version": 3 }, "egl-registry": { "baseline": "2021-11-23", "port-version": 0 }, "eigen3": { - "baseline": "3.3.9", - "port-version": 1 + "baseline": "3.4.0", + "port-version": 2 }, "elfio": { - "baseline": "3.9", + "baseline": "3.10", "port-version": 0 }, "elfutils": { - "baseline": "0.182", + "baseline": "0.186", "port-version": 2 }, "embree2": { "baseline": "2.17.7", - "port-version": 3 + "port-version": 4 }, "embree3": { "baseline": "3.12.2", @@ -2044,44 +2088,48 @@ "baseline": "2021-10-16", "port-version": 0 }, + "eventpp": { + "baseline": "0.1.2", + "port-version": 0 + }, "evpp": { "baseline": "0.7.0", "port-version": 5 }, "exiv2": { "baseline": "0.27.5", - "port-version": 0 + "port-version": 1 }, "expat": { - "baseline": "2.4.1", - "port-version": 0 + "baseline": "2.4.8", + "port-version": 1 }, "expected-lite": { "baseline": "0.5.0", "port-version": 0 }, "exprtk": { - "baseline": "2021-01-01", - "port-version": 1 + "baseline": "2022-01-01", + "port-version": 2 }, "ezc3d": { - "baseline": "1.4.6", + "baseline": "1.4.7", "port-version": 0 }, "faad2": { "baseline": "2.9.1", - "port-version": 4 + "port-version": 5 }, "fadbad": { "baseline": "2.1.0", "port-version": 1 }, "faiss": { - "baseline": "1.7.1", + "baseline": "1.7.2", "port-version": 0 }, "fakeit": { - "baseline": "2.0.9", + "baseline": "2.1.0", "port-version": 0 }, "fann": { @@ -2106,7 +2154,7 @@ }, "fastcgi": { "baseline": "2020-09-11", - "port-version": 2 + "port-version": 4 }, "fastfeat": { "baseline": "391d5e9", @@ -2126,10 +2174,10 @@ }, "fbgemm": { "baseline": "2021-03-18", - "port-version": 2 + "port-version": 4 }, "fbthrift": { - "baseline": "2021.06.14.00", + "baseline": "2022.03.21.00", "port-version": 0 }, "fcl": { @@ -2146,22 +2194,18 @@ }, "ffmpeg": { "baseline": "4.4.1", - "port-version": 4 + "port-version": 12 }, "ffnvcodec": { "baseline": "11.1.5.0", - "port-version": 0 + "port-version": 1 }, "fftw3": { "baseline": "3.3.10", - "port-version": 2 + "port-version": 3 }, "fftwpp": { "baseline": "2019-12-19", - "port-version": 1 - }, - "field3d": { - "baseline": "1.7.3", "port-version": 2 }, "fixed-string": { @@ -2169,12 +2213,16 @@ "port-version": 1 }, "fizz": { - "baseline": "2021.06.14.00", - "port-version": 0 + "baseline": "2022.03.21.00", + "port-version": 1 }, "flann": { "baseline": "2019-04-07", - "port-version": 3 + "port-version": 5 + }, + "flash-runtime-extensions": { + "baseline": "2.4", + "port-version": 1 }, "flashlight-cpu": { "baseline": "0.3", @@ -2186,14 +2234,14 @@ }, "flatbuffers": { "baseline": "2.0.0", - "port-version": 2 + "port-version": 3 }, "flint": { "baseline": "2.8.0", - "port-version": 0 + "port-version": 1 }, "fltk": { - "baseline": "1.3.7", + "baseline": "1.3.8", "port-version": 1 }, "fluidlite": { @@ -2201,8 +2249,8 @@ "port-version": 2 }, "fluidsynth": { - "baseline": "2.2.4", - "port-version": 1 + "baseline": "2.2.6", + "port-version": 0 }, "fmem": { "baseline": "c-libs-2ccee3d2fb", @@ -2217,20 +2265,20 @@ "port-version": 4 }, "fmt": { - "baseline": "8.1.0", - "port-version": 0 + "baseline": "8.1.1", + "port-version": 1 }, "folly": { - "baseline": "2021.06.14.00", - "port-version": 3 + "baseline": "2022.03.21.00", + "port-version": 0 }, "font-chef": { "baseline": "1.1.0", "port-version": 0 }, "fontconfig": { - "baseline": "2.13.94", - "port-version": 4 + "baseline": "2.14.0", + "port-version": 0 }, "foonathan-memory": { "baseline": "2019-07-21", @@ -2261,28 +2309,28 @@ "port-version": 1 }, "freeglut": { - "baseline": "3.2.1", - "port-version": 7 + "baseline": "3.2.2", + "port-version": 0 }, "freeimage": { "baseline": "3.18.0", - "port-version": 21 + "port-version": 22 }, "freeopcua": { "baseline": "20190125", "port-version": 5 }, "freerdp": { - "baseline": "2.4.0", - "port-version": 3 + "baseline": "2.5.0", + "port-version": 0 }, "freetds": { "baseline": "1.2.11", - "port-version": 1 + "port-version": 2 }, "freetype": { - "baseline": "2.11.0", - "port-version": 2 + "baseline": "2.11.1", + "port-version": 1 }, "freetype-gl": { "baseline": "2020-09-14", @@ -2294,7 +2342,7 @@ }, "fribidi": { "baseline": "1.0.11", - "port-version": 2 + "port-version": 3 }, "frozen": { "baseline": "2021-04-22", @@ -2313,20 +2361,20 @@ "port-version": 4 }, "ftxui": { - "baseline": "2021-10-17", - "port-version": 0 + "baseline": "2.0.0", + "port-version": 1 }, "function2": { "baseline": "4.2.0", "port-version": 1 }, "functions-framework-cpp": { - "baseline": "1.0.0", - "port-version": 1 + "baseline": "1.1.0", + "port-version": 0 }, "fuzzylite": { "baseline": "6.0", - "port-version": 4 + "port-version": 5 }, "fxdiv": { "baseline": "2021-02-21", @@ -2338,18 +2386,18 @@ }, "g3log": { "baseline": "1.3.4", - "port-version": 1 + "port-version": 2 }, "gainput": { "baseline": "1.0.0", - "port-version": 4 + "port-version": 5 }, "gamedev-framework": { "baseline": "0.20.0", - "port-version": 1 + "port-version": 2 }, "gamenetworkingsockets": { - "baseline": "1.3.0", + "baseline": "1.4.0", "port-version": 0 }, "gamma": { @@ -2358,19 +2406,23 @@ }, "gasol": { "baseline": "2018-01-04", - "port-version": 1 + "port-version": 2 }, "gaussianlib": { "baseline": "2019-08-04", "port-version": 1 }, + "gazebo": { + "baseline": "2022-01-20", + "port-version": 0 + }, "gcem": { "baseline": "1.13.1", "port-version": 1 }, "gdal": { - "baseline": "3.4.0", - "port-version": 6 + "baseline": "3.4.2", + "port-version": 0 }, "gdcm": { "baseline": "3.0.7", @@ -2394,11 +2446,11 @@ }, "geogram": { "baseline": "1.7.6", - "port-version": 1 + "port-version": 2 }, "geographiclib": { "baseline": "1.52", - "port-version": 1 + "port-version": 2 }, "geos": { "baseline": "3.10.0", @@ -2410,7 +2462,7 @@ }, "getdns": { "baseline": "1.7.0", - "port-version": 0 + "port-version": 3 }, "getopt": { "baseline": "0", @@ -2418,11 +2470,11 @@ }, "getopt-win32": { "baseline": "0.1", - "port-version": 1 + "port-version": 2 }, "gettext": { "baseline": "0.21", - "port-version": 8 + "port-version": 9 }, "gettimeofday": { "baseline": "2017-10-14", @@ -2438,11 +2490,11 @@ }, "gherkin-c": { "baseline": "2019-10-07", - "port-version": 2 + "port-version": 3 }, "giflib": { "baseline": "5.2.1", - "port-version": 1 + "port-version": 2 }, "ginkgo": { "baseline": "1.4.0", @@ -2469,7 +2521,7 @@ "port-version": 0 }, "glfw3": { - "baseline": "3.3.6", + "baseline": "3.3.7", "port-version": 0 }, "gli": { @@ -2477,12 +2529,12 @@ "port-version": 0 }, "glib": { - "baseline": "2.70.1", - "port-version": 1 + "baseline": "2.70.5", + "port-version": 0 }, "glibmm": { - "baseline": "2.68.1", - "port-version": 2 + "baseline": "2.70.0", + "port-version": 1 }, "glm": { "baseline": "0.9.9.8", @@ -2493,15 +2545,15 @@ "port-version": 4 }, "glog": { - "baseline": "0.4.0", - "port-version": 4 + "baseline": "0.5.0", + "port-version": 0 }, "gloo": { "baseline": "20201203", "port-version": 0 }, "glslang": { - "baseline": "11.6.0", + "baseline": "11.8.0", "port-version": 0 }, "glui": { @@ -2514,19 +2566,23 @@ }, "gmmlib": { "baseline": "21.3.2", - "port-version": 0 + "port-version": 1 }, "gmp": { "baseline": "6.2.1", - "port-version": 7 + "port-version": 9 }, "gmsh": { "baseline": "4.9.0", "port-version": 0 }, + "gobject-introspection": { + "baseline": "1.70.0", + "port-version": 1 + }, "google-cloud-cpp": { - "baseline": "1.35.0", - "port-version": 0 + "baseline": "1.39.0", + "port-version": 1 }, "google-cloud-cpp-common": { "baseline": "alias", @@ -2542,11 +2598,11 @@ }, "gperf": { "baseline": "3.1", - "port-version": 2 + "port-version": 3 }, "gperftools": { "baseline": "2019-09-02", - "port-version": 2 + "port-version": 3 }, "gpgme": { "baseline": "1.14.0", @@ -2574,14 +2630,14 @@ }, "graphviz": { "baseline": "2.49.1", - "port-version": 1 + "port-version": 3 }, "greatest": { "baseline": "1.5.0", "port-version": 0 }, "grpc": { - "baseline": "1.41.0", + "baseline": "1.44.0", "port-version": 0 }, "grppi": { @@ -2598,7 +2654,7 @@ }, "gsoap": { "baseline": "2.8.112", - "port-version": 0 + "port-version": 1 }, "gst-rtsp-server": { "baseline": "1.19.2", @@ -2606,18 +2662,22 @@ }, "gstreamer": { "baseline": "1.19.2", - "port-version": 2 + "port-version": 5 }, "gtest": { "baseline": "1.11.0", - "port-version": 3 + "port-version": 5 }, "gtk": { - "baseline": "4.4.0", - "port-version": 1 + "baseline": "4.6.0", + "port-version": 0 }, "gtkmm": { - "baseline": "4.4.0", + "baseline": "4.6.0", + "port-version": 0 + }, + "gtl": { + "baseline": "1.0.0", "port-version": 0 }, "gts": { @@ -2626,7 +2686,7 @@ }, "guetzli": { "baseline": "2020-09-14", - "port-version": 1 + "port-version": 2 }, "guilite": { "baseline": "2021-07-31", @@ -2642,7 +2702,7 @@ }, "h3": { "baseline": "3.7.2", - "port-version": 0 + "port-version": 1 }, "h5py-lzf": { "baseline": "2019-12-04", @@ -2657,8 +2717,8 @@ "port-version": 0 }, "harfbuzz": { - "baseline": "3.0.0", - "port-version": 1 + "baseline": "3.2.0", + "port-version": 2 }, "hayai": { "baseline": "2019-08-10", @@ -2670,7 +2730,7 @@ }, "hdf5": { "baseline": "1.12.1", - "port-version": 3 + "port-version": 4 }, "healpix": { "baseline": "1.12.10", @@ -2682,7 +2742,7 @@ }, "hexl": { "baseline": "1.2.3", - "port-version": 0 + "port-version": 1 }, "hffix": { "baseline": "1.0.0", @@ -2708,9 +2768,13 @@ "baseline": "1.0.2", "port-version": 3 }, + "hps": { + "baseline": "2022-01-18", + "port-version": 0 + }, "hpx": { "baseline": "1.7.1", - "port-version": 3 + "port-version": 5 }, "http-parser": { "baseline": "2.9.4", @@ -2722,11 +2786,11 @@ }, "hunspell": { "baseline": "1.7.0", - "port-version": 6 + "port-version": 8 }, "hwloc": { - "baseline": "2.5.0", - "port-version": 1 + "baseline": "2.7.0", + "port-version": 0 }, "hyperscan": { "baseline": "5.3.0", @@ -2741,8 +2805,8 @@ "port-version": 0 }, "icu": { - "baseline": "69.1", - "port-version": 16 + "baseline": "70.1", + "port-version": 0 }, "ideviceinstaller": { "baseline": "1.1.2.23", @@ -2750,7 +2814,7 @@ }, "idevicerestore": { "baseline": "1.0.12", - "port-version": 5 + "port-version": 7 }, "if97": { "baseline": "2.1.2", @@ -2774,7 +2838,7 @@ }, "ignition-common3": { "baseline": "3.9.0", - "port-version": 1 + "port-version": 2 }, "ignition-fuel-tools1": { "baseline": "1.2.0", @@ -2802,11 +2866,11 @@ }, "ignition-msgs5": { "baseline": "5.3.0", - "port-version": 3 + "port-version": 4 }, "ignition-msgs6": { "baseline": "6.0.0", - "port-version": 2 + "port-version": 3 }, "ignition-plugin1": { "baseline": "1.1.0", @@ -2814,23 +2878,23 @@ }, "ignition-transport4": { "baseline": "4.0.0", - "port-version": 3 + "port-version": 5 }, "ignition-transport8": { "baseline": "8.1.0", - "port-version": 1 + "port-version": 2 }, "ignition-transport9": { "baseline": "9.0.0", - "port-version": 1 + "port-version": 3 }, "igraph": { - "baseline": "0.9.6", + "baseline": "0.9.8", "port-version": 0 }, "iir1": { "baseline": "1.9.0", - "port-version": 0 + "port-version": 1 }, "ijg-libjpeg": { "baseline": "9d", @@ -2841,27 +2905,27 @@ "port-version": 1 }, "imath": { - "baseline": "3.1.3", - "port-version": 1 + "baseline": "3.1.5", + "port-version": 0 }, "imgui": { - "baseline": "1.86", + "baseline": "1.87", "port-version": 0 }, "imgui-sfml": { - "baseline": "2.4", - "port-version": 1 + "baseline": "2.5", + "port-version": 0 }, "imguizmo": { "baseline": "1.83", "port-version": 0 }, "immer": { - "baseline": "2021-05-03", + "baseline": "2022-02-12", "port-version": 0 }, "implot": { - "baseline": "0.12", + "baseline": "0.13", "port-version": 0 }, "indicators": { @@ -2874,7 +2938,7 @@ }, "infoware": { "baseline": "2021-06-16", - "port-version": 0 + "port-version": 1 }, "inih": { "baseline": "51", @@ -2889,8 +2953,8 @@ "port-version": 0 }, "intel-ipsec": { - "baseline": "0.52", - "port-version": 2 + "baseline": "1.1", + "port-version": 0 }, "intel-mkl": { "baseline": "2020.0.0", @@ -2898,7 +2962,7 @@ }, "intelrdfpmathlib": { "baseline": "20U2", - "port-version": 2 + "port-version": 3 }, "io2d": { "baseline": "2020-09-14", @@ -2906,7 +2970,7 @@ }, "irrlicht": { "baseline": "1.8.4", - "port-version": 12 + "port-version": 13 }, "irrxml": { "baseline": "0", @@ -2921,24 +2985,24 @@ "port-version": 2 }, "itk": { - "baseline": "5.1.0", - "port-version": 7 + "baseline": "5.2.1", + "port-version": 1 }, "itpp": { "baseline": "4.3.1", "port-version": 8 }, "ixwebsocket": { - "baseline": "11.2.6", + "baseline": "11.3.3", "port-version": 0 }, "jack2": { "baseline": "1.9.19", - "port-version": 0 + "port-version": 1 }, "jaeger-client-cpp": { "baseline": "0.7.0", - "port-version": 0 + "port-version": 1 }, "jansson": { "baseline": "2.13.1", @@ -2946,7 +3010,7 @@ }, "jasper": { "baseline": "2.0.33", - "port-version": 0 + "port-version": 3 }, "jbig2dec": { "baseline": "0.19", @@ -2977,7 +3041,7 @@ "port-version": 2 }, "json-dto": { - "baseline": "0.3.0", + "baseline": "0.3.1", "port-version": 0 }, "json-schema-validator": { @@ -2997,7 +3061,7 @@ "port-version": 3 }, "jsoncons": { - "baseline": "0.165.0", + "baseline": "0.168.3", "port-version": 1 }, "jsoncpp": { @@ -3046,11 +3110,11 @@ }, "keystone": { "baseline": "0.9.2", - "port-version": 1 + "port-version": 2 }, "kf5archive": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5attica": { "baseline": "5.89.0", @@ -3194,11 +3258,11 @@ }, "kfr": { "baseline": "4.2.1", - "port-version": 0 + "port-version": 1 }, "kinectsdk1": { "baseline": "1.8", - "port-version": 3 + "port-version": 4 }, "kinectsdk2": { "baseline": "2.0", @@ -3214,23 +3278,23 @@ }, "knet": { "baseline": "1.1.0", - "port-version": 0 + "port-version": 1 }, "krabsetw": { "baseline": "4.1.18", - "port-version": 0 + "port-version": 1 }, "ktx": { "baseline": "4.0.0", - "port-version": 0 + "port-version": 2 }, "kubazip": { "baseline": "0.1.19", "port-version": 1 }, "kubernetes": { - "baseline": "2021-11-24", - "port-version": 0 + "baseline": "2022-01-19", + "port-version": 1 }, "kuku": { "baseline": "2.1", @@ -3242,19 +3306,19 @@ }, "kwsys": { "baseline": "2021-08-06", - "port-version": 0 + "port-version": 1 }, "lager": { - "baseline": "2021-06-17", - "port-version": 1 + "baseline": "2022-02-21", + "port-version": 0 }, "lapack": { - "baseline": "3", - "port-version": 2 + "baseline": "2022-02-22", + "port-version": 0 }, "lapack-reference": { - "baseline": "3.8.0", - "port-version": 6 + "baseline": "3.10.0", + "port-version": 0 }, "lastools": { "baseline": "2020-05-09", @@ -3269,7 +3333,7 @@ "port-version": 0 }, "lazy-importer": { - "baseline": "2021-10-23", + "baseline": "2022-02-09", "port-version": 0 }, "lcm": { @@ -3278,7 +3342,7 @@ }, "lcms": { "baseline": "2.12", - "port-version": 2 + "port-version": 3 }, "leaf": { "baseline": "0.2.2", @@ -3289,7 +3353,7 @@ "port-version": 1 }, "leptonica": { - "baseline": "1.81.1", + "baseline": "1.82.0", "port-version": 0 }, "lerc": { @@ -3302,11 +3366,11 @@ }, "leveldb": { "baseline": "1.22", - "port-version": 2 + "port-version": 5 }, "levmar": { "baseline": "2.6", - "port-version": 0 + "port-version": 1 }, "libaaplus": { "baseline": "2.36", @@ -3318,11 +3382,15 @@ }, "libalkimia": { "baseline": "8.1.70", - "port-version": 0 + "port-version": 1 + }, + "libao": { + "baseline": "1.2.2", + "port-version": 4 }, "libarchive": { "baseline": "3.5.2", - "port-version": 2 + "port-version": 5 }, "libass": { "baseline": "0.15.2", @@ -3330,7 +3398,7 @@ }, "libassuan": { "baseline": "2.5.3", - "port-version": 3 + "port-version": 4 }, "libatomic-ops": { "baseline": "7.7.0", @@ -3342,11 +3410,11 @@ }, "libb2": { "baseline": "0.98.1", - "port-version": 5 + "port-version": 6 }, "libbacktrace": { "baseline": "2021-03-14", - "port-version": 0 + "port-version": 1 }, "libbf": { "baseline": "1.0.0", @@ -3358,7 +3426,7 @@ }, "libcanberra": { "baseline": "0.30", - "port-version": 1 + "port-version": 2 }, "libcbor": { "baseline": "0.8.0", @@ -3384,9 +3452,13 @@ "baseline": "1.4.1", "port-version": 1 }, + "libcpplocate": { + "baseline": "2.3.0", + "port-version": 0 + }, "libcrafter": { "baseline": "1.0", - "port-version": 1 + "port-version": 2 }, "libcroco": { "baseline": "0.6.13", @@ -3396,13 +3468,17 @@ "baseline": "0.3", "port-version": 1 }, - "libdatachannel": { - "baseline": "0.16.0", + "libcurl-simple-https": { + "baseline": "2022-02-14", "port-version": 0 }, + "libdatachannel": { + "baseline": "0.16.4", + "port-version": 1 + }, "libdatrie": { - "baseline": "0.2.10", - "port-version": 4 + "baseline": "0.2.13", + "port-version": 1 }, "libdc1394": { "baseline": "2.2.6", @@ -3410,7 +3486,7 @@ }, "libde265": { "baseline": "1.0.8", - "port-version": 3 + "port-version": 5 }, "libdisasm": { "baseline": "0.23", @@ -3426,12 +3502,16 @@ }, "libdshowcapture": { "baseline": "0.6.0", - "port-version": 2 + "port-version": 3 }, "libe57": { - "baseline": "1.1.312", + "baseline": "1.1.332", "port-version": 1 }, + "libe57format": { + "baseline": "2.2.0", + "port-version": 0 + }, "libebur128": { "baseline": "1.2.6", "port-version": 0 @@ -3442,27 +3522,27 @@ }, "libevent": { "baseline": "2.1.12", - "port-version": 5 + "port-version": 6 }, "libevhtp": { "baseline": "1.2.18", - "port-version": 2 + "port-version": 3 }, "libexif": { "baseline": "0.6.22", - "port-version": 1 + "port-version": 2 }, "libfabric": { "baseline": "1.13.2", - "port-version": 0 + "port-version": 1 }, "libffi": { "baseline": "3.4.2", "port-version": 4 }, "libfido2": { - "baseline": "1.7.0", - "port-version": 0 + "baseline": "1.10.0", + "port-version": 1 }, "libflac": { "baseline": "1.3.3", @@ -3493,28 +3573,32 @@ "port-version": 1 }, "libgeotiff": { - "baseline": "1.7.0", + "baseline": "1.7.1", "port-version": 0 }, "libgit2": { - "baseline": "1.3.0", - "port-version": 2 + "baseline": "1.4.2", + "port-version": 0 }, "libgnutls": { "baseline": "3.6.15", - "port-version": 2 + "port-version": 3 }, "libgo": { "baseline": "3.1", - "port-version": 3 + "port-version": 4 }, "libgpg-error": { "baseline": "1.42", "port-version": 3 }, + "libgpiod": { + "baseline": "1.6.3", + "port-version": 0 + }, "libgpod": { "baseline": "2019-08-29", - "port-version": 3 + "port-version": 4 }, "libgta": { "baseline": "1.0.8", @@ -3526,7 +3610,7 @@ }, "libgwenhywfar": { "baseline": "5.6.0", - "port-version": 1 + "port-version": 2 }, "libgxps": { "baseline": "0.3.2", @@ -3538,19 +3622,19 @@ }, "libhdfs3": { "baseline": "2019-11-05", - "port-version": 1 + "port-version": 3 }, "libheif": { "baseline": "1.12.0", - "port-version": 1 + "port-version": 3 }, "libhsplasma": { "baseline": "2021.06.08", - "port-version": 0 + "port-version": 1 }, "libhv": { - "baseline": "1.2.2", - "port-version": 0 + "baseline": "1.2.4", + "port-version": 1 }, "libhydrogen": { "baseline": "2021-12-02", @@ -3562,7 +3646,7 @@ }, "libiconv": { "baseline": "1.16", - "port-version": 11 + "port-version": 13 }, "libics": { "baseline": "1.6.5", @@ -3573,12 +3657,12 @@ "port-version": 0 }, "libidn2": { - "baseline": "2.3.0", - "port-version": 4 + "baseline": "2.3.1", + "port-version": 0 }, "libigl": { "baseline": "2.3.0", - "port-version": 0 + "port-version": 1 }, "libilbc": { "baseline": "3.0.3", @@ -3593,11 +3677,11 @@ "port-version": 3 }, "libjpeg-turbo": { - "baseline": "2.1.2", - "port-version": 0 + "baseline": "2.1.3", + "port-version": 2 }, "libjuice": { - "baseline": "0.9.1", + "baseline": "0.9.8", "port-version": 0 }, "libjxl": { @@ -3626,19 +3710,19 @@ }, "liblinear": { "baseline": "243", - "port-version": 0 + "port-version": 1 }, "liblo": { "baseline": "0.31", "port-version": 2 }, "liblsl": { - "baseline": "1.14.0", - "port-version": 2 + "baseline": "1.16.0", + "port-version": 0 }, "liblzma": { "baseline": "5.2.5", - "port-version": 4 + "port-version": 5 }, "libmad": { "baseline": "0.15.1", @@ -3662,11 +3746,11 @@ }, "libmesh": { "baseline": "1.5.0", - "port-version": 2 + "port-version": 4 }, "libmicrohttpd": { - "baseline": "0.9.63", - "port-version": 7 + "baseline": "0.9.75", + "port-version": 0 }, "libmikmod": { "baseline": "3.3.11.1", @@ -3674,7 +3758,7 @@ }, "libmodbus": { "baseline": "3.1.6", - "port-version": 1 + "port-version": 2 }, "libmodman": { "baseline": "2.0.1", @@ -3694,31 +3778,31 @@ }, "libmpeg2": { "baseline": "0.5.1", - "port-version": 1 + "port-version": 2 }, "libmspack": { "baseline": "0.10.1", "port-version": 4 }, "libmt32emu": { - "baseline": "2.5.3", - "port-version": 1 + "baseline": "2.6.2", + "port-version": 0 }, "libmupdf": { "baseline": "1.19.0-rc2", - "port-version": 0 + "port-version": 1 }, "libmysql": { "baseline": "8.0.20", - "port-version": 5 + "port-version": 6 }, "libnice": { - "baseline": "0.1.15", - "port-version": 7 + "baseline": "0.1.18", + "port-version": 0 }, "libnoise": { "baseline": "1.0.0", - "port-version": 2 + "port-version": 3 }, "libnop": { "baseline": "2021-03-01", @@ -3762,11 +3846,11 @@ }, "libosip2": { "baseline": "5.2.0", - "port-version": 1 + "port-version": 2 }, "libosmium": { "baseline": "2.17.1", - "port-version": 0 + "port-version": 1 }, "libosmscout": { "baseline": "1.1.1", @@ -3778,7 +3862,7 @@ }, "libp7client": { "baseline": "5.6", - "port-version": 1 + "port-version": 2 }, "libpcap": { "baseline": "1.10.1", @@ -3786,7 +3870,7 @@ }, "libpff": { "baseline": "2018-07-14", - "port-version": 2 + "port-version": 3 }, "libplist": { "baseline": "1.3.6", @@ -3805,12 +3889,12 @@ "port-version": 14 }, "libpq": { - "baseline": "12.9", + "baseline": "14.1", "port-version": 1 }, "libpqxx": { "baseline": "7.6.0", - "port-version": 2 + "port-version": 3 }, "libprotobuf-mutator": { "baseline": "1.0", @@ -3818,11 +3902,11 @@ }, "libproxy": { "baseline": "0.4.17", - "port-version": 1 + "port-version": 2 }, "libqcow": { "baseline": "20210419", - "port-version": 1 + "port-version": 2 }, "libqglviewer": { "baseline": "2.7.2", @@ -3833,12 +3917,12 @@ "port-version": 1 }, "librabbitmq": { - "baseline": "2020-06-03", + "baseline": "0.11.0", "port-version": 1 }, "libraqm": { - "baseline": "0.7.0", - "port-version": 3 + "baseline": "0.9.0", + "port-version": 0 }, "libraw": { "baseline": "201903", @@ -3846,10 +3930,10 @@ }, "librdkafka": { "baseline": "1.8.2", - "port-version": 0 + "port-version": 2 }, "libressl": { - "baseline": "3.3.4", + "baseline": "3.4.2", "port-version": 0 }, "librsvg": { @@ -3858,11 +3942,11 @@ }, "librsync": { "baseline": "2.3.2", - "port-version": 0 + "port-version": 1 }, "librtmp": { "baseline": "2019-11-11", - "port-version": 2 + "port-version": 3 }, "librttopo": { "baseline": "1.1.0", @@ -3874,11 +3958,11 @@ }, "libsass": { "baseline": "3.6.5", - "port-version": 0 + "port-version": 1 }, "libsbml": { "baseline": "5.19.0", - "port-version": 1 + "port-version": 2 }, "libsbsms": { "baseline": "2.3.0", @@ -3900,17 +3984,21 @@ "baseline": "3.0.3", "port-version": 1 }, + "libslirp": { + "baseline": "4.6.1", + "port-version": 1 + }, "libsmb2": { "baseline": "2021-04-29", - "port-version": 0 + "port-version": 1 }, "libsndfile": { - "baseline": "1.0.31", + "baseline": "1.1.0", "port-version": 0 }, "libsnoretoast": { "baseline": "0.8.0", - "port-version": 1 + "port-version": 2 }, "libsodium": { "baseline": "1.0.18", @@ -3918,7 +4006,7 @@ }, "libsoundio": { "baseline": "2.0.0", - "port-version": 4 + "port-version": 6 }, "libspatialindex": { "baseline": "1.9.3", @@ -3926,31 +4014,31 @@ }, "libspatialite": { "baseline": "5.0.1", - "port-version": 2 + "port-version": 4 }, "libspnav": { "baseline": "0.2.3", - "port-version": 1 + "port-version": 2 }, "libsquish": { "baseline": "1.15", - "port-version": 9 + "port-version": 10 }, "libsrt": { "baseline": "1.4.4", - "port-version": 1 + "port-version": 2 }, "libsrtp": { "baseline": "2.4.2", - "port-version": 0 + "port-version": 1 }, "libssh": { "baseline": "0.9.6", - "port-version": 1 + "port-version": 2 }, "libssh2": { "baseline": "1.10.0", - "port-version": 0 + "port-version": 4 }, "libstemmer": { "baseline": "2017-9", @@ -3969,7 +4057,7 @@ "port-version": 3 }, "libtcod": { - "baseline": "1.19.0", + "baseline": "1.20.1", "port-version": 0 }, "libtess2": { @@ -3982,7 +4070,7 @@ }, "libtins": { "baseline": "4.3", - "port-version": 4 + "port-version": 6 }, "libtomcrypt": { "baseline": "1.18.2", @@ -3993,16 +4081,16 @@ "port-version": 2 }, "libtorrent": { - "baseline": "1.2.14", - "port-version": 1 + "baseline": "2.0.5", + "port-version": 0 }, "libu2f-server": { "baseline": "1.1.0", - "port-version": 3 + "port-version": 4 }, "libudis86": { "baseline": "2018-01-28-56ff6c87", - "port-version": 1 + "port-version": 2 }, "libudns": { "baseline": "0.4", @@ -4022,11 +4110,11 @@ }, "libunistring": { "baseline": "0.9.10", - "port-version": 1 + "port-version": 2 }, "liburing": { "baseline": "2.0", - "port-version": 0 + "port-version": 3 }, "libusb": { "baseline": "1.0.24", @@ -4034,19 +4122,19 @@ }, "libusb-win32": { "baseline": "1.2.6.0", - "port-version": 7 + "port-version": 8 }, "libusbmuxd": { "baseline": "1.2.219", - "port-version": 1 + "port-version": 2 }, "libuuid": { "baseline": "1.0.3", - "port-version": 9 + "port-version": 11 }, "libuv": { - "baseline": "1.42.0", - "port-version": 2 + "baseline": "1.43.0", + "port-version": 0 }, "libuvc": { "baseline": "2020-11-24", @@ -4054,11 +4142,11 @@ }, "libvmdk": { "baseline": "20200926", - "port-version": 1 + "port-version": 2 }, "libvorbis": { "baseline": "1.3.7", - "port-version": 1 + "port-version": 2 }, "libvpx": { "baseline": "1.10.0", @@ -4066,7 +4154,7 @@ }, "libwandio": { "baseline": "4.2.1", - "port-version": 4 + "port-version": 6 }, "libwebm": { "baseline": "1.0.0.28", @@ -4078,11 +4166,11 @@ }, "libwebsockets": { "baseline": "4.3.0", - "port-version": 0 + "port-version": 3 }, "libxdiff": { "baseline": "0.23", - "port-version": 1 + "port-version": 2 }, "libxlsxwriter": { "baseline": "1.1.4", @@ -4090,7 +4178,7 @@ }, "libxml2": { "baseline": "2.9.12", - "port-version": 4 + "port-version": 5 }, "libxmlmm": { "baseline": "0.6.0", @@ -4102,11 +4190,11 @@ }, "libxmp-lite": { "baseline": "4.4.1", - "port-version": 7 + "port-version": 8 }, "libxslt": { "baseline": "1.1.34", - "port-version": 3 + "port-version": 4 }, "libyaml": { "baseline": "0.2.5", @@ -4130,11 +4218,11 @@ }, "licensepp": { "baseline": "2020-05-19", - "port-version": 2 + "port-version": 3 }, "lilv": { "baseline": "0.24.10", - "port-version": 0 + "port-version": 1 }, "linalg": { "baseline": "2.1", @@ -4144,12 +4232,16 @@ "baseline": "4754bee2d8eb3", "port-version": 2 }, + "lionkor-commandline": { + "baseline": "2.0.0", + "port-version": 0 + }, "live555": { "baseline": "2021-12-18", "port-version": 0 }, "llfio": { - "baseline": "2.0-20211208", + "baseline": "2.0-20220112", "port-version": 0 }, "llgl": { @@ -4158,11 +4250,11 @@ }, "llvm": { "baseline": "13.0.0", - "port-version": 1 + "port-version": 3 }, "lmdb": { - "baseline": "0.9.24", - "port-version": 1 + "baseline": "0.9.29", + "port-version": 0 }, "lodepng": { "baseline": "2021-12-04", @@ -4174,11 +4266,11 @@ }, "log4cplus": { "baseline": "2.0.7", - "port-version": 0 + "port-version": 1 }, "log4cpp": { "baseline": "2.9.1", - "port-version": 6 + "port-version": 7 }, "log4cxx": { "baseline": "0.12.1", @@ -4186,15 +4278,15 @@ }, "loguru": { "baseline": "2.1.0", - "port-version": 2 + "port-version": 3 }, "lpeg": { "baseline": "1.0.2", "port-version": 2 }, "lua": { - "baseline": "5.4.3", - "port-version": 3 + "baseline": "5.4.4", + "port-version": 1 }, "luabridge": { "baseline": "2.6", @@ -4206,15 +4298,19 @@ }, "luajit": { "baseline": "2.0.5", - "port-version": 4 + "port-version": 5 }, "luasec": { "baseline": "1.0.1", - "port-version": 0 + "port-version": 1 }, "luasocket": { "baseline": "2020-09-14", - "port-version": 1 + "port-version": 2 + }, + "lunasvg": { + "baseline": "2.3.1", + "port-version": 0 }, "lv2": { "baseline": "1.18.2", @@ -4261,8 +4357,8 @@ "port-version": 8 }, "mailio": { - "baseline": "0.20.0", - "port-version": 1 + "baseline": "0.21.0", + "port-version": 2 }, "mapbox-geojson-cpp": { "baseline": "0.5.1", @@ -4289,7 +4385,7 @@ "port-version": 0 }, "mapnik": { - "baseline": "2021-11-15", + "baseline": "2022-01-28", "port-version": 1 }, "marble": { @@ -4297,7 +4393,7 @@ "port-version": 3 }, "marl": { - "baseline": "2021-04-25", + "baseline": "2022-03-02", "port-version": 0 }, "mathc": { @@ -4325,8 +4421,8 @@ "port-version": 0 }, "mbedtls": { - "baseline": "2.24.0", - "port-version": 3 + "baseline": "2.28.0", + "port-version": 0 }, "mcpp": { "baseline": "2.7.2.14", @@ -4338,7 +4434,7 @@ }, "mdnsresponder": { "baseline": "878.270.2", - "port-version": 0 + "port-version": 1 }, "mdspan": { "baseline": "2021-11-03", @@ -4354,7 +4450,7 @@ }, "mesa": { "baseline": "21.2.5", - "port-version": 0 + "port-version": 3 }, "meschach": { "baseline": "1.2b", @@ -4382,7 +4478,7 @@ }, "mhook": { "baseline": "2.5.1", - "port-version": 2 + "port-version": 3 }, "microsoft-signalr": { "baseline": "0.1.0-alpha3", @@ -4394,10 +4490,10 @@ }, "milerius-sfml-imgui": { "baseline": "1.1", - "port-version": 3 + "port-version": 4 }, "mimalloc": { - "baseline": "2.0.3", + "baseline": "2.0.5", "port-version": 1 }, "minc": { @@ -4406,7 +4502,7 @@ }, "minhook": { "baseline": "1.3.3", - "port-version": 2 + "port-version": 3 }, "minifb": { "baseline": "2019-08-20", @@ -4438,11 +4534,11 @@ }, "minizip": { "baseline": "1.2.11", - "port-version": 9 + "port-version": 10 }, "minizip-ng": { - "baseline": "3.0.2", - "port-version": 1 + "baseline": "3.0.5", + "port-version": 0 }, "mio": { "baseline": "2019-02-10", @@ -4454,11 +4550,11 @@ }, "mman": { "baseline": "git-f5ff813", - "port-version": 4 + "port-version": 5 }, "mmloader": { "baseline": "2021-12-13", - "port-version": 0 + "port-version": 1 }, "mmx": { "baseline": "2019-09-29", @@ -4466,7 +4562,7 @@ }, "mnn": { "baseline": "1.1.0", - "port-version": 1 + "port-version": 2 }, "modp-base64": { "baseline": "2020-09-26", @@ -4481,12 +4577,12 @@ "port-version": 2 }, "mongoose": { - "baseline": "7.1", - "port-version": 0 + "baseline": "7.5", + "port-version": 1 }, "monkeys-audio": { "baseline": "5.70", - "port-version": 1 + "port-version": 2 }, "moos-core": { "baseline": "10.4.0", @@ -4526,23 +4622,23 @@ }, "mpc": { "baseline": "1.2.0", - "port-version": 1 + "port-version": 2 }, "mpfr": { "baseline": "4.1.0", - "port-version": 2 + "port-version": 4 }, "mpg123": { "baseline": "1.29.2", - "port-version": 1 + "port-version": 2 }, "mpi": { "baseline": "1", "port-version": 2 }, "mpir": { - "baseline": "3.0.0", - "port-version": 10 + "baseline": "2022-03-02", + "port-version": 0 }, "mpmcqueue": { "baseline": "2019-07-26", @@ -4558,11 +4654,11 @@ }, "ms-gltf": { "baseline": "r1.9.5.4", - "port-version": 0 + "port-version": 1 }, "ms-gsl": { - "baseline": "3.1.0", - "port-version": 1 + "baseline": "4.0.0", + "port-version": 0 }, "ms-quic": { "baseline": "1.2.0", @@ -4590,7 +4686,7 @@ }, "msmpi": { "baseline": "10.1.12498", - "port-version": 2 + "port-version": 3 }, "mstch": { "baseline": "1.0.2", @@ -4602,23 +4698,23 @@ }, "munit": { "baseline": "2019-04-06", - "port-version": 4 + "port-version": 5 }, "muparser": { - "baseline": "2.3.2", + "baseline": "2.3.3", "port-version": 2 }, "murmurhash": { "baseline": "2016-01-09", - "port-version": 4 + "port-version": 5 }, "mvfst": { - "baseline": "0.1", + "baseline": "2022-03-27", "port-version": 0 }, "mygui": { "baseline": "3.4.1", - "port-version": 1 + "port-version": 2 }, "nameof": { "baseline": "0.10.1", @@ -4633,8 +4729,8 @@ "port-version": 1 }, "nanobench": { - "baseline": "4.3.0", - "port-version": 1 + "baseline": "4.3.6", + "port-version": 0 }, "nanodbc": { "baseline": "2.13.0", @@ -4646,7 +4742,7 @@ }, "nanogui": { "baseline": "2019-09-23", - "port-version": 2 + "port-version": 3 }, "nanomsg": { "baseline": "1.1.5", @@ -4661,35 +4757,39 @@ "port-version": 1 }, "nanorange": { - "baseline": "0.0.0", - "port-version": 1 + "baseline": "2020-07-06", + "port-version": 0 }, "nanort": { "baseline": "2019-08-20", "port-version": 2 }, "nanovg": { - "baseline": "2019-8-30", - "port-version": 4 + "baseline": "2019-08-30", + "port-version": 5 }, "nativefiledialog": { - "baseline": "2019-08-28", - "port-version": 1 + "baseline": "2022-01-20", + "port-version": 0 + }, + "nayuki-qr-code-generator": { + "baseline": "1.7.0", + "port-version": 0 }, "nccl": { "baseline": "2.4.6", - "port-version": 1 + "port-version": 2 }, "ncurses": { "baseline": "6.3", - "port-version": 0 + "port-version": 1 }, "neargye-semver": { "baseline": "0.3.0", "port-version": 0 }, "ned14-internal-quickcpplib": { - "baseline": "0.0.0-8089a948", + "baseline": "0.0.0-cad832c8", "port-version": 0 }, "neon2sse": { @@ -4698,7 +4798,7 @@ }, "netcdf-c": { "baseline": "4.8.1", - "port-version": 1 + "port-version": 2 }, "netcdf-cxx4": { "baseline": "4.3.1", @@ -4706,15 +4806,15 @@ }, "nethost": { "baseline": "2019-12-21", - "port-version": 1 + "port-version": 2 }, "nettle": { - "baseline": "3.6", - "port-version": 1 + "baseline": "3.7.3", + "port-version": 0 }, "networkdirect-sdk": { "baseline": "2.0.1", - "port-version": 2 + "port-version": 3 }, "nghttp2": { "baseline": "1.46.0", @@ -4722,7 +4822,7 @@ }, "ngspice": { "baseline": "35", - "port-version": 0 + "port-version": 2 }, "nifly": { "baseline": "1.0.0", @@ -4737,8 +4837,8 @@ "port-version": 2 }, "nlohmann-json": { - "baseline": "3.10.4", - "port-version": 0 + "baseline": "3.10.5", + "port-version": 2 }, "nlopt": { "baseline": "2.7.0", @@ -4750,7 +4850,7 @@ }, "nmslib": { "baseline": "2.1.1", - "port-version": 0 + "port-version": 1 }, "nng": { "baseline": "1.5.1", @@ -4762,7 +4862,7 @@ }, "nnpack": { "baseline": "2021-02-21", - "port-version": 1 + "port-version": 3 }, "nonius": { "baseline": "2019-04-20", @@ -4776,14 +4876,26 @@ "baseline": "4.1.2", "port-version": 1 }, + "nspr": { + "baseline": "4.33", + "port-version": 0 + }, + "nss": { + "baseline": "3.77", + "port-version": 0 + }, "nsync": { "baseline": "1.24.0", - "port-version": 0 + "port-version": 1 }, "nt-wrapper": { "baseline": "2019-08-10", "port-version": 1 }, + "nu-book-zxing-cpp": { + "baseline": "1.2.0", + "port-version": 0 + }, "nuklear": { "baseline": "2021-03-18", "port-version": 1 @@ -4802,54 +4914,58 @@ }, "nvtt": { "baseline": "2.1.2", - "port-version": 2 + "port-version": 4 }, "oatpp": { - "baseline": "1.2.5", + "baseline": "1.3.0", "port-version": 0 }, "oatpp-consul": { - "baseline": "1.2.5", + "baseline": "1.3.0", "port-version": 0 }, "oatpp-curl": { - "baseline": "1.2.5", + "baseline": "1.3.0", "port-version": 0 }, "oatpp-libressl": { - "baseline": "1.2.5", + "baseline": "1.3.0", "port-version": 0 }, "oatpp-mbedtls": { - "baseline": "1.2.5", + "baseline": "1.3.0", "port-version": 0 }, "oatpp-mongo": { - "baseline": "1.2.5", + "baseline": "1.3.0", "port-version": 0 }, "oatpp-openssl": { - "baseline": "1.2.5", + "baseline": "1.3.0", "port-version": 0 }, "oatpp-postgresql": { - "baseline": "1.2.5", + "baseline": "1.3.0", "port-version": 0 }, "oatpp-sqlite": { - "baseline": "1.2.5", + "baseline": "1.3.0", + "port-version": 0 + }, + "oatpp-ssdp": { + "baseline": "1.3.0", "port-version": 0 }, "oatpp-swagger": { - "baseline": "1.2.5", + "baseline": "1.3.0", "port-version": 0 }, "oatpp-websocket": { - "baseline": "1.2.5", + "baseline": "1.3.0", "port-version": 0 }, "oatpp-zlib": { - "baseline": "1.2.5", + "baseline": "1.3.0", "port-version": 0 }, "observer-ptr-lite": { @@ -4858,7 +4974,7 @@ }, "ocilib": { "baseline": "4.7.3", - "port-version": 0 + "port-version": 2 }, "octomap": { "baseline": "1.9.5", @@ -4878,15 +4994,15 @@ }, "ogre": { "baseline": "1.12.9", - "port-version": 5 + "port-version": 7 }, "ogre-next": { - "baseline": "2019-10-20", - "port-version": 2 + "baseline": "2.3.0", + "port-version": 0 }, "ois": { "baseline": "1.5.1", - "port-version": 0 + "port-version": 1 }, "ompl": { "baseline": "1.5.1", @@ -4898,7 +5014,7 @@ }, "onednn": { "baseline": "2.4.3", - "port-version": 0 + "port-version": 1 }, "oniguruma": { "baseline": "6.9.7.1", @@ -4906,7 +5022,7 @@ }, "onnx": { "baseline": "1.10.2", - "port-version": 0 + "port-version": 1 }, "onnx-optimizer": { "baseline": "0.2.6", @@ -4914,23 +5030,23 @@ }, "onnxruntime-gpu": { "baseline": "1.5.1", - "port-version": 0 + "port-version": 1 }, "oof": { "baseline": "2021-11-23", "port-version": 0 }, "open62541": { - "baseline": "1.2.2", + "baseline": "1.2.3", "port-version": 1 }, "openal-soft": { "baseline": "1.21.1", - "port-version": 3 + "port-version": 4 }, "openblas": { - "baseline": "0.3.15", - "port-version": 1 + "baseline": "0.3.19", + "port-version": 0 }, "opencascade": { "baseline": "7.6.0", @@ -4938,7 +5054,7 @@ }, "opencc": { "baseline": "2020-04-26", - "port-version": 9 + "port-version": 10 }, "opencensus-cpp": { "baseline": "2021-08-26", @@ -4949,8 +5065,8 @@ "port-version": 8 }, "opencolorio": { - "baseline": "2.1.0", - "port-version": 1 + "baseline": "2.1.1", + "port-version": 2 }, "opencolorio-tools": { "baseline": "1.1.1", @@ -4961,32 +5077,32 @@ "port-version": 2 }, "opencv": { - "baseline": "4.5.4", - "port-version": 1 + "baseline": "4.5.5", + "port-version": 0 }, "opencv2": { "baseline": "2.4.13.7", - "port-version": 9 + "port-version": 11 }, "opencv3": { "baseline": "3.4.16", - "port-version": 1 + "port-version": 5 }, "opencv4": { - "baseline": "4.5.4", - "port-version": 2 + "baseline": "4.5.5", + "port-version": 1 }, "opendnp3": { "baseline": "3.1.1", - "port-version": 0 + "port-version": 1 }, "openexr": { "baseline": "2.5.0", "port-version": 3 }, "opengl": { - "baseline": "0.0", - "port-version": 9 + "baseline": "2022-03-14", + "port-version": 0 }, "opengl-registry": { "baseline": "2021-11-17", @@ -5002,7 +5118,7 @@ }, "openimageio": { "baseline": "2.3.10.1", - "port-version": 0 + "port-version": 3 }, "openjpeg": { "baseline": "2.4.0", @@ -5018,11 +5134,11 @@ }, "openmpi": { "baseline": "4.1.0", - "port-version": 3 + "port-version": 4 }, "openmvg": { "baseline": "2.0", - "port-version": 0 + "port-version": 3 }, "openmvs": { "baseline": "1.1.1", @@ -5037,8 +5153,8 @@ "port-version": 1 }, "openssl": { - "baseline": "1.1.1m", - "port-version": 0 + "baseline": "3.0.2", + "port-version": 2 }, "openssl-unix": { "baseline": "1.1.1h", @@ -5054,18 +5170,18 @@ }, "opensubdiv": { "baseline": "3.4.3", - "port-version": 3 + "port-version": 4 }, "opentelemetry-cpp": { - "baseline": "1.0.1", - "port-version": 1 + "baseline": "1.2.0", + "port-version": 0 }, "opentracing": { "baseline": "1.6.0", - "port-version": 1 + "port-version": 2 }, "openvdb": { - "baseline": "8.2.0", + "baseline": "9.0.0", "port-version": 0 }, "openvpn3": { @@ -5074,11 +5190,11 @@ }, "openvr": { "baseline": "1.16.8", - "port-version": 1 + "port-version": 2 }, "openxr-loader": { - "baseline": "1.0.20", - "port-version": 1 + "baseline": "1.0.22", + "port-version": 3 }, "optimus-cpp": { "baseline": "0.3.0", @@ -5118,7 +5234,7 @@ }, "osgearth": { "baseline": "3.2", - "port-version": 3 + "port-version": 4 }, "osi": { "baseline": "0.108.6", @@ -5126,7 +5242,7 @@ }, "otl": { "baseline": "4.0.463", - "port-version": 0 + "port-version": 1 }, "outcome": { "baseline": "2.2.2-20211208", @@ -5157,7 +5273,7 @@ "port-version": 0 }, "pango": { - "baseline": "1.50.3", + "baseline": "1.50.6", "port-version": 0 }, "pangolin": { @@ -5166,11 +5282,11 @@ }, "pangomm": { "baseline": "2.50.0", - "port-version": 0 + "port-version": 1 }, "parallel-hashmap": { - "baseline": "1.33", - "port-version": 1 + "baseline": "1.34", + "port-version": 0 }, "parallelstl": { "baseline": "20200330", @@ -5178,7 +5294,7 @@ }, "paraview": { "baseline": "5.9.1", - "port-version": 0 + "port-version": 1 }, "parmetis": { "baseline": "4.0.3", @@ -5194,11 +5310,11 @@ }, "pbc": { "baseline": "0.5.14", - "port-version": 5 + "port-version": 6 }, "pcapplusplus": { "baseline": "21.11", - "port-version": 0 + "port-version": 1 }, "pcg": { "baseline": "2021-04-06", @@ -5206,7 +5322,7 @@ }, "pcl": { "baseline": "1.12.0", - "port-version": 2 + "port-version": 6 }, "pcre": { "baseline": "8.45", @@ -5217,12 +5333,12 @@ "port-version": 2 }, "pdal": { - "baseline": "1.7.1", - "port-version": 13 + "baseline": "2.3.0", + "port-version": 0 }, "pdal-c": { - "baseline": "1.8", - "port-version": 3 + "baseline": "2.1", + "port-version": 0 }, "pdcurses": { "baseline": "3.9", @@ -5237,7 +5353,7 @@ "port-version": 0 }, "pegtl": { - "baseline": "3.2.2", + "baseline": "3.2.5", "port-version": 0 }, "pegtl-2": { @@ -5250,7 +5366,7 @@ }, "pfring": { "baseline": "2019-10-17", - "port-version": 3 + "port-version": 4 }, "pfultz2-linq": { "baseline": "2019-05-14", @@ -5266,7 +5382,7 @@ }, "physx": { "baseline": "4.1.2", - "port-version": 0 + "port-version": 1 }, "picojson": { "baseline": "1.3.0", @@ -5278,23 +5394,23 @@ }, "piex": { "baseline": "2019-07-11", - "port-version": 1 + "port-version": 2 }, "pistache": { "baseline": "2021-03-31", "port-version": 3 }, "pixel": { - "baseline": "0.3", - "port-version": 3 + "baseline": "2022-03-15", + "port-version": 0 }, "pixman": { "baseline": "0.40.0", - "port-version": 1 + "port-version": 2 }, "pkgconf": { "baseline": "1.8.0", - "port-version": 1 + "port-version": 2 }, "platform-folders": { "baseline": "4.1.0", @@ -5326,7 +5442,7 @@ }, "plibsys": { "baseline": "0.0.4", - "port-version": 5 + "port-version": 6 }, "plog": { "baseline": "1.1.5", @@ -5342,7 +5458,7 @@ }, "pmdk": { "baseline": "1.11.0", - "port-version": 0 + "port-version": 1 }, "pngpp": { "baseline": "0.2.10", @@ -5353,8 +5469,8 @@ "port-version": 3 }, "poco": { - "baseline": "1.11.0", - "port-version": 2 + "baseline": "1.11.1", + "port-version": 0 }, "podofo": { "baseline": "0.9.7", @@ -5373,8 +5489,8 @@ "port-version": 10 }, "polyhook2": { - "baseline": "2021-05-09", - "port-version": 1 + "baseline": "2022-03-01", + "port-version": 0 }, "polymorphic-value": { "baseline": "1.3.0", @@ -5385,12 +5501,12 @@ "port-version": 4 }, "poppler": { - "baseline": "20.12.1", - "port-version": 6 + "baseline": "22.3.0", + "port-version": 1 }, "popsift": { "baseline": "0.9", - "port-version": 2 + "port-version": 3 }, "portable-snippets": { "baseline": "2019-09-20", @@ -5398,15 +5514,15 @@ }, "portaudio": { "baseline": "19.7", - "port-version": 2 + "port-version": 3 }, "portmidi": { "baseline": "2.0.2", - "port-version": 0 + "port-version": 1 }, "portsmf": { "baseline": "0.238", - "port-version": 0 + "port-version": 1 }, "ppconsul": { "baseline": "0.5", @@ -5426,15 +5542,15 @@ }, "presentmon": { "baseline": "1.7.0", - "port-version": 0 + "port-version": 1 }, "proj": { - "baseline": "0", - "port-version": 1 + "baseline": "9.0.0", + "port-version": 0 }, "proj4": { - "baseline": "8.2.1", - "port-version": 0 + "baseline": "8.9.9", + "port-version": 1 }, "prometheus-cpp": { "baseline": "1.0.0", @@ -5445,7 +5561,7 @@ "port-version": 0 }, "protobuf": { - "baseline": "3.18.0", + "baseline": "3.19.4", "port-version": 0 }, "protobuf-c": { @@ -5458,11 +5574,11 @@ }, "protozero": { "baseline": "1.7.0", - "port-version": 0 + "port-version": 1 }, "proxygen": { - "baseline": "2021.06.14.00", - "port-version": 0 + "baseline": "2022.03.21.00", + "port-version": 1 }, "psimd": { "baseline": "2021-02-21", @@ -5470,7 +5586,7 @@ }, "ptex": { "baseline": "2.3.2", - "port-version": 3 + "port-version": 4 }, "pthread": { "baseline": "3.0.0", @@ -5493,8 +5609,8 @@ "port-version": 1 }, "pybind11": { - "baseline": "2.8.1", - "port-version": 1 + "baseline": "2.9.2", + "port-version": 0 }, "pystring": { "baseline": "1.1.3", @@ -5502,11 +5618,11 @@ }, "python2": { "baseline": "2.7.18", - "port-version": 1 + "port-version": 4 }, "python3": { - "baseline": "3.10.1", - "port-version": 4 + "baseline": "3.10.2", + "port-version": 1 }, "qca": { "baseline": "2.3.4", @@ -5518,26 +5634,26 @@ }, "qhttpengine": { "baseline": "1.0.2", - "port-version": 0 + "port-version": 1 }, "qhull": { "baseline": "8.0.2", - "port-version": 2 + "port-version": 3 }, "qnnpack": { "baseline": "2021-02-26", - "port-version": 0 + "port-version": 2 }, "qpid-proton": { "baseline": "0.32.0", - "port-version": 2 + "port-version": 4 }, "qscintilla": { "baseline": "2.12.0", "port-version": 1 }, "qt": { - "baseline": "6.2.2", + "baseline": "6.2.4", "port-version": 0 }, "qt-advanced-docking-system": { @@ -5545,179 +5661,179 @@ "port-version": 0 }, "qt5": { - "baseline": "5.15.2", + "baseline": "5.15.3", "port-version": 1 }, "qt5-3d": { - "baseline": "5.15.2", - "port-version": 2 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-activeqt": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-androidextras": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-base": { - "baseline": "5.15.2", - "port-version": 19 + "baseline": "5.15.3", + "port-version": 2 }, "qt5-canvas3d": { "baseline": "0", "port-version": 1 }, "qt5-charts": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-connectivity": { - "baseline": "5.15.2", - "port-version": 2 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-datavis3d": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-declarative": { - "baseline": "5.15.2", - "port-version": 3 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-doc": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-gamepad": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-graphicaleffects": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-imageformats": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-location": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-macextras": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-modularscripts": { "baseline": "deprecated", "port-version": 1 }, "qt5-mqtt": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-multimedia": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-networkauth": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-purchasing": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-quickcontrols": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-quickcontrols2": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-remoteobjects": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-script": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-scxml": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-sensors": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-serialbus": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-serialport": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-speech": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-svg": { - "baseline": "5.15.2", - "port-version": 2 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-tools": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-translations": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-virtualkeyboard": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-wayland": { - "baseline": "5.15.2", - "port-version": 2 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-webchannel": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-webengine": { - "baseline": "5.15.2", - "port-version": 3 + "baseline": "5.15.3", + "port-version": 1 }, "qt5-webglplugin": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-websockets": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-webview": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-winextras": { - "baseline": "5.15.2", + "baseline": "5.15.3", "port-version": 1 }, "qt5-x11extras": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5-xmlpatterns": { - "baseline": "5.15.2", - "port-version": 1 + "baseline": "5.15.3", + "port-version": 0 }, "qt5compat": { - "baseline": "6.2.2", + "baseline": "6.2.4", "port-version": 0 }, "qt6betablock": { @@ -5725,51 +5841,51 @@ "port-version": 0 }, "qtactiveqt": { - "baseline": "6.2.2", + "baseline": "6.2.4", "port-version": 0 }, "qtapplicationmanager": { - "baseline": "6.2.2", - "port-version": 1 + "baseline": "6.2.4", + "port-version": 0 }, "qtbase": { - "baseline": "6.2.2", - "port-version": 2 + "baseline": "6.2.4", + "port-version": 0 }, "qtcharts": { - "baseline": "6.2.2", + "baseline": "6.2.4", "port-version": 0 }, "qtcoap": { - "baseline": "6.2.2", + "baseline": "6.2.4", "port-version": 0 }, "qtconnectivity": { - "baseline": "6.2.2", + "baseline": "6.2.4", "port-version": 0 }, "qtdatavis3d": { - "baseline": "6.2.2", + "baseline": "6.2.4", "port-version": 0 }, "qtdeclarative": { - "baseline": "6.2.2", - "port-version": 1 + "baseline": "6.2.4", + "port-version": 0 }, "qtdeviceutilities": { - "baseline": "6.2.2", + "baseline": "6.2.4", "port-version": 0 }, "qtdoc": { - "baseline": "6.2.2", + "baseline": "6.2.4", "port-version": 0 }, "qtimageformats": { - "baseline": "6.2.2", + "baseline": "6.2.4", "port-version": 0 }, "qtinterfaceframework": { - "baseline": "6.2.2", + "baseline": "6.2.4", "port-version": 0 }, "qtkeychain": { @@ -5781,35 +5897,35 @@ "port-version": 0 }, "qtlocation": { - "baseline": "6.2.2", + "baseline": "6.2.4", "port-version": 0 }, "qtlottie": { - "baseline": "6.2.2", + "baseline": "6.2.4", "port-version": 0 }, "qtmqtt": { - "baseline": "6.2.2", + "baseline": "6.2.4", "port-version": 0 }, "qtmultimedia": { - "baseline": "6.2.2", + "baseline": "6.2.4", "port-version": 0 }, "qtnetworkauth": { - "baseline": "6.2.2", + "baseline": "6.2.4", "port-version": 0 }, "qtopcua": { - "baseline": "6.2.2", + "baseline": "6.2.4", "port-version": 0 }, "qtpositioning": { - "baseline": "6.2.2", + "baseline": "6.2.4", "port-version": 0 }, "qtquick3d": { - "baseline": "6.2.2", + "baseline": "6.2.4", "port-version": 0 }, "qtquickcontrols2": { @@ -5817,67 +5933,67 @@ "port-version": 0 }, "qtquicktimeline": { - "baseline": "6.2.2", + "baseline": "6.2.4", "port-version": 0 }, "qtremoteobjects": { - "baseline": "6.2.2", + "baseline": "6.2.4", "port-version": 0 }, "qtscxml": { - "baseline": "6.2.2", + "baseline": "6.2.4", "port-version": 0 }, "qtsensors": { - "baseline": "6.2.2", + "baseline": "6.2.4", "port-version": 0 }, "qtserialbus": { - "baseline": "6.2.2", + "baseline": "6.2.4", "port-version": 0 }, "qtserialport": { - "baseline": "6.2.2", + "baseline": "6.2.4", "port-version": 0 }, "qtshadertools": { - "baseline": "6.2.2", + "baseline": "6.2.4", "port-version": 0 }, "qtsvg": { - "baseline": "6.2.2", + "baseline": "6.2.4", "port-version": 0 }, "qttools": { - "baseline": "6.2.2", + "baseline": "6.2.4", "port-version": 0 }, "qttranslations": { - "baseline": "6.2.2", + "baseline": "6.2.4", "port-version": 0 }, "qtvirtualkeyboard": { - "baseline": "6.2.2", + "baseline": "6.2.4", "port-version": 0 }, "qtwayland": { - "baseline": "6.2.2", + "baseline": "6.2.4", "port-version": 0 }, "qtwebchannel": { - "baseline": "6.2.2", + "baseline": "6.2.4", "port-version": 0 }, "qtwebengine": { - "baseline": "6.2.2", + "baseline": "6.2.4", "port-version": 0 }, "qtwebsockets": { - "baseline": "6.2.2", + "baseline": "6.2.4", "port-version": 0 }, "qtwebview": { - "baseline": "6.2.2", + "baseline": "6.2.4", "port-version": 0 }, "quadtree": { @@ -5885,7 +6001,7 @@ "port-version": 1 }, "quantlib": { - "baseline": "1.24", + "baseline": "1.25", "port-version": 0 }, "quaternions": { @@ -5902,11 +6018,11 @@ }, "quickfix": { "baseline": "1.15.1", - "port-version": 5 + "port-version": 7 }, "quill": { "baseline": "1.6.3", - "port-version": 3 + "port-version": 4 }, "quirc": { "baseline": "1.1", @@ -5918,7 +6034,7 @@ }, "qwtw": { "baseline": "3.1.0", - "port-version": 1 + "port-version": 2 }, "rabit": { "baseline": "0.1", @@ -5928,6 +6044,10 @@ "baseline": "6.10", "port-version": 4 }, + "randomstr": { + "baseline": "2022-02-03", + "port-version": 0 + }, "rang": { "baseline": "3.2", "port-version": 0 @@ -5966,7 +6086,7 @@ }, "raylib": { "baseline": "4.0.0", - "port-version": 0 + "port-version": 3 }, "rbdl": { "baseline": "2.6.0", @@ -5994,27 +6114,27 @@ }, "readline-unix": { "baseline": "8.1", - "port-version": 0 + "port-version": 1 }, "readline-win32": { "baseline": "5.0", - "port-version": 3 + "port-version": 4 }, "readosm": { "baseline": "1.1.0a", "port-version": 2 }, "realsense2": { - "baseline": "2.49.0", - "port-version": 3 + "baseline": "2.50.0", + "port-version": 1 }, "recast": { "baseline": "1.5.1", "port-version": 4 }, "redis-plus-plus": { - "baseline": "1.3.1", - "port-version": 1 + "baseline": "1.3.2", + "port-version": 0 }, "refl-cpp": { "baseline": "0.12.2", @@ -6024,13 +6144,17 @@ "baseline": "2019-04-14", "port-version": 1 }, + "rendergraph": { + "baseline": "1.0.0", + "port-version": 0 + }, "replxx": { "baseline": "0.0.4", - "port-version": 0 + "port-version": 1 }, "reproc": { "baseline": "14.2.4", - "port-version": 0 + "port-version": 1 }, "rest-rpc": { "baseline": "0.07", @@ -6045,8 +6169,8 @@ "port-version": 1 }, "restclient-cpp": { - "baseline": "0.5.2", - "port-version": 1 + "baseline": "2022-02-09", + "port-version": 0 }, "restinio": { "baseline": "0.6.14", @@ -6058,7 +6182,11 @@ }, "rhash": { "baseline": "1.4.0", - "port-version": 1 + "port-version": 2 + }, + "rhasheq": { + "baseline": "0.0.1", + "port-version": 0 }, "riffcpp": { "baseline": "2.2.4", @@ -6077,7 +6205,7 @@ "port-version": 3 }, "robin-hood-hashing": { - "baseline": "3.11.4", + "baseline": "3.11.5", "port-version": 0 }, "robin-map": { @@ -6096,33 +6224,29 @@ "baseline": "1.1.4", "port-version": 1 }, - "rs-core-lib": { - "baseline": "2020-09-14", - "port-version": 1 - }, "rsasynccpp": { "baseline": "0.0.7", - "port-version": 0 + "port-version": 1 }, "rsm-binary-io": { "baseline": "2.0.4", - "port-version": 0 + "port-version": 1 }, "rsm-bsa": { - "baseline": "4.0.0", + "baseline": "4.0.3", "port-version": 0 }, "rsm-mmio": { "baseline": "1.1.0", - "port-version": 1 + "port-version": 2 }, "rsocket": { "baseline": "2021.08.30.00", - "port-version": 0 + "port-version": 1 }, "rtabmap": { "baseline": "0.20.13", - "port-version": 1 + "port-version": 3 }, "rtaudio": { "baseline": "2021-11-16", @@ -6130,11 +6254,11 @@ }, "rtlsdr": { "baseline": "2020-04-16", - "port-version": 2 + "port-version": 3 }, "rtmidi": { "baseline": "4.0.0", - "port-version": 3 + "port-version": 4 }, "rttr": { "baseline": "0.9.6", @@ -6150,7 +6274,7 @@ }, "rxspencer": { "baseline": "3.9.0", - "port-version": 0 + "port-version": 1 }, "ryml": { "baseline": "2021-07-24", @@ -6158,14 +6282,14 @@ }, "ryu": { "baseline": "2.0", - "port-version": 5 + "port-version": 6 }, "s2geometry": { "baseline": "0.9.0", - "port-version": 0 + "port-version": 1 }, "s2n": { - "baseline": "1.3.0", + "baseline": "1.3.5", "port-version": 0 }, "safeint": { @@ -6173,8 +6297,8 @@ "port-version": 0 }, "sail": { - "baseline": "0.9.0-pre19", - "port-version": 1 + "baseline": "0.9.0-pre21", + "port-version": 0 }, "sais": { "baseline": "2.4.1", @@ -6190,27 +6314,27 @@ }, "sbp": { "baseline": "3.4.10", - "port-version": 0 + "port-version": 1 }, "scintilla": { "baseline": "4.4.6", - "port-version": 0 + "port-version": 1 }, "sciplot": { "baseline": "0.2.2", "port-version": 0 }, "sciter": { - "baseline": "deprecated", - "port-version": 0 + "baseline": "0", + "port-version": 1 }, "sciter-js": { - "baseline": "4.4.8.16", + "baseline": "4.4.8.31", "port-version": 0 }, "scnlib": { - "baseline": "0.4", - "port-version": 1 + "baseline": "1.0", + "port-version": 0 }, "scottt-debugbreak": { "baseline": "1.0", @@ -6218,31 +6342,31 @@ }, "scylla-wrapper": { "baseline": "2018-08-26-16e6f435", - "port-version": 1 + "port-version": 2 }, "sdformat10": { "baseline": "10.0.0", - "port-version": 1 + "port-version": 2 }, "sdformat6": { "baseline": "6.2.0", - "port-version": 4 + "port-version": 6 }, "sdformat9": { "baseline": "9.4.0", - "port-version": 3 + "port-version": 5 }, "sdl1": { "baseline": "1.2.15", - "port-version": 14 + "port-version": 15 }, "sdl1-net": { "baseline": "1.2.8", "port-version": 4 }, "sdl2": { - "baseline": "2.0.16", - "port-version": 3 + "baseline": "2.0.20", + "port-version": 1 }, "sdl2-gfx": { "baseline": "1.0.4", @@ -6250,7 +6374,7 @@ }, "sdl2-image": { "baseline": "2.0.5", - "port-version": 3 + "port-version": 4 }, "sdl2-mixer": { "baseline": "2.0.4", @@ -6270,7 +6394,7 @@ }, "seal": { "baseline": "3.7.2", - "port-version": 0 + "port-version": 2 }, "secp256k1": { "baseline": "2017-19-10", @@ -6282,10 +6406,10 @@ }, "sentencepiece": { "baseline": "0.1.96", - "port-version": 0 + "port-version": 1 }, "sentry-native": { - "baseline": "0.4.13", + "baseline": "0.4.15", "port-version": 0 }, "septag-sx": { @@ -6300,6 +6424,10 @@ "baseline": "0.30.4", "port-version": 0 }, + "serdepp": { + "baseline": "0.1.4", + "port-version": 0 + }, "sf2cute": { "baseline": "0.2.0", "port-version": 2 @@ -6310,7 +6438,7 @@ }, "sfml": { "baseline": "2.5.1", - "port-version": 10 + "port-version": 12 }, "sfsexp": { "baseline": "1.3.1", @@ -6318,19 +6446,19 @@ }, "shaderc": { "baseline": "2021.1", - "port-version": 1 + "port-version": 2 }, "shaderwriter": { - "baseline": "1.1.0", + "baseline": "2.2.0", "port-version": 0 }, "shapelib": { "baseline": "1.5.0", - "port-version": 2 + "port-version": 3 }, "shiva": { "baseline": "1.0", - "port-version": 4 + "port-version": 5 }, "shiva-sfml": { "baseline": "1.0", @@ -6338,7 +6466,7 @@ }, "shogun": { "baseline": "6.1.4", - "port-version": 6 + "port-version": 7 }, "signalrclient": { "baseline": "1.0.0-beta1-9", @@ -6350,11 +6478,11 @@ }, "simage": { "baseline": "1.8.1", - "port-version": 3 + "port-version": 4 }, "simbody": { "baseline": "2022-01-04", - "port-version": 0 + "port-version": 1 }, "simde": { "baseline": "0.7.2", @@ -6373,8 +6501,8 @@ "port-version": 1 }, "simpleini": { - "baseline": "2018-08-31", - "port-version": 5 + "baseline": "4.19", + "port-version": 0 }, "sjpeg": { "baseline": "2021-10-31", @@ -6386,23 +6514,23 @@ }, "skia": { "baseline": "2020-05-18", - "port-version": 6 + "port-version": 8 }, "skyr-url": { "baseline": "1.13.0", - "port-version": 1 + "port-version": 2 }, "sleef": { "baseline": "3.5.1", - "port-version": 0 + "port-version": 2 }, "sleepy-discord": { - "baseline": "2021-07-07", - "port-version": 1 + "baseline": "2022-02-05", + "port-version": 0 }, "slikenet": { "baseline": "2021-06-07", - "port-version": 0 + "port-version": 1 }, "sltbench": { "baseline": "2.4.0", @@ -6441,20 +6569,20 @@ "port-version": 0 }, "sockpp": { - "baseline": "0.7", - "port-version": 1 + "baseline": "0.7.1", + "port-version": 0 }, "soem": { "baseline": "1.4.0", - "port-version": 2 + "port-version": 3 }, "soil": { "baseline": "2021-04-22", - "port-version": 0 + "port-version": 1 }, "soil2": { "baseline": "2021-05-01", - "port-version": 0 + "port-version": 1 }, "sokol": { "baseline": "2019-09-09", @@ -6469,8 +6597,8 @@ "port-version": 1 }, "sophus": { - "baseline": "1.0.0", - "port-version": 7 + "baseline": "2021-09-14", + "port-version": 0 }, "soqt": { "baseline": "1.6.0", @@ -6482,7 +6610,7 @@ }, "soundtouch": { "baseline": "2.3.1", - "port-version": 1 + "port-version": 2 }, "soxr": { "baseline": "0.1.3", @@ -6522,10 +6650,10 @@ }, "spdk-isal": { "baseline": "20181006", - "port-version": 1 + "port-version": 2 }, "spdlog": { - "baseline": "1.9.2", + "baseline": "1.10.0", "port-version": 0 }, "spectra": { @@ -6534,11 +6662,11 @@ }, "speex": { "baseline": "1.2.0", - "port-version": 9 + "port-version": 11 }, "speexdsp": { "baseline": "1.2.0", - "port-version": 6 + "port-version": 7 }, "spirit-po": { "baseline": "1.1.2", @@ -6549,11 +6677,15 @@ "port-version": 2 }, "spirv-headers": { - "baseline": "2021-03-25", + "baseline": "1.3.204.1", + "port-version": 0 + }, + "spirv-reflect": { + "baseline": "1.3.204.1", "port-version": 0 }, "spirv-tools": { - "baseline": "2021.1", + "baseline": "2022.1", "port-version": 0 }, "spix": { @@ -6569,7 +6701,7 @@ "port-version": 1 }, "sqlcipher": { - "baseline": "4.5.0", + "baseline": "4.5.1", "port-version": 0 }, "sqlite-modern-cpp": { @@ -6581,7 +6713,7 @@ "port-version": 0 }, "sqlite3": { - "baseline": "3.37.0", + "baseline": "3.37.2", "port-version": 1 }, "sqlitecpp": { @@ -6617,8 +6749,8 @@ "port-version": 0 }, "starlink-ast": { - "baseline": "9.2.5", - "port-version": 0 + "baseline": "9.2.7", + "port-version": 1 }, "status-code": { "baseline": "1.0.0-20211208", @@ -6674,7 +6806,7 @@ }, "superlu": { "baseline": "2020-01-07", - "port-version": 4 + "port-version": 5 }, "symengine": { "baseline": "0.7.0", @@ -6698,7 +6830,7 @@ }, "taglib": { "baseline": "1.12.0", - "port-version": 1 + "port-version": 2 }, "taocpp-json": { "baseline": "2020-09-14", @@ -6709,12 +6841,16 @@ "port-version": 1 }, "taskflow": { - "baseline": "3.2.0", + "baseline": "3.3.0", "port-version": 0 }, "tbb": { "baseline": "2020_U3", - "port-version": 6 + "port-version": 8 + }, + "tcb-span": { + "baseline": "2021-12-15", + "port-version": 0 }, "tcl": { "baseline": "core-9-0-a1", @@ -6726,7 +6862,7 @@ }, "teemo": { "baseline": "2.6", - "port-version": 0 + "port-version": 1 }, "telnetpp": { "baseline": "2.1.2", @@ -6734,11 +6870,11 @@ }, "tensorflow": { "baseline": "2.7.0", - "port-version": 1 + "port-version": 2 }, "tensorflow-cc": { "baseline": "2.7.0", - "port-version": 1 + "port-version": 2 }, "tensorflow-common": { "baseline": "2.7.0", @@ -6746,7 +6882,7 @@ }, "tensorpipe": { "baseline": "2021-04-26", - "port-version": 0 + "port-version": 1 }, "termcolor": { "baseline": "2.0.0", @@ -6754,15 +6890,15 @@ }, "tesseract": { "baseline": "4.1.1", - "port-version": 9 + "port-version": 10 }, "tfhe": { "baseline": "1.0.1", - "port-version": 2 + "port-version": 3 }, "tgbot-cpp": { - "baseline": "1.2.1", - "port-version": 1 + "baseline": "1.3", + "port-version": 0 }, "tgc": { "baseline": "2019-08-11", @@ -6770,11 +6906,11 @@ }, "tgui": { "baseline": "2021-04-19", - "port-version": 2 + "port-version": 3 }, "theia": { "baseline": "0.8", - "port-version": 5 + "port-version": 6 }, "think-cell-range": { "baseline": "498839d", @@ -6794,15 +6930,15 @@ }, "tidy-html5": { "baseline": "5.7.28", - "port-version": 4 + "port-version": 5 }, "tiff": { "baseline": "4.3.0", - "port-version": 3 + "port-version": 6 }, "tinkerforge": { "baseline": "2.1.25", - "port-version": 1 + "port-version": 2 }, "tiny-aes-c": { "baseline": "2019-07-31", @@ -6824,6 +6960,10 @@ "baseline": "2019-07-31", "port-version": 1 }, + "tinycbor": { + "baseline": "0.6.0", + "port-version": 1 + }, "tinycthread": { "baseline": "2019-08-06", "port-version": 1 @@ -6833,8 +6973,8 @@ "port-version": 1 }, "tinyexif": { - "baseline": "1.0.2", - "port-version": 7 + "baseline": "2022-02-15", + "port-version": 0 }, "tinyexpr": { "baseline": "2020-09-25", @@ -6846,7 +6986,7 @@ }, "tinyfiledialogs": { "baseline": "3.8.8", - "port-version": 3 + "port-version": 4 }, "tinygltf": { "baseline": "2.5.0", @@ -6914,7 +7054,7 @@ }, "tmx": { "baseline": "1.2.0", - "port-version": 0 + "port-version": 1 }, "tmxlite": { "baseline": "1.3.0", @@ -6929,11 +7069,11 @@ "port-version": 0 }, "tomlplusplus": { - "baseline": "2.5.0", - "port-version": 3 + "baseline": "3.0.1", + "port-version": 0 }, "tool-meson": { - "baseline": "2021-11-19", + "baseline": "2022-01-21", "port-version": 0 }, "torch-th": { @@ -6941,7 +7081,7 @@ "port-version": 3 }, "tracy": { - "baseline": "0.7.8", + "baseline": "0.8.0", "port-version": 0 }, "transwarp": { @@ -6949,7 +7089,7 @@ "port-version": 0 }, "trantor": { - "baseline": "1.5.4", + "baseline": "1.5.5", "port-version": 0 }, "tre": { @@ -6966,7 +7106,11 @@ }, "triangle": { "baseline": "1.6", - "port-version": 1 + "port-version": 2 + }, + "triton": { + "baseline": "0.9", + "port-version": 2 }, "trompeloeil": { "baseline": "41", @@ -6986,15 +7130,15 @@ }, "ttauri": { "baseline": "0.5.0", - "port-version": 0 + "port-version": 1 }, "turbobase64": { "baseline": "2020-01-12", - "port-version": 1 + "port-version": 2 }, "tvision": { "baseline": "2021-08-10", - "port-version": 0 + "port-version": 1 }, "tweeny": { "baseline": "3.2.0", @@ -7013,16 +7157,16 @@ "port-version": 2 }, "umock-c": { - "baseline": "2020-06-17", - "port-version": 2 + "baseline": "2022-01-21", + "port-version": 0 }, "unicorn": { - "baseline": "2020-09-14", - "port-version": 1 + "baseline": "1.0.3", + "port-version": 0 }, "unicorn-lib": { - "baseline": "2020-03-02", - "port-version": 2 + "baseline": "2022-01-24", + "port-version": 0 }, "units": { "baseline": "2.3.1", @@ -7042,7 +7186,7 @@ }, "unrar": { "baseline": "5.8.1", - "port-version": 1 + "port-version": 3 }, "upb": { "baseline": "2021-10-19", @@ -7070,7 +7214,7 @@ }, "usd": { "baseline": "20.08", - "port-version": 1 + "port-version": 2 }, "usockets": { "baseline": "0.8.1", @@ -7081,7 +7225,7 @@ "port-version": 1 }, "utf8h": { - "baseline": "2021-10-21", + "baseline": "2021-11-18", "port-version": 0 }, "utf8proc": { @@ -7102,10 +7246,10 @@ }, "uthenticode": { "baseline": "1.0.6", - "port-version": 0 + "port-version": 2 }, "uvatlas": { - "baseline": "2021-11-08", + "baseline": "2022-03-24", "port-version": 0 }, "uvw": { @@ -7113,16 +7257,16 @@ "port-version": 1 }, "uwebsockets": { - "baseline": "20.8.0", + "baseline": "20.11.0", "port-version": 0 }, "v-hacd": { "baseline": "3.2.0", - "port-version": 2 + "port-version": 3 }, "v8": { "baseline": "9.1.269.39", - "port-version": 2 + "port-version": 3 }, "valijson": { "baseline": "0.6", @@ -7134,7 +7278,7 @@ }, "vamp-sdk": { "baseline": "2.10", - "port-version": 1 + "port-version": 2 }, "variant-lite": { "baseline": "2.0.0", @@ -7142,47 +7286,67 @@ }, "vc": { "baseline": "1.4.2", - "port-version": 1 + "port-version": 2 }, "vcglib": { "baseline": "1.0.1", "port-version": 1 }, "vcpkg-cmake": { - "baseline": "2021-12-20", + "baseline": "2022-04-07", "port-version": 0 }, "vcpkg-cmake-config": { - "baseline": "2021-12-28", + "baseline": "2022-02-06", + "port-version": 0 + }, + "vcpkg-get-python-packages": { + "baseline": "2022-02-12", "port-version": 0 }, "vcpkg-gfortran": { "baseline": "3", - "port-version": 1 + "port-version": 2 }, "vcpkg-gn": { "baseline": "2021-11-16", - "port-version": 0 + "port-version": 1 }, "vcpkg-pkgconfig-get-modules": { - "baseline": "2021-04-02", - "port-version": 1 + "baseline": "2022-02-10", + "port-version": 0 }, "vcpkg-qmake": { - "baseline": "2021-10-23", + "baseline": "2022-02-14", + "port-version": 0 + }, + "vcpkg-tool-gyp-nss": { + "baseline": "2022-03-04", + "port-version": 0 + }, + "vcpkg-tool-lessmsi": { + "baseline": "1.10.0", "port-version": 0 }, "vcpkg-tool-meson": { "baseline": "0.60.2", - "port-version": 1 + "port-version": 2 + }, + "vcpkg-tool-mozbuild": { + "baseline": "3.3", + "port-version": 0 }, "vcpkg-tool-nodejs": { "baseline": "14.17.4", "port-version": 0 }, + "vcpkg-tool-python2": { + "baseline": "2.7.18", + "port-version": 0 + }, "vectorclass": { "baseline": "2.00.01", - "port-version": 1 + "port-version": 2 }, "visit-struct": { "baseline": "1.0", @@ -7198,11 +7362,11 @@ }, "vlpp": { "baseline": "0.11.0.0", - "port-version": 1 + "port-version": 2 }, "volk": { - "baseline": "2019-09-26", - "port-version": 1 + "baseline": "1.3.204", + "port-version": 0 }, "vs-yasm": { "baseline": "0.5.0", @@ -7210,7 +7374,7 @@ }, "vtk": { "baseline": "9.0.3-pv5.9.1", - "port-version": 5 + "port-version": 10 }, "vtk-dicom": { "baseline": "0.8.12", @@ -7233,8 +7397,8 @@ "port-version": 0 }, "vulkan-memory-allocator": { - "baseline": "2021-07-07", - "port-version": 1 + "baseline": "3.0.0", + "port-version": 0 }, "vxl": { "baseline": "2.0.2", @@ -7242,10 +7406,10 @@ }, "wampcc": { "baseline": "2019-09-04", - "port-version": 2 + "port-version": 3 }, "wangle": { - "baseline": "2021.06.14.00", + "baseline": "2022.03.21.00", "port-version": 0 }, "wavelib": { @@ -7254,11 +7418,11 @@ }, "wavpack": { "baseline": "5.4.0", - "port-version": 0 + "port-version": 1 }, "websocketpp": { "baseline": "0.8.2", - "port-version": 1 + "port-version": 2 }, "wepoll": { "baseline": "1.5.8", @@ -7278,7 +7442,7 @@ }, "wincrypt": { "baseline": "0.0", - "port-version": 3 + "port-version": 4 }, "winlamb": { "baseline": "2020-10-15", @@ -7286,23 +7450,27 @@ }, "winpcap": { "baseline": "4.1.3", - "port-version": 6 + "port-version": 8 }, "winpty": { "baseline": "0.4.3", "port-version": 0 }, "winreg": { - "baseline": "4.1.2", + "baseline": "5.1.0", "port-version": 0 }, "winsock2": { "baseline": "0.0", - "port-version": 3 + "port-version": 4 + }, + "winsparkle": { + "baseline": "0.7.0", + "port-version": 1 }, "wintoast": { "baseline": "1.2.0", - "port-version": 1 + "port-version": 2 }, "woff2": { "baseline": "1.0.2", @@ -7318,15 +7486,15 @@ }, "wpilib": { "baseline": "2020.3.2", - "port-version": 1 + "port-version": 2 }, "wren": { "baseline": "2019-07-01", "port-version": 1 }, "wt": { - "baseline": "4.5.0", - "port-version": 2 + "baseline": "4.6.1", + "port-version": 0 }, "wtl": { "baseline": "10.0.10320", @@ -7338,15 +7506,15 @@ }, "wxwidgets": { "baseline": "3.1.5", - "port-version": 5 + "port-version": 8 }, "x-plane": { "baseline": "3.0.3", - "port-version": 0 + "port-version": 1 }, "x264": { "baseline": "164-5db6aa6cab1b146", - "port-version": 3 + "port-version": 4 }, "x265": { "baseline": "3.4", @@ -7358,15 +7526,15 @@ }, "xaudio2redist": { "baseline": "1.2.8", - "port-version": 0 + "port-version": 2 }, "xbyak": { "baseline": "6.00", - "port-version": 0 + "port-version": 1 }, "xerces-c": { "baseline": "3.2.3", - "port-version": 3 + "port-version": 4 }, "xeus": { "baseline": "0.24.3", @@ -7385,16 +7553,12 @@ "port-version": 0 }, "xmlsec": { - "baseline": "1.2.32", + "baseline": "1.2.33", "port-version": 0 }, - "xmsh": { - "baseline": "0.5.2", - "port-version": 2 - }, "xnnpack": { "baseline": "2021-05-17", - "port-version": 1 + "port-version": 2 }, "xorstr": { "baseline": "2021-10-23", @@ -7404,12 +7568,16 @@ "baseline": "0.8.1", "port-version": 1 }, + "xqilla": { + "baseline": "2.3.4", + "port-version": 1 + }, "xsimd": { "baseline": "8.0.3", "port-version": 0 }, "xtensor": { - "baseline": "0.23.10", + "baseline": "0.24.0", "port-version": 0 }, "xtensor-blas": { @@ -7434,14 +7602,14 @@ }, "yajl": { "baseline": "2.1.0", - "port-version": 2 + "port-version": 3 }, "yaml-cpp": { "baseline": "0.7.0", "port-version": 1 }, "yara": { - "baseline": "4.1.1", + "baseline": "4.2.0", "port-version": 0 }, "yas": { @@ -7450,19 +7618,19 @@ }, "yasm": { "baseline": "1.3.0", - "port-version": 2 + "port-version": 3 }, "yasm-tool": { - "baseline": "1.3.0", + "baseline": "2021-12-14", "port-version": 0 }, "yasm-tool-helper": { "baseline": "2020-03-11", - "port-version": 0 + "port-version": 1 }, "yato": { - "baseline": "1.0", - "port-version": 3 + "baseline": "2022-03-06", + "port-version": 0 }, "yoga": { "baseline": "1.19.0", @@ -7477,8 +7645,8 @@ "port-version": 0 }, "z3": { - "baseline": "4.8.12", - "port-version": 1 + "baseline": "4.8.14", + "port-version": 0 }, "z85": { "baseline": "1.0", @@ -7486,7 +7654,7 @@ }, "zeromq": { "baseline": "4.3.4", - "port-version": 2 + "port-version": 5 }, "zfp": { "baseline": "0.5.5", @@ -7494,11 +7662,11 @@ }, "zkpp": { "baseline": "0.2.3", - "port-version": 1 + "port-version": 2 }, "zlib": { - "baseline": "1.2.11", - "port-version": 13 + "baseline": "1.2.12", + "port-version": 0 }, "zlib-ng": { "baseline": "2.0.5", @@ -7512,26 +7680,30 @@ "baseline": "1.0.3", "port-version": 1 }, + "zpp-bits": { + "baseline": "4.3.3", + "port-version": 0 + }, "zserge-webview": { "baseline": "2019-04-27", "port-version": 3 }, "zstd": { - "baseline": "1.5.0", + "baseline": "1.5.2", "port-version": 1 }, "zstr": { "baseline": "1.0.4", "port-version": 2 }, + "ztd-text": { + "baseline": "2022-03-21", + "port-version": 0 + }, "zug": { "baseline": "2021-04-23", "port-version": 0 }, - "zxing-cpp": { - "baseline": "2020-12", - "port-version": 3 - }, "zydis": { "baseline": "3.2.1", "port-version": 0 @@ -7541,8 +7713,8 @@ "port-version": 3 }, "zziplib": { - "baseline": "0.13.71", - "port-version": 3 + "baseline": "0.13.72", + "port-version": 0 } } } diff --git a/external_imported/vcpkg/versions/c-/c-ares.json b/external_imported/vcpkg/versions/c-/c-ares.json index 59b8c1d2d..85b6c17c0 100644 --- a/external_imported/vcpkg/versions/c-/c-ares.json +++ b/external_imported/vcpkg/versions/c-/c-ares.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "60b32d4ff262f2603153b8496e39f7b0aba39f99", + "version-semver": "1.18.1", + "port-version": 0 + }, + { + "git-tree": "8c97dd38d470b96784d2aa4484d04afca77e2c60", + "version-semver": "1.17.2", + "port-version": 2 + }, { "git-tree": "d434c999ea00b87bfbee3d79ddc6fc1b6f12d7fe", "version-semver": "1.17.2", diff --git a/external_imported/vcpkg/versions/c-/c-dbg-macro.json b/external_imported/vcpkg/versions/c-/c-dbg-macro.json new file mode 100644 index 000000000..3bacd629b --- /dev/null +++ b/external_imported/vcpkg/versions/c-/c-dbg-macro.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c6819bcf6380a622775dfa3cebbcaf44ef745710", + "version-date": "2020-02-29", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/c-/c89stringutils.json b/external_imported/vcpkg/versions/c-/c89stringutils.json new file mode 100644 index 000000000..7d7aa3a41 --- /dev/null +++ b/external_imported/vcpkg/versions/c-/c89stringutils.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9c5dcb3c6cf4442e2fdcb4cdea39f512db0ead54", + "version": "0.0.1", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/c-/caffe2.json b/external_imported/vcpkg/versions/c-/caffe2.json index 53fb01084..67fc8fea4 100644 --- a/external_imported/vcpkg/versions/c-/caffe2.json +++ b/external_imported/vcpkg/versions/c-/caffe2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ca32eb4601a1c35daa69e526f0af30efeb599c8c", + "version": "0.8.1", + "port-version": 6 + }, { "git-tree": "e4ebcedb57e572959c4f8e30c2885cda2367e0a7", "version-string": "0.8.1", diff --git a/external_imported/vcpkg/versions/c-/cairo.json b/external_imported/vcpkg/versions/c-/cairo.json index 624283981..bedb50249 100644 --- a/external_imported/vcpkg/versions/c-/cairo.json +++ b/external_imported/vcpkg/versions/c-/cairo.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "f43fb974219928aea5f95efc7c61f27b49051a28", + "version": "1.17.6", + "port-version": 1 + }, + { + "git-tree": "9f67515a6cf8aaeb6c9dcd2263ce913bd596249d", + "version": "1.17.6", + "port-version": 0 + }, + { + "git-tree": "c024050e140b5174c6ef3094bad3cb2d6a710f82", + "version": "1.17.4", + "port-version": 4 + }, { "git-tree": "d8bed1ec84c641aad98858b6fb1151b09273227e", "version": "1.17.4", diff --git a/external_imported/vcpkg/versions/c-/cairomm.json b/external_imported/vcpkg/versions/c-/cairomm.json index 8b828b0c2..7bfd0bf73 100644 --- a/external_imported/vcpkg/versions/c-/cairomm.json +++ b/external_imported/vcpkg/versions/c-/cairomm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ae92557bdcf5f6dc8364cb179fd8fe57b0698ce", + "version": "1.16.1", + "port-version": 0 + }, { "git-tree": "6cf38af57700ebdb1933bd3e4f4c0580de8aaab9", "version": "1.16.0", diff --git a/external_imported/vcpkg/versions/c-/calceph.json b/external_imported/vcpkg/versions/c-/calceph.json index 94c64459b..8e60196c2 100644 --- a/external_imported/vcpkg/versions/c-/calceph.json +++ b/external_imported/vcpkg/versions/c-/calceph.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "98f9a949826498f0929b5745fff07fb9747b82fa", + "version": "3.5.1", + "port-version": 0 + }, + { + "git-tree": "f9919835108077ed1a077ef023b60903f52df42c", + "version": "3.5.0", + "port-version": 2 + }, { "git-tree": "48bd1ecc8648d44291fbaf0a11f5f12aa017c077", "version": "3.5.0", diff --git a/external_imported/vcpkg/versions/c-/camport3.json b/external_imported/vcpkg/versions/c-/camport3.json index 6de0f201f..3ad3ae220 100644 --- a/external_imported/vcpkg/versions/c-/camport3.json +++ b/external_imported/vcpkg/versions/c-/camport3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ed31882bd5119a95ef69ba8323e0f4575ee5dc6d", + "version-string": "1.5.3", + "port-version": 2 + }, { "git-tree": "da6cb57213a9c5e3e4877a1c2278524f6228a80b", "version-string": "1.5.3", diff --git a/external_imported/vcpkg/versions/c-/capnproto.json b/external_imported/vcpkg/versions/c-/capnproto.json index cf51d2af2..7916de0c0 100644 --- a/external_imported/vcpkg/versions/c-/capnproto.json +++ b/external_imported/vcpkg/versions/c-/capnproto.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "17b054432f141c746019130d2b689d4fd4919938", + "version": "0.9.1", + "port-version": 2 + }, { "git-tree": "129b6b745372d94f313df0989ad6a8980d7eaef7", "version": "0.9.1", diff --git a/external_imported/vcpkg/versions/c-/capstone.json b/external_imported/vcpkg/versions/c-/capstone.json index bcd224fa7..008cc376f 100644 --- a/external_imported/vcpkg/versions/c-/capstone.json +++ b/external_imported/vcpkg/versions/c-/capstone.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f7b26d8f672f30156cad79a647525b8dd8c9781b", + "version": "5.0.0-rc2", + "port-version": 0 + }, + { + "git-tree": "5250715402bf0c970792dafe6947aa810adde0f1", + "version": "4.0.2", + "port-version": 3 + }, { "git-tree": "465e527988f09c855e156cff45b7ee6dfbe1d303", "version": "4.0.2", diff --git a/external_imported/vcpkg/versions/c-/cargs.json b/external_imported/vcpkg/versions/c-/cargs.json new file mode 100644 index 000000000..b25f1fc0f --- /dev/null +++ b/external_imported/vcpkg/versions/c-/cargs.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "afa520193b882259b02bd2f8646982d340374d2d", + "version": "1.0.3", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/c-/catch2.json b/external_imported/vcpkg/versions/c-/catch2.json index d08a8d2f1..27944f37d 100644 --- a/external_imported/vcpkg/versions/c-/catch2.json +++ b/external_imported/vcpkg/versions/c-/catch2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c243585b5ba220e6aebcdb59dc59867afff7af6e", + "version-semver": "2.13.8", + "port-version": 1 + }, { "git-tree": "b58473cdc953ae1d09f30f0ba1e641c6cc34719f", "version-semver": "2.13.8", diff --git a/external_imported/vcpkg/versions/c-/cello.json b/external_imported/vcpkg/versions/c-/cello.json index 115105130..de140e58f 100644 --- a/external_imported/vcpkg/versions/c-/cello.json +++ b/external_imported/vcpkg/versions/c-/cello.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a281b67048d19f8136aaa8e0198b1db5dec5c4dd", + "version-date": "2019-07-23", + "port-version": 2 + }, { "git-tree": "45d476438561ae8c8e7a8eb7871faadb1379e874", "version-string": "2019-07-23", diff --git a/external_imported/vcpkg/versions/c-/cereal.json b/external_imported/vcpkg/versions/c-/cereal.json index e74d7fc26..46847d295 100644 --- a/external_imported/vcpkg/versions/c-/cereal.json +++ b/external_imported/vcpkg/versions/c-/cereal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e292069bec2c118568ea23a3db965037a9e38790", + "version": "1.3.1", + "port-version": 0 + }, { "git-tree": "7229804bbf716bbefe8052d650fc94687b6dae42", "version-string": "1.3.0", diff --git a/external_imported/vcpkg/versions/c-/ceres.json b/external_imported/vcpkg/versions/c-/ceres.json index b2284cd17..30107ef84 100644 --- a/external_imported/vcpkg/versions/c-/ceres.json +++ b/external_imported/vcpkg/versions/c-/ceres.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "af54888fc010404793ba51c862147575c09a988b", + "version-semver": "2.0.0", + "port-version": 6 + }, { "git-tree": "07f2aa6906e97637ae7a4ed6dcfce6867eb1a049", "version-semver": "2.0.0", diff --git a/external_imported/vcpkg/versions/c-/cfitsio.json b/external_imported/vcpkg/versions/c-/cfitsio.json index adf8116dd..42b71d6fa 100644 --- a/external_imported/vcpkg/versions/c-/cfitsio.json +++ b/external_imported/vcpkg/versions/c-/cfitsio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bc1418de4f14dd9c1a7e9c9ebc8d8015e1769935", + "version": "3.49", + "port-version": 2 + }, { "git-tree": "0ed894cb8efbfd277570991a78f29b70e4e931cd", "version": "3.49", diff --git a/external_imported/vcpkg/versions/c-/cgal.json b/external_imported/vcpkg/versions/c-/cgal.json index 0cbcb5ccd..13b6b7272 100644 --- a/external_imported/vcpkg/versions/c-/cgal.json +++ b/external_imported/vcpkg/versions/c-/cgal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0acdd574cd028b7ca4acd762f01938492c6d4719", + "version": "5.4", + "port-version": 0 + }, { "git-tree": "da69aec4c03275e85108ebc2dc2d512057d6ac32", "version": "5.3.1", diff --git a/external_imported/vcpkg/versions/c-/chakracore.json b/external_imported/vcpkg/versions/c-/chakracore.json index 66253a2e8..58aa5f895 100644 --- a/external_imported/vcpkg/versions/c-/chakracore.json +++ b/external_imported/vcpkg/versions/c-/chakracore.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "614248322cae7f18cd412cc90848a9f140ec9f60", + "version-date": "2021-04-22", + "port-version": 2 + }, + { + "git-tree": "8ce7ea484830cdf24c8af45ebad35ba10e76f61c", + "version-date": "2021-04-22", + "port-version": 1 + }, { "git-tree": "0aa775c085b114b0ec67ea23ee99ece252d9e498", "version-string": "2021-04-22", diff --git a/external_imported/vcpkg/versions/c-/charls.json b/external_imported/vcpkg/versions/c-/charls.json index e2f9510e0..c2785ce7a 100644 --- a/external_imported/vcpkg/versions/c-/charls.json +++ b/external_imported/vcpkg/versions/c-/charls.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb6273d01bce3793f42709b833ac47ff0afe71a6", + "version": "2.3.4", + "port-version": 0 + }, { "git-tree": "215d96df3e02eb0bfaae991586f4b64fd03c6cf2", "version-string": "2.2.0", diff --git a/external_imported/vcpkg/versions/c-/chartdir.json b/external_imported/vcpkg/versions/c-/chartdir.json index 13afedbde..e2b949dd9 100644 --- a/external_imported/vcpkg/versions/c-/chartdir.json +++ b/external_imported/vcpkg/versions/c-/chartdir.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "2b4bad1eb46439cbd63295d8120f03966c52d162", + "version": "7.0.0", + "port-version": 3 + }, + { + "git-tree": "fe0cf0c045f1092f18faa48f70b6b23d66e6298e", + "version": "7.0.0", + "port-version": 2 + }, { "git-tree": "fc56555cd56d261127f985f6208cb23258dcb262", "version": "7.0.0", diff --git a/external_imported/vcpkg/versions/c-/chromium-base.json b/external_imported/vcpkg/versions/c-/chromium-base.json index d109033d4..74ed18962 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": "36e6dbafdea0e90a8717907171efa375d2580d8b", + "version-string": "86.0.4199.1", + "port-version": 3 + }, { "git-tree": "e0ee4950d82a3613501a9647b688a451be6b187c", "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 8c5b7c8e3..d3c124855 100644 --- a/external_imported/vcpkg/versions/c-/civetweb.json +++ b/external_imported/vcpkg/versions/c-/civetweb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0e09fcaf964728e71394be1fc43d018fcde2e355", + "version": "1.15", + "port-version": 1 + }, { "git-tree": "536e2167b093981486715537c12a52d0696b3840", "version": "1.15", diff --git a/external_imported/vcpkg/versions/c-/clamav.json b/external_imported/vcpkg/versions/c-/clamav.json index 6038414f1..645312b20 100644 --- a/external_imported/vcpkg/versions/c-/clamav.json +++ b/external_imported/vcpkg/versions/c-/clamav.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "36dda0d43469bb23e4d56b170e40261b810509f1", + "version-semver": "0.103.0", + "port-version": 3 + }, { "git-tree": "5580f5bf0e6812edc0e114f55b3377117b5aa6ff", "version-semver": "0.103.0", diff --git a/external_imported/vcpkg/versions/c-/clapack.json b/external_imported/vcpkg/versions/c-/clapack.json index f0700bc5a..421ccf45a 100644 --- a/external_imported/vcpkg/versions/c-/clapack.json +++ b/external_imported/vcpkg/versions/c-/clapack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2fd47cedfcd13b7c3a339c7acf4b89c14caea8d5", + "version": "3.2.1", + "port-version": 20 + }, { "git-tree": "bedf61cf9cf765a2c823e1f2427a16af6d8a711e", "version-string": "3.2.1", diff --git a/external_imported/vcpkg/versions/c-/clblast.json b/external_imported/vcpkg/versions/c-/clblast.json index c73b72826..8ae9e3d63 100644 --- a/external_imported/vcpkg/versions/c-/clblast.json +++ b/external_imported/vcpkg/versions/c-/clblast.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f3fc8c351cba8b45e06d835b27101617a5ba74b0", + "version": "1.5.2", + "port-version": 2 + }, + { + "git-tree": "e85773ea54da7675b468d6fd479871899667aa3a", + "version": "1.5.2", + "port-version": 1 + }, { "git-tree": "1908d2071402d3175fd77f272005be69ff02abbf", "version": "1.5.2", diff --git a/external_imported/vcpkg/versions/c-/clockutils.json b/external_imported/vcpkg/versions/c-/clockutils.json index 0e658fecb..98504ce75 100644 --- a/external_imported/vcpkg/versions/c-/clockutils.json +++ b/external_imported/vcpkg/versions/c-/clockutils.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "08f337ddf39f1cda9dd6431374cdb0ee748745da", + "version": "1.1.1", + "port-version": 1 + }, { "git-tree": "1fb64c4ec3d5aced719df16f96e79be4bb64cee7", "version-string": "1.1.1-3651f232c27074c4ceead169e223edf5f00247c5", diff --git a/external_imported/vcpkg/versions/c-/clrng.json b/external_imported/vcpkg/versions/c-/clrng.json index ab1f2c788..8fc665536 100644 --- a/external_imported/vcpkg/versions/c-/clrng.json +++ b/external_imported/vcpkg/versions/c-/clrng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7cc0e3574395caa55371315638a94981a178f2bf", + "version-date": "2020-12-01", + "port-version": 3 + }, { "git-tree": "9e9072006facf085465f2bcc8291a3a90508c46a", "version-date": "2020-12-01", diff --git a/external_imported/vcpkg/versions/c-/cnats.json b/external_imported/vcpkg/versions/c-/cnats.json new file mode 100644 index 000000000..60faf07f0 --- /dev/null +++ b/external_imported/vcpkg/versions/c-/cnats.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ab962ebd7a13f87db7aea528cd4d5725b4fde292", + "version": "3.2.0", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/c-/co.json b/external_imported/vcpkg/versions/c-/co.json index dd7c8e5a0..f5291d2e2 100644 --- a/external_imported/vcpkg/versions/c-/co.json +++ b/external_imported/vcpkg/versions/c-/co.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "569af78fe06ff14cd71ec70f14915d06344ed62b", + "version-semver": "2.0.3", + "port-version": 1 + }, { "git-tree": "812bf72c24739504b6ddc3d3c4d941981ff3a032", "version-semver": "2.0.3", diff --git a/external_imported/vcpkg/versions/c-/cocoyaxi.json b/external_imported/vcpkg/versions/c-/cocoyaxi.json new file mode 100644 index 000000000..55eaafec0 --- /dev/null +++ b/external_imported/vcpkg/versions/c-/cocoyaxi.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "991d1f948e96ec46e60f5d6925a825d63599eb44", + "version-semver": "2.0.3", + "port-version": 2 + }, + { + "git-tree": "5d874995d9ab680be3c0bb8d18ceebfd9485f1bd", + "version-semver": "2.0.3", + "port-version": 1 + } + ] +} diff --git a/external_imported/vcpkg/versions/c-/coin.json b/external_imported/vcpkg/versions/c-/coin.json index 6a52852b5..006d2f924 100644 --- a/external_imported/vcpkg/versions/c-/coin.json +++ b/external_imported/vcpkg/versions/c-/coin.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e974f1b74758c3af03beefadef6f060437a2af69", + "version-string": "4.0.0", + "port-version": 5 + }, { "git-tree": "e5bf7296f7f3b3655c946280754bbbfbbbf9db2a", "version-string": "4.0.0", diff --git a/external_imported/vcpkg/versions/c-/colmap.json b/external_imported/vcpkg/versions/c-/colmap.json index 118e56326..3f00dddf1 100644 --- a/external_imported/vcpkg/versions/c-/colmap.json +++ b/external_imported/vcpkg/versions/c-/colmap.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "bf74fe8bdad103c3212e029ac7e736c759be2aa8", + "version-date": "2022-03-14", + "port-version": 0 + }, + { + "git-tree": "81329023ad5f9b2bd27554d2d8a97f8e63aef708", + "version-string": "3.7", + "port-version": 0 + }, { "git-tree": "7d3a2a8f71b464856f91f3b8b7e2362ec27d6487", "version-string": "3.6", diff --git a/external_imported/vcpkg/versions/c-/color-console.json b/external_imported/vcpkg/versions/c-/color-console.json new file mode 100644 index 000000000..7aab6764a --- /dev/null +++ b/external_imported/vcpkg/versions/c-/color-console.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "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.json b/external_imported/vcpkg/versions/c-/comms.json index 5a0c6228f..358460579 100644 --- a/external_imported/vcpkg/versions/c-/comms.json +++ b/external_imported/vcpkg/versions/c-/comms.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "377ae2ef208c319a5b1360f6dbce38ddae897466", + "version-semver": "3.4.0", + "port-version": 1 + }, { "git-tree": "05c5eff9612ccbb544cdcbc8f453e12394956ed8", "version-semver": "3.4.0", diff --git a/external_imported/vcpkg/versions/c-/commsdsl.json b/external_imported/vcpkg/versions/c-/commsdsl.json index 8096dfd07..44b2e2593 100644 --- a/external_imported/vcpkg/versions/c-/commsdsl.json +++ b/external_imported/vcpkg/versions/c-/commsdsl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6dc397dcd2267999f4c8d34fabd9a7e2dcf48ced", + "version-semver": "3.6.4", + "port-version": 1 + }, { "git-tree": "0e714012afcd0c56b2b55f6ab18b0092f6cd0066", "version-semver": "3.6.4", diff --git a/external_imported/vcpkg/versions/c-/concurrencpp.json b/external_imported/vcpkg/versions/c-/concurrencpp.json index 269d3c43f..9f314987f 100644 --- a/external_imported/vcpkg/versions/c-/concurrencpp.json +++ b/external_imported/vcpkg/versions/c-/concurrencpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "180b2c3ae47ddd4832fd3d6f8359728a6eda1094", + "version": "0.1.4", + "port-version": 0 + }, { "git-tree": "a6aa7450d44761622be41ef803ef3b92c6388f23", "version-string": "0.1.3", diff --git a/external_imported/vcpkg/versions/c-/coroutine.json b/external_imported/vcpkg/versions/c-/coroutine.json index 3bb9ab69b..9f4f3905a 100644 --- a/external_imported/vcpkg/versions/c-/coroutine.json +++ b/external_imported/vcpkg/versions/c-/coroutine.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c1ce0f42bbf3898d3421a3c7b6494f69853385f5", + "version": "1.5.0", + "port-version": 4 + }, + { + "git-tree": "d6cef429d17c011260cd718a2738ec7282098866", + "version": "1.5.0", + "port-version": 3 + }, { "git-tree": "14f8ad97489e980329f98d4c95146dafb32cedb9", "version-string": "1.5.0", diff --git a/external_imported/vcpkg/versions/c-/cpp-httplib.json b/external_imported/vcpkg/versions/c-/cpp-httplib.json index 230748b4a..3f00794b6 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": "55de9c78120ee08fc96d9a6badab8e1d137ab36a", + "version": "0.10.3", + "port-version": 0 + }, { "git-tree": "bfee573e08d3e240e345491ca8e9df1d4f86b05c", "version": "0.9.7", diff --git a/external_imported/vcpkg/versions/c-/cpp-ipc.json b/external_imported/vcpkg/versions/c-/cpp-ipc.json index 97dce1abe..edac286d3 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": "86a57c4fce501c6a9bcde5728ea6787b7425176a", + "version": "1.0.1", + "port-version": 1 + }, { "git-tree": "28482723c3bf4c785828c44d7df79bb901404afd", "version": "1.0.1", diff --git a/external_imported/vcpkg/versions/c-/cpp-netlib.json b/external_imported/vcpkg/versions/c-/cpp-netlib.json index 56e991266..448a85849 100644 --- a/external_imported/vcpkg/versions/c-/cpp-netlib.json +++ b/external_imported/vcpkg/versions/c-/cpp-netlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "49ff4ae830f2e1ae9141ea3155c6d962ca1c7946", + "version-string": "0.13.0", + "port-version": 6 + }, { "git-tree": "28abab182be22ac70207027a6a7e206416bd28b0", "version-string": "0.13.0", diff --git a/external_imported/vcpkg/versions/c-/cpp-redis.json b/external_imported/vcpkg/versions/c-/cpp-redis.json index 866315dc8..e280eaa7f 100644 --- a/external_imported/vcpkg/versions/c-/cpp-redis.json +++ b/external_imported/vcpkg/versions/c-/cpp-redis.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9714d8cf0b5557d4362f54f0906295b10a154832", + "version": "4.3.1", + "port-version": 5 + }, { "git-tree": "5ba5958862c17ab2f3943b0134b2ad756ae73613", "version-string": "4.3.1", diff --git a/external_imported/vcpkg/versions/c-/cppad.json b/external_imported/vcpkg/versions/c-/cppad.json index 38aadae7b..ace126b5f 100644 --- a/external_imported/vcpkg/versions/c-/cppad.json +++ b/external_imported/vcpkg/versions/c-/cppad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e05a071cbc00d0343c57c70c2b0b043d570f8627", + "version-string": "20210000.7", + "port-version": 3 + }, { "git-tree": "5ec54e982dd160ae43272613536a53de6884d6d4", "version-string": "20210000.7", diff --git a/external_imported/vcpkg/versions/c-/cppcms.json b/external_imported/vcpkg/versions/c-/cppcms.json index ade141096..b476ab542 100644 --- a/external_imported/vcpkg/versions/c-/cppcms.json +++ b/external_imported/vcpkg/versions/c-/cppcms.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "05ef150cab0e8f56bd4f06b41baa9125d94e3451", + "version-string": "1.2.1", + "port-version": 4 + }, { "git-tree": "9582485ed72df7ad43d20b3680e13eaeb76f76e7", "version-string": "1.2.1", diff --git a/external_imported/vcpkg/versions/c-/cppcoro.json b/external_imported/vcpkg/versions/c-/cppcoro.json index daf5da05e..5febcb385 100644 --- a/external_imported/vcpkg/versions/c-/cppcoro.json +++ b/external_imported/vcpkg/versions/c-/cppcoro.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76350a224261bfe57c726e6f3a022d925cb26606", + "version-date": "2020-02-28", + "port-version": 3 + }, { "git-tree": "a9788359b921d309c2982f3f190ac9cb8583f28a", "version-string": "2020-2-28", diff --git a/external_imported/vcpkg/versions/c-/cppgraphqlgen.json b/external_imported/vcpkg/versions/c-/cppgraphqlgen.json index 29914e9c9..fff667860 100644 --- a/external_imported/vcpkg/versions/c-/cppgraphqlgen.json +++ b/external_imported/vcpkg/versions/c-/cppgraphqlgen.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "95b14163e5e6caf3ae1795167c8ea9503c7a8153", + "version-semver": "4.1.1", + "port-version": 0 + }, + { + "git-tree": "23ec5f0002e33dd6c76bab436dec806cfde33235", + "version-semver": "4.1.0", + "port-version": 0 + }, { "git-tree": "6f5eb4a891a143e9d56a8e4791fb87da321a561c", "version-semver": "4.0.0", diff --git a/external_imported/vcpkg/versions/c-/cppunit.json b/external_imported/vcpkg/versions/c-/cppunit.json index 181fce503..46d182a4b 100644 --- a/external_imported/vcpkg/versions/c-/cppunit.json +++ b/external_imported/vcpkg/versions/c-/cppunit.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "671d125960c9cce11a92b65b8bdfba73f85b09b5", + "version": "1.15.1", + "port-version": 3 + }, + { + "git-tree": "5a65f009e556f249711d69ed679c2b570d9e79db", + "version": "1.15.1", + "port-version": 2 + }, { "git-tree": "1384ee0101801f599b23f167aee7cfc733536022", "version": "1.15.1", diff --git a/external_imported/vcpkg/versions/c-/cppxaml.json b/external_imported/vcpkg/versions/c-/cppxaml.json new file mode 100644 index 000000000..94f9a1ec7 --- /dev/null +++ b/external_imported/vcpkg/versions/c-/cppxaml.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "57d825ac962df4a92481b82161ea7b7088929a82", + "version": "0.0.16", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/c-/cpr.json b/external_imported/vcpkg/versions/c-/cpr.json index f272c9fa5..823f87fb6 100644 --- a/external_imported/vcpkg/versions/c-/cpr.json +++ b/external_imported/vcpkg/versions/c-/cpr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a73ff58e720c30c96a1f7d12f98c9553a62a0d7", + "version-semver": "1.8.1", + "port-version": 0 + }, { "git-tree": "ada43417fa0d4613e92e3daafc717b83079d7959", "version-semver": "1.7.2", diff --git a/external_imported/vcpkg/versions/c-/cpu-features.json b/external_imported/vcpkg/versions/c-/cpu-features.json index 3d96d9efb..4a9fbc9fc 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": "7df362e53cec246374da4f3d192bb1d4bb71b2b9", + "version": "0.6.0", + "port-version": 1 + }, { "git-tree": "1e64c7ac2673d19f18e8bc447b14e3ae7f842c81", "version": "0.6.0", diff --git a/external_imported/vcpkg/versions/c-/cpuid.json b/external_imported/vcpkg/versions/c-/cpuid.json index 658b88edb..097f9d93f 100644 --- a/external_imported/vcpkg/versions/c-/cpuid.json +++ b/external_imported/vcpkg/versions/c-/cpuid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa97f1bac97c79fa1595ed1a4b141c209fc375e8", + "version": "0.5.1", + "port-version": 3 + }, { "git-tree": "ad9738f7afc11f1fa0cea524f4d79dd6cc644e7c", "version": "0.5.1", diff --git a/external_imported/vcpkg/versions/c-/cpuinfo.json b/external_imported/vcpkg/versions/c-/cpuinfo.json index 7c3abd38e..fef8a68d0 100644 --- a/external_imported/vcpkg/versions/c-/cpuinfo.json +++ b/external_imported/vcpkg/versions/c-/cpuinfo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "69febccb10ae5b789dd6c5af2b85740617fc34f4", + "version-date": "2022-04-02", + "port-version": 0 + }, { "git-tree": "28dbefcc9131ff8ce6fa939f7fcdb5cf0d4ee7fd", "version-date": "2021-04-04", diff --git a/external_imported/vcpkg/versions/c-/crashpad.json b/external_imported/vcpkg/versions/c-/crashpad.json index 8551c961a..6a57a6161 100644 --- a/external_imported/vcpkg/versions/c-/crashpad.json +++ b/external_imported/vcpkg/versions/c-/crashpad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "88ee612aa949155b1e363bb710578811d3283033", + "version-date": "2020-03-18", + "port-version": 2 + }, { "git-tree": "1968933546b1d1a71dbe8869f68f13d014fcb943", "version-string": "2020-03-18", diff --git a/external_imported/vcpkg/versions/c-/crashrpt.json b/external_imported/vcpkg/versions/c-/crashrpt.json index 633efbaa4..55c72bc51 100644 --- a/external_imported/vcpkg/versions/c-/crashrpt.json +++ b/external_imported/vcpkg/versions/c-/crashrpt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "896d96ee0613edabd92048142803845fa11baa68", + "version": "1.4.3", + "port-version": 2 + }, { "git-tree": "ad55102e0d167bb457349e5b2b4cec75efc45a91", "version": "1.4.3", diff --git a/external_imported/vcpkg/versions/c-/crfsuite.json b/external_imported/vcpkg/versions/c-/crfsuite.json index 604199407..045806899 100644 --- a/external_imported/vcpkg/versions/c-/crfsuite.json +++ b/external_imported/vcpkg/versions/c-/crfsuite.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "b74e8dd91be02cf5bbbd6f6387d66468fe579e8e", + "version-date": "2019-07-21", + "port-version": 3 + }, + { + "git-tree": "973286d78761d5a06d7188a21df0e15124dbf610", + "version-date": "2019-07-21", + "port-version": 2 + }, { "git-tree": "65bc9733064d028bb4f2960d824862263f74bfde", "version-date": "2019-07-21", diff --git a/external_imported/vcpkg/versions/c-/croncpp.json b/external_imported/vcpkg/versions/c-/croncpp.json index f1feb4ca4..99f598042 100644 --- a/external_imported/vcpkg/versions/c-/croncpp.json +++ b/external_imported/vcpkg/versions/c-/croncpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0fb4aefe39d2d695cb5cc89a4f3c92e4229605f5", + "version-date": "2020-09-04", + "port-version": 3 + }, { "git-tree": "79f67dcb192287955f663db8cc36f73455f78990", "version-string": "2020-09-04", diff --git a/external_imported/vcpkg/versions/c-/crossguid.json b/external_imported/vcpkg/versions/c-/crossguid.json index dcffc082f..ce2ce308a 100644 --- a/external_imported/vcpkg/versions/c-/crossguid.json +++ b/external_imported/vcpkg/versions/c-/crossguid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "93714099ddf83b2f3437a080c8acc08ff74cbe37", + "version-date": "2021-10-22", + "port-version": 2 + }, { "git-tree": "4e53633ff35a2bcfb9076aee3e0d740406e788d3", "version-date": "2021-10-22", diff --git a/external_imported/vcpkg/versions/c-/crow.json b/external_imported/vcpkg/versions/c-/crow.json index 2a3174ddd..703a78aca 100644 --- a/external_imported/vcpkg/versions/c-/crow.json +++ b/external_imported/vcpkg/versions/c-/crow.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e21a4fb8fd849bfe3ee8d77dbdb3a4953dd08d55", + "version": "1.0-1", + "port-version": 0 + }, + { + "git-tree": "7e3e9d55fe174a7a7fc05c8afdac245eea49a654", + "version": "0.3.4", + "port-version": 0 + }, { "git-tree": "a843201119b89aaf74f30b1b74e1309b71ce0310", "version": "0.3.3", diff --git a/external_imported/vcpkg/versions/c-/cryptopp.json b/external_imported/vcpkg/versions/c-/cryptopp.json index 56bb041dd..879c3d14c 100644 --- a/external_imported/vcpkg/versions/c-/cryptopp.json +++ b/external_imported/vcpkg/versions/c-/cryptopp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0d47535ac1767600626347e025079450a909c6ba", + "version": "8.6.0", + "port-version": 0 + }, { "git-tree": "2092d648b56a683bcd8b3e72f4adc3a966956c17", "version-string": "8.5.0", diff --git a/external_imported/vcpkg/versions/c-/cspice.json b/external_imported/vcpkg/versions/c-/cspice.json index 6586f30eb..9cb27a05f 100644 --- a/external_imported/vcpkg/versions/c-/cspice.json +++ b/external_imported/vcpkg/versions/c-/cspice.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "1da82692c98d788552288f73818983fc3b561b7b", + "version": "67", + "port-version": 2 + }, + { + "git-tree": "2ad682ffd7b5b7cb6316fd77dc99dda7e6100731", + "version": "67", + "port-version": 1 + }, + { + "git-tree": "1c8f251f7712ff12e7b94d059a56eff69915fb43", + "version-string": "67", + "port-version": 0 + }, { "git-tree": "2b03824386796440e0b529f4e29413686f0fc5d5", "version-string": "66", diff --git a/external_imported/vcpkg/versions/c-/ctemplate.json b/external_imported/vcpkg/versions/c-/ctemplate.json index d9e9f8ecb..231ef80ca 100644 --- a/external_imported/vcpkg/versions/c-/ctemplate.json +++ b/external_imported/vcpkg/versions/c-/ctemplate.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d0cd0a34b622b661af41d0f829ad22e406cd6c7f", + "version-date": "2020-09-14", + "port-version": 3 + }, { "git-tree": "491ab782407b38835b9a555dc77e6d3af485fdae", "version-date": "2020-09-14", diff --git a/external_imported/vcpkg/versions/c-/cub.json b/external_imported/vcpkg/versions/c-/cub.json index 5478b5292..4dc47df08 100644 --- a/external_imported/vcpkg/versions/c-/cub.json +++ b/external_imported/vcpkg/versions/c-/cub.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d6fe5c753cf67eeb18b536ea933864d15a88331d", + "version": "1.16.0", + "port-version": 0 + }, { "git-tree": "ec58db0c42a8978215a38d7e9ac938dd1b936c1f", "version": "1.12.0", diff --git a/external_imported/vcpkg/versions/c-/cuda.json b/external_imported/vcpkg/versions/c-/cuda.json index 12a4ed370..878a0c33f 100644 --- a/external_imported/vcpkg/versions/c-/cuda.json +++ b/external_imported/vcpkg/versions/c-/cuda.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "4e8939c3547a570a73098c091da7b9e28f71015c", + "version": "10.1", + "port-version": 10 + }, + { + "git-tree": "7895738a8a164beddfb53c4c69352b202d8e13e9", + "version-string": "10.1", + "port-version": 9 + }, { "git-tree": "43b8008115ab934b4cf1b36c38bb02ed845712bd", "version-string": "10.1", diff --git a/external_imported/vcpkg/versions/c-/cudnn.json b/external_imported/vcpkg/versions/c-/cudnn.json index 6e6a6fd92..9fa8f53a3 100644 --- a/external_imported/vcpkg/versions/c-/cudnn.json +++ b/external_imported/vcpkg/versions/c-/cudnn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "62f2616b19fe2b3b7dbc8a81e190900819f2ba3e", + "version": "7.6.5", + "port-version": 5 + }, { "git-tree": "c23360a6cfba2b5c8962c0c106d165ca31224162", "version": "7.6.5", diff --git a/external_imported/vcpkg/versions/c-/curl.json b/external_imported/vcpkg/versions/c-/curl.json index a73767ce6..8828352aa 100644 --- a/external_imported/vcpkg/versions/c-/curl.json +++ b/external_imported/vcpkg/versions/c-/curl.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "203696f71dd43fa55a1b1104570135bebf869819", + "version": "7.82.0", + "port-version": 0 + }, + { + "git-tree": "30162d8bfeb7628fb397969fc95e379705a52509", + "version": "7.81.0", + "port-version": 0 + }, { "git-tree": "8e13da05c975cb6f5bed6cf3b8054a817a00b45d", "version": "7.80.0", diff --git a/external_imported/vcpkg/versions/c-/curlpp.json b/external_imported/vcpkg/versions/c-/curlpp.json index 33f166cd3..1398ea703 100644 --- a/external_imported/vcpkg/versions/c-/curlpp.json +++ b/external_imported/vcpkg/versions/c-/curlpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ebde1c1d303f750ce06e530295a820787878e6cd", + "version-date": "2018-06-15", + "port-version": 7 + }, { "git-tree": "a4cea77cfb3429b1ea778167d06c39a691b97e13", "version-date": "2018-06-15", diff --git a/external_imported/vcpkg/versions/d-/darknet.json b/external_imported/vcpkg/versions/d-/darknet.json index 7db7849e0..644996618 100644 --- a/external_imported/vcpkg/versions/d-/darknet.json +++ b/external_imported/vcpkg/versions/d-/darknet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b9b918e6e0af651d83b284cd0f423b6b49951aef", + "version-date": "2022-03-06", + "port-version": 0 + }, { "git-tree": "cb0cb4dcba244d4b82cdd65fa0c993cfd4691992", "version-date": "2021-04-16", diff --git a/external_imported/vcpkg/versions/d-/date.json b/external_imported/vcpkg/versions/d-/date.json index 61c6c4941..e845993b0 100644 --- a/external_imported/vcpkg/versions/d-/date.json +++ b/external_imported/vcpkg/versions/d-/date.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "14d5c6822908ad2fd1d700cca2067ae4b8ef4404", + "version": "3.0.1", + "port-version": 2 + }, { "git-tree": "e281c60aee492a2be56e78ce6a53cb5db927b1dc", "version": "3.0.1", diff --git a/external_imported/vcpkg/versions/d-/dav1d.json b/external_imported/vcpkg/versions/d-/dav1d.json index c655ee649..064c5d579 100644 --- a/external_imported/vcpkg/versions/d-/dav1d.json +++ b/external_imported/vcpkg/versions/d-/dav1d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d92dfe48dbd557d90d9c216bc5a5a4b9435939c1", + "version-semver": "0.8.2", + "port-version": 3 + }, { "git-tree": "d0d3738c56710defd998cb619b649ddf6e43e017", "version-semver": "0.8.2", diff --git a/external_imported/vcpkg/versions/d-/dbghelp.json b/external_imported/vcpkg/versions/d-/dbghelp.json index b279a5b45..064c04c4a 100644 --- a/external_imported/vcpkg/versions/d-/dbghelp.json +++ b/external_imported/vcpkg/versions/d-/dbghelp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c90a3ad39f6dc1e0558acf89de26f220d0fd0c1f", + "version": "0", + "port-version": 2 + }, { "git-tree": "70109bd0d38dce02dc4ee2258fc40a2df72559f8", "version-string": "0.0", diff --git a/external_imported/vcpkg/versions/d-/dcmtk.json b/external_imported/vcpkg/versions/d-/dcmtk.json index 98820308e..a75be2932 100644 --- a/external_imported/vcpkg/versions/d-/dcmtk.json +++ b/external_imported/vcpkg/versions/d-/dcmtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ce25087f7df7d83c796eee09b4457e7aa70848ad", + "version": "3.6.6", + "port-version": 3 + }, { "git-tree": "24716759e4aa3fb67b014163ae3be95ad88120b6", "version-string": "3.6.6", diff --git a/external_imported/vcpkg/versions/d-/detours.json b/external_imported/vcpkg/versions/d-/detours.json index d5b7471a3..b868ac038 100644 --- a/external_imported/vcpkg/versions/d-/detours.json +++ b/external_imported/vcpkg/versions/d-/detours.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9dc31719cf3c251f0530bf8ddb5c6131590386da", + "version": "4.0.1", + "port-version": 5 + }, { "git-tree": "5399f9185e9e7d815bf3c8380e745b5be77c2258", "version-string": "4.0.1", diff --git a/external_imported/vcpkg/versions/d-/devicenameresolver.json b/external_imported/vcpkg/versions/d-/devicenameresolver.json index f8eebb52f..fe2447d1b 100644 --- a/external_imported/vcpkg/versions/d-/devicenameresolver.json +++ b/external_imported/vcpkg/versions/d-/devicenameresolver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a87ff3bcc7e455cf7b73ca36ff4e7ac0c54faba1", + "version-string": "2016-06-26-0850d88fa6", + "port-version": 3 + }, { "git-tree": "1c24f08a86eef969a65c6acdd123edfe704c4c0c", "version-string": "2016-06-26-0850d88fa6", diff --git a/external_imported/vcpkg/versions/d-/dimcli.json b/external_imported/vcpkg/versions/d-/dimcli.json index f6e8eab85..f50b03953 100644 --- a/external_imported/vcpkg/versions/d-/dimcli.json +++ b/external_imported/vcpkg/versions/d-/dimcli.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5d3878991b69b5ed78b2d82c56c5d3a707e13eb0", + "version-semver": "5.0.2", + "port-version": 3 + }, { "git-tree": "9901ca1f1a121a702d4fb4c73ad6a482adff6c3f", "version-semver": "5.0.2", diff --git a/external_imported/vcpkg/versions/d-/directx-headers.json b/external_imported/vcpkg/versions/d-/directx-headers.json index 6e1917dd9..7f8bb1812 100644 --- a/external_imported/vcpkg/versions/d-/directx-headers.json +++ b/external_imported/vcpkg/versions/d-/directx-headers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e9da93d00966da04931e1eab14be7bb4fc8998d5", + "version": "1.4.9", + "port-version": 1 + }, { "git-tree": "bf1d2dfc334ecb42998d443147a2acd5eb88e312", "version": "1.4.9", diff --git a/external_imported/vcpkg/versions/d-/directxmath.json b/external_imported/vcpkg/versions/d-/directxmath.json index 44477eae7..0bd805c40 100644 --- a/external_imported/vcpkg/versions/d-/directxmath.json +++ b/external_imported/vcpkg/versions/d-/directxmath.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ebf69755284c5ea16a26b4dbfa4534af962c96a0", + "version-date": "2022-01-18", + "port-version": 0 + }, { "git-tree": "d02145b6ed0cbe882bfb75291f832a11ab0582ce", "version-string": "jan2021", diff --git a/external_imported/vcpkg/versions/d-/directxmesh.json b/external_imported/vcpkg/versions/d-/directxmesh.json index 168e5a42c..6204eb5a3 100644 --- a/external_imported/vcpkg/versions/d-/directxmesh.json +++ b/external_imported/vcpkg/versions/d-/directxmesh.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "799bc935afc5a0b5d8d50037f28807512fc7c38e", + "version-date": "2022-03-24", + "port-version": 0 + }, + { + "git-tree": "aef77bf208f6e95c682fd8d41590c5b0516f1f0f", + "version-date": "2022-02-28", + "port-version": 0 + }, + { + "git-tree": "a8cbbe307c2ac5a241a6ec4b1e76e121a1ffb2db", + "version-date": "2021-11-08", + "port-version": 1 + }, { "git-tree": "3680e7acf9764cc28152bc39b02497d4a7c13797", "version-date": "2021-11-08", diff --git a/external_imported/vcpkg/versions/d-/directxsdk.json b/external_imported/vcpkg/versions/d-/directxsdk.json index c40d1fad2..8beece35a 100644 --- a/external_imported/vcpkg/versions/d-/directxsdk.json +++ b/external_imported/vcpkg/versions/d-/directxsdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8bed733174eb790455d8da61a3df3d89a631365d", + "version-string": "jun10", + "port-version": 5 + }, { "git-tree": "440a5b43febdcc709d9ae1d768371c0b184ca92e", "version-string": "jun10", diff --git a/external_imported/vcpkg/versions/d-/directxtex.json b/external_imported/vcpkg/versions/d-/directxtex.json index c383fe172..a3b3dc8cd 100644 --- a/external_imported/vcpkg/versions/d-/directxtex.json +++ b/external_imported/vcpkg/versions/d-/directxtex.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "15870041c7dc7d9db536c8770c6334f96af9f92c", + "version-date": "2022-03-24", + "port-version": 0 + }, + { + "git-tree": "424610ae5719fee5f738756146719d13d1483879", + "version-date": "2022-02-28", + "port-version": 0 + }, + { + "git-tree": "ec03f6fb3941d00726655dae315f09b6eb47d9ce", + "version-date": "2021-11-08", + "port-version": 1 + }, { "git-tree": "5c53206e385754a983e7f7c4ed208cc12f2cee44", "version-date": "2021-11-08", diff --git a/external_imported/vcpkg/versions/d-/directxtk.json b/external_imported/vcpkg/versions/d-/directxtk.json index f90e63495..12018a7aa 100644 --- a/external_imported/vcpkg/versions/d-/directxtk.json +++ b/external_imported/vcpkg/versions/d-/directxtk.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "d6e54dc5cc77469ecc88f949b6c149cb01f5a335", + "version-date": "2022-03-24", + "port-version": 0 + }, + { + "git-tree": "64937ca8d8ec8cc57bfdea9fea74bd39cd0ea507", + "version-date": "2022-02-28", + "port-version": 0 + }, + { + "git-tree": "34ecf07435420320f41c8aa7405926dc300359b2", + "version-date": "2021-11-08", + "port-version": 1 + }, { "git-tree": "57d691bc395a321a33bf9ed67cdafe438ab28a1f", "version-date": "2021-11-08", diff --git a/external_imported/vcpkg/versions/d-/directxtk12.json b/external_imported/vcpkg/versions/d-/directxtk12.json index 90580fd3a..6f3eac0f7 100644 --- a/external_imported/vcpkg/versions/d-/directxtk12.json +++ b/external_imported/vcpkg/versions/d-/directxtk12.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "c89638b81272f98ae99cfb782c1269ad7b1836a5", + "version-date": "2022-03-24", + "port-version": 0 + }, + { + "git-tree": "e324f5499354e15e49fa1c591ab864b114518e74", + "version-date": "2022-02-28", + "port-version": 0 + }, + { + "git-tree": "2019efd91b858e5075651d1ebbfa45dc1961aa2d", + "version-date": "2021-11-08", + "port-version": 1 + }, { "git-tree": "538dfbadce1c413fae24e65d900ab30ca5ff6877", "version-date": "2021-11-08", diff --git a/external_imported/vcpkg/versions/d-/discord-game-sdk.json b/external_imported/vcpkg/versions/d-/discord-game-sdk.json index d1768f170..636bbfe88 100644 --- a/external_imported/vcpkg/versions/d-/discord-game-sdk.json +++ b/external_imported/vcpkg/versions/d-/discord-game-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "792eac2fec1f5fbeff9cd819c73a08b8eefabb14", + "version": "2.5.6", + "port-version": 4 + }, { "git-tree": "4ddd26248ed26eb2676c96330e8ae5a0c3f82a3d", "version": "2.5.6", diff --git a/external_imported/vcpkg/versions/d-/discordcoreapi.json b/external_imported/vcpkg/versions/d-/discordcoreapi.json new file mode 100644 index 000000000..b895d0164 --- /dev/null +++ b/external_imported/vcpkg/versions/d-/discordcoreapi.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d7e58144cce6a1eeda7ae8cac47726a9edddfbec", + "version-date": "2022-03-30", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/d-/dlfcn-win32.json b/external_imported/vcpkg/versions/d-/dlfcn-win32.json index df182c585..f3208fac6 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": "6ae0dd5fc5f29e2299690404410ce7129ec5c035", + "version": "1.1.1", + "port-version": 6 + }, { "git-tree": "37cc87e9f214e146c81fff2a8aa5ae018622674d", "version-string": "1.1.1", diff --git a/external_imported/vcpkg/versions/d-/dlib.json b/external_imported/vcpkg/versions/d-/dlib.json index e5bbb6bd3..a1af91a22 100644 --- a/external_imported/vcpkg/versions/d-/dlib.json +++ b/external_imported/vcpkg/versions/d-/dlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "825d6117ba43320dd5969535320b8be3144ea9de", + "version": "19.23", + "port-version": 0 + }, { "git-tree": "c92510c697bca717ad070d4462e44a4c26735b91", "version": "19.22", diff --git a/external_imported/vcpkg/versions/d-/dmlc.json b/external_imported/vcpkg/versions/d-/dmlc.json index 97a0362d2..72b091b61 100644 --- a/external_imported/vcpkg/versions/d-/dmlc.json +++ b/external_imported/vcpkg/versions/d-/dmlc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d1ce501d0c9ed32e6de5f73290635b259f67364", + "version-date": "2019-08-12", + "port-version": 7 + }, { "git-tree": "47d5b971d74b762c6c52e676d5c1c082ee462c0e", "version-date": "2019-08-12", diff --git a/external_imported/vcpkg/versions/d-/doctest.json b/external_imported/vcpkg/versions/d-/doctest.json index d413559fa..f2afaf04b 100644 --- a/external_imported/vcpkg/versions/d-/doctest.json +++ b/external_imported/vcpkg/versions/d-/doctest.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "74d6364092a4086dd36a0d54a3d16e3cc24fe478", + "version": "2.4.8", + "port-version": 0 + }, { "git-tree": "15aee759d06d6b4a61bc3fec3ecd1fbfac7c1d05", "version": "2.4.6", diff --git a/external_imported/vcpkg/versions/d-/double-conversion.json b/external_imported/vcpkg/versions/d-/double-conversion.json index c6d5973e8..133306d2c 100644 --- a/external_imported/vcpkg/versions/d-/double-conversion.json +++ b/external_imported/vcpkg/versions/d-/double-conversion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b85d7877f614063165639f251200a65e8d5c9ba5", + "version": "3.2.0", + "port-version": 0 + }, { "git-tree": "d28a31601897003105b70c847d82a82cd5b5355a", "version-string": "3.1.5", diff --git a/external_imported/vcpkg/versions/d-/drlibs.json b/external_imported/vcpkg/versions/d-/drlibs.json index e57997920..79c361f3d 100644 --- a/external_imported/vcpkg/versions/d-/drlibs.json +++ b/external_imported/vcpkg/versions/d-/drlibs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4fbb06000e3d4c3699920debbc828cc279362d91", + "version-date": "2022-04-03", + "port-version": 0 + }, { "git-tree": "80b487d4ce97c60609cdba15430c0d8b34fb6235", "version-date": "2021-11-02", diff --git a/external_imported/vcpkg/versions/d-/drogon.json b/external_imported/vcpkg/versions/d-/drogon.json index d929cf6ce..7e0e9d97f 100644 --- a/external_imported/vcpkg/versions/d-/drogon.json +++ b/external_imported/vcpkg/versions/d-/drogon.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "a66c2bb4632ab86589f1cabed26607d510ae2eba", + "version-semver": "1.7.5", + "port-version": 0 + }, + { + "git-tree": "b7be1868461c479ff45609e892bc5de9adf42258", + "version-semver": "1.7.4", + "port-version": 2 + }, + { + "git-tree": "e5e1c950e966613f9b867570346f9458bff71826", + "version-semver": "1.7.4", + "port-version": 1 + }, { "git-tree": "275d55a78bb61a79f0d66cd4f71e6b5892566666", "version-semver": "1.7.4", diff --git a/external_imported/vcpkg/versions/d-/dstorage.json b/external_imported/vcpkg/versions/d-/dstorage.json new file mode 100644 index 000000000..cc27ca922 --- /dev/null +++ b/external_imported/vcpkg/versions/d-/dstorage.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b2494bc112c6d12ffbb8a8bc687a1ae2ad583221", + "version": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/d-/duilib.json b/external_imported/vcpkg/versions/d-/duilib.json index efe7ebaf0..3b6ebdde1 100644 --- a/external_imported/vcpkg/versions/d-/duilib.json +++ b/external_imported/vcpkg/versions/d-/duilib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "36c7ba26c4af9fabce94dfb4a2ffe87b7b7467c0", + "version-date": "2019-04-28", + "port-version": 5 + }, { "git-tree": "c23619497c06f6d2e22dae79e731c2a7da51208c", "version-string": "2019-4-28", diff --git a/external_imported/vcpkg/versions/d-/dxsdk-d3dx.json b/external_imported/vcpkg/versions/d-/dxsdk-d3dx.json index f6594d45f..81208748a 100644 --- a/external_imported/vcpkg/versions/d-/dxsdk-d3dx.json +++ b/external_imported/vcpkg/versions/d-/dxsdk-d3dx.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "4f9cac012452363e92e36d5978972cee3b9154e5", + "version": "9.29.952.8", + "port-version": 3 + }, + { + "git-tree": "3f16a0560a2beb7205ed033b5ac2e5d5d2223161", + "version": "9.29.952.8", + "port-version": 2 + }, { "git-tree": "81aeb21cd027336b00f758ece5371f0c4930be2e", "version": "9.29.952.8", diff --git a/external_imported/vcpkg/versions/d-/dxut.json b/external_imported/vcpkg/versions/d-/dxut.json index ef3b7c69c..3ce7912d8 100644 --- a/external_imported/vcpkg/versions/d-/dxut.json +++ b/external_imported/vcpkg/versions/d-/dxut.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b8f2fd1c9674e75aee3d139934b3980a47b3d0eb", + "version": "11.26", + "port-version": 1 + }, { "git-tree": "098b30a228f1d71cfa5b0e21a4c9bf9ade3774e6", "version": "11.26", diff --git a/external_imported/vcpkg/versions/e-/earcut-hpp.json b/external_imported/vcpkg/versions/e-/earcut-hpp.json new file mode 100644 index 000000000..41b661439 --- /dev/null +++ b/external_imported/vcpkg/versions/e-/earcut-hpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "89c9c15fcd180f5e17b02290430dfe7019dc830c", + "version": "2.2.3", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/e-/eastl.json b/external_imported/vcpkg/versions/e-/eastl.json index 7a6794871..a62180cf8 100644 --- a/external_imported/vcpkg/versions/e-/eastl.json +++ b/external_imported/vcpkg/versions/e-/eastl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa2de2990c3b1e6e008e1cafea8ad82c765278fb", + "version-string": "3.18.00", + "port-version": 2 + }, { "git-tree": "41bc58f85c73fb0dec5374fc0c9b84ffc401555c", "version-string": "3.18.00", diff --git a/external_imported/vcpkg/versions/e-/easyhook.json b/external_imported/vcpkg/versions/e-/easyhook.json index c914ec295..4c770cc0e 100644 --- a/external_imported/vcpkg/versions/e-/easyhook.json +++ b/external_imported/vcpkg/versions/e-/easyhook.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "71b209c038081c700231ebc3be136c6976f22c4b", + "version": "2.7.7097.0", + "port-version": 5 + }, + { + "git-tree": "54eb13c17af41e5e869503410d13f67e6886c8ff", + "version": "2.7.7097.0", + "port-version": 4 + }, { "git-tree": "6fefce9309d25f4fdd8675a3168cbfd049f9b863", "version": "2.7.7097.0", diff --git a/external_imported/vcpkg/versions/e-/eathread.json b/external_imported/vcpkg/versions/e-/eathread.json index b9ee87482..4568b724d 100644 --- a/external_imported/vcpkg/versions/e-/eathread.json +++ b/external_imported/vcpkg/versions/e-/eathread.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "341734fa50c34beff0593368922f71829fb0ff19", + "version-string": "1.32.09", + "port-version": 3 + }, { "git-tree": "273dda3270d68ca1c465bb093cba07e71bd6a62f", "version-string": "1.32.09", diff --git a/external_imported/vcpkg/versions/e-/ebml.json b/external_imported/vcpkg/versions/e-/ebml.json index 3d935cba3..d6ea50e46 100644 --- a/external_imported/vcpkg/versions/e-/ebml.json +++ b/external_imported/vcpkg/versions/e-/ebml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4fc7059101f067e639c84844996c77eaba7908e6", + "version": "1.4.2", + "port-version": 1 + }, { "git-tree": "ba8376ad269930aee17a0890ccbd267639122616", "version": "1.4.2", diff --git a/external_imported/vcpkg/versions/e-/ecsutil.json b/external_imported/vcpkg/versions/e-/ecsutil.json index 65def84ff..61d35945c 100644 --- a/external_imported/vcpkg/versions/e-/ecsutil.json +++ b/external_imported/vcpkg/versions/e-/ecsutil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "93fbfca024b36b2424e521b4426efa8d40028291", + "version-string": "1.0.7.15", + "port-version": 2 + }, { "git-tree": "7fb65a14c061886745af3a158b7f2bc8b71184fc", "version-string": "1.0.7.15", diff --git a/external_imported/vcpkg/versions/e-/effects11.json b/external_imported/vcpkg/versions/e-/effects11.json index 4850d41d5..8389d0744 100644 --- a/external_imported/vcpkg/versions/e-/effects11.json +++ b/external_imported/vcpkg/versions/e-/effects11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c2c6305e1ca4352d853c035f29d1d7daa3e47444", + "version": "11.26", + "port-version": 2 + }, { "git-tree": "ed264ec7ce47f6c0ad48933d3ced950b4841726f", "version": "11.26", diff --git a/external_imported/vcpkg/versions/e-/efsw.json b/external_imported/vcpkg/versions/e-/efsw.json index c58cd1f6d..e33826cd9 100644 --- a/external_imported/vcpkg/versions/e-/efsw.json +++ b/external_imported/vcpkg/versions/e-/efsw.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6ebed2c2027b2500f01aa9f755df88098810826e", + "version-date": "2020-06-08", + "port-version": 3 + }, { "git-tree": "67bb6e4495d7a98abb97ef8da9d7486508974042", "version-string": "2020-06-08", diff --git a/external_imported/vcpkg/versions/e-/eigen3.json b/external_imported/vcpkg/versions/e-/eigen3.json index 37649711c..850e31dcc 100644 --- a/external_imported/vcpkg/versions/e-/eigen3.json +++ b/external_imported/vcpkg/versions/e-/eigen3.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "250d10d414a5542aaf832350264498ba727c4c03", + "version": "3.4.0", + "port-version": 2 + }, + { + "git-tree": "4b40326590314e1f3a08c75e83a42d0738040b68", + "version": "3.4.0", + "port-version": 1 + }, + { + "git-tree": "0475ed327bda734cad0acd35978cde9379bc8619", + "version": "3.4.0", + "port-version": 0 + }, { "git-tree": "2b845a54aa220fa4099e97be4031cb63634665e3", "version-string": "3.3.9", diff --git a/external_imported/vcpkg/versions/e-/elfio.json b/external_imported/vcpkg/versions/e-/elfio.json index fb9208863..01d0d53b6 100644 --- a/external_imported/vcpkg/versions/e-/elfio.json +++ b/external_imported/vcpkg/versions/e-/elfio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76c8087deffd555757001f6c2dcf33f59901290f", + "version": "3.10", + "port-version": 0 + }, { "git-tree": "4c3c450c25f313eba1565d93542dbe2caa17aec4", "version": "3.9", diff --git a/external_imported/vcpkg/versions/e-/elfutils.json b/external_imported/vcpkg/versions/e-/elfutils.json index bc61bd61d..2bd68e50f 100644 --- a/external_imported/vcpkg/versions/e-/elfutils.json +++ b/external_imported/vcpkg/versions/e-/elfutils.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "03e8299432623718bf6b58a61d19d408b6c8828c", + "version": "0.186", + "port-version": 2 + }, + { + "git-tree": "1e219cc99d3cfb41ba24f835240acf510a62bc3c", + "version-string": "0.186", + "port-version": 1 + }, + { + "git-tree": "18162722eb91e8a24f6ce1ba945a8a2e1af90896", + "version-string": "0.186", + "port-version": 0 + }, { "git-tree": "9aa4fefa61893cd4b37c0f1a2f16ab255ab0c4bf", "version-string": "0.182", diff --git a/external_imported/vcpkg/versions/e-/embree2.json b/external_imported/vcpkg/versions/e-/embree2.json index 668cfc9cc..6b45901ef 100644 --- a/external_imported/vcpkg/versions/e-/embree2.json +++ b/external_imported/vcpkg/versions/e-/embree2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "59aae2cf542f2420880b312e4e5071c6afcd5aaa", + "version-semver": "2.17.7", + "port-version": 4 + }, { "git-tree": "b4048eb6da97d8a23b849a1b5fba7ba93f9c33bf", "version-semver": "2.17.7", diff --git a/external_imported/vcpkg/versions/e-/eventpp.json b/external_imported/vcpkg/versions/e-/eventpp.json new file mode 100644 index 000000000..4b723916d --- /dev/null +++ b/external_imported/vcpkg/versions/e-/eventpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3f11cacc8b5a6f9f2951992d29cee39e52ef601f", + "version-semver": "0.1.2", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/e-/exiv2.json b/external_imported/vcpkg/versions/e-/exiv2.json index 15f3a1ef6..383a24350 100644 --- a/external_imported/vcpkg/versions/e-/exiv2.json +++ b/external_imported/vcpkg/versions/e-/exiv2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5e7341b739d7b05fbb40492158b01b8fa9fcdb74", + "version": "0.27.5", + "port-version": 1 + }, { "git-tree": "65e38e497c48c6e2fc463997ce9998e6af9f56b5", "version": "0.27.5", diff --git a/external_imported/vcpkg/versions/e-/expat.json b/external_imported/vcpkg/versions/e-/expat.json index 6ebce1bf3..812a56a83 100644 --- a/external_imported/vcpkg/versions/e-/expat.json +++ b/external_imported/vcpkg/versions/e-/expat.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "18754c99766e364a887a08bbf85c7fae06185f36", + "version": "2.4.8", + "port-version": 1 + }, + { + "git-tree": "35013cd612175defc1832114f6a841888a6f6aad", + "version": "2.4.8", + "port-version": 0 + }, { "git-tree": "d63d8c6684bc73856e3f684601761939e32feeb3", "version-semver": "2.4.1", diff --git a/external_imported/vcpkg/versions/e-/exprtk.json b/external_imported/vcpkg/versions/e-/exprtk.json index 0dd368f44..473d7ccab 100644 --- a/external_imported/vcpkg/versions/e-/exprtk.json +++ b/external_imported/vcpkg/versions/e-/exprtk.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f643b034afeb28a7e39b6556eb78594aa49181a4", + "version-date": "2022-01-01", + "port-version": 2 + }, + { + "git-tree": "2cf53dbae59a6b96821ac0407d0bb9a87dd2561c", + "version-date": "2021-01-01", + "port-version": 2 + }, { "git-tree": "f43789e8da0899715ef1d0544880baa13ce38d64", "version-string": "2021-01-01", diff --git a/external_imported/vcpkg/versions/e-/ezc3d.json b/external_imported/vcpkg/versions/e-/ezc3d.json index 27adf4358..116bab01a 100644 --- a/external_imported/vcpkg/versions/e-/ezc3d.json +++ b/external_imported/vcpkg/versions/e-/ezc3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "21ec5f8371f785c406c466171aadff744e2b34e2", + "version": "1.4.7", + "port-version": 0 + }, { "git-tree": "555219f96920ec01fc38ecd89e0a19188206be22", "version": "1.4.6", diff --git a/external_imported/vcpkg/versions/f-/faad2.json b/external_imported/vcpkg/versions/f-/faad2.json index 18db5fc84..40a3d2c83 100644 --- a/external_imported/vcpkg/versions/f-/faad2.json +++ b/external_imported/vcpkg/versions/f-/faad2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "67b420585d5f99b7dec259912abd2d7edcfb9492", + "version": "2.9.1", + "port-version": 5 + }, { "git-tree": "a1ec8e5247412b2ba6584c63307f88fe91d12251", "version": "2.9.1", diff --git a/external_imported/vcpkg/versions/f-/faiss.json b/external_imported/vcpkg/versions/f-/faiss.json index 8e9e24bd9..58721b0df 100644 --- a/external_imported/vcpkg/versions/f-/faiss.json +++ b/external_imported/vcpkg/versions/f-/faiss.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "1f9afe2148c0cfa76354882e136af60bab695061", + "version-semver": "1.7.2", + "port-version": 0 + }, + { + "git-tree": "efbc0f9d771826b57c327d3a008ee4bff6bdbda1", + "version-semver": "1.7.1", + "port-version": 1 + }, { "git-tree": "7c8e333f76263e7ca027e52fdf1d14b025be234c", "version-semver": "1.7.1", diff --git a/external_imported/vcpkg/versions/f-/fakeit.json b/external_imported/vcpkg/versions/f-/fakeit.json index c849a4fd3..328716091 100644 --- a/external_imported/vcpkg/versions/f-/fakeit.json +++ b/external_imported/vcpkg/versions/f-/fakeit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e69fbaa4aed8ea6adf901929dd369ead884b9977", + "version": "2.1.0", + "port-version": 0 + }, { "git-tree": "c7be74886e3d0e180a2abc712c1f95f26f6f3c67", "version": "2.0.9", diff --git a/external_imported/vcpkg/versions/f-/fastcgi.json b/external_imported/vcpkg/versions/f-/fastcgi.json index 13622e826..3f2460989 100644 --- a/external_imported/vcpkg/versions/f-/fastcgi.json +++ b/external_imported/vcpkg/versions/f-/fastcgi.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "8a8f47edb8fc80608665c48ace9195e2334c3b6e", + "version-date": "2020-09-11", + "port-version": 4 + }, + { + "git-tree": "b3d35715764de0b692fb70742856d39b75bb625d", + "version-date": "2020-09-11", + "port-version": 3 + }, { "git-tree": "f99bded0b957390244bb1c1327dd84dbd5a43634", "version-date": "2020-09-11", diff --git a/external_imported/vcpkg/versions/f-/fbgemm.json b/external_imported/vcpkg/versions/f-/fbgemm.json index 2308259e2..5f34b896f 100644 --- a/external_imported/vcpkg/versions/f-/fbgemm.json +++ b/external_imported/vcpkg/versions/f-/fbgemm.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e3afaf099d4759d2d2a57caccb7d54ca2d5b2359", + "version-date": "2021-03-18", + "port-version": 4 + }, + { + "git-tree": "89489c3afc56789dd2a8344dc89455723ec0eec3", + "version-date": "2021-03-18", + "port-version": 3 + }, { "git-tree": "8707b988ad38aae04720ce3494ef09603bd67954", "version-date": "2021-03-18", diff --git a/external_imported/vcpkg/versions/f-/fbthrift.json b/external_imported/vcpkg/versions/f-/fbthrift.json index e6231a686..2418aeecd 100644 --- a/external_imported/vcpkg/versions/f-/fbthrift.json +++ b/external_imported/vcpkg/versions/f-/fbthrift.json @@ -1,5 +1,30 @@ { "versions": [ + { + "git-tree": "0cd01b0f0f6c77c87eea5331b75b01c9e9a20e2c", + "version-string": "2022.03.21.00", + "port-version": 0 + }, + { + "git-tree": "228608a7708d80532948eec3a0987f2e85e4a43c", + "version-string": "2022.01.31.00", + "port-version": 2 + }, + { + "git-tree": "bf1148604c897c7727621feb13713eac7e782497", + "version-string": "2022.01.31.00", + "port-version": 1 + }, + { + "git-tree": "f92f736e3c525d5ac52b546eae1e0b9cf880b382", + "version-string": "2022.01.31.00", + "port-version": 0 + }, + { + "git-tree": "3b06c9c143910647d74c5688610fc294bc493849", + "version-string": "2021.06.14.00", + "port-version": 1 + }, { "git-tree": "f57f144d8d7fe3db4534798d827e2e217f6e9b35", "version-string": "2021.06.14.00", diff --git a/external_imported/vcpkg/versions/f-/ffmpeg.json b/external_imported/vcpkg/versions/f-/ffmpeg.json index 1fdafc9e3..cf2dda6d9 100644 --- a/external_imported/vcpkg/versions/f-/ffmpeg.json +++ b/external_imported/vcpkg/versions/f-/ffmpeg.json @@ -1,5 +1,45 @@ { "versions": [ + { + "git-tree": "84064f1dfced06504fd3d76b60f8e21b37c22c2b", + "version": "4.4.1", + "port-version": 12 + }, + { + "git-tree": "4be11b342853200f575143c5bb5353b044621293", + "version": "4.4.1", + "port-version": 11 + }, + { + "git-tree": "d525f98e7146a1fd731febe7c472232142d62821", + "version": "4.4.1", + "port-version": 10 + }, + { + "git-tree": "558575c9b18b2ff734d48fe175e61f5a11c02ce4", + "version": "4.4.1", + "port-version": 9 + }, + { + "git-tree": "03b7a2329bc927de9637d45738c23e607e4f4387", + "version": "4.4.1", + "port-version": 8 + }, + { + "git-tree": "8b692478001452049ea19d32ec199f58c5de3a77", + "version": "4.4.1", + "port-version": 7 + }, + { + "git-tree": "f81278fe4661e442e3bd6ea274af6b397e4e3ff5", + "version": "4.4.1", + "port-version": 6 + }, + { + "git-tree": "9e9f11b54d40824604dc895ac7f9f0a39dc21486", + "version": "4.4.1", + "port-version": 5 + }, { "git-tree": "d7e12377ceb86caf3720807cb4be9f0f51c93798", "version": "4.4.1", diff --git a/external_imported/vcpkg/versions/f-/ffnvcodec.json b/external_imported/vcpkg/versions/f-/ffnvcodec.json index c249b192e..dc6a492f9 100644 --- a/external_imported/vcpkg/versions/f-/ffnvcodec.json +++ b/external_imported/vcpkg/versions/f-/ffnvcodec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f49e200522747c711e28db563004ce1f5a2f816", + "version": "11.1.5.0", + "port-version": 1 + }, { "git-tree": "b86f38b94c28605c5f3b2bc060b8e43e26e0ad42", "version": "11.1.5.0", diff --git a/external_imported/vcpkg/versions/f-/fftw3.json b/external_imported/vcpkg/versions/f-/fftw3.json index ecf575509..27f1fec62 100644 --- a/external_imported/vcpkg/versions/f-/fftw3.json +++ b/external_imported/vcpkg/versions/f-/fftw3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2bd307eb2dafcd4938d16fc484fbbb731228f4c3", + "version": "3.3.10", + "port-version": 3 + }, { "git-tree": "3cd11b90c63cec797697dc3235ae1e22e4a509fc", "version": "3.3.10", diff --git a/external_imported/vcpkg/versions/f-/fftwpp.json b/external_imported/vcpkg/versions/f-/fftwpp.json index 5427eaba1..696a59c99 100644 --- a/external_imported/vcpkg/versions/f-/fftwpp.json +++ b/external_imported/vcpkg/versions/f-/fftwpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e7eb11bd6344e0d4db5a9e510a980ec2fedfdf90", + "version-date": "2019-12-19", + "port-version": 2 + }, { "git-tree": "d9b689681032352f667f7335feed82d0260fe5bf", "version-string": "2019-12-19", diff --git a/external_imported/vcpkg/versions/f-/field3d.json b/external_imported/vcpkg/versions/f-/field3d.json index 380afc323..e26752a6b 100644 --- a/external_imported/vcpkg/versions/f-/field3d.json +++ b/external_imported/vcpkg/versions/f-/field3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "272cb43e1adfe3c332af92658966a37ab59b8a53", + "version": "1.7.3", + "port-version": 3 + }, { "git-tree": "54a68f2c7d892d5876ff65ad373907bdcfc1b17e", "version-string": "1.7.3", diff --git a/external_imported/vcpkg/versions/f-/fizz.json b/external_imported/vcpkg/versions/f-/fizz.json index 076a17f99..77febcf19 100644 --- a/external_imported/vcpkg/versions/f-/fizz.json +++ b/external_imported/vcpkg/versions/f-/fizz.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "3a4e5784b588827080b88e75299923149b842c4d", + "version-string": "2022.03.21.00", + "port-version": 1 + }, + { + "git-tree": "57fdd6342f89ccc3569b1a3416be67cd8dd7b59d", + "version-string": "2022.01.31.00", + "port-version": 1 + }, + { + "git-tree": "14651559e385107d92830b5464007f7b49a1ce4c", + "version-string": "2022.01.31.00", + "port-version": 0 + }, + { + "git-tree": "8472de52ae8a7914ab4c87e23be8250ae497a0aa", + "version-string": "2021.06.14.00", + "port-version": 1 + }, { "git-tree": "522047f79c1dde2cfbc509a21b4f1faf910efb12", "version-string": "2021.06.14.00", diff --git a/external_imported/vcpkg/versions/f-/flann.json b/external_imported/vcpkg/versions/f-/flann.json index 19f01d96b..71d955c8c 100644 --- a/external_imported/vcpkg/versions/f-/flann.json +++ b/external_imported/vcpkg/versions/f-/flann.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "b31eace0fd51c64ee799affea9ef2127dab68a25", + "version-date": "2019-04-07", + "port-version": 5 + }, + { + "git-tree": "9ceb0dabb980c9cdfb5d9cf1a23e66ec90e75285", + "version-date": "2019-04-07", + "port-version": 4 + }, { "git-tree": "7677f18c73aa0d5216af138b2fba9bcea56e3f1b", "version-date": "2019-04-07", diff --git a/external_imported/vcpkg/versions/f-/flash-runtime-extensions.json b/external_imported/vcpkg/versions/f-/flash-runtime-extensions.json new file mode 100644 index 000000000..c2f0d09cc --- /dev/null +++ b/external_imported/vcpkg/versions/f-/flash-runtime-extensions.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "ae5a85fa619355c266c5232762456120280d4046", + "version": "2.4", + "port-version": 1 + }, + { + "git-tree": "39452440462486913d797009f7e4676d95f1ad7b", + "version": "2.4", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/f-/flatbuffers.json b/external_imported/vcpkg/versions/f-/flatbuffers.json index f6805b6df..6e2a73e54 100644 --- a/external_imported/vcpkg/versions/f-/flatbuffers.json +++ b/external_imported/vcpkg/versions/f-/flatbuffers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8713fce3bc50837e44d958ddc745471619c511c4", + "version": "2.0.0", + "port-version": 3 + }, { "git-tree": "65234b189b0389dfa2f89f58f33e56037a03b519", "version-string": "2.0.0", diff --git a/external_imported/vcpkg/versions/f-/flint.json b/external_imported/vcpkg/versions/f-/flint.json index 266b67e65..ea685f8d1 100644 --- a/external_imported/vcpkg/versions/f-/flint.json +++ b/external_imported/vcpkg/versions/f-/flint.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "26e57956bebf9fb602b989791e663db8cd4f686b", + "version-semver": "2.8.0", + "port-version": 1 + }, { "git-tree": "270de68a6011ec21e64b76b4db6c99e9fd76930a", "version-semver": "2.8.0", diff --git a/external_imported/vcpkg/versions/f-/fltk.json b/external_imported/vcpkg/versions/f-/fltk.json index e247a6bcd..07d0695ee 100644 --- a/external_imported/vcpkg/versions/f-/fltk.json +++ b/external_imported/vcpkg/versions/f-/fltk.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "86da5d186aa27c3a6a9a9903eaa2806edde44bd8", + "version": "1.3.8", + "port-version": 1 + }, + { + "git-tree": "0a6f2dbd574e17da82e99414a644fca8f8efce52", + "version": "1.3.8", + "port-version": 0 + }, { "git-tree": "3acdb7ac34f79b7fdf7ac043ad12b5568de92309", "version": "1.3.7", diff --git a/external_imported/vcpkg/versions/f-/fluidsynth.json b/external_imported/vcpkg/versions/f-/fluidsynth.json index 09153fa1a..8b85a542f 100644 --- a/external_imported/vcpkg/versions/f-/fluidsynth.json +++ b/external_imported/vcpkg/versions/f-/fluidsynth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7740f8dfb97fa273a9f9ed740ade48f9953ff393", + "version": "2.2.6", + "port-version": 0 + }, { "git-tree": "5ffab5df62c9846a6daa5acbd13fd6966594ed77", "version": "2.2.4", diff --git a/external_imported/vcpkg/versions/f-/fmt.json b/external_imported/vcpkg/versions/f-/fmt.json index 2c861a062..c016f90d1 100644 --- a/external_imported/vcpkg/versions/f-/fmt.json +++ b/external_imported/vcpkg/versions/f-/fmt.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "602d9743b7957c9e82a06d0e81d58637c6df5222", + "version": "8.1.1", + "port-version": 1 + }, + { + "git-tree": "9748716da169977423d02b3c3f0de7b7f274e34e", + "version": "8.1.1", + "port-version": 0 + }, { "git-tree": "3aa440d7c335eb584170ae5fdf4eea6a17c900ee", "version": "8.1.0", diff --git a/external_imported/vcpkg/versions/f-/folly.json b/external_imported/vcpkg/versions/f-/folly.json index 689c82a26..ab08aaad8 100644 --- a/external_imported/vcpkg/versions/f-/folly.json +++ b/external_imported/vcpkg/versions/f-/folly.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "bb704ec83012c1ef40ba934b0d5f3ae45471e4bd", + "version-string": "2022.03.21.00", + "port-version": 0 + }, + { + "git-tree": "10d3306d94114d0916a4691c131e233c08dc9090", + "version-string": "2022.01.31.00", + "port-version": 1 + }, + { + "git-tree": "b6f74d739ff2aef400ac83919bd9753eb1cc647f", + "version-string": "2022.01.31.00", + "port-version": 0 + }, + { + "git-tree": "c31f74183da180ea71937f3c5b6ac0c8a3619b1b", + "version-string": "2021.06.14.00", + "port-version": 4 + }, { "git-tree": "8bba15fddadde6b40f2984f6928aa24a50aa2b47", "version-string": "2021.06.14.00", diff --git a/external_imported/vcpkg/versions/f-/fontconfig.json b/external_imported/vcpkg/versions/f-/fontconfig.json index 3756041a7..70a3570d9 100644 --- a/external_imported/vcpkg/versions/f-/fontconfig.json +++ b/external_imported/vcpkg/versions/f-/fontconfig.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "49816baac2cb555355f7e0176c5d36b2701cfceb", + "version": "2.14.0", + "port-version": 0 + }, + { + "git-tree": "8f782f79dc3a2c6834a7e5de4a941b11822067dd", + "version": "2.13.94", + "port-version": 6 + }, + { + "git-tree": "2f32046747209c234e60dc297b48d5bdc7ee4494", + "version": "2.13.94", + "port-version": 5 + }, { "git-tree": "41142efe19b6591f0de47857a32fecdb8bbfc717", "version": "2.13.94", diff --git a/external_imported/vcpkg/versions/f-/freeglut.json b/external_imported/vcpkg/versions/f-/freeglut.json index c2006f589..8a79d81a4 100644 --- a/external_imported/vcpkg/versions/f-/freeglut.json +++ b/external_imported/vcpkg/versions/f-/freeglut.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f4eceb7b1ee13b64d859833d2dce4152233c99bc", + "version": "3.2.2", + "port-version": 0 + }, { "git-tree": "bf1c06d0a07b6bc80a63c3825a4d136f5307a2f4", "version-string": "3.2.1", diff --git a/external_imported/vcpkg/versions/f-/freeimage.json b/external_imported/vcpkg/versions/f-/freeimage.json index bc867ec11..8c6c1586b 100644 --- a/external_imported/vcpkg/versions/f-/freeimage.json +++ b/external_imported/vcpkg/versions/f-/freeimage.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9bad6f331c05331144e8bad4a2ef63d4c594cd5a", + "version": "3.18.0", + "port-version": 22 + }, { "git-tree": "7d0f28dd10d54f1f11d09875fbfafd1579e948c4", "version": "3.18.0", diff --git a/external_imported/vcpkg/versions/f-/freerdp.json b/external_imported/vcpkg/versions/f-/freerdp.json index 92554c4a3..9864e5a11 100644 --- a/external_imported/vcpkg/versions/f-/freerdp.json +++ b/external_imported/vcpkg/versions/f-/freerdp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f786583b737855616d84a5177491deaf7d367a0", + "version": "2.5.0", + "port-version": 0 + }, { "git-tree": "e2fdb84a883ddea3d2dd68e8cc1faea98e991e83", "version": "2.4.0", diff --git a/external_imported/vcpkg/versions/f-/freetds.json b/external_imported/vcpkg/versions/f-/freetds.json index cb6828f87..19513003f 100644 --- a/external_imported/vcpkg/versions/f-/freetds.json +++ b/external_imported/vcpkg/versions/f-/freetds.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d3cbd323de7835a0dc5239e8b51b20f783121bdb", + "version": "1.2.11", + "port-version": 2 + }, { "git-tree": "78236f0bd404616850bc174e84bb6736cc197d73", "version-string": "1.2.11", diff --git a/external_imported/vcpkg/versions/f-/freetype.json b/external_imported/vcpkg/versions/f-/freetype.json index 55c9b9b2f..50198e1b2 100644 --- a/external_imported/vcpkg/versions/f-/freetype.json +++ b/external_imported/vcpkg/versions/f-/freetype.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ab8f5879ab23ffa292c80169f750b7edd6c2b4f1", + "version-semver": "2.11.1", + "port-version": 1 + }, + { + "git-tree": "dadbf4b6e5f5670bf49489e26de326be6a72f962", + "version-semver": "2.11.1", + "port-version": 0 + }, { "git-tree": "9d21ff9f7071d83c1e04eca8cae21b99438400d8", "version-semver": "2.11.0", diff --git a/external_imported/vcpkg/versions/f-/fribidi.json b/external_imported/vcpkg/versions/f-/fribidi.json index 998f90358..b291a9777 100644 --- a/external_imported/vcpkg/versions/f-/fribidi.json +++ b/external_imported/vcpkg/versions/f-/fribidi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "038a02d8e9a403f61bd3d45ce0f6f626a67d72f3", + "version": "1.0.11", + "port-version": 3 + }, { "git-tree": "134c67f3f8db520442ed5bea02262f14d647f7ce", "version": "1.0.11", diff --git a/external_imported/vcpkg/versions/f-/ftxui.json b/external_imported/vcpkg/versions/f-/ftxui.json index f291e7f04..f27022935 100644 --- a/external_imported/vcpkg/versions/f-/ftxui.json +++ b/external_imported/vcpkg/versions/f-/ftxui.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f84934653f0ae5ca32279726f41dae1b2f6a4fb5", + "version-semver": "2.0.0", + "port-version": 1 + }, + { + "git-tree": "92b9696ab8e0f19cca9e5bf161719700aecdb425", + "version-date": "2021-10-17", + "port-version": 1 + }, { "git-tree": "e98623fd181fa1ad4b0ec07053dc140066dfb66f", "version-date": "2021-10-17", diff --git a/external_imported/vcpkg/versions/f-/functions-framework-cpp.json b/external_imported/vcpkg/versions/f-/functions-framework-cpp.json index b275187ef..5de6dc260 100644 --- a/external_imported/vcpkg/versions/f-/functions-framework-cpp.json +++ b/external_imported/vcpkg/versions/f-/functions-framework-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9e0ac94b09059d2a341c6f1614f8d9146732ed2", + "version": "1.1.0", + "port-version": 0 + }, { "git-tree": "45f93916767e8d79db63cc94b8274f98ee1bef1c", "version": "1.0.0", diff --git a/external_imported/vcpkg/versions/f-/fuzzylite.json b/external_imported/vcpkg/versions/f-/fuzzylite.json index 735d20e80..8741a481e 100644 --- a/external_imported/vcpkg/versions/f-/fuzzylite.json +++ b/external_imported/vcpkg/versions/f-/fuzzylite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "27926f33e6bab79f1eefa5c7999645f855c5fda3", + "version": "6.0", + "port-version": 5 + }, { "git-tree": "df47396ca528792e73f67bb8f297a064b46ef21b", "version-string": "6.0", diff --git a/external_imported/vcpkg/versions/g-/g3log.json b/external_imported/vcpkg/versions/g-/g3log.json index cf39075dc..3451c7667 100644 --- a/external_imported/vcpkg/versions/g-/g3log.json +++ b/external_imported/vcpkg/versions/g-/g3log.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b97c6fdba216caec4a83323a693a871cb57968fd", + "version": "1.3.4", + "port-version": 2 + }, { "git-tree": "37d239e8b61380aeb3bc6bbeaa2a91649787b34a", "version": "1.3.4", diff --git a/external_imported/vcpkg/versions/g-/gainput.json b/external_imported/vcpkg/versions/g-/gainput.json index cbe403aa6..9ce5b1b0c 100644 --- a/external_imported/vcpkg/versions/g-/gainput.json +++ b/external_imported/vcpkg/versions/g-/gainput.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6edb146db254b1cec192c12f335bef0e54455770", + "version": "1.0.0", + "port-version": 5 + }, { "git-tree": "8751b5a093ee68d0273600efc1ecfcd23056aa47", "version-string": "1.0.0", diff --git a/external_imported/vcpkg/versions/g-/gamedev-framework.json b/external_imported/vcpkg/versions/g-/gamedev-framework.json index 624ae0444..13f04015a 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": "4dbeca9676a469cb84eb1cfc731ae9bbc9110447", + "version-semver": "0.20.0", + "port-version": 2 + }, { "git-tree": "a9771cd4f7093f5d34a78d3e2417707185444910", "version-semver": "0.20.0", diff --git a/external_imported/vcpkg/versions/g-/gamenetworkingsockets.json b/external_imported/vcpkg/versions/g-/gamenetworkingsockets.json index 3aeda7b8c..3f87f529e 100644 --- a/external_imported/vcpkg/versions/g-/gamenetworkingsockets.json +++ b/external_imported/vcpkg/versions/g-/gamenetworkingsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "56c1a61c82400d285d3d37cf8e20a1f362a0d83f", + "version": "1.4.0", + "port-version": 0 + }, { "git-tree": "02453dad9eb5272c445ba8e22c3d1aa3383a1a11", "version": "1.3.0", diff --git a/external_imported/vcpkg/versions/g-/gasol.json b/external_imported/vcpkg/versions/g-/gasol.json index 4318cd2e7..f9e5c97d4 100644 --- a/external_imported/vcpkg/versions/g-/gasol.json +++ b/external_imported/vcpkg/versions/g-/gasol.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "50bd4cd06666ebc284bb8d8157057c5a451bc11d", + "version-date": "2018-01-04", + "port-version": 2 + }, { "git-tree": "2425692b7bd94282d858e19c2a1360c274cb3e4c", "version-string": "2018-01-04", diff --git a/external_imported/vcpkg/versions/g-/gazebo.json b/external_imported/vcpkg/versions/g-/gazebo.json new file mode 100644 index 000000000..78d9fcac4 --- /dev/null +++ b/external_imported/vcpkg/versions/g-/gazebo.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "983e90284c8c0073e0193750a412eb4df01accdc", + "version-date": "2022-01-20", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/g-/gdal.json b/external_imported/vcpkg/versions/g-/gdal.json index 4a4a5b33c..6f1222acf 100644 --- a/external_imported/vcpkg/versions/g-/gdal.json +++ b/external_imported/vcpkg/versions/g-/gdal.json @@ -1,5 +1,35 @@ { "versions": [ + { + "git-tree": "7c26036e04d87f1f5c27bf4bffa589b2481f47d3", + "version-semver": "3.4.2", + "port-version": 0 + }, + { + "git-tree": "daeafe53684ed8335d3bf77deeffa3424b26120d", + "version-semver": "3.4.1", + "port-version": 4 + }, + { + "git-tree": "a8c88697265b7f88d7576c24c57456da86500b19", + "version-semver": "3.4.1", + "port-version": 3 + }, + { + "git-tree": "e90ac12366dec86dcacf5a66562e48f80254b3c5", + "version-semver": "3.4.1", + "port-version": 2 + }, + { + "git-tree": "b3bff053bc6f972c2c19f88047f2a5ae53f21746", + "version-semver": "3.4.1", + "port-version": 1 + }, + { + "git-tree": "a905d07fce3cebd0d1b52809cbdf1e37cce60cf3", + "version-semver": "3.4.1", + "port-version": 0 + }, { "git-tree": "db90242c9a7b428c65415a64e83c149965dd7ceb", "version-semver": "3.4.0", diff --git a/external_imported/vcpkg/versions/g-/geogram.json b/external_imported/vcpkg/versions/g-/geogram.json index 0c7d105d6..9ee01d4bc 100644 --- a/external_imported/vcpkg/versions/g-/geogram.json +++ b/external_imported/vcpkg/versions/g-/geogram.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d68db6c8078b7598e5bed6550a911f791ae63ab3", + "version": "1.7.6", + "port-version": 2 + }, { "git-tree": "d6d9b9c3652ebbfd846a225ba06a1867e0a6ba25", "version": "1.7.6", diff --git a/external_imported/vcpkg/versions/g-/geographiclib.json b/external_imported/vcpkg/versions/g-/geographiclib.json index 120c03144..75c6083df 100644 --- a/external_imported/vcpkg/versions/g-/geographiclib.json +++ b/external_imported/vcpkg/versions/g-/geographiclib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "907cce8f399c32730fa20954780e16187bb28bd0", + "version": "1.52", + "port-version": 2 + }, { "git-tree": "7ffcb729874bc667cba2368b92d64dc04effb73c", "version": "1.52", diff --git a/external_imported/vcpkg/versions/g-/getdns.json b/external_imported/vcpkg/versions/g-/getdns.json index 091ad9b19..33ed8e70d 100644 --- a/external_imported/vcpkg/versions/g-/getdns.json +++ b/external_imported/vcpkg/versions/g-/getdns.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "b604fb24c9b81bf4bc5c30e7ca86e52750a86935", + "version": "1.7.0", + "port-version": 3 + }, + { + "git-tree": "877301bc39a398579f0f3f13725afcd4bcd797c4", + "version": "1.7.0", + "port-version": 2 + }, + { + "git-tree": "3fc05946f698399983a44d1c9a173df743c7bacf", + "version": "1.7.0", + "port-version": 1 + }, { "git-tree": "fd966770afa413f4502ba69f0c2e0a860b08f967", "version": "1.7.0", diff --git a/external_imported/vcpkg/versions/g-/getopt-win32.json b/external_imported/vcpkg/versions/g-/getopt-win32.json index 890684207..3f3316afb 100644 --- a/external_imported/vcpkg/versions/g-/getopt-win32.json +++ b/external_imported/vcpkg/versions/g-/getopt-win32.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "93d03f637c26f2efa154dfd7c3efb02074cf5eda", + "version-string": "0.1", + "port-version": 2 + }, { "git-tree": "d4b235f13a89dbec23f09caa05c7b71c176cfab8", "version-string": "0.1", diff --git a/external_imported/vcpkg/versions/g-/gettext.json b/external_imported/vcpkg/versions/g-/gettext.json index de3e43d52..22712c19d 100644 --- a/external_imported/vcpkg/versions/g-/gettext.json +++ b/external_imported/vcpkg/versions/g-/gettext.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5bf45743516e2ae999eb14017370828e237ad533", + "version": "0.21", + "port-version": 9 + }, { "git-tree": "d1dc6ee2684911bfcb6f63c498413a118c235ba5", "version": "0.21", diff --git a/external_imported/vcpkg/versions/g-/gherkin-c.json b/external_imported/vcpkg/versions/g-/gherkin-c.json index a274ee39d..71207c432 100644 --- a/external_imported/vcpkg/versions/g-/gherkin-c.json +++ b/external_imported/vcpkg/versions/g-/gherkin-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cb7cfa3a82651ab27840177189e5dc7938bf1241", + "version-date": "2019-10-07", + "port-version": 3 + }, { "git-tree": "e59a73d00ecbf68ae14b61beec141128d8f94612", "version-string": "2019-10-07", diff --git a/external_imported/vcpkg/versions/g-/giflib.json b/external_imported/vcpkg/versions/g-/giflib.json index 834cde1ea..e9456f42e 100644 --- a/external_imported/vcpkg/versions/g-/giflib.json +++ b/external_imported/vcpkg/versions/g-/giflib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5b5833304ba0e1be5ff125f265d1f2e1098a93cb", + "version": "5.2.1", + "port-version": 2 + }, { "git-tree": "14178ec83d76a40e314adcf9bba75b63e99bc56d", "version": "5.2.1", diff --git a/external_imported/vcpkg/versions/g-/glfw3.json b/external_imported/vcpkg/versions/g-/glfw3.json index a199bb4ee..bf6222fba 100644 --- a/external_imported/vcpkg/versions/g-/glfw3.json +++ b/external_imported/vcpkg/versions/g-/glfw3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1da77592851c5a530a1c96c6d7d554c625b7f509", + "version-semver": "3.3.7", + "port-version": 0 + }, { "git-tree": "8a41aae4fb04023a3a94bf3aa66196b0aee2cc8e", "version-semver": "3.3.6", diff --git a/external_imported/vcpkg/versions/g-/glib.json b/external_imported/vcpkg/versions/g-/glib.json index abbb4bb3f..c4c805e65 100644 --- a/external_imported/vcpkg/versions/g-/glib.json +++ b/external_imported/vcpkg/versions/g-/glib.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c9d76755634e72f74de67a04e2713ba0278e772a", + "version": "2.70.5", + "port-version": 0 + }, + { + "git-tree": "83e2d36acbf39c01a33df90c4e65fee0221008aa", + "version": "2.70.1", + "port-version": 2 + }, { "git-tree": "52cb59030261a49d5afb22e2f95e5f9d24548532", "version": "2.70.1", diff --git a/external_imported/vcpkg/versions/g-/glibmm.json b/external_imported/vcpkg/versions/g-/glibmm.json index bc474973e..69d42a047 100644 --- a/external_imported/vcpkg/versions/g-/glibmm.json +++ b/external_imported/vcpkg/versions/g-/glibmm.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "75f0e8e579c069e71bdb773c9e741fc7182e0379", + "version": "2.70.0", + "port-version": 1 + }, + { + "git-tree": "d485de58180f1755b67cb2b829c7c73e4dfae13a", + "version": "2.70.0", + "port-version": 0 + }, { "git-tree": "dd76481f04a2d3747dcd2c5eef0333ce5c6d61e5", "version": "2.68.1", diff --git a/external_imported/vcpkg/versions/g-/glog.json b/external_imported/vcpkg/versions/g-/glog.json index 8a105b070..b34d37318 100644 --- a/external_imported/vcpkg/versions/g-/glog.json +++ b/external_imported/vcpkg/versions/g-/glog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "55b03c1cae45ba6b081c9072e6431d720467c82b", + "version": "0.5.0", + "port-version": 0 + }, { "git-tree": "27503732c21f2d6652d12d62b1e9c180c1d33c47", "version-string": "0.4.0", diff --git a/external_imported/vcpkg/versions/g-/glslang.json b/external_imported/vcpkg/versions/g-/glslang.json index 312611485..2d97b899d 100644 --- a/external_imported/vcpkg/versions/g-/glslang.json +++ b/external_imported/vcpkg/versions/g-/glslang.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4d7780995e9523d16a56714fcef0159f18ecfa52", + "version": "11.8.0", + "port-version": 0 + }, { "git-tree": "0e89013d81f909760cdc3ce9015f84ce74621eec", "version": "11.6.0", @@ -10,6 +15,11 @@ "version": "11.5.0", "port-version": 0 }, + { + "git-tree": "a7d9b6a3d936d273c6b1966eb3b8fe8cb1ba28d1", + "version-string": "2019-03-05", + "port-version": 3 + }, { "git-tree": "29f2d736c8273c412c4fcf0fd50da379d1ec9a0b", "version-string": "2019-03-05", diff --git a/external_imported/vcpkg/versions/g-/gmmlib.json b/external_imported/vcpkg/versions/g-/gmmlib.json index dac45e5ee..4f40f75e7 100644 --- a/external_imported/vcpkg/versions/g-/gmmlib.json +++ b/external_imported/vcpkg/versions/g-/gmmlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d7dbf37aa324f038b12f99d697da82299d3ec9a0", + "version": "21.3.2", + "port-version": 1 + }, { "git-tree": "5b69783d8bdff160371ecc494af42d6ec8d8ffa0", "version": "21.3.2", diff --git a/external_imported/vcpkg/versions/g-/gmp.json b/external_imported/vcpkg/versions/g-/gmp.json index 52dbc389f..9505d80d1 100644 --- a/external_imported/vcpkg/versions/g-/gmp.json +++ b/external_imported/vcpkg/versions/g-/gmp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7b9a71843073bf4a86bb64ddf219c9900ebb3dbd", + "version": "6.2.1", + "port-version": 9 + }, + { + "git-tree": "8d09c9addf60d381cabe4c565cb59b27f5b2bdc7", + "version-string": "6.2.1", + "port-version": 8 + }, { "git-tree": "5d207c0d8a6481f96f2277fd3245f2a80456a706", "version-string": "6.2.1", diff --git a/external_imported/vcpkg/versions/g-/gobject-introspection.json b/external_imported/vcpkg/versions/g-/gobject-introspection.json new file mode 100644 index 000000000..16c0cbb1d --- /dev/null +++ b/external_imported/vcpkg/versions/g-/gobject-introspection.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "a39c3bd1142fd69e6dba29cf3bd4c7e93b049406", + "version": "1.70.0", + "port-version": 1 + }, + { + "git-tree": "5f162cfae947901b4110ea23cb5163699a079cfe", + "version": "1.70.0", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/g-/google-cloud-cpp.json b/external_imported/vcpkg/versions/g-/google-cloud-cpp.json index 188a9728a..62f2f8638 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": "7f6839d85455e137c21bf5bf894e00e0327c3423", + "version": "1.39.0", + "port-version": 1 + }, + { + "git-tree": "ca8e8015d59f4f5e03b0a257d46506c2b0219a71", + "version": "1.39.0", + "port-version": 0 + }, + { + "git-tree": "a22f467e483356f9ce6b6d8502385d447c28912a", + "version": "1.38.0", + "port-version": 2 + }, + { + "git-tree": "284b1c6a7a7ac2d2d878aa68766b7db3c6775314", + "version": "1.38.0", + "port-version": 1 + }, + { + "git-tree": "f67a7068dcb56bb2a97b03a6960d522b71eb28f5", + "version": "1.38.0", + "port-version": 0 + }, + { + "git-tree": "b986c9bce793574d2a4936c1b23e705aa8b29abc", + "version": "1.37.0", + "port-version": 0 + }, + { + "git-tree": "15cf3b112010a1f5c8ec0948f135a5e1863a2246", + "version": "1.36.0", + "port-version": 1 + }, + { + "git-tree": "7b5a4cd75e98700c970afb3b0f6de808bc954ef3", + "version": "1.36.0", + "port-version": 0 + }, + { + "git-tree": "cb69d19a2e45c9dae1a8caa1ee5898b4344cb7f1", + "version": "1.35.0", + "port-version": 2 + }, + { + "git-tree": "5df9e36ebb6dd75abc2a5ff3aebdd61719739e8e", + "version": "1.35.0", + "port-version": 1 + }, { "git-tree": "171fbf69839919f9cbd18e7d1d3c4375920c4ae5", "version": "1.35.0", diff --git a/external_imported/vcpkg/versions/g-/gperf.json b/external_imported/vcpkg/versions/g-/gperf.json index 173f43225..addff5181 100644 --- a/external_imported/vcpkg/versions/g-/gperf.json +++ b/external_imported/vcpkg/versions/g-/gperf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "15455ef99f1ce92d079d047e90fc486c098c6b18", + "version": "3.1", + "port-version": 3 + }, { "git-tree": "b8854df263b141671e3463bb19ca258cf0c641d2", "version-string": "3.1", diff --git a/external_imported/vcpkg/versions/g-/gperftools.json b/external_imported/vcpkg/versions/g-/gperftools.json index 1f2a5a932..426994d61 100644 --- a/external_imported/vcpkg/versions/g-/gperftools.json +++ b/external_imported/vcpkg/versions/g-/gperftools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc4a899d2089a6a683a2cbc8fc5ab6dae3fc45de", + "version-date": "2019-09-02", + "port-version": 3 + }, { "git-tree": "7bf526ef5e6a6a1dfb5fa4cb6941e415b64b94b3", "version-date": "2019-09-02", diff --git a/external_imported/vcpkg/versions/g-/graphviz.json b/external_imported/vcpkg/versions/g-/graphviz.json index 32fd45fe6..725c98546 100644 --- a/external_imported/vcpkg/versions/g-/graphviz.json +++ b/external_imported/vcpkg/versions/g-/graphviz.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c1f20d0e1aaccb1035e3fe3eb95d005b4161a56e", + "version-semver": "2.49.1", + "port-version": 3 + }, + { + "git-tree": "912ac6a1578bd9cf23c20ed7f3bc85c25058c872", + "version-semver": "2.49.1", + "port-version": 2 + }, { "git-tree": "61316edc3deb64749cf84f70f5b0dbd669c06a9e", "version-semver": "2.49.1", diff --git a/external_imported/vcpkg/versions/g-/grpc.json b/external_imported/vcpkg/versions/g-/grpc.json index 4d776dcd4..160d6a33a 100644 --- a/external_imported/vcpkg/versions/g-/grpc.json +++ b/external_imported/vcpkg/versions/g-/grpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "489c160e47ae99de58a438f93714ecbb008df330", + "version-semver": "1.44.0", + "port-version": 0 + }, { "git-tree": "5e3795bf43afe5243e47e18ac66a28bc722207f5", "version-semver": "1.41.0", diff --git a/external_imported/vcpkg/versions/g-/gsoap.json b/external_imported/vcpkg/versions/g-/gsoap.json index a81153c33..ec7cae019 100644 --- a/external_imported/vcpkg/versions/g-/gsoap.json +++ b/external_imported/vcpkg/versions/g-/gsoap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1fa5f6d124e48e4c9c80949c5b8e9c6d40dc2e43", + "version": "2.8.112", + "port-version": 1 + }, { "git-tree": "3f3950a7c522535f3095358a298f7af276894a94", "version": "2.8.112", diff --git a/external_imported/vcpkg/versions/g-/gstreamer.json b/external_imported/vcpkg/versions/g-/gstreamer.json index 62cc11ebf..4accf168c 100644 --- a/external_imported/vcpkg/versions/g-/gstreamer.json +++ b/external_imported/vcpkg/versions/g-/gstreamer.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "0524a22dbda0c09201b9c677b6f72dbce870d6df", + "version": "1.19.2", + "port-version": 5 + }, + { + "git-tree": "78cacf62a38c4cfc4e399720463bef9312f115dc", + "version": "1.19.2", + "port-version": 4 + }, + { + "git-tree": "25482001e85b34b144a67fc9cc86127f9e8c89ea", + "version": "1.19.2", + "port-version": 3 + }, { "git-tree": "ec9fdf057bbec637e21db3a56297439e420106d4", "version": "1.19.2", diff --git a/external_imported/vcpkg/versions/g-/gtest.json b/external_imported/vcpkg/versions/g-/gtest.json index ee080567e..58f9b691a 100644 --- a/external_imported/vcpkg/versions/g-/gtest.json +++ b/external_imported/vcpkg/versions/g-/gtest.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "9731f44f8b0ecbc67eafccd0440700357d2cdfc4", + "version-semver": "1.11.0", + "port-version": 5 + }, + { + "git-tree": "9b9432e429e940c2d86eeef6fcf03bc74418c4c5", + "version-semver": "1.11.0", + "port-version": 4 + }, { "git-tree": "bc195b45d4d766498fb51de96427835c7c4d5748", "version-semver": "1.11.0", diff --git a/external_imported/vcpkg/versions/g-/gtk.json b/external_imported/vcpkg/versions/g-/gtk.json index fb8066074..9d944fe71 100644 --- a/external_imported/vcpkg/versions/g-/gtk.json +++ b/external_imported/vcpkg/versions/g-/gtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ae837c3a08bb71e486641d8b4464c132dbf54464", + "version": "4.6.0", + "port-version": 0 + }, { "git-tree": "a7d9e7cccb1be0a50b7b9cfa961adc93bca948fa", "version": "4.4.0", diff --git a/external_imported/vcpkg/versions/g-/gtkmm.json b/external_imported/vcpkg/versions/g-/gtkmm.json index 50ed4c319..ef30294f4 100644 --- a/external_imported/vcpkg/versions/g-/gtkmm.json +++ b/external_imported/vcpkg/versions/g-/gtkmm.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f39d8f061ae7242baf2b1b78b76253b2ee21c936", + "version": "4.6.0", + "port-version": 0 + }, + { + "git-tree": "8e30c6169ae3b7778ba17649312e6fc064fe1b43", + "version": "4.4.0", + "port-version": 1 + }, { "git-tree": "9d316a91086b6f8ccd32e422abc4dd5083eb22c2", "version": "4.4.0", diff --git a/external_imported/vcpkg/versions/g-/gtl.json b/external_imported/vcpkg/versions/g-/gtl.json new file mode 100644 index 000000000..5776144ad --- /dev/null +++ b/external_imported/vcpkg/versions/g-/gtl.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "52665bb6e7f0bbe30ffabc59521a937072ecc9e2", + "version": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/g-/guetzli.json b/external_imported/vcpkg/versions/g-/guetzli.json index dd15734c6..49eb0255c 100644 --- a/external_imported/vcpkg/versions/g-/guetzli.json +++ b/external_imported/vcpkg/versions/g-/guetzli.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a7da0a5fa0b5bdb568edcbde81b314c3f7089cb0", + "version-date": "2020-09-14", + "port-version": 2 + }, { "git-tree": "2adfb6dcd5eab92b258f45aaf4a494bed18eb687", "version-string": "2020-09-14", diff --git a/external_imported/vcpkg/versions/h-/h3.json b/external_imported/vcpkg/versions/h-/h3.json index f886f1166..7fe6fd9f1 100644 --- a/external_imported/vcpkg/versions/h-/h3.json +++ b/external_imported/vcpkg/versions/h-/h3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "582bd670eb802209ca1dddca0067252e0736ea03", + "version-semver": "3.7.2", + "port-version": 1 + }, { "git-tree": "6c441a2da3a894cd1f1ec177c4b73abf2686f5b2", "version-semver": "3.7.2", diff --git a/external_imported/vcpkg/versions/h-/harfbuzz.json b/external_imported/vcpkg/versions/h-/harfbuzz.json index fb4840943..0f296ad12 100644 --- a/external_imported/vcpkg/versions/h-/harfbuzz.json +++ b/external_imported/vcpkg/versions/h-/harfbuzz.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "fb0fcb23cc704f5a2bca6fc631622309876ab271", + "version-semver": "3.2.0", + "port-version": 2 + }, + { + "git-tree": "b2c918c04e1ecf5b6a591911cea03f7093ab6933", + "version-semver": "3.2.0", + "port-version": 1 + }, + { + "git-tree": "a504ad46b9acfebdf6cc5e32bd0057d045f39115", + "version-semver": "3.2.0", + "port-version": 0 + }, { "git-tree": "151b8dba4351ec70354a0cc1485e5eb720df5f75", "version-semver": "3.0.0", diff --git a/external_imported/vcpkg/versions/h-/hdf5.json b/external_imported/vcpkg/versions/h-/hdf5.json index 3d7914a80..a82c072f6 100644 --- a/external_imported/vcpkg/versions/h-/hdf5.json +++ b/external_imported/vcpkg/versions/h-/hdf5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1000a70aefebfdd856715d265c3421c80157b773", + "version": "1.12.1", + "port-version": 4 + }, { "git-tree": "c12760535a18d9f3ac5497103dc76a961bac991e", "version": "1.12.1", diff --git a/external_imported/vcpkg/versions/h-/hexl.json b/external_imported/vcpkg/versions/h-/hexl.json index c1ade7158..cc0d88ede 100644 --- a/external_imported/vcpkg/versions/h-/hexl.json +++ b/external_imported/vcpkg/versions/h-/hexl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c345ad60bfec1af5f712c6076de5d58ec497d889", + "version": "1.2.3", + "port-version": 1 + }, { "git-tree": "b79e9b07e9389a78ab2d421cc45940e52948d956", "version": "1.2.3", diff --git a/external_imported/vcpkg/versions/h-/hps.json b/external_imported/vcpkg/versions/h-/hps.json new file mode 100644 index 000000000..c969995e1 --- /dev/null +++ b/external_imported/vcpkg/versions/h-/hps.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "8a0ec99ea7523e63fdb09fcf0eeda02739160688", + "version-date": "2022-01-18", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/h-/hpx.json b/external_imported/vcpkg/versions/h-/hpx.json index f0af19d84..2bf34abec 100644 --- a/external_imported/vcpkg/versions/h-/hpx.json +++ b/external_imported/vcpkg/versions/h-/hpx.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "48d153f2932b01257af5a799676268abdfb35fac", + "version-semver": "1.7.1", + "port-version": 5 + }, + { + "git-tree": "815641d6119376c546119a841f6c035e8f27b8da", + "version-semver": "1.7.1", + "port-version": 4 + }, { "git-tree": "ca0e813d228cd5ea6e5c05ae81e7e89e825783d0", "version-semver": "1.7.1", diff --git a/external_imported/vcpkg/versions/h-/hunspell.json b/external_imported/vcpkg/versions/h-/hunspell.json index daa3f12a1..7477d3161 100644 --- a/external_imported/vcpkg/versions/h-/hunspell.json +++ b/external_imported/vcpkg/versions/h-/hunspell.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "9beac8cd192fb54839925b083fa72e611d7bcfee", + "version": "1.7.0", + "port-version": 8 + }, + { + "git-tree": "a7db92584496fe08ac10f8f32556ca89e14018aa", + "version": "1.7.0", + "port-version": 7 + }, { "git-tree": "459909cbf52806ce8df547bed3265d7d5c4abfc2", "version": "1.7.0", diff --git a/external_imported/vcpkg/versions/h-/hwloc.json b/external_imported/vcpkg/versions/h-/hwloc.json index 4907125a4..f3f40d96a 100644 --- a/external_imported/vcpkg/versions/h-/hwloc.json +++ b/external_imported/vcpkg/versions/h-/hwloc.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "22d2c0f63d27b10b032eb6cb3bd07055300fc961", + "version": "2.7.0", + "port-version": 0 + }, + { + "git-tree": "fda6ebfe17a601d067ee6809571bedbedb590eef", + "version": "2.5.0", + "port-version": 3 + }, + { + "git-tree": "4d5dc3e908e5a9e750ea228042e013e6b8a6fd77", + "version": "2.5.0", + "port-version": 2 + }, { "git-tree": "bb188ce07f5e0b88685f5c6740c52c8f45636878", "version": "2.5.0", diff --git a/external_imported/vcpkg/versions/i-/icu.json b/external_imported/vcpkg/versions/i-/icu.json index a3dce8c55..fe4be9d2f 100644 --- a/external_imported/vcpkg/versions/i-/icu.json +++ b/external_imported/vcpkg/versions/i-/icu.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "2d082108b0899697c9b6253c260188728374e56b", + "version": "70.1", + "port-version": 0 + }, + { + "git-tree": "5d1bac4d5b2a05af577b0aa5bb8f600e5cf15427", + "version": "69.1", + "port-version": 19 + }, + { + "git-tree": "789755812260e6c4759e305d1591938513023c07", + "version": "69.1", + "port-version": 18 + }, + { + "git-tree": "0dc7426123d7307c353c40d63f74682f2faaabf1", + "version": "69.1", + "port-version": 17 + }, { "git-tree": "042eb68cba932ed45a95883c733406331cbaad6c", "version": "69.1", diff --git a/external_imported/vcpkg/versions/i-/idevicerestore.json b/external_imported/vcpkg/versions/i-/idevicerestore.json index 6eb9e5293..1db7a148e 100644 --- a/external_imported/vcpkg/versions/i-/idevicerestore.json +++ b/external_imported/vcpkg/versions/i-/idevicerestore.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "0269d10da20f4f0b8d1317f21b71a7e8cac0ff16", + "version": "1.0.12", + "port-version": 7 + }, + { + "git-tree": "020019d72f9fa90089c2f406edb5938294f2dc3d", + "version-string": "1.0.12", + "port-version": 6 + }, { "git-tree": "4ba1b8951ed8c7f3ac7ba2b786c58e44ad322a86", "version-string": "1.0.12", diff --git a/external_imported/vcpkg/versions/i-/ignition-common3.json b/external_imported/vcpkg/versions/i-/ignition-common3.json index f0c554426..ccad732b9 100644 --- a/external_imported/vcpkg/versions/i-/ignition-common3.json +++ b/external_imported/vcpkg/versions/i-/ignition-common3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ee01029f1822c107fb6654c440aad50f5e5b97d3", + "version-string": "3.9.0", + "port-version": 2 + }, { "git-tree": "f576cb30e5369daf724e9465dd29ef496f327283", "version-string": "3.9.0", diff --git a/external_imported/vcpkg/versions/i-/ignition-msgs5.json b/external_imported/vcpkg/versions/i-/ignition-msgs5.json index 466575043..a2fcd4fd2 100644 --- a/external_imported/vcpkg/versions/i-/ignition-msgs5.json +++ b/external_imported/vcpkg/versions/i-/ignition-msgs5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a77594480a911b7648ca1ad24a575b826ddc2a9a", + "version": "5.3.0", + "port-version": 4 + }, { "git-tree": "4a9266bfbd56f0c547a7c02e8a416315ae226bf3", "version-string": "5.3.0", diff --git a/external_imported/vcpkg/versions/i-/ignition-msgs6.json b/external_imported/vcpkg/versions/i-/ignition-msgs6.json index 2c500d46f..4d1447919 100644 --- a/external_imported/vcpkg/versions/i-/ignition-msgs6.json +++ b/external_imported/vcpkg/versions/i-/ignition-msgs6.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "99d4ba95339db124ba068ea2b7fe9cf53d648da3", + "version": "6.0.0", + "port-version": 3 + }, { "git-tree": "60d1f5a0cdcb7c9fcf7c5dc92f29d1d56a83fc67", "version-string": "6.0.0", diff --git a/external_imported/vcpkg/versions/i-/ignition-transport4.json b/external_imported/vcpkg/versions/i-/ignition-transport4.json index 0492b7b39..916bf8f06 100644 --- a/external_imported/vcpkg/versions/i-/ignition-transport4.json +++ b/external_imported/vcpkg/versions/i-/ignition-transport4.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "17d4c446fb99c9510ee2324a03529b6fb1119a41", + "version": "4.0.0", + "port-version": 5 + }, + { + "git-tree": "24af2dccedbb77ff7f1d514871f291776fd7a86f", + "version-string": "4.0.0", + "port-version": 4 + }, { "git-tree": "1df4d0fec30b796611ef0840f4b74a7008d6c1fb", "version-string": "4.0.0", diff --git a/external_imported/vcpkg/versions/i-/ignition-transport8.json b/external_imported/vcpkg/versions/i-/ignition-transport8.json index 5f68e579d..c731867f2 100644 --- a/external_imported/vcpkg/versions/i-/ignition-transport8.json +++ b/external_imported/vcpkg/versions/i-/ignition-transport8.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "10fb9c7619753767ea31b84db43272712730f32c", + "version-string": "8.1.0", + "port-version": 2 + }, { "git-tree": "0841028ca6e8959f60f38c082d998b84dc273910", "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 ced65c2b3..b121adedc 100644 --- a/external_imported/vcpkg/versions/i-/ignition-transport9.json +++ b/external_imported/vcpkg/versions/i-/ignition-transport9.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "abbc50866e79bb1566460eb88135358ed740268d", + "version": "9.0.0", + "port-version": 3 + }, + { + "git-tree": "0829d67a63010fca7f587ca7370db716570aa969", + "version-string": "9.0.0", + "port-version": 2 + }, { "git-tree": "263d88cb08544cb6fc3ff459c24a12832c0fdcb0", "version-string": "9.0.0", diff --git a/external_imported/vcpkg/versions/i-/igraph.json b/external_imported/vcpkg/versions/i-/igraph.json index 65976bd74..a37f62b31 100644 --- a/external_imported/vcpkg/versions/i-/igraph.json +++ b/external_imported/vcpkg/versions/i-/igraph.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5af04d279a55817e0ca26a113a67cf48884f9aaf", + "version": "0.9.8", + "port-version": 0 + }, + { + "git-tree": "3ebbe45814d64c35e654ecb39cf5acf9401c793a", + "version": "0.9.7", + "port-version": 0 + }, { "git-tree": "75f0a463ec9ebb92fdc9f67f3da0a849cae3f4e2", "version": "0.9.6", diff --git a/external_imported/vcpkg/versions/i-/iir1.json b/external_imported/vcpkg/versions/i-/iir1.json index 0cb293f69..9bd18e4ea 100644 --- a/external_imported/vcpkg/versions/i-/iir1.json +++ b/external_imported/vcpkg/versions/i-/iir1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "393a498a50400c062dafdefbbbdbd3d1c3daef4a", + "version": "1.9.0", + "port-version": 1 + }, { "git-tree": "45098a249e45e71b1efa228efae07950b4499be4", "version": "1.9.0", diff --git a/external_imported/vcpkg/versions/i-/imath.json b/external_imported/vcpkg/versions/i-/imath.json index 0053f4def..f1385c4d1 100644 --- a/external_imported/vcpkg/versions/i-/imath.json +++ b/external_imported/vcpkg/versions/i-/imath.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e72149f2fce9434300bbdd84562ad7a58aa4ac90", + "version": "3.1.5", + "port-version": 0 + }, { "git-tree": "f8d9cbaa52114f1030e4bc9ee0e075da76d7be5c", "version": "3.1.3", diff --git a/external_imported/vcpkg/versions/i-/imgui-sfml.json b/external_imported/vcpkg/versions/i-/imgui-sfml.json index d97501fde..21b4db84f 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": "8ece0f7736052672d61d85745b1fb6a3b1362720", + "version": "2.5", + "port-version": 0 + }, { "git-tree": "5a40fbdee68d1f6157c8b5e0784fb701b290d0cc", "version": "2.4", diff --git a/external_imported/vcpkg/versions/i-/imgui.json b/external_imported/vcpkg/versions/i-/imgui.json index 486daf058..0804d5120 100644 --- a/external_imported/vcpkg/versions/i-/imgui.json +++ b/external_imported/vcpkg/versions/i-/imgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b9a40068f3905099cc5cb247f1b488d0e27dfd7f", + "version": "1.87", + "port-version": 0 + }, { "git-tree": "afdf40a53f1f7d77248d9cdeb3f629698d0a72c5", "version": "1.86", diff --git a/external_imported/vcpkg/versions/i-/immer.json b/external_imported/vcpkg/versions/i-/immer.json index 0ab115f21..0e018380b 100644 --- a/external_imported/vcpkg/versions/i-/immer.json +++ b/external_imported/vcpkg/versions/i-/immer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "37adfac25bfa3c7df3718c1cb0c9be295eb34cb3", + "version-date": "2022-02-12", + "port-version": 0 + }, { "git-tree": "0ee78459721140ead0ace0a031bbb9d28039b19e", "version-date": "2021-05-03", diff --git a/external_imported/vcpkg/versions/i-/implot.json b/external_imported/vcpkg/versions/i-/implot.json index a25aff5b1..067455617 100644 --- a/external_imported/vcpkg/versions/i-/implot.json +++ b/external_imported/vcpkg/versions/i-/implot.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6166fdfe50da875e98426577b0fd64e8c26c924c", + "version": "0.13", + "port-version": 0 + }, { "git-tree": "ab3bc9b82bfc7fbd1808cc55559ed58b648ed964", "version": "0.12", diff --git a/external_imported/vcpkg/versions/i-/infoware.json b/external_imported/vcpkg/versions/i-/infoware.json index 1f9a2257e..7c148d6b7 100644 --- a/external_imported/vcpkg/versions/i-/infoware.json +++ b/external_imported/vcpkg/versions/i-/infoware.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5501ab1b5d5391ca168856f073f6a46d5ea83268", + "version-date": "2021-06-16", + "port-version": 1 + }, { "git-tree": "9c278f55bb9b202c251c0414d877a4a238b57214", "version-date": "2021-06-16", diff --git a/external_imported/vcpkg/versions/i-/intel-ipsec.json b/external_imported/vcpkg/versions/i-/intel-ipsec.json index 81e930bb5..877844428 100644 --- a/external_imported/vcpkg/versions/i-/intel-ipsec.json +++ b/external_imported/vcpkg/versions/i-/intel-ipsec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fd3b71153cb4510e0de7475975f85bbbe41e9747", + "version": "1.1", + "port-version": 0 + }, { "git-tree": "39c4caebc1d5e618dcc455c9b7accb7fb2693f39", "version-string": "0.52", diff --git a/external_imported/vcpkg/versions/i-/intelrdfpmathlib.json b/external_imported/vcpkg/versions/i-/intelrdfpmathlib.json index f1dd031cf..079529415 100644 --- a/external_imported/vcpkg/versions/i-/intelrdfpmathlib.json +++ b/external_imported/vcpkg/versions/i-/intelrdfpmathlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b105f0256b4fccc53e7653a732dc65459e1d8562", + "version-string": "20U2", + "port-version": 3 + }, { "git-tree": "089f42e2cae01699241dca4ebe6bbae95300d0f7", "version-string": "20U2", diff --git a/external_imported/vcpkg/versions/i-/irrlicht.json b/external_imported/vcpkg/versions/i-/irrlicht.json index c31731569..39261a9df 100644 --- a/external_imported/vcpkg/versions/i-/irrlicht.json +++ b/external_imported/vcpkg/versions/i-/irrlicht.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a824dffa239fccbb9b780c9926c91f1a25d000df", + "version-string": "1.8.4", + "port-version": 13 + }, { "git-tree": "fd24be00084e5387a0ae764c42621977340ec74b", "version-string": "1.8.4", diff --git a/external_imported/vcpkg/versions/i-/itk.json b/external_imported/vcpkg/versions/i-/itk.json index a21838f20..7b63c922b 100644 --- a/external_imported/vcpkg/versions/i-/itk.json +++ b/external_imported/vcpkg/versions/i-/itk.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "21beac1c375ce633f869566345d7418849633c3e", + "version": "5.2.1", + "port-version": 1 + }, + { + "git-tree": "8d67caa9e2fb41246a3baebbfaccc8f0aff51223", + "version": "5.2.1", + "port-version": 0 + }, { "git-tree": "ce0e8cb19f661a4bb4aabde6b87b7bca5025be9e", "version-semver": "5.1.0", diff --git a/external_imported/vcpkg/versions/i-/ixwebsocket.json b/external_imported/vcpkg/versions/i-/ixwebsocket.json index fdc16164f..7db4ef058 100644 --- a/external_imported/vcpkg/versions/i-/ixwebsocket.json +++ b/external_imported/vcpkg/versions/i-/ixwebsocket.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "59a791c16bb7cf163c801d50013cafd8ae9b94a7", + "version-semver": "11.3.3", + "port-version": 0 + }, { "git-tree": "23fff75b15231882eb9461ff479a9f6edba3a450", "version-semver": "11.2.6", diff --git a/external_imported/vcpkg/versions/j-/jack2.json b/external_imported/vcpkg/versions/j-/jack2.json index 4d9d85694..057fecc05 100644 --- a/external_imported/vcpkg/versions/j-/jack2.json +++ b/external_imported/vcpkg/versions/j-/jack2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f5494181c269f8b65a26fd702664bfde1a3f2e3f", + "version-semver": "1.9.19", + "port-version": 1 + }, { "git-tree": "408805b50757c6f3e5585ca5fddf17df005dfb58", "version-semver": "1.9.19", diff --git a/external_imported/vcpkg/versions/j-/jaeger-client-cpp.json b/external_imported/vcpkg/versions/j-/jaeger-client-cpp.json index ecd406ae5..aa48ff581 100644 --- a/external_imported/vcpkg/versions/j-/jaeger-client-cpp.json +++ b/external_imported/vcpkg/versions/j-/jaeger-client-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8a329e81cae8c0e9f5dc9c0f9921c3a1e2db706d", + "version-semver": "0.7.0", + "port-version": 1 + }, { "git-tree": "7b0bbe0b96ee8a4f4bffc825ada7b9c713468307", "version-semver": "0.7.0", diff --git a/external_imported/vcpkg/versions/j-/jasper.json b/external_imported/vcpkg/versions/j-/jasper.json index cb4bc78cf..00ce7cf1e 100644 --- a/external_imported/vcpkg/versions/j-/jasper.json +++ b/external_imported/vcpkg/versions/j-/jasper.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "caf8b5e479138be21f8a7782806e9ef5c1dcdb37", + "version": "2.0.33", + "port-version": 3 + }, + { + "git-tree": "59d44227795e2e5e31a0f3e327832e4013b1e255", + "version": "2.0.33", + "port-version": 2 + }, + { + "git-tree": "6fc7475e9c22dafb473c98e00136e89c03ad8f5b", + "version": "2.0.33", + "port-version": 1 + }, { "git-tree": "c00bfcf7f17b8ba6db6ee5e62ac379902bbba96f", "version": "2.0.33", diff --git a/external_imported/vcpkg/versions/j-/json-dto.json b/external_imported/vcpkg/versions/j-/json-dto.json index 9a3dc83fd..80ba6b3a8 100644 --- a/external_imported/vcpkg/versions/j-/json-dto.json +++ b/external_imported/vcpkg/versions/j-/json-dto.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "39f955915ba68ad247df8963e6427bd3c0f3479a", + "version": "0.3.1", + "port-version": 0 + }, { "git-tree": "87cb384a3c0b77cf96d77ea95e22f1e9051cb19d", "version": "0.3.0", diff --git a/external_imported/vcpkg/versions/j-/jsoncons.json b/external_imported/vcpkg/versions/j-/jsoncons.json index b95f7df74..8ef14f506 100644 --- a/external_imported/vcpkg/versions/j-/jsoncons.json +++ b/external_imported/vcpkg/versions/j-/jsoncons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ee0a71fa7021ce4daf9c225529489e7e1da7f10a", + "version-string": "0.168.3", + "port-version": 1 + }, { "git-tree": "ace7d792691e3fadf81394f348f0dce587aa5293", "version-string": "0.165.0", diff --git a/external_imported/vcpkg/versions/k-/keystone.json b/external_imported/vcpkg/versions/k-/keystone.json index 7f8c71f6f..68b76c7ca 100644 --- a/external_imported/vcpkg/versions/k-/keystone.json +++ b/external_imported/vcpkg/versions/k-/keystone.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f0094b1730f5973d7c3661eec95eb009d1d272b9", + "version-semver": "0.9.2", + "port-version": 2 + }, { "git-tree": "34865a7cf3fbcf4f104e8b136862aa8acc1a7ca7", "version-semver": "0.9.2", diff --git a/external_imported/vcpkg/versions/k-/kf5archive.json b/external_imported/vcpkg/versions/k-/kf5archive.json index 93892b042..ab9038bb7 100644 --- a/external_imported/vcpkg/versions/k-/kf5archive.json +++ b/external_imported/vcpkg/versions/k-/kf5archive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2eafcdc8cb04d2ec80f9beb89254ca4f74616a07", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "55574a9d2677a48ae7f69740641f5fdbc5b0e068", "version": "5.89.0", diff --git a/external_imported/vcpkg/versions/k-/kfr.json b/external_imported/vcpkg/versions/k-/kfr.json index 00a6e7aa4..863c2a4f9 100644 --- a/external_imported/vcpkg/versions/k-/kfr.json +++ b/external_imported/vcpkg/versions/k-/kfr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76c0a2397fec739067cac1a9970c113ed47341b1", + "version-semver": "4.2.1", + "port-version": 1 + }, { "git-tree": "3c67a5df3f480154a5f3472c58952566b55b688c", "version-semver": "4.2.1", diff --git a/external_imported/vcpkg/versions/k-/kinectsdk1.json b/external_imported/vcpkg/versions/k-/kinectsdk1.json index 6ddfc2b12..263c42573 100644 --- a/external_imported/vcpkg/versions/k-/kinectsdk1.json +++ b/external_imported/vcpkg/versions/k-/kinectsdk1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d49f0532a6e9776666ef3960a9b267f32ff3cfc4", + "version": "1.8", + "port-version": 4 + }, { "git-tree": "b48f4bf28923981e5a8ad549daa4dc8ee64dac83", "version-string": "1.8", diff --git a/external_imported/vcpkg/versions/k-/knet.json b/external_imported/vcpkg/versions/k-/knet.json index cb0f8496b..37388ca01 100644 --- a/external_imported/vcpkg/versions/k-/knet.json +++ b/external_imported/vcpkg/versions/k-/knet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76216c380a8db7e28debacd7faafce6be6c2d705", + "version": "1.1.0", + "port-version": 1 + }, { "git-tree": "6d45707ca4c853c0c0bcd076b98fab73c605d906", "version": "1.1.0", diff --git a/external_imported/vcpkg/versions/k-/krabsetw.json b/external_imported/vcpkg/versions/k-/krabsetw.json index 703e3ecf7..101a63128 100644 --- a/external_imported/vcpkg/versions/k-/krabsetw.json +++ b/external_imported/vcpkg/versions/k-/krabsetw.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b1f3fa7092c3cb91e5891fcf8f0923dd1f604887", + "version": "4.1.18", + "port-version": 1 + }, { "git-tree": "eafa1dce01b80f2483c3dd6b74b17b4d5b8bb215", "version-string": "4.1.18", diff --git a/external_imported/vcpkg/versions/k-/ktx.json b/external_imported/vcpkg/versions/k-/ktx.json index 21db2789d..98609c3f7 100644 --- a/external_imported/vcpkg/versions/k-/ktx.json +++ b/external_imported/vcpkg/versions/k-/ktx.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "048534e1a90a5e15ebf065ccfc752c9c5fea77c5", + "version": "4.0.0", + "port-version": 2 + }, + { + "git-tree": "2d554178c6665e285b8a480dabe83fcf72aa5514", + "version": "4.0.0", + "port-version": 1 + }, { "git-tree": "bb7f4de2ff7141cda0da61c7a0419559fc30c53a", "version": "4.0.0", diff --git a/external_imported/vcpkg/versions/k-/kubernetes.json b/external_imported/vcpkg/versions/k-/kubernetes.json index bf2d687ae..4aaef0239 100644 --- a/external_imported/vcpkg/versions/k-/kubernetes.json +++ b/external_imported/vcpkg/versions/k-/kubernetes.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "81d419c292d699e92444e7629e01b1d1cf0ba762", + "version-date": "2022-01-19", + "port-version": 1 + }, + { + "git-tree": "0f41209b8d9dd8477bf2bb9ea91234c3680f1ee5", + "version-date": "2022-01-19", + "port-version": 0 + }, { "git-tree": "df271a1aba7a2a955fc65e213e3a7c61a81e61b5", "version-date": "2021-11-24", diff --git a/external_imported/vcpkg/versions/k-/kwsys.json b/external_imported/vcpkg/versions/k-/kwsys.json index fd3fb9fa7..a1db6c211 100644 --- a/external_imported/vcpkg/versions/k-/kwsys.json +++ b/external_imported/vcpkg/versions/k-/kwsys.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6e898afb7fa1cdf9f1d72b64467a04fded7b2082", + "version-date": "2021-08-06", + "port-version": 1 + }, { "git-tree": "376ae3a199ad4fdaad235b6e01b92ed217388550", "version-date": "2021-08-06", diff --git a/external_imported/vcpkg/versions/l-/lager.json b/external_imported/vcpkg/versions/l-/lager.json index 1fd9e7d2f..7da3ee095 100644 --- a/external_imported/vcpkg/versions/l-/lager.json +++ b/external_imported/vcpkg/versions/l-/lager.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8dd0744209e866c731522176fdcdf056fcbb853f", + "version-date": "2022-02-21", + "port-version": 0 + }, { "git-tree": "c65b1f179b9d6fe4048cf44f3186de7a0332742f", "version-date": "2021-06-17", diff --git a/external_imported/vcpkg/versions/l-/lapack-reference.json b/external_imported/vcpkg/versions/l-/lapack-reference.json index 99d6f8a7c..999e4f135 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": "14b5e3ab7315ce36951f759c6254712ed41cc0af", + "version": "3.10.0", + "port-version": 0 + }, { "git-tree": "10799c7ec42f8369179ba7a8e927235596cb8bb7", "version-semver": "3.8.0", diff --git a/external_imported/vcpkg/versions/l-/lapack.json b/external_imported/vcpkg/versions/l-/lapack.json index a4c332617..5803b5922 100644 --- a/external_imported/vcpkg/versions/l-/lapack.json +++ b/external_imported/vcpkg/versions/l-/lapack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3a9c5b51e3480db058719db223df981e0e679819", + "version-date": "2022-02-22", + "port-version": 0 + }, { "git-tree": "e52f9dc39357e3e7224273a21c0efaf275f15ae6", "version-string": "3", diff --git a/external_imported/vcpkg/versions/l-/lazy-importer.json b/external_imported/vcpkg/versions/l-/lazy-importer.json index 2885cce7a..85591f3cb 100644 --- a/external_imported/vcpkg/versions/l-/lazy-importer.json +++ b/external_imported/vcpkg/versions/l-/lazy-importer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba952940f6531135428e3827d0610d3596b683cb", + "version-date": "2022-02-09", + "port-version": 0 + }, { "git-tree": "3dba7a5ee217d732847b9906ba01f8571733cc35", "version-date": "2021-10-23", diff --git a/external_imported/vcpkg/versions/l-/lcms.json b/external_imported/vcpkg/versions/l-/lcms.json index 02e5a2eda..5253e4224 100644 --- a/external_imported/vcpkg/versions/l-/lcms.json +++ b/external_imported/vcpkg/versions/l-/lcms.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5e1b890660ea5d2a869407a0714d4385e949b4d6", + "version": "2.12", + "port-version": 3 + }, { "git-tree": "27ea0f07f8132e37a1e265ee54216eb0abc185dd", "version": "2.12", diff --git a/external_imported/vcpkg/versions/l-/leptonica.json b/external_imported/vcpkg/versions/l-/leptonica.json index 6e1143686..c0de57365 100644 --- a/external_imported/vcpkg/versions/l-/leptonica.json +++ b/external_imported/vcpkg/versions/l-/leptonica.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d69fc1cdb4cfb42aa1b6e608418f313fbbb3f9ab", + "version": "1.82.0", + "port-version": 0 + }, + { + "git-tree": "677775654e1914afaf5791361e9de3fac4762edc", + "version": "1.81.1", + "port-version": 1 + }, { "git-tree": "215a8a32b41e1561998ac840c3c35404707186a2", "version": "1.81.1", diff --git a/external_imported/vcpkg/versions/l-/leveldb.json b/external_imported/vcpkg/versions/l-/leveldb.json index b119457f9..9abb3c341 100644 --- a/external_imported/vcpkg/versions/l-/leveldb.json +++ b/external_imported/vcpkg/versions/l-/leveldb.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "2ca11f66c6efa417b28755759b6c67670524f532", + "version": "1.22", + "port-version": 5 + }, + { + "git-tree": "c41d96d2e0f6f6301e2370bc00fa7390cdd94330", + "version-string": "1.22", + "port-version": 4 + }, + { + "git-tree": "55e42f74e1f541143900887a64661c8c8e4ea713", + "version-string": "1.22", + "port-version": 3 + }, { "git-tree": "d94e4685c15581a8e5740ee6061d8b608645fd31", "version-string": "1.22", diff --git a/external_imported/vcpkg/versions/l-/levmar.json b/external_imported/vcpkg/versions/l-/levmar.json index 78c1e7438..d7490901a 100644 --- a/external_imported/vcpkg/versions/l-/levmar.json +++ b/external_imported/vcpkg/versions/l-/levmar.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a869430352021a5fcecdd780a25e5ee0a4d769f5", + "version": "2.6", + "port-version": 1 + }, { "git-tree": "cbd0d2a467f781175f1900ca6857ddff74ab1cc5", "version-string": "2.6", diff --git a/external_imported/vcpkg/versions/l-/libalkimia.json b/external_imported/vcpkg/versions/l-/libalkimia.json index 4b64a7e12..2bd6b715e 100644 --- a/external_imported/vcpkg/versions/l-/libalkimia.json +++ b/external_imported/vcpkg/versions/l-/libalkimia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "09e0633aca7ce1433e7cd6542404a12f90bf1de1", + "version": "8.1.70", + "port-version": 1 + }, { "git-tree": "6cf107a0e18ea3b0238500ece6257e212a6ddd2b", "version": "8.1.70", diff --git a/external_imported/vcpkg/versions/l-/libao.json b/external_imported/vcpkg/versions/l-/libao.json new file mode 100644 index 000000000..e5186e1ae --- /dev/null +++ b/external_imported/vcpkg/versions/l-/libao.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "11240d91b73e6a968da37b8053a8a64a6d9ea55f", + "version": "1.2.2", + "port-version": 4 + }, + { + "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 cd9e96f76..1cb4b7bf0 100644 --- a/external_imported/vcpkg/versions/l-/libarchive.json +++ b/external_imported/vcpkg/versions/l-/libarchive.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "aeb6f06729d407abcf56fa92b2fcff01c031035b", + "version-semver": "3.5.2", + "port-version": 5 + }, + { + "git-tree": "96ba668589b8400bcc1164b98fc5dcecf3af923e", + "version-semver": "3.5.2", + "port-version": 4 + }, + { + "git-tree": "2408bfca781ee9e5add6e674043e5f8ccca73a1b", + "version-semver": "3.5.2", + "port-version": 3 + }, { "git-tree": "d79d7deb863644fb2bd6570d17cfa88386fc4156", "version-semver": "3.5.2", diff --git a/external_imported/vcpkg/versions/l-/libassuan.json b/external_imported/vcpkg/versions/l-/libassuan.json index fb13a824e..7d3acd0e4 100644 --- a/external_imported/vcpkg/versions/l-/libassuan.json +++ b/external_imported/vcpkg/versions/l-/libassuan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cf0ffd2dfbb239d338524fc0ea59311a869144c0", + "version": "2.5.3", + "port-version": 4 + }, { "git-tree": "4ff2ab79b12dcb656fa6286fdbfdff01b11b5b15", "version": "2.5.3", diff --git a/external_imported/vcpkg/versions/l-/libb2.json b/external_imported/vcpkg/versions/l-/libb2.json index 084a1ee4c..b26edd252 100644 --- a/external_imported/vcpkg/versions/l-/libb2.json +++ b/external_imported/vcpkg/versions/l-/libb2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7c113e12089453e4e2cf2bbf67ad1f0b80a133a8", + "version": "0.98.1", + "port-version": 6 + }, { "git-tree": "0419d2f293a094dc4cdca1111daea2a6425a137b", "version": "0.98.1", diff --git a/external_imported/vcpkg/versions/l-/libbacktrace.json b/external_imported/vcpkg/versions/l-/libbacktrace.json index 252be58df..7204869c5 100644 --- a/external_imported/vcpkg/versions/l-/libbacktrace.json +++ b/external_imported/vcpkg/versions/l-/libbacktrace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9544b83bfa32d57ce62d9193a427a246b71f685", + "version-date": "2021-03-14", + "port-version": 1 + }, { "git-tree": "8772967fbaa6b8840266c0d04a6daccc78b44c3d", "version-date": "2021-03-14", diff --git a/external_imported/vcpkg/versions/l-/libcanberra.json b/external_imported/vcpkg/versions/l-/libcanberra.json index 6a3eb68e9..70262ca3e 100644 --- a/external_imported/vcpkg/versions/l-/libcanberra.json +++ b/external_imported/vcpkg/versions/l-/libcanberra.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "30f433bae08d825ed5c8050194b7dd6a3009bf9a", + "version": "0.30", + "port-version": 2 + }, { "git-tree": "18398f54e696bb43cf68dc7efc3e32304487057e", "version": "0.30", diff --git a/external_imported/vcpkg/versions/l-/libcpplocate.json b/external_imported/vcpkg/versions/l-/libcpplocate.json new file mode 100644 index 000000000..ae128c720 --- /dev/null +++ b/external_imported/vcpkg/versions/l-/libcpplocate.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5f15b69e558a8774ebbc5bde4f5ddf70da27611c", + "version-semver": "2.3.0", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/l-/libcrafter.json b/external_imported/vcpkg/versions/l-/libcrafter.json index 9cc0e3881..098d07d84 100644 --- a/external_imported/vcpkg/versions/l-/libcrafter.json +++ b/external_imported/vcpkg/versions/l-/libcrafter.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0ecb9324842496e1b30a3aec8dbda993e7881612", + "version": "1.0", + "port-version": 2 + }, { "git-tree": "f8fd06400911305144ebbecfd5f4ab627cf40743", "version": "1.0", diff --git a/external_imported/vcpkg/versions/l-/libcurl-simple-https.json b/external_imported/vcpkg/versions/l-/libcurl-simple-https.json new file mode 100644 index 000000000..3c91befa8 --- /dev/null +++ b/external_imported/vcpkg/versions/l-/libcurl-simple-https.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "6b22a1dafa22c05f8eed41236534a247a28c23d0", + "version-date": "2022-02-14", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/l-/libdatachannel.json b/external_imported/vcpkg/versions/l-/libdatachannel.json index 415f1ff4f..17279c4e6 100644 --- a/external_imported/vcpkg/versions/l-/libdatachannel.json +++ b/external_imported/vcpkg/versions/l-/libdatachannel.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "61f3e1e569991d144cb32b0f21c2b1e3baab78a2", + "version-semver": "0.16.4", + "port-version": 1 + }, + { + "git-tree": "a9f98aa660deca99a714ae3fc0e7a356c5d74cc8", + "version-semver": "0.16.4", + "port-version": 0 + }, { "git-tree": "d688c15b940166a1d8ecf701cafb7a060a7abd48", "version-semver": "0.16.0", diff --git a/external_imported/vcpkg/versions/l-/libdatrie.json b/external_imported/vcpkg/versions/l-/libdatrie.json index e67f74a58..14fe14750 100644 --- a/external_imported/vcpkg/versions/l-/libdatrie.json +++ b/external_imported/vcpkg/versions/l-/libdatrie.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "60d1568dadc94ddb1b894b33a8da7b20802a96e8", + "version": "0.2.13", + "port-version": 1 + }, + { + "git-tree": "f8e0374439550fd870ff280c0a3321c202b42929", + "version": "0.2.13", + "port-version": 0 + }, { "git-tree": "55aab3566cc2c82313f67f484a411b28f53da90b", "version-string": "0.2.10", diff --git a/external_imported/vcpkg/versions/l-/libde265.json b/external_imported/vcpkg/versions/l-/libde265.json index cc1bf8f53..3ebc23251 100644 --- a/external_imported/vcpkg/versions/l-/libde265.json +++ b/external_imported/vcpkg/versions/l-/libde265.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "404108a20a6a0699d08f867b7da085ef3d91360b", + "version": "1.0.8", + "port-version": 5 + }, + { + "git-tree": "f69d985ecdaa897d5efd10422f739d450373e26d", + "version": "1.0.8", + "port-version": 4 + }, { "git-tree": "83f4bc2d067f213063ca93d6f1514d3f7278452c", "version-string": "1.0.8", diff --git a/external_imported/vcpkg/versions/l-/libdshowcapture.json b/external_imported/vcpkg/versions/l-/libdshowcapture.json index e73534175..7cb7815ef 100644 --- a/external_imported/vcpkg/versions/l-/libdshowcapture.json +++ b/external_imported/vcpkg/versions/l-/libdshowcapture.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fc1b7753ef4b7e6fc6d6390bc86fe5186ca45a92", + "version": "0.6.0", + "port-version": 3 + }, { "git-tree": "3573e5e73ce2e61477815f452a5d2cd4a96ec0c7", "version-string": "0.6.0", diff --git a/external_imported/vcpkg/versions/l-/libe57.json b/external_imported/vcpkg/versions/l-/libe57.json index e21d6930b..0371207ea 100644 --- a/external_imported/vcpkg/versions/l-/libe57.json +++ b/external_imported/vcpkg/versions/l-/libe57.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e38a82bc97129e317606207d234101aefe7dcb17", + "version-semver": "1.1.332", + "port-version": 1 + }, { "git-tree": "ed9a20551a07f8dbcb637af8394653c326e95aac", "version-semver": "1.1.312", diff --git a/external_imported/vcpkg/versions/l-/libe57format.json b/external_imported/vcpkg/versions/l-/libe57format.json new file mode 100644 index 000000000..52e292de1 --- /dev/null +++ b/external_imported/vcpkg/versions/l-/libe57format.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "49edc5b7628b3ce80320347ed3284237b50ac162", + "version-string": "2.2.0", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/l-/libevent.json b/external_imported/vcpkg/versions/l-/libevent.json index e3f6e6a1e..91ff59886 100644 --- a/external_imported/vcpkg/versions/l-/libevent.json +++ b/external_imported/vcpkg/versions/l-/libevent.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c1fbaddea4a9b98b61cba0d785441115c161d24f", + "version": "2.1.12", + "port-version": 6 + }, { "git-tree": "4c3a73b8448f16fa69e497ef6f1df41a261a9b54", "version": "2.1.12", diff --git a/external_imported/vcpkg/versions/l-/libevhtp.json b/external_imported/vcpkg/versions/l-/libevhtp.json index a28699da2..9df827724 100644 --- a/external_imported/vcpkg/versions/l-/libevhtp.json +++ b/external_imported/vcpkg/versions/l-/libevhtp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2180aafd93f4089a276e9a5de9fe2d28d8e0f88d", + "version": "1.2.18", + "port-version": 3 + }, { "git-tree": "c28b6abc864cbfff6270358471bf9e97fd063710", "version-string": "1.2.18", diff --git a/external_imported/vcpkg/versions/l-/libexif.json b/external_imported/vcpkg/versions/l-/libexif.json index 972e3bcf9..838a142b5 100644 --- a/external_imported/vcpkg/versions/l-/libexif.json +++ b/external_imported/vcpkg/versions/l-/libexif.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cbe71aeb850791354309f2c953bf117ddc64f97a", + "version": "0.6.22", + "port-version": 2 + }, { "git-tree": "b068504fa067776d51b304e0c28e23532957c4b6", "version-string": "0.6.22", diff --git a/external_imported/vcpkg/versions/l-/libfabric.json b/external_imported/vcpkg/versions/l-/libfabric.json index dc53985c2..f12f77fad 100644 --- a/external_imported/vcpkg/versions/l-/libfabric.json +++ b/external_imported/vcpkg/versions/l-/libfabric.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d0a766bd1f01a742dcc12e13bafd741b94d7a3c0", + "version-semver": "1.13.2", + "port-version": 1 + }, { "git-tree": "f2ab311b282b282a5b10a3b52938c08efcdd1fc2", "version-semver": "1.13.2", diff --git a/external_imported/vcpkg/versions/l-/libfido2.json b/external_imported/vcpkg/versions/l-/libfido2.json index df4a488ab..95a5d06be 100644 --- a/external_imported/vcpkg/versions/l-/libfido2.json +++ b/external_imported/vcpkg/versions/l-/libfido2.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ad26e81c6c119e160709c7e0ce7872d888ed5a57", + "version": "1.10.0", + "port-version": 1 + }, + { + "git-tree": "0d3dc297cbc4c116910b6cb793bc3b5a06834e00", + "version": "1.10.0", + "port-version": 0 + }, { "git-tree": "170a0bcbc2f58e140205858db504ecfe7ade1a9f", "version": "1.7.0", diff --git a/external_imported/vcpkg/versions/l-/libgeotiff.json b/external_imported/vcpkg/versions/l-/libgeotiff.json index a7ca72e9a..6c93ee7b6 100644 --- a/external_imported/vcpkg/versions/l-/libgeotiff.json +++ b/external_imported/vcpkg/versions/l-/libgeotiff.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5f9baab006dd2bd507b6b8f63d2226dc6ce97cd1", + "version": "1.7.1", + "port-version": 0 + }, + { + "git-tree": "91982f7018b13638993efc70c14bf0996105f0bc", + "version": "1.7.0", + "port-version": 1 + }, { "git-tree": "f68bbf7c0472548573a69d1e41801edb1179c028", "version": "1.7.0", diff --git a/external_imported/vcpkg/versions/l-/libgit2.json b/external_imported/vcpkg/versions/l-/libgit2.json index 6eeb5426a..170466619 100644 --- a/external_imported/vcpkg/versions/l-/libgit2.json +++ b/external_imported/vcpkg/versions/l-/libgit2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e036ca61d2e12b110c920cadf92f0aa4f39cac9b", + "version-semver": "1.4.2", + "port-version": 0 + }, { "git-tree": "37f2b6e92b60481a4db74de9da17385706d7d2e9", "version-semver": "1.3.0", diff --git a/external_imported/vcpkg/versions/l-/libgnutls.json b/external_imported/vcpkg/versions/l-/libgnutls.json index fd09cc370..7e4285583 100644 --- a/external_imported/vcpkg/versions/l-/libgnutls.json +++ b/external_imported/vcpkg/versions/l-/libgnutls.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f041c07b59c7ac2389ac1fd6d8a175466bb648b7", + "version": "3.6.15", + "port-version": 3 + }, { "git-tree": "c03a1c452fa39d1b6d884aa3ef12c0c98a11f0a3", "version": "3.6.15", diff --git a/external_imported/vcpkg/versions/l-/libgo.json b/external_imported/vcpkg/versions/l-/libgo.json index 0b0b0d40f..f8921f77a 100644 --- a/external_imported/vcpkg/versions/l-/libgo.json +++ b/external_imported/vcpkg/versions/l-/libgo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b50450a394cd5b4e882d353439c3dae6cc0564f2", + "version": "3.1", + "port-version": 4 + }, { "git-tree": "120510985335ea4bd1b8a91982d0f95842e43ba3", "version": "3.1", diff --git a/external_imported/vcpkg/versions/l-/libgpiod.json b/external_imported/vcpkg/versions/l-/libgpiod.json new file mode 100644 index 000000000..8737d8f5d --- /dev/null +++ b/external_imported/vcpkg/versions/l-/libgpiod.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9a8b2a2d891f2435ff9ce3fbcea0bd870327bad0", + "version": "1.6.3", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/l-/libgpod.json b/external_imported/vcpkg/versions/l-/libgpod.json index 09cdc08bd..04c205a2b 100644 --- a/external_imported/vcpkg/versions/l-/libgpod.json +++ b/external_imported/vcpkg/versions/l-/libgpod.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7006c4e3b96b2f99797857f8fee4496871940eff", + "version-date": "2019-08-29", + "port-version": 4 + }, { "git-tree": "5adfcf9af0bb6d32ba1d2f28df12216795406115", "version-date": "2019-08-29", diff --git a/external_imported/vcpkg/versions/l-/libgwenhywfar.json b/external_imported/vcpkg/versions/l-/libgwenhywfar.json index 8449e9141..2fe591469 100644 --- a/external_imported/vcpkg/versions/l-/libgwenhywfar.json +++ b/external_imported/vcpkg/versions/l-/libgwenhywfar.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0aa4c84df4c2b05214574c2dbd524dfee2b694f8", + "version-semver": "5.6.0", + "port-version": 2 + }, { "git-tree": "279d1ba6d5ca2068bcd117050cb0f3c464b2cb8f", "version-semver": "5.6.0", diff --git a/external_imported/vcpkg/versions/l-/libhdfs3.json b/external_imported/vcpkg/versions/l-/libhdfs3.json index 452e12406..3e3ad9c31 100644 --- a/external_imported/vcpkg/versions/l-/libhdfs3.json +++ b/external_imported/vcpkg/versions/l-/libhdfs3.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "b672d2e93109f3909140f7315703ab2ea010d808", + "version-date": "2019-11-05", + "port-version": 3 + }, + { + "git-tree": "440244ba92f1f0b67d7246f707df2545f477f3f4", + "version-string": "2019-11-05", + "port-version": 2 + }, { "git-tree": "21db40c50744011ba13568f8e3a72dd97de84ea9", "version-string": "2019-11-05", diff --git a/external_imported/vcpkg/versions/l-/libheif.json b/external_imported/vcpkg/versions/l-/libheif.json index f89944275..437397e9a 100644 --- a/external_imported/vcpkg/versions/l-/libheif.json +++ b/external_imported/vcpkg/versions/l-/libheif.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "9638a1f823a06ad68484b408f5640ac2204b5262", + "version": "1.12.0", + "port-version": 3 + }, + { + "git-tree": "73b2b4b29035aa22da5ccd0c4c46dbb6e5516424", + "version": "1.12.0", + "port-version": 2 + }, { "git-tree": "738b6fc8b77a7fa90cd5966358dc3be684a832c1", "version": "1.12.0", diff --git a/external_imported/vcpkg/versions/l-/libhsplasma.json b/external_imported/vcpkg/versions/l-/libhsplasma.json index 43e6b79a5..146287506 100644 --- a/external_imported/vcpkg/versions/l-/libhsplasma.json +++ b/external_imported/vcpkg/versions/l-/libhsplasma.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e9aee8fff86881286f825d1efa9afd1d4f013c6", + "version-string": "2021.06.08", + "port-version": 1 + }, { "git-tree": "9ffbd25ec776fbae40999d98a50d927180b560b5", "version-string": "2021.06.08", diff --git a/external_imported/vcpkg/versions/l-/libhv.json b/external_imported/vcpkg/versions/l-/libhv.json index ad084ec2c..f2f0d3cb7 100644 --- a/external_imported/vcpkg/versions/l-/libhv.json +++ b/external_imported/vcpkg/versions/l-/libhv.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "b5953fb3634520fafd04507d0a7266e92c87a129", + "version": "1.2.4", + "port-version": 1 + }, + { + "git-tree": "9867c0ba3cb7de25db2dd22fdd5633de7faae440", + "version": "1.2.4", + "port-version": 0 + }, + { + "git-tree": "83c3744dfa329eb88671faee8c3839c1b5f3901e", + "version": "1.2.2", + "port-version": 1 + }, { "git-tree": "49dd8455e873417e8c6e336cdac63bc40cae8342", "version": "1.2.2", diff --git a/external_imported/vcpkg/versions/l-/libiconv.json b/external_imported/vcpkg/versions/l-/libiconv.json index 9423b2719..24335a8f5 100644 --- a/external_imported/vcpkg/versions/l-/libiconv.json +++ b/external_imported/vcpkg/versions/l-/libiconv.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "cc4f1edf5a444934d4a757420a6cd3fed596e1d5", + "version": "1.16", + "port-version": 13 + }, + { + "git-tree": "3942643a4d682982e61b60611394e4315dfc42a1", + "version": "1.16", + "port-version": 12 + }, { "git-tree": "f82980bff6c23bcccd043300679ebf8afa3e0a22", "version": "1.16", diff --git a/external_imported/vcpkg/versions/l-/libidn2.json b/external_imported/vcpkg/versions/l-/libidn2.json index 47fb7c9c6..1917ca6b9 100644 --- a/external_imported/vcpkg/versions/l-/libidn2.json +++ b/external_imported/vcpkg/versions/l-/libidn2.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "639f3ae3abc9b7265de12b29bfefb49a683e0b53", + "version": "2.3.1", + "port-version": 0 + }, + { + "git-tree": "b1eb568bf3bdf3fdb6e04b69f62f0347f2dff2ed", + "version": "2.3.0", + "port-version": 5 + }, { "git-tree": "a73dca27190e239f6ff09db7124b885a23d732e4", "version": "2.3.0", diff --git a/external_imported/vcpkg/versions/l-/libigl.json b/external_imported/vcpkg/versions/l-/libigl.json index 6498ecd34..17a22a4f4 100644 --- a/external_imported/vcpkg/versions/l-/libigl.json +++ b/external_imported/vcpkg/versions/l-/libigl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b4de37a62b3d7349f427f26ad38b8fe1f386d09d", + "version": "2.3.0", + "port-version": 1 + }, { "git-tree": "6ddb181a509d6897a3e29b7a1a696af1db2e044f", "version": "2.3.0", diff --git a/external_imported/vcpkg/versions/l-/libjpeg-turbo.json b/external_imported/vcpkg/versions/l-/libjpeg-turbo.json index ce4a07cbf..857413fbe 100644 --- a/external_imported/vcpkg/versions/l-/libjpeg-turbo.json +++ b/external_imported/vcpkg/versions/l-/libjpeg-turbo.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "dd9bb6eb0d4e28d2b3ef0d83b6b9ef736555621d", + "version": "2.1.3", + "port-version": 2 + }, + { + "git-tree": "7373af20f73237f0453fb02a1ba097e5f710d2f5", + "version": "2.1.3", + "port-version": 1 + }, + { + "git-tree": "987bbe2533672eff1aaf160f0f36c818a1f986ee", + "version": "2.1.3", + "port-version": 0 + }, { "git-tree": "b37f789a1bb562a1469e0c30cf195c641ab824a6", "version": "2.1.2", diff --git a/external_imported/vcpkg/versions/l-/libjuice.json b/external_imported/vcpkg/versions/l-/libjuice.json index 78d57ea55..cce469f9a 100644 --- a/external_imported/vcpkg/versions/l-/libjuice.json +++ b/external_imported/vcpkg/versions/l-/libjuice.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "62c215b49c59158589a9bc98d02b20243ef1bf0b", + "version": "0.9.8", + "port-version": 0 + }, + { + "git-tree": "f544d762be0d7f9016b47f865843d0e575535166", + "version": "0.9.6", + "port-version": 0 + }, { "git-tree": "564ac624cbbabb45356d592264c090a0e6f64669", "version": "0.9.1", diff --git a/external_imported/vcpkg/versions/l-/liblinear.json b/external_imported/vcpkg/versions/l-/liblinear.json index bc5f62266..3c17116bb 100644 --- a/external_imported/vcpkg/versions/l-/liblinear.json +++ b/external_imported/vcpkg/versions/l-/liblinear.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5b88b9d95a1e851e77dd3018ce305abdc529a5da", + "version": "243", + "port-version": 1 + }, { "git-tree": "1a1acaef662beb37406c20bf6293109025f8df1b", "version-string": "243", diff --git a/external_imported/vcpkg/versions/l-/liblsl.json b/external_imported/vcpkg/versions/l-/liblsl.json index d62780f23..37c645f7a 100644 --- a/external_imported/vcpkg/versions/l-/liblsl.json +++ b/external_imported/vcpkg/versions/l-/liblsl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "282fee909d2df5c818b0577a4c063c146376cef5", + "version": "1.16.0", + "port-version": 0 + }, { "git-tree": "451923eac66cd517eb01dbf297e207e0760c4414", "version-string": "1.14.0", diff --git a/external_imported/vcpkg/versions/l-/liblzma.json b/external_imported/vcpkg/versions/l-/liblzma.json index aa67e4602..ce6deba11 100644 --- a/external_imported/vcpkg/versions/l-/liblzma.json +++ b/external_imported/vcpkg/versions/l-/liblzma.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "18b7cbd0972b536a6bd4c0ef0f41dce9c3f047ac", + "version-semver": "5.2.5", + "port-version": 5 + }, { "git-tree": "273eaeff533f90bc42394cca9f1ea23ff6b49534", "version-semver": "5.2.5", diff --git a/external_imported/vcpkg/versions/l-/libmesh.json b/external_imported/vcpkg/versions/l-/libmesh.json index a8ebbf98a..555e78ddd 100644 --- a/external_imported/vcpkg/versions/l-/libmesh.json +++ b/external_imported/vcpkg/versions/l-/libmesh.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "347e56f7cd6e4bf1ca5621c564e4421a7f5a45cd", + "version": "1.5.0", + "port-version": 4 + }, + { + "git-tree": "8583d8a15a7b694bb7a8346580c5f8a3f7478f28", + "version-string": "1.5.0", + "port-version": 3 + }, { "git-tree": "99d2914d8591e790d8d9e16eeb572b2dfa6776d7", "version-string": "1.5.0", diff --git a/external_imported/vcpkg/versions/l-/libmicrohttpd.json b/external_imported/vcpkg/versions/l-/libmicrohttpd.json index 484dff20c..d90a9e06b 100644 --- a/external_imported/vcpkg/versions/l-/libmicrohttpd.json +++ b/external_imported/vcpkg/versions/l-/libmicrohttpd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "059bfe5715b9179cbd4d365ca571e6fade762700", + "version": "0.9.75", + "port-version": 0 + }, { "git-tree": "f6c2bc7d6fd2ee5441a6235f3c99067aad069b14", "version": "0.9.63", diff --git a/external_imported/vcpkg/versions/l-/libmodbus.json b/external_imported/vcpkg/versions/l-/libmodbus.json index 86be284b3..f0a166f16 100644 --- a/external_imported/vcpkg/versions/l-/libmodbus.json +++ b/external_imported/vcpkg/versions/l-/libmodbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "654921557bd29a70ed05ce78374c52b43e6defad", + "version": "3.1.6", + "port-version": 2 + }, { "git-tree": "a4d3ea1104f095d0d92d4f81d595776ad6f6b21e", "version-string": "3.1.6", diff --git a/external_imported/vcpkg/versions/l-/libmpeg2.json b/external_imported/vcpkg/versions/l-/libmpeg2.json index e13c81d62..a291c352e 100644 --- a/external_imported/vcpkg/versions/l-/libmpeg2.json +++ b/external_imported/vcpkg/versions/l-/libmpeg2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "71e878d5483d51cab0d347f8e4e162b305216255", + "version": "0.5.1", + "port-version": 2 + }, { "git-tree": "f7325b83ac5b58747d2dc18859f771b641a0d76f", "version-string": "0.5.1", diff --git a/external_imported/vcpkg/versions/l-/libmt32emu.json b/external_imported/vcpkg/versions/l-/libmt32emu.json index 5fd4ad5af..76e96543d 100644 --- a/external_imported/vcpkg/versions/l-/libmt32emu.json +++ b/external_imported/vcpkg/versions/l-/libmt32emu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "de283dae22ced9be75cf6356a02732fec8b4eb11", + "version": "2.6.2", + "port-version": 0 + }, { "git-tree": "da8f12396b75ff5163acd190bf7f79a3d0b5098a", "version": "2.5.3", diff --git a/external_imported/vcpkg/versions/l-/libmupdf.json b/external_imported/vcpkg/versions/l-/libmupdf.json index a900d9f5f..67e2b7dc0 100644 --- a/external_imported/vcpkg/versions/l-/libmupdf.json +++ b/external_imported/vcpkg/versions/l-/libmupdf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9ca3ac09949f15d339ff747bb36f8593ff087959", + "version": "1.19.0-rc2", + "port-version": 1 + }, { "git-tree": "e91affc70edc5bab8dc75c274f14ba03b345c0bb", "version-string": "1.19.0-rc2", diff --git a/external_imported/vcpkg/versions/l-/libmysql.json b/external_imported/vcpkg/versions/l-/libmysql.json index 113bab426..c1a4d97c6 100644 --- a/external_imported/vcpkg/versions/l-/libmysql.json +++ b/external_imported/vcpkg/versions/l-/libmysql.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2bc452d4f5cd5392799424e1bb920175f979dd84", + "version": "8.0.20", + "port-version": 6 + }, { "git-tree": "d19f8e799e7eb9dc6c24968d1fa8c31debc38b62", "version": "8.0.20", diff --git a/external_imported/vcpkg/versions/l-/libnice.json b/external_imported/vcpkg/versions/l-/libnice.json index a6b3d01b0..199e05f67 100644 --- a/external_imported/vcpkg/versions/l-/libnice.json +++ b/external_imported/vcpkg/versions/l-/libnice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0317c7f34e075c4ebad894b0a6fffed8657f93e5", + "version": "0.1.18", + "port-version": 0 + }, { "git-tree": "5149e313236cfc0ae0e7352e6d151559564bd657", "version": "0.1.15", diff --git a/external_imported/vcpkg/versions/l-/libnoise.json b/external_imported/vcpkg/versions/l-/libnoise.json index 1300aa980..73a4991fa 100644 --- a/external_imported/vcpkg/versions/l-/libnoise.json +++ b/external_imported/vcpkg/versions/l-/libnoise.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24b694017cb633bae1e071413648afdf3623fc38", + "version": "1.0.0", + "port-version": 3 + }, { "git-tree": "d9a3fa0e4772f2c11fe3d177dea6ec8a23b06b07", "version-string": "1.0.0", diff --git a/external_imported/vcpkg/versions/l-/libosip2.json b/external_imported/vcpkg/versions/l-/libosip2.json index b3dd2aa34..e94b9362b 100644 --- a/external_imported/vcpkg/versions/l-/libosip2.json +++ b/external_imported/vcpkg/versions/l-/libosip2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "711e04603ccba9622918413848035af14335ef63", + "version": "5.2.0", + "port-version": 2 + }, { "git-tree": "918421395ccee5a5d894f2720b4a779369eb0f97", "version": "5.2.0", diff --git a/external_imported/vcpkg/versions/l-/libosmium.json b/external_imported/vcpkg/versions/l-/libosmium.json index acf60f09b..ff0000a08 100644 --- a/external_imported/vcpkg/versions/l-/libosmium.json +++ b/external_imported/vcpkg/versions/l-/libosmium.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e9ae3d97e11dfebbba6d839add7886b4bede3b1", + "version-semver": "2.17.1", + "port-version": 1 + }, { "git-tree": "862e140771bed4c7e9b7bc8ffc798edbbd3daa1c", "version-semver": "2.17.1", diff --git a/external_imported/vcpkg/versions/l-/libp7client.json b/external_imported/vcpkg/versions/l-/libp7client.json index c8f285bd0..e1b4da476 100644 --- a/external_imported/vcpkg/versions/l-/libp7client.json +++ b/external_imported/vcpkg/versions/l-/libp7client.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dcf6b61cbaf4a0d50c256e830142176b49eabad6", + "version-string": "5.6", + "port-version": 2 + }, { "git-tree": "dcb9500d0ef29115ec13c39c943ce85d2030ac56", "version-string": "5.6", diff --git a/external_imported/vcpkg/versions/l-/libpff.json b/external_imported/vcpkg/versions/l-/libpff.json index ddaf67af5..7d305a168 100644 --- a/external_imported/vcpkg/versions/l-/libpff.json +++ b/external_imported/vcpkg/versions/l-/libpff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24cc99a6c6ead368c4711dc67e8e7a7ae4444f09", + "version-date": "2018-07-14", + "port-version": 3 + }, { "git-tree": "fc83ea1c4fe9bd9731134772ff7df1c1f3ff6ab9", "version-string": "2018-07-14", diff --git a/external_imported/vcpkg/versions/l-/libpq.json b/external_imported/vcpkg/versions/l-/libpq.json index bdad019f8..2944d48a5 100644 --- a/external_imported/vcpkg/versions/l-/libpq.json +++ b/external_imported/vcpkg/versions/l-/libpq.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "0f614944d19861d7751cd9c880c6b61d87f36a3d", + "version": "14.1", + "port-version": 1 + }, + { + "git-tree": "f33ace97e90816fb5aa827168d87aec2f1f95705", + "version": "14.1", + "port-version": 0 + }, { "git-tree": "099cade84111279ffa4a909061cb8f4f36137842", "version": "12.9", diff --git a/external_imported/vcpkg/versions/l-/libpqxx.json b/external_imported/vcpkg/versions/l-/libpqxx.json index 8166fc426..5c0592d27 100644 --- a/external_imported/vcpkg/versions/l-/libpqxx.json +++ b/external_imported/vcpkg/versions/l-/libpqxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6dd0107ca668c589cf18a57a884dd3ef276730cf", + "version-semver": "7.6.0", + "port-version": 3 + }, { "git-tree": "5c4df2807e229629d04aecc0a66f11219d4dcbcd", "version-semver": "7.6.0", diff --git a/external_imported/vcpkg/versions/l-/libproxy.json b/external_imported/vcpkg/versions/l-/libproxy.json index 034b48d44..1a5479e01 100644 --- a/external_imported/vcpkg/versions/l-/libproxy.json +++ b/external_imported/vcpkg/versions/l-/libproxy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a44c6a0f0d04d6ea82c7a29c879dfd13cadb38ca", + "version": "0.4.17", + "port-version": 2 + }, { "git-tree": "159dadd3ff9a4ba3ce1fec74a933980aa895ee02", "version": "0.4.17", diff --git a/external_imported/vcpkg/versions/l-/libqcow.json b/external_imported/vcpkg/versions/l-/libqcow.json index 2d4ce7f32..7ea89f693 100644 --- a/external_imported/vcpkg/versions/l-/libqcow.json +++ b/external_imported/vcpkg/versions/l-/libqcow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "03d185bd85372ecd790739994ef2eb487a9595bc", + "version-string": "20210419", + "port-version": 2 + }, { "git-tree": "1d32eac160d01f07c4918816493353b53375f7de", "version-string": "20210419", diff --git a/external_imported/vcpkg/versions/l-/librabbitmq.json b/external_imported/vcpkg/versions/l-/librabbitmq.json index 7b0b761a4..1184cdf79 100644 --- a/external_imported/vcpkg/versions/l-/librabbitmq.json +++ b/external_imported/vcpkg/versions/l-/librabbitmq.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "3131805ba3b7940db19df08d930a13d2fc1c707c", + "version": "0.11.0", + "port-version": 1 + }, + { + "git-tree": "cfed3947ffb960b8b8bd399093aa21f5981464b7", + "version": "0.11.0", + "port-version": 0 + }, { "git-tree": "002128f2677cfaa53843e36849ebcfef1f2c540e", "version-string": "2020-06-03", diff --git a/external_imported/vcpkg/versions/l-/libraqm.json b/external_imported/vcpkg/versions/l-/libraqm.json index 12ac74fd8..b024ba019 100644 --- a/external_imported/vcpkg/versions/l-/libraqm.json +++ b/external_imported/vcpkg/versions/l-/libraqm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e5cdb799bec1a56eba248db499ac2e64d8a3b059", + "version-string": "0.9.0", + "port-version": 0 + }, { "git-tree": "7c83ce59ebe48d25178c998704ba4559807288ba", "version-string": "0.7.0", diff --git a/external_imported/vcpkg/versions/l-/librdkafka.json b/external_imported/vcpkg/versions/l-/librdkafka.json index 4d4df5405..ff08e20cb 100644 --- a/external_imported/vcpkg/versions/l-/librdkafka.json +++ b/external_imported/vcpkg/versions/l-/librdkafka.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "0583e5dcb6a79a29685250e2b43ca1cd2a798d96", + "version": "1.8.2", + "port-version": 2 + }, + { + "git-tree": "2f7a6da2edf664e544914466d1cc8994d1ea475a", + "version": "1.8.2", + "port-version": 1 + }, { "git-tree": "dc5076b17ce1f54f6e61560036325ca9f24cda64", "version": "1.8.2", diff --git a/external_imported/vcpkg/versions/l-/libressl.json b/external_imported/vcpkg/versions/l-/libressl.json index 0ba04b1e1..7312a9eda 100644 --- a/external_imported/vcpkg/versions/l-/libressl.json +++ b/external_imported/vcpkg/versions/l-/libressl.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "09613175bb9f051a273b68c0520ad4017d8fabd9", + "version": "3.4.2", + "port-version": 0 + }, + { + "git-tree": "1541c15439fdf9199c6796b51cd59fa644b7d9e4", + "version": "3.3.4", + "port-version": 1 + }, { "git-tree": "2dcc81c2e764c5f32d9c35280ab9ae06fda622c3", "version": "3.3.4", diff --git a/external_imported/vcpkg/versions/l-/librsync.json b/external_imported/vcpkg/versions/l-/librsync.json index 1233b9154..6ea83e07f 100644 --- a/external_imported/vcpkg/versions/l-/librsync.json +++ b/external_imported/vcpkg/versions/l-/librsync.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1d252092a8f0d2ecbf57a4113324b363d4c43db1", + "version-semver": "2.3.2", + "port-version": 1 + }, { "git-tree": "e6fbc4e5fec56fbef5ac08d642e8b550a1c47490", "version-semver": "2.3.2", diff --git a/external_imported/vcpkg/versions/l-/librtmp.json b/external_imported/vcpkg/versions/l-/librtmp.json index 72021cfdd..6f0544b25 100644 --- a/external_imported/vcpkg/versions/l-/librtmp.json +++ b/external_imported/vcpkg/versions/l-/librtmp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "337fb3f8ed2cb44c9ed06d7dc8b00356e077aa40", + "version-date": "2019-11-11", + "port-version": 3 + }, { "git-tree": "f3b156fff5f461b63a2665c4ec4a9a805e5a5447", "version-date": "2019-11-11", diff --git a/external_imported/vcpkg/versions/l-/libsass.json b/external_imported/vcpkg/versions/l-/libsass.json index 1e5b38e6c..55295b935 100644 --- a/external_imported/vcpkg/versions/l-/libsass.json +++ b/external_imported/vcpkg/versions/l-/libsass.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f688f8a8026f1078f224e7bcc4eef8fc21561a2", + "version": "3.6.5", + "port-version": 1 + }, { "git-tree": "f6568e763bc2718b27a5dc2d3d1db4d3cf651572", "version": "3.6.5", diff --git a/external_imported/vcpkg/versions/l-/libsbml.json b/external_imported/vcpkg/versions/l-/libsbml.json index 9dd6c3d51..2f488b144 100644 --- a/external_imported/vcpkg/versions/l-/libsbml.json +++ b/external_imported/vcpkg/versions/l-/libsbml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9793402aaa4679187a9a703f189239544e3daf77", + "version": "5.19.0", + "port-version": 2 + }, { "git-tree": "12ec3d5ff69d3e8b960c03b9b0ae8127663227f5", "version": "5.19.0", diff --git a/external_imported/vcpkg/versions/l-/libslirp.json b/external_imported/vcpkg/versions/l-/libslirp.json new file mode 100644 index 000000000..a46de194d --- /dev/null +++ b/external_imported/vcpkg/versions/l-/libslirp.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "3230fcf2c1b8018c5eac033b618f2cb35217772f", + "version-semver": "4.6.1", + "port-version": 1 + }, + { + "git-tree": "5a7b734c0850f035d3eb2abc2d3dbf6389124be5", + "version-semver": "4.6.1", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/l-/libsmb2.json b/external_imported/vcpkg/versions/l-/libsmb2.json index 3e27f55b6..07034124a 100644 --- a/external_imported/vcpkg/versions/l-/libsmb2.json +++ b/external_imported/vcpkg/versions/l-/libsmb2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2793ccd966a8c7b7cbe925000471c3ba3ef7d77b", + "version-date": "2021-04-29", + "port-version": 1 + }, { "git-tree": "033110ed64eb6d73a85ab8439c13b84b5ee02891", "version-date": "2021-04-29", diff --git a/external_imported/vcpkg/versions/l-/libsndfile.json b/external_imported/vcpkg/versions/l-/libsndfile.json index d0206cf84..b1d58472d 100644 --- a/external_imported/vcpkg/versions/l-/libsndfile.json +++ b/external_imported/vcpkg/versions/l-/libsndfile.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1ec8249a4721dda26735a12603defe2aa680c264", + "version-semver": "1.1.0", + "port-version": 0 + }, { "git-tree": "587283d6fa07092beece87351d1361506293ff59", "version-string": "1.0.31", diff --git a/external_imported/vcpkg/versions/l-/libsnoretoast.json b/external_imported/vcpkg/versions/l-/libsnoretoast.json index 513047f33..026d6eaac 100644 --- a/external_imported/vcpkg/versions/l-/libsnoretoast.json +++ b/external_imported/vcpkg/versions/l-/libsnoretoast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9931c3af48647454daf01f77ea23c63fc9aeb732", + "version": "0.8.0", + "port-version": 2 + }, { "git-tree": "66d0c5615dc55a5a5201e6de21d5a7acbaa4bd9b", "version": "0.8.0", diff --git a/external_imported/vcpkg/versions/l-/libsoundio.json b/external_imported/vcpkg/versions/l-/libsoundio.json index 083e8b901..b2a720c60 100644 --- a/external_imported/vcpkg/versions/l-/libsoundio.json +++ b/external_imported/vcpkg/versions/l-/libsoundio.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ff8356daa64c082441be7beb2d51c5360a54a6cd", + "version": "2.0.0", + "port-version": 6 + }, + { + "git-tree": "ea8a154b722a142045906b20d2df00a38d330d6b", + "version": "2.0.0", + "port-version": 5 + }, { "git-tree": "96de946826ca6aafdc9409f9d75f02a6d082cffb", "version": "2.0.0", diff --git a/external_imported/vcpkg/versions/l-/libspatialite.json b/external_imported/vcpkg/versions/l-/libspatialite.json index 6e1c427f8..a12239827 100644 --- a/external_imported/vcpkg/versions/l-/libspatialite.json +++ b/external_imported/vcpkg/versions/l-/libspatialite.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "4d7f5aa6151c1285c1b6cd5b6c03ee34db4c0c98", + "version": "5.0.1", + "port-version": 4 + }, + { + "git-tree": "ad90cccc74f447ccc40309956f67092c845fe40b", + "version": "5.0.1", + "port-version": 3 + }, { "git-tree": "35cc452ea0fc43d38cfca4d340e47f13c9fd740f", "version": "5.0.1", diff --git a/external_imported/vcpkg/versions/l-/libspnav.json b/external_imported/vcpkg/versions/l-/libspnav.json index 33081a8b7..353ca850d 100644 --- a/external_imported/vcpkg/versions/l-/libspnav.json +++ b/external_imported/vcpkg/versions/l-/libspnav.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6c31fef991e0961c3194b1f9847469e98a1bdb03", + "version": "0.2.3", + "port-version": 2 + }, { "git-tree": "c34294f2e748d1600ca87ed7086a0ddcedb1a7b9", "version-string": "0.2.3", diff --git a/external_imported/vcpkg/versions/l-/libsquish.json b/external_imported/vcpkg/versions/l-/libsquish.json index 4c70c7dec..da008f533 100644 --- a/external_imported/vcpkg/versions/l-/libsquish.json +++ b/external_imported/vcpkg/versions/l-/libsquish.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9a7ae325bacc78d07dc92de654a877584cff0cca", + "version": "1.15", + "port-version": 10 + }, { "git-tree": "97da7fd0b127d2b07821950e5aee7acadbcd9d17", "version-string": "1.15", diff --git a/external_imported/vcpkg/versions/l-/libsrt.json b/external_imported/vcpkg/versions/l-/libsrt.json index aa4078732..80e2ed58c 100644 --- a/external_imported/vcpkg/versions/l-/libsrt.json +++ b/external_imported/vcpkg/versions/l-/libsrt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bec354df76b0c680977252a11a9e88b1ae6818b9", + "version": "1.4.4", + "port-version": 2 + }, { "git-tree": "8181eb237eec2ba795164edfbd47f69d6b8466d8", "version": "1.4.4", diff --git a/external_imported/vcpkg/versions/l-/libsrtp.json b/external_imported/vcpkg/versions/l-/libsrtp.json index eafc5bb2b..85c54b46b 100644 --- a/external_imported/vcpkg/versions/l-/libsrtp.json +++ b/external_imported/vcpkg/versions/l-/libsrtp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a7e8bce682acd4a29f666961a69127864cd93374", + "version": "2.4.2", + "port-version": 1 + }, { "git-tree": "20d89602c93b0aa1df176a8610b514b014375c8c", "version": "2.4.2", diff --git a/external_imported/vcpkg/versions/l-/libssh.json b/external_imported/vcpkg/versions/l-/libssh.json index 087f62b1f..3d650f766 100644 --- a/external_imported/vcpkg/versions/l-/libssh.json +++ b/external_imported/vcpkg/versions/l-/libssh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7023d2f926234da8e19b11cb3a6d1d37dfbb008c", + "version": "0.9.6", + "port-version": 2 + }, { "git-tree": "9e1cde44baefed40b0e994bfe088a7788f1efacf", "version": "0.9.6", diff --git a/external_imported/vcpkg/versions/l-/libssh2.json b/external_imported/vcpkg/versions/l-/libssh2.json index 0d3fbfbeb..821615909 100644 --- a/external_imported/vcpkg/versions/l-/libssh2.json +++ b/external_imported/vcpkg/versions/l-/libssh2.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "5d6f965bcf911a4750731aad9785a4b40686a2b3", + "version": "1.10.0", + "port-version": 4 + }, + { + "git-tree": "d1a340be6b7c2a25f42cf4de44c836a577477bfc", + "version": "1.10.0", + "port-version": 3 + }, + { + "git-tree": "944feb4094c60226c2526be764fed688bb8b334f", + "version": "1.10.0", + "port-version": 2 + }, + { + "git-tree": "3c6dd977de517dc2091377a58c55b7d23f2bc3a0", + "version": "1.10.0", + "port-version": 1 + }, { "git-tree": "996df01b95684f41e8870b9154aeea3bffc63840", "version": "1.10.0", diff --git a/external_imported/vcpkg/versions/l-/libtcod.json b/external_imported/vcpkg/versions/l-/libtcod.json index eb40f06b1..4cc62a81d 100644 --- a/external_imported/vcpkg/versions/l-/libtcod.json +++ b/external_imported/vcpkg/versions/l-/libtcod.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ec66d469b71cab685daede349e5193d15ab866c7", + "version": "1.20.1", + "port-version": 0 + }, { "git-tree": "6ab01712cf4356c3364d01b0e2c2c8cbbad760a3", "version-semver": "1.19.0", diff --git a/external_imported/vcpkg/versions/l-/libtins.json b/external_imported/vcpkg/versions/l-/libtins.json index 176027fc6..d81d747b0 100644 --- a/external_imported/vcpkg/versions/l-/libtins.json +++ b/external_imported/vcpkg/versions/l-/libtins.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "4a1470befea5c6b5c7418f9b85f37d6f8733d7d5", + "version": "4.3", + "port-version": 6 + }, + { + "git-tree": "9abc8b1a535ffaf99a680412cfd8f0c743c3fc6d", + "version": "4.3", + "port-version": 5 + }, { "git-tree": "de1a1dc51c90ca57412fe5f8d57eeef42a41ec74", "version": "4.3", diff --git a/external_imported/vcpkg/versions/l-/libtorrent.json b/external_imported/vcpkg/versions/l-/libtorrent.json index 919372b2e..bb12eb92f 100644 --- a/external_imported/vcpkg/versions/l-/libtorrent.json +++ b/external_imported/vcpkg/versions/l-/libtorrent.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e27617cd7ff2be85ee0c2d4a60be16cee95f1302", + "version": "2.0.5", + "port-version": 0 + }, + { + "git-tree": "eec22cb36f26cc1cd10714a8bdd974b451ba9832", + "version": "1.2.14", + "port-version": 2 + }, { "git-tree": "8ee811432c2056d11d9f2d346142c2c1be44a328", "version": "1.2.14", diff --git a/external_imported/vcpkg/versions/l-/libu2f-server.json b/external_imported/vcpkg/versions/l-/libu2f-server.json index cb3a974df..19fb01c5f 100644 --- a/external_imported/vcpkg/versions/l-/libu2f-server.json +++ b/external_imported/vcpkg/versions/l-/libu2f-server.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cb5d1d70d0e3baab221910b12b33e9e34fd383f2", + "version": "1.1.0", + "port-version": 4 + }, { "git-tree": "1939b985161f406db50f8e455a5b7c4ada800596", "version-string": "1.1.0", diff --git a/external_imported/vcpkg/versions/l-/libudis86.json b/external_imported/vcpkg/versions/l-/libudis86.json index 0e098416d..1cd4ee611 100644 --- a/external_imported/vcpkg/versions/l-/libudis86.json +++ b/external_imported/vcpkg/versions/l-/libudis86.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "22693ee63d17429c0430a2888b515a047cbb4c7d", + "version-string": "2018-01-28-56ff6c87", + "port-version": 2 + }, { "git-tree": "e8ab6af2cfbbb52901433f92f0c028bc766ce3ae", "version-string": "2018-01-28-56ff6c87", diff --git a/external_imported/vcpkg/versions/l-/libunistring.json b/external_imported/vcpkg/versions/l-/libunistring.json index 3651b41cf..90395ba3c 100644 --- a/external_imported/vcpkg/versions/l-/libunistring.json +++ b/external_imported/vcpkg/versions/l-/libunistring.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1d6ff819975c70dc53d9aefa5d9046a0a21617b4", + "version": "0.9.10", + "port-version": 2 + }, { "git-tree": "7e74b9d781041b3a5c09b72f77b8e79ea6add168", "version": "0.9.10", diff --git a/external_imported/vcpkg/versions/l-/liburing.json b/external_imported/vcpkg/versions/l-/liburing.json index 0ec46a4a7..2fc0750a7 100644 --- a/external_imported/vcpkg/versions/l-/liburing.json +++ b/external_imported/vcpkg/versions/l-/liburing.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "10bf5144950610a1f587342c5107bf4fdfb52658", + "version": "2.0", + "port-version": 3 + }, + { + "git-tree": "65bbf5b3f642b9e76a659d78a9077d207c827b76", + "version": "2.0", + "port-version": 2 + }, + { + "git-tree": "e193d537e05887e8efeae8ab1328dc7e33499e01", + "version": "2.0", + "port-version": 1 + }, { "git-tree": "b4d90242721d15d6dc5287690c3b8d42c2e8d0f0", "version": "2.0", diff --git a/external_imported/vcpkg/versions/l-/libusb-win32.json b/external_imported/vcpkg/versions/l-/libusb-win32.json index df798ee16..e7f17dc82 100644 --- a/external_imported/vcpkg/versions/l-/libusb-win32.json +++ b/external_imported/vcpkg/versions/l-/libusb-win32.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fd3ac7f3d9331b546a957f651f9f911d69d7ef4f", + "version-string": "1.2.6.0", + "port-version": 8 + }, { "git-tree": "a75f1e3bedf1a31e8c812d07c24eb867fdd74a29", "version-string": "1.2.6.0", diff --git a/external_imported/vcpkg/versions/l-/libusbmuxd.json b/external_imported/vcpkg/versions/l-/libusbmuxd.json index c378816e6..06351ca95 100644 --- a/external_imported/vcpkg/versions/l-/libusbmuxd.json +++ b/external_imported/vcpkg/versions/l-/libusbmuxd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d6ac12d94326fae11d86e39030433003251aa62", + "version": "1.2.219", + "port-version": 2 + }, { "git-tree": "a50e755ad62ff56d5012dd84e0ccd196175a807c", "version-string": "1.2.219", diff --git a/external_imported/vcpkg/versions/l-/libuuid.json b/external_imported/vcpkg/versions/l-/libuuid.json index 0fdb748ec..aeb730dcd 100644 --- a/external_imported/vcpkg/versions/l-/libuuid.json +++ b/external_imported/vcpkg/versions/l-/libuuid.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "4d0fcae0591fc7776a9cf39996796326222e72ad", + "version": "1.0.3", + "port-version": 11 + }, + { + "git-tree": "47283ef4bb45ef38cfd61160bc1cec2d69e572b4", + "version": "1.0.3", + "port-version": 10 + }, { "git-tree": "a545c6c9bf405bd60cb97d6e2086f1273f5a3321", "version": "1.0.3", diff --git a/external_imported/vcpkg/versions/l-/libuv.json b/external_imported/vcpkg/versions/l-/libuv.json index 56c9a2b88..fd88da0a5 100644 --- a/external_imported/vcpkg/versions/l-/libuv.json +++ b/external_imported/vcpkg/versions/l-/libuv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa2d73ef2b9197ea47572bc783826b650ed04f0f", + "version-semver": "1.43.0", + "port-version": 0 + }, { "git-tree": "2cb9ed135277e1b121fbf0a391be6a8d5cb2ddcf", "version-semver": "1.42.0", diff --git a/external_imported/vcpkg/versions/l-/libvmdk.json b/external_imported/vcpkg/versions/l-/libvmdk.json index d2569ca29..d62a1103c 100644 --- a/external_imported/vcpkg/versions/l-/libvmdk.json +++ b/external_imported/vcpkg/versions/l-/libvmdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f1d35304c7ab4940f834735c091eca7a2ee43305", + "version-string": "20200926", + "port-version": 2 + }, { "git-tree": "8efc63f616daad6af987a274eb292d2605bd8f4b", "version-string": "20200926", diff --git a/external_imported/vcpkg/versions/l-/libvorbis.json b/external_imported/vcpkg/versions/l-/libvorbis.json index 03309caf1..0df7ea5b3 100644 --- a/external_imported/vcpkg/versions/l-/libvorbis.json +++ b/external_imported/vcpkg/versions/l-/libvorbis.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c4c646a26ce3e6ad63992d3e4a55cb185159b23c", + "version": "1.3.7", + "port-version": 2 + }, { "git-tree": "54dcb5ab354422e9518a905d501ccc22dcb69098", "version-string": "1.3.7", diff --git a/external_imported/vcpkg/versions/l-/libwandio.json b/external_imported/vcpkg/versions/l-/libwandio.json index 754697db3..53798c59b 100644 --- a/external_imported/vcpkg/versions/l-/libwandio.json +++ b/external_imported/vcpkg/versions/l-/libwandio.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "eb4e485cc1313349e0fbb65d4997d5968245877a", + "version": "4.2.1", + "port-version": 6 + }, + { + "git-tree": "8340fce2f7c5dd26c578bb7c59f8d3f8d982c105", + "version-string": "4.2.1", + "port-version": 5 + }, { "git-tree": "ffa2cfbc601c2a9a2fdcbc20f44b312597952ec6", "version-string": "4.2.1", diff --git a/external_imported/vcpkg/versions/l-/libwebsockets.json b/external_imported/vcpkg/versions/l-/libwebsockets.json index f30fa0291..16e498395 100644 --- a/external_imported/vcpkg/versions/l-/libwebsockets.json +++ b/external_imported/vcpkg/versions/l-/libwebsockets.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "52c31e301f0eaa969b7850c20be357ec3f845994", + "version-semver": "4.3.0", + "port-version": 3 + }, + { + "git-tree": "d8b0df2d428b6902450b58a8dc5e0743549d16b0", + "version-semver": "4.3.0", + "port-version": 2 + }, + { + "git-tree": "b4ef6833cbf3bb5c97e3150bbdb61bccb8db21cd", + "version-semver": "4.3.0", + "port-version": 1 + }, { "git-tree": "c3a1ad34c2592c162c5a3b0935fe8adb2d15a08a", "version-semver": "4.3.0", diff --git a/external_imported/vcpkg/versions/l-/libxdiff.json b/external_imported/vcpkg/versions/l-/libxdiff.json index e475c8b97..130c9f6fe 100644 --- a/external_imported/vcpkg/versions/l-/libxdiff.json +++ b/external_imported/vcpkg/versions/l-/libxdiff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "88e90a302307649ee4266069f5f85a06941530ff", + "version": "0.23", + "port-version": 2 + }, { "git-tree": "dfe80df2ce315833069e20c710acf1349b901e60", "version-string": "0.23", diff --git a/external_imported/vcpkg/versions/l-/libxml2.json b/external_imported/vcpkg/versions/l-/libxml2.json index 5645cd564..e3f0b4de3 100644 --- a/external_imported/vcpkg/versions/l-/libxml2.json +++ b/external_imported/vcpkg/versions/l-/libxml2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "582189632eff9dc4ba2ef262a853c339d2838bd9", + "version-semver": "2.9.12", + "port-version": 5 + }, { "git-tree": "5cb8ed61786fdd081204880cd02d9376b17130eb", "version-semver": "2.9.12", diff --git a/external_imported/vcpkg/versions/l-/libxmp-lite.json b/external_imported/vcpkg/versions/l-/libxmp-lite.json index 2b2ca1075..7fde53fb3 100644 --- a/external_imported/vcpkg/versions/l-/libxmp-lite.json +++ b/external_imported/vcpkg/versions/l-/libxmp-lite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb6da404365a98bffa1f8622b652c15929c81811", + "version": "4.4.1", + "port-version": 8 + }, { "git-tree": "dda1a742b2612d9d926fef9c804d5e5efd041777", "version-string": "4.4.1", diff --git a/external_imported/vcpkg/versions/l-/libxslt.json b/external_imported/vcpkg/versions/l-/libxslt.json index 00300beaa..4305d6ee5 100644 --- a/external_imported/vcpkg/versions/l-/libxslt.json +++ b/external_imported/vcpkg/versions/l-/libxslt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "034ea26a2cde47c4d19df6eb35bc124a79ad37a3", + "version": "1.1.34", + "port-version": 4 + }, { "git-tree": "f139a7054e2347bc0f48ba6cabe14a74e7d1db36", "version": "1.1.34", diff --git a/external_imported/vcpkg/versions/l-/licensepp.json b/external_imported/vcpkg/versions/l-/licensepp.json index 20cd42e9e..6318660c9 100644 --- a/external_imported/vcpkg/versions/l-/licensepp.json +++ b/external_imported/vcpkg/versions/l-/licensepp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5bbecce6621b387f3522f31745fa839c6401f09d", + "version-date": "2020-05-19", + "port-version": 3 + }, { "git-tree": "f7115621dbc8deb47ebd3a8ff8dc7eeaf26c80fd", "version-string": "2020-05-19", diff --git a/external_imported/vcpkg/versions/l-/lilv.json b/external_imported/vcpkg/versions/l-/lilv.json index 3964c793f..0cc4bdc77 100644 --- a/external_imported/vcpkg/versions/l-/lilv.json +++ b/external_imported/vcpkg/versions/l-/lilv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a4dc357aa0d6533993a18ec3a9358a39d9ed3a54", + "version": "0.24.10", + "port-version": 1 + }, { "git-tree": "7cf6faadffa3ad04da656c4fbbdcee367b302fdb", "version-string": "0.24.10", diff --git a/external_imported/vcpkg/versions/l-/lionkor-commandline.json b/external_imported/vcpkg/versions/l-/lionkor-commandline.json new file mode 100644 index 000000000..0283efb57 --- /dev/null +++ b/external_imported/vcpkg/versions/l-/lionkor-commandline.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "bb56d3f901805ac69ea5d7bd27a07b789f3232e5", + "version-semver": "2.0.0", + "port-version": 0 + }, + { + "git-tree": "857618e8e62e8395973a0c48c61c837877b65fac", + "version-semver": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/l-/llfio.json b/external_imported/vcpkg/versions/l-/llfio.json index 3e695c557..f2a4b5461 100644 --- a/external_imported/vcpkg/versions/l-/llfio.json +++ b/external_imported/vcpkg/versions/l-/llfio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aaacb49264f3175de57367f28c90bd3904d7209f", + "version-string": "2.0-20220112", + "port-version": 0 + }, { "git-tree": "105f6228f09ad995de4826cf860811d3e7eab7f2", "version-string": "2.0-20211208", diff --git a/external_imported/vcpkg/versions/l-/llvm.json b/external_imported/vcpkg/versions/l-/llvm.json index 447998774..ee0a089ff 100644 --- a/external_imported/vcpkg/versions/l-/llvm.json +++ b/external_imported/vcpkg/versions/l-/llvm.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "15418b7e938058677963d920b616403240eca37f", + "version": "13.0.0", + "port-version": 3 + }, + { + "git-tree": "2c86dc65e952d8abe6140578df4db2c742180358", + "version": "13.0.0", + "port-version": 2 + }, { "git-tree": "b3ebd32f2ff4394d72edeb0f4b804d914a2e3f94", "version": "13.0.0", diff --git a/external_imported/vcpkg/versions/l-/lmdb.json b/external_imported/vcpkg/versions/l-/lmdb.json index e33bdad98..027244f68 100644 --- a/external_imported/vcpkg/versions/l-/lmdb.json +++ b/external_imported/vcpkg/versions/l-/lmdb.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "980e2c4a26c75996e3940a9b46032356643e592b", + "version": "0.9.29", + "port-version": 0 + }, + { + "git-tree": "022fa44ff8c5ef9ea4b308468259c0775d4a72c1", + "version": "0.9.24", + "port-version": 2 + }, { "git-tree": "f3599ec6a6285945a3eeeac1f9b0db810855ec5a", "version-string": "0.9.24", diff --git a/external_imported/vcpkg/versions/l-/log4cplus.json b/external_imported/vcpkg/versions/l-/log4cplus.json index 474c940f5..ac896243b 100644 --- a/external_imported/vcpkg/versions/l-/log4cplus.json +++ b/external_imported/vcpkg/versions/l-/log4cplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7eb39878c5311e28d66f4a25e0c1583c1c99ff82", + "version": "2.0.7", + "port-version": 1 + }, { "git-tree": "765ee7e801e35c4c77e890bb4af363042e9384ae", "version": "2.0.7", diff --git a/external_imported/vcpkg/versions/l-/log4cpp.json b/external_imported/vcpkg/versions/l-/log4cpp.json index 44f7d5172..3f35bb86e 100644 --- a/external_imported/vcpkg/versions/l-/log4cpp.json +++ b/external_imported/vcpkg/versions/l-/log4cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ed51c9c96387b0e97754a2ede544d589ae3b5af2", + "version": "2.9.1", + "port-version": 7 + }, { "git-tree": "c68e17d674484b6ec48269fb47eb711f0e2fcbab", "version-string": "2.9.1", diff --git a/external_imported/vcpkg/versions/l-/loguru.json b/external_imported/vcpkg/versions/l-/loguru.json index 9eef71fba..f6ecdd322 100644 --- a/external_imported/vcpkg/versions/l-/loguru.json +++ b/external_imported/vcpkg/versions/l-/loguru.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "827f85e170a1d4548088fa36cf46817e146184d0", + "version": "2.1.0", + "port-version": 3 + }, { "git-tree": "c429f674d828c20881f410892d633b483e9d30dd", "version-string": "2.1.0", diff --git a/external_imported/vcpkg/versions/l-/lua.json b/external_imported/vcpkg/versions/l-/lua.json index b54786308..9ee6c7e25 100644 --- a/external_imported/vcpkg/versions/l-/lua.json +++ b/external_imported/vcpkg/versions/l-/lua.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "26701e6e610ff6eaee198ca1aaa0b9125e4b2d6f", + "version": "5.4.4", + "port-version": 1 + }, + { + "git-tree": "811a56cbdf5cfd0f8e57c2b3cff2a03e5c709723", + "version": "5.4.4", + "port-version": 0 + }, { "git-tree": "6a9a787a9369019f1dd867cc1c1d6c10296441d9", "version-semver": "5.4.3", diff --git a/external_imported/vcpkg/versions/l-/luajit.json b/external_imported/vcpkg/versions/l-/luajit.json index 9f519d788..2e60dce61 100644 --- a/external_imported/vcpkg/versions/l-/luajit.json +++ b/external_imported/vcpkg/versions/l-/luajit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3748aef9d3bd9d941f6af4d9c049cc55194cb7f5", + "version": "2.0.5", + "port-version": 5 + }, { "git-tree": "10777e8d3827f33dd042ae2cee5d309f48a108c0", "version-string": "2.0.5", diff --git a/external_imported/vcpkg/versions/l-/luasec.json b/external_imported/vcpkg/versions/l-/luasec.json index 7e8595650..29c704691 100644 --- a/external_imported/vcpkg/versions/l-/luasec.json +++ b/external_imported/vcpkg/versions/l-/luasec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ac5ef37f939164b6bc4a63bf7eeec24e8e8c5a79", + "version": "1.0.1", + "port-version": 1 + }, { "git-tree": "2529ee34af0b23fb576f0e8ed672ceba83c4c305", "version": "1.0.1", diff --git a/external_imported/vcpkg/versions/l-/luasocket.json b/external_imported/vcpkg/versions/l-/luasocket.json index 40d0976fb..568f5f181 100644 --- a/external_imported/vcpkg/versions/l-/luasocket.json +++ b/external_imported/vcpkg/versions/l-/luasocket.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "94ee0f78bf41cf8d10f7bc25b2305a9a0a33cb36", + "version-date": "2020-09-14", + "port-version": 2 + }, { "git-tree": "9eefd1250090f0a85e48d86a1d25f226e1a978d3", "version-string": "2020-09-14", diff --git a/external_imported/vcpkg/versions/l-/lunasvg.json b/external_imported/vcpkg/versions/l-/lunasvg.json new file mode 100644 index 000000000..fb076139e --- /dev/null +++ b/external_imported/vcpkg/versions/l-/lunasvg.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "bf20380ca537151f7d1e02a6ca5b19c302db18c7", + "version": "2.3.1", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/m-/mailio.json b/external_imported/vcpkg/versions/m-/mailio.json index b46de83b8..156df34a5 100644 --- a/external_imported/vcpkg/versions/m-/mailio.json +++ b/external_imported/vcpkg/versions/m-/mailio.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "a9f20b309b2d9f68c5e10eb193ef19c3c51a3faa", + "version": "0.21.0", + "port-version": 2 + }, + { + "git-tree": "f0fde0f6599aacd2b890c94326f504bf2af8f642", + "version": "0.21.0", + "port-version": 1 + }, + { + "git-tree": "cd8eea3c3ba5b6d465f5c799861571294c795d50", + "version": "0.21.0", + "port-version": 0 + }, + { + "git-tree": "452f51edc1d79104f3cf968477176d155666cb46", + "version": "0.20.0", + "port-version": 2 + }, { "git-tree": "819040f9644957f597a2429bb3365cbf4f58e35d", "version": "0.20.0", diff --git a/external_imported/vcpkg/versions/m-/mapnik.json b/external_imported/vcpkg/versions/m-/mapnik.json index faee7dbb0..19ea139eb 100644 --- a/external_imported/vcpkg/versions/m-/mapnik.json +++ b/external_imported/vcpkg/versions/m-/mapnik.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "ab089220fb5ecc215804a68c2122d3e0d3ed58bc", + "version-date": "2022-01-28", + "port-version": 1 + }, + { + "git-tree": "f352e6316057a4b1751482bd75dd9793aa92771a", + "version-date": "2022-01-28", + "port-version": 0 + }, + { + "git-tree": "e067081de907e0344717281f8d689421621d1798", + "version-date": "2021-12-14", + "port-version": 0 + }, { "git-tree": "3f8eb08ffc7a02dd08de30c0851587d9537fc72e", "version-date": "2021-11-15", diff --git a/external_imported/vcpkg/versions/m-/marl.json b/external_imported/vcpkg/versions/m-/marl.json index 0b62afa36..fe8b7b988 100644 --- a/external_imported/vcpkg/versions/m-/marl.json +++ b/external_imported/vcpkg/versions/m-/marl.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "b6430e8be3b742d1466c45570a5d4946c427dd25", + "version-date": "2022-03-02", + "port-version": 0 + }, + { + "git-tree": "fd57df5a81ab5870018fd3d288922a14a235fcc4", + "version-date": "2021-04-25", + "port-version": 1 + }, { "git-tree": "455a779684efcee90811a7a1d2a86ba1b29a8996", "version-date": "2021-04-25", diff --git a/external_imported/vcpkg/versions/m-/mbedtls.json b/external_imported/vcpkg/versions/m-/mbedtls.json index d9fdc8f6b..440fc362e 100644 --- a/external_imported/vcpkg/versions/m-/mbedtls.json +++ b/external_imported/vcpkg/versions/m-/mbedtls.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "50e6870207f6a1f0b1e2197978b4403de775eac2", + "version": "2.28.0", + "port-version": 0 + }, + { + "git-tree": "676b36c2f6fc72a2fbbbe521ae46fdefe5db67ca", + "version": "2.24.0", + "port-version": 4 + }, { "git-tree": "a68475211755b3999de8cb2ec1d2fdfe9bb8ab10", "version-string": "2.24.0", diff --git a/external_imported/vcpkg/versions/m-/mdnsresponder.json b/external_imported/vcpkg/versions/m-/mdnsresponder.json index 1503ea668..f410f5208 100644 --- a/external_imported/vcpkg/versions/m-/mdnsresponder.json +++ b/external_imported/vcpkg/versions/m-/mdnsresponder.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3a57c5a00a432c5f54ca26ddf0a1ea7298364e55", + "version": "878.270.2", + "port-version": 1 + }, { "git-tree": "0feece31cd1ade61b7f16a0a23880d3b29ad3eb4", "version": "878.270.2", diff --git a/external_imported/vcpkg/versions/m-/mesa.json b/external_imported/vcpkg/versions/m-/mesa.json index 3e7707d7b..37187a0e3 100644 --- a/external_imported/vcpkg/versions/m-/mesa.json +++ b/external_imported/vcpkg/versions/m-/mesa.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "aa75375f1cc9c3c4697c8fa8df4e647fb60f0125", + "version": "21.2.5", + "port-version": 3 + }, + { + "git-tree": "60ae9e5d7081930a0e736be1742db18b01a0114b", + "version": "21.2.5", + "port-version": 2 + }, + { + "git-tree": "9318298d8532439ec65868f7b1997f2b8d49fec5", + "version": "21.2.5", + "port-version": 1 + }, { "git-tree": "55d54a8cf6adc14ea9d2ac84621f75295a367a07", "version": "21.2.5", diff --git a/external_imported/vcpkg/versions/m-/mhook.json b/external_imported/vcpkg/versions/m-/mhook.json index f2e9587c3..40c74d9b3 100644 --- a/external_imported/vcpkg/versions/m-/mhook.json +++ b/external_imported/vcpkg/versions/m-/mhook.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5f4f5f56588f1c2b391e6c8766a4fa4dd713514d", + "version": "2.5.1", + "port-version": 3 + }, { "git-tree": "63acd5f7a94d6b86d9fb2b3642e0fbd253f21e47", "version-string": "2.5.1", diff --git a/external_imported/vcpkg/versions/m-/milerius-sfml-imgui.json b/external_imported/vcpkg/versions/m-/milerius-sfml-imgui.json index 581b42fad..90859a944 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": "4bfc198df4803019e174c0489fcc91e178f66930", + "version": "1.1", + "port-version": 4 + }, { "git-tree": "ecf4d9fd039390613094ab42564601f32f9982c3", "version-string": "1.1", diff --git a/external_imported/vcpkg/versions/m-/mimalloc.json b/external_imported/vcpkg/versions/m-/mimalloc.json index def3c7b02..d5427e0d1 100644 --- a/external_imported/vcpkg/versions/m-/mimalloc.json +++ b/external_imported/vcpkg/versions/m-/mimalloc.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "e4dc5fc89e8c1f860b9f07b3d449a5d67f56cfd4", + "version": "2.0.5", + "port-version": 1 + }, + { + "git-tree": "370692d9dc2cb2bc9f013041003e069e47febb67", + "version": "2.0.5", + "port-version": 0 + }, + { + "git-tree": "e68a15fa535a3dcf4a1dba0f277eb239cc27b863", + "version": "2.0.3", + "port-version": 2 + }, { "git-tree": "0b8064b8481fdeb88e2b4933c485ea0f6b99d779", "version": "2.0.3", diff --git a/external_imported/vcpkg/versions/m-/minhook.json b/external_imported/vcpkg/versions/m-/minhook.json index 8e90429e4..6cab06468 100644 --- a/external_imported/vcpkg/versions/m-/minhook.json +++ b/external_imported/vcpkg/versions/m-/minhook.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fea414bee13115e201fe93699ba5b55c7ae031b8", + "version": "1.3.3", + "port-version": 3 + }, { "git-tree": "8dbdd0ae999b8929af5e9df0cbae321bb0d71cea", "version-string": "1.3.3", diff --git a/external_imported/vcpkg/versions/m-/minizip-ng.json b/external_imported/vcpkg/versions/m-/minizip-ng.json index e71ee7e33..e63af534d 100644 --- a/external_imported/vcpkg/versions/m-/minizip-ng.json +++ b/external_imported/vcpkg/versions/m-/minizip-ng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "36ef459c57047fcfc0ddbfc97d7360d7307acb24", + "version": "3.0.5", + "port-version": 0 + }, { "git-tree": "4a8de7f8609b758c48eea13b67d47c22efc832a3", "version": "3.0.2", diff --git a/external_imported/vcpkg/versions/m-/minizip.json b/external_imported/vcpkg/versions/m-/minizip.json index acbf12137..5931b7c32 100644 --- a/external_imported/vcpkg/versions/m-/minizip.json +++ b/external_imported/vcpkg/versions/m-/minizip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c3bec48dc73b936a25a26a9ec1941aac9e39fcf1", + "version-semver": "1.2.11", + "port-version": 10 + }, { "git-tree": "fc89de0b8a1105f6bee9625bba4031b138862a39", "version-semver": "1.2.11", diff --git a/external_imported/vcpkg/versions/m-/mman.json b/external_imported/vcpkg/versions/m-/mman.json index bf2242361..226b2e7d9 100644 --- a/external_imported/vcpkg/versions/m-/mman.json +++ b/external_imported/vcpkg/versions/m-/mman.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fff4dfa412b18aa027005a5ea952932cbf10cd74", + "version-string": "git-f5ff813", + "port-version": 5 + }, { "git-tree": "30ad8930ff3b29bd994587b1ff58e5205deb32bc", "version-string": "git-f5ff813", diff --git a/external_imported/vcpkg/versions/m-/mmloader.json b/external_imported/vcpkg/versions/m-/mmloader.json index a8aa19357..a381834b3 100644 --- a/external_imported/vcpkg/versions/m-/mmloader.json +++ b/external_imported/vcpkg/versions/m-/mmloader.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "104d16ae01f6ae753fde8406f75a01b9353aa1f2", + "version-date": "2021-12-13", + "port-version": 1 + }, { "git-tree": "030c251ff729f1063950f5473cf393125f888ca2", "version-date": "2021-12-13", diff --git a/external_imported/vcpkg/versions/m-/mnn.json b/external_imported/vcpkg/versions/m-/mnn.json index fd88fd1d5..af46b0080 100644 --- a/external_imported/vcpkg/versions/m-/mnn.json +++ b/external_imported/vcpkg/versions/m-/mnn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e77125ae365a54bdcbbdb5bb2d77d32834a4487b", + "version": "1.1.0", + "port-version": 2 + }, { "git-tree": "10351b13b0daa0e66de483597da63e0d60e9777a", "version": "1.1.0", diff --git a/external_imported/vcpkg/versions/m-/mongoose.json b/external_imported/vcpkg/versions/m-/mongoose.json index fae1081ea..7d09a84ad 100644 --- a/external_imported/vcpkg/versions/m-/mongoose.json +++ b/external_imported/vcpkg/versions/m-/mongoose.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "504d873811dc91402f21952ea4c9fd08602cc822", + "version": "7.5", + "port-version": 1 + }, + { + "git-tree": "e48192c7d0e653962481e1c2be9e7663ead35e74", + "version": "7.5", + "port-version": 0 + }, { "git-tree": "a706659c49d7ac73bfa869a3497ffeec2c57af71", "version": "7.1", diff --git a/external_imported/vcpkg/versions/m-/monkeys-audio.json b/external_imported/vcpkg/versions/m-/monkeys-audio.json index b1effe8c7..83f85a51b 100644 --- a/external_imported/vcpkg/versions/m-/monkeys-audio.json +++ b/external_imported/vcpkg/versions/m-/monkeys-audio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6dbdeec6bf1752114f81a6ad09c85d046dc2ca3b", + "version": "5.70", + "port-version": 2 + }, { "git-tree": "e7058d11b081c99f9be409c3770e9d41b6487505", "version-string": "5.70", diff --git a/external_imported/vcpkg/versions/m-/mpc.json b/external_imported/vcpkg/versions/m-/mpc.json index 209ac786c..da45380dc 100644 --- a/external_imported/vcpkg/versions/m-/mpc.json +++ b/external_imported/vcpkg/versions/m-/mpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c38230459b115da37fe9fe0161c7462de85549d5", + "version": "1.2.0", + "port-version": 2 + }, { "git-tree": "8ef4f1423bd95ed6bbe514de46fc9f4c8884ae5e", "version-string": "1.2.0", diff --git a/external_imported/vcpkg/versions/m-/mpfr.json b/external_imported/vcpkg/versions/m-/mpfr.json index 944aa04ed..e3316b5bb 100644 --- a/external_imported/vcpkg/versions/m-/mpfr.json +++ b/external_imported/vcpkg/versions/m-/mpfr.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "af50e086428e7b7b1e1e5969a296a770a32ff88d", + "version": "4.1.0", + "port-version": 4 + }, + { + "git-tree": "9f38beb4c3179d0b08008af901d05c2a70afaa1b", + "version-string": "4.1.0", + "port-version": 3 + }, { "git-tree": "655c136cd8328e30476ae39a3fd5ff99c915907c", "version-string": "4.1.0", diff --git a/external_imported/vcpkg/versions/m-/mpg123.json b/external_imported/vcpkg/versions/m-/mpg123.json index 8e7e9b411..ead30f3ac 100644 --- a/external_imported/vcpkg/versions/m-/mpg123.json +++ b/external_imported/vcpkg/versions/m-/mpg123.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f03fbe2d20adf858700d4c90204ff808d00c34b2", + "version": "1.29.2", + "port-version": 2 + }, { "git-tree": "d7d73f2de9ed526b2cc13e39a4bdc100fcd6ab4e", "version": "1.29.2", diff --git a/external_imported/vcpkg/versions/m-/mpir.json b/external_imported/vcpkg/versions/m-/mpir.json index 0dd5bbbdc..ff850fbcd 100644 --- a/external_imported/vcpkg/versions/m-/mpir.json +++ b/external_imported/vcpkg/versions/m-/mpir.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5358d4a724061eab499969ae3b56f8abbdea3347", + "version-date": "2022-03-02", + "port-version": 0 + }, + { + "git-tree": "8aabcec72d2006d0a338159fac489aae1da57220", + "version": "3.0.0", + "port-version": 11 + }, { "git-tree": "6d62b01b328d3537a808a6b68cdecaa44ea0d0d7", "version-string": "3.0.0", diff --git a/external_imported/vcpkg/versions/m-/ms-gltf.json b/external_imported/vcpkg/versions/m-/ms-gltf.json index ccc4e4b3d..d31cbad7f 100644 --- a/external_imported/vcpkg/versions/m-/ms-gltf.json +++ b/external_imported/vcpkg/versions/m-/ms-gltf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b287c12480725603087cb1ebd5044a6a4bd6b2cb", + "version-string": "r1.9.5.4", + "port-version": 1 + }, { "git-tree": "aeeeac2de78af647be1312f6e9ab687c18369e99", "version-string": "r1.9.5.4", diff --git a/external_imported/vcpkg/versions/m-/ms-gsl.json b/external_imported/vcpkg/versions/m-/ms-gsl.json index a33d7ae48..3693c2721 100644 --- a/external_imported/vcpkg/versions/m-/ms-gsl.json +++ b/external_imported/vcpkg/versions/m-/ms-gsl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d8d320f8c5db1a6b0c7517d110b854bc4b551e5", + "version": "4.0.0", + "port-version": 0 + }, { "git-tree": "d51947d40835a72b1728c68ca8587e04e3f8e1e2", "version-string": "3.1.0", diff --git a/external_imported/vcpkg/versions/m-/msmpi.json b/external_imported/vcpkg/versions/m-/msmpi.json index 7890abddd..16149fa95 100644 --- a/external_imported/vcpkg/versions/m-/msmpi.json +++ b/external_imported/vcpkg/versions/m-/msmpi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "92f5e217faeaf4ec7e205a56bfff3a13b75e0393", + "version": "10.1.12498", + "port-version": 3 + }, { "git-tree": "a93f4540161febeb02c42e92a6bfff770c4729dc", "version": "10.1.12498", diff --git a/external_imported/vcpkg/versions/m-/munit.json b/external_imported/vcpkg/versions/m-/munit.json index e5aabeb35..a0f4d1707 100644 --- a/external_imported/vcpkg/versions/m-/munit.json +++ b/external_imported/vcpkg/versions/m-/munit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d905b3126db7f555eba6a3a02598e0b3b6a97492", + "version-date": "2019-04-06", + "port-version": 5 + }, { "git-tree": "37416e6f9f63789221184c07fd4e040d4d8646a2", "version-string": "2019-04-06", diff --git a/external_imported/vcpkg/versions/m-/muparser.json b/external_imported/vcpkg/versions/m-/muparser.json index 481fd9ef3..c2fd36fd1 100644 --- a/external_imported/vcpkg/versions/m-/muparser.json +++ b/external_imported/vcpkg/versions/m-/muparser.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "6987fcdb2ed52f7891489a2c97bdc92b64c46a6f", + "version": "2.3.3", + "port-version": 2 + }, + { + "git-tree": "6b93a7e6250aaa93e20c752426eb4fb1bcb08411", + "version": "2.3.3", + "port-version": 1 + }, + { + "git-tree": "e2e6e7754f6e242c497aca1dd784be15acc5c11f", + "version": "2.3.3-1", + "port-version": 0 + }, { "git-tree": "ffef8786866359a02e3e50d62bcda523967fddce", "version-string": "2.3.2", diff --git a/external_imported/vcpkg/versions/m-/murmurhash.json b/external_imported/vcpkg/versions/m-/murmurhash.json index a34122123..090b6a732 100644 --- a/external_imported/vcpkg/versions/m-/murmurhash.json +++ b/external_imported/vcpkg/versions/m-/murmurhash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bbaeb761deb522f06cde0e3efb0610ac3e6afa4d", + "version-date": "2016-01-09", + "port-version": 5 + }, { "git-tree": "5c0ccc0561113eac6ab8881d62a94f31a4ab8d70", "version-string": "2016-01-09", diff --git a/external_imported/vcpkg/versions/m-/mvfst.json b/external_imported/vcpkg/versions/m-/mvfst.json index 2bf6bed18..54b8bdcd4 100644 --- a/external_imported/vcpkg/versions/m-/mvfst.json +++ b/external_imported/vcpkg/versions/m-/mvfst.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "b054de2d05773c286f25528132a496dd075d3914", + "version-date": "2022-03-27", + "port-version": 0 + }, + { + "git-tree": "042a5236f46c787daf8334a8ca9c0cd3f71ab1b4", + "version": "0.2", + "port-version": 1 + }, + { + "git-tree": "72ff9157858363c60db8f1e0bd8de03546f7d0e4", + "version": "0.2", + "port-version": 0 + }, + { + "git-tree": "c73381f28aba19d8c008096270feca19a798fa92", + "version": "0.1", + "port-version": 1 + }, { "git-tree": "9af76c6cd8bea86bff84e5ccddc9f9e39290391e", "version": "0.1", diff --git a/external_imported/vcpkg/versions/m-/mygui.json b/external_imported/vcpkg/versions/m-/mygui.json index c575698b9..d7b1309f5 100644 --- a/external_imported/vcpkg/versions/m-/mygui.json +++ b/external_imported/vcpkg/versions/m-/mygui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "425cd3df40c8941ec9b3755bc0b3effdd91dc162", + "version": "3.4.1", + "port-version": 2 + }, { "git-tree": "d06b2f348d834355086a927f9aabdd47d271819b", "version": "3.4.1", diff --git a/external_imported/vcpkg/versions/n-/nanobench.json b/external_imported/vcpkg/versions/n-/nanobench.json index de8cc9db7..7be13eb56 100644 --- a/external_imported/vcpkg/versions/n-/nanobench.json +++ b/external_imported/vcpkg/versions/n-/nanobench.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b2078ee30dd4414efb21ecb3fe7c54efa854bc95", + "version": "4.3.6", + "port-version": 0 + }, { "git-tree": "d7dea56e415792e4f5c3a2b80ba3731a2955fbf2", "version-string": "4.3.0", diff --git a/external_imported/vcpkg/versions/n-/nanogui.json b/external_imported/vcpkg/versions/n-/nanogui.json index 96ea5ef6b..25cc3e33a 100644 --- a/external_imported/vcpkg/versions/n-/nanogui.json +++ b/external_imported/vcpkg/versions/n-/nanogui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "55a7f3e088fe04ac01f7693c0685770ba865e6ae", + "version-date": "2019-09-23", + "port-version": 3 + }, { "git-tree": "bb3bc286985c1be4bb92ab92e45617410726de3c", "version-string": "2019-09-23", diff --git a/external_imported/vcpkg/versions/n-/nanorange.json b/external_imported/vcpkg/versions/n-/nanorange.json index 308349280..8316508a1 100644 --- a/external_imported/vcpkg/versions/n-/nanorange.json +++ b/external_imported/vcpkg/versions/n-/nanorange.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "66af15410d36dcfe707cfa3ed693e2ad4b8c0a6b", + "version-date": "2020-07-06", + "port-version": 0 + }, { "git-tree": "a9d8e3712ada3496381d4a9ec4d8b6eb638f65e8", "version-string": "0.0.0", diff --git a/external_imported/vcpkg/versions/n-/nanovg.json b/external_imported/vcpkg/versions/n-/nanovg.json index 3393bb25f..56718be73 100644 --- a/external_imported/vcpkg/versions/n-/nanovg.json +++ b/external_imported/vcpkg/versions/n-/nanovg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6ea125c3f4f9b665a744cd0738c8a11837106f05", + "version-date": "2019-08-30", + "port-version": 5 + }, { "git-tree": "016ef1232ccb3f452530283711be418b33c28e17", "version-string": "2019-8-30", diff --git a/external_imported/vcpkg/versions/n-/nativefiledialog.json b/external_imported/vcpkg/versions/n-/nativefiledialog.json index 29df598c1..831ee32e4 100644 --- a/external_imported/vcpkg/versions/n-/nativefiledialog.json +++ b/external_imported/vcpkg/versions/n-/nativefiledialog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a74fcf99cb59fc1094b1b40622cead632c0df81a", + "version-date": "2022-01-20", + "port-version": 0 + }, { "git-tree": "d765a8f84ba49c18701f68b7471f1b93b7313ddc", "version-date": "2019-08-28", diff --git a/external_imported/vcpkg/versions/n-/nayuki-qr-code-generator.json b/external_imported/vcpkg/versions/n-/nayuki-qr-code-generator.json new file mode 100644 index 000000000..126ef8e55 --- /dev/null +++ b/external_imported/vcpkg/versions/n-/nayuki-qr-code-generator.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9131848b9c36878cb0944b3e8058fa0d25b0d335", + "version": "1.7.0", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/n-/nccl.json b/external_imported/vcpkg/versions/n-/nccl.json index 67df82234..5739121ed 100644 --- a/external_imported/vcpkg/versions/n-/nccl.json +++ b/external_imported/vcpkg/versions/n-/nccl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f07fdf26f53fd4974ad4cb6d6df430dc28e52aa", + "version": "2.4.6", + "port-version": 2 + }, { "git-tree": "c9b172ef032bf322539dab71b19f5dc27b679fd0", "version-string": "2.4.6", diff --git a/external_imported/vcpkg/versions/n-/ncurses.json b/external_imported/vcpkg/versions/n-/ncurses.json index bf9d49428..26698d561 100644 --- a/external_imported/vcpkg/versions/n-/ncurses.json +++ b/external_imported/vcpkg/versions/n-/ncurses.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ea7aecbf38cef7f64f929c679d55812e679ca496", + "version": "6.3", + "port-version": 1 + }, { "git-tree": "68d49e9492a5a00c0b04cfbe2985ed99fc33973a", "version-string": "6.3", diff --git a/external_imported/vcpkg/versions/n-/ned14-internal-quickcpplib.json b/external_imported/vcpkg/versions/n-/ned14-internal-quickcpplib.json index eda3c80df..dbd0afaa8 100644 --- a/external_imported/vcpkg/versions/n-/ned14-internal-quickcpplib.json +++ b/external_imported/vcpkg/versions/n-/ned14-internal-quickcpplib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "af77893b0d87106812194f8bc866ecfbc6ade24a", + "version-string": "0.0.0-cad832c8", + "port-version": 0 + }, { "git-tree": "e27f2efe92a17e1c67c5115c9ef15e7e63b1f3e8", "version-string": "0.0.0-8089a948", diff --git a/external_imported/vcpkg/versions/n-/netcdf-c.json b/external_imported/vcpkg/versions/n-/netcdf-c.json index 61db416a0..af3e5e2b4 100644 --- a/external_imported/vcpkg/versions/n-/netcdf-c.json +++ b/external_imported/vcpkg/versions/n-/netcdf-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f4d487e2f7e093b2406887023bb3a0856735bad5", + "version": "4.8.1", + "port-version": 2 + }, { "git-tree": "9d8a0a97fd75563172e3f1947608db3802c3b84a", "version": "4.8.1", diff --git a/external_imported/vcpkg/versions/n-/nethost.json b/external_imported/vcpkg/versions/n-/nethost.json index c430d8a41..0181e8cde 100644 --- a/external_imported/vcpkg/versions/n-/nethost.json +++ b/external_imported/vcpkg/versions/n-/nethost.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5b1a7d98ce2c1520bbb370dfc2fcb8c3d704c300", + "version-date": "2019-12-21", + "port-version": 2 + }, { "git-tree": "15d7240f68194b95c97bdac0658a1ffce7015f34", "version-string": "2019-12-21", diff --git a/external_imported/vcpkg/versions/n-/nettle.json b/external_imported/vcpkg/versions/n-/nettle.json index 00096cd8d..450619245 100644 --- a/external_imported/vcpkg/versions/n-/nettle.json +++ b/external_imported/vcpkg/versions/n-/nettle.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "17fa323aae2ecee658549bd9a8951a2ce6c9880a", + "version": "3.7.3", + "port-version": 0 + }, + { + "git-tree": "2d7735edc12e985fbe6bae0489a8c01ff18413cd", + "version": "3.6", + "port-version": 2 + }, { "git-tree": "87e3211d256198eb00d854b24b2043efb0fe892d", "version-string": "3.6", diff --git a/external_imported/vcpkg/versions/n-/networkdirect-sdk.json b/external_imported/vcpkg/versions/n-/networkdirect-sdk.json index 9032a3a6f..36ef8dc50 100644 --- a/external_imported/vcpkg/versions/n-/networkdirect-sdk.json +++ b/external_imported/vcpkg/versions/n-/networkdirect-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4ae7e238a2a00496c78d2d2bb2101f9e054975e9", + "version": "2.0.1", + "port-version": 3 + }, { "git-tree": "38faf77539eb45a0336501ea8af5d63b9ca11c83", "version-string": "2.0.1", diff --git a/external_imported/vcpkg/versions/n-/ngspice.json b/external_imported/vcpkg/versions/n-/ngspice.json index e5ae9654d..79a6d2a47 100644 --- a/external_imported/vcpkg/versions/n-/ngspice.json +++ b/external_imported/vcpkg/versions/n-/ngspice.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ec514c4b9a568123369d7d081d004a2d92f6d592", + "version": "35", + "port-version": 2 + }, + { + "git-tree": "f9060da8afaaccceef8b5265f7758f20bc23e289", + "version": "35", + "port-version": 1 + }, { "git-tree": "cce657d55082d7a23496c44cb311e208ea31cab4", "version-string": "35", diff --git a/external_imported/vcpkg/versions/n-/nlohmann-json.json b/external_imported/vcpkg/versions/n-/nlohmann-json.json index 29cfd1938..2b6fa1d43 100644 --- a/external_imported/vcpkg/versions/n-/nlohmann-json.json +++ b/external_imported/vcpkg/versions/n-/nlohmann-json.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "becf6a86f7e28342840fc807840c68b133c6fad8", + "version-semver": "3.10.5", + "port-version": 2 + }, + { + "git-tree": "fa0a087d0444a7f2c79a44bce91c51550d5f2e47", + "version-semver": "3.10.5", + "port-version": 1 + }, + { + "git-tree": "d1fe747457714c4c43b12502de05b2d006b440d4", + "version-semver": "3.10.5", + "port-version": 0 + }, { "git-tree": "f948131b4bc6e2e9ae67cb7d40f5e930991fba21", "version-semver": "3.10.4", diff --git a/external_imported/vcpkg/versions/n-/nmslib.json b/external_imported/vcpkg/versions/n-/nmslib.json index 83c6d4e86..733d5e457 100644 --- a/external_imported/vcpkg/versions/n-/nmslib.json +++ b/external_imported/vcpkg/versions/n-/nmslib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "98fea3cd9111ced5710357dee8212e576efd514b", + "version": "2.1.1", + "port-version": 1 + }, { "git-tree": "b0256cb272ca0fe86ee427cdd64ad08f41c656b8", "version": "2.1.1", diff --git a/external_imported/vcpkg/versions/n-/nnpack.json b/external_imported/vcpkg/versions/n-/nnpack.json index 00fe37611..853644ff3 100644 --- a/external_imported/vcpkg/versions/n-/nnpack.json +++ b/external_imported/vcpkg/versions/n-/nnpack.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7d9e236a8f7e71e46c901da4f8a250c47221bd91", + "version-date": "2021-02-21", + "port-version": 3 + }, + { + "git-tree": "2479c1088fd75df5e9f06e85086c748aefae9e11", + "version-date": "2021-02-21", + "port-version": 2 + }, { "git-tree": "42cc5d6dad2376e9322d715341bb0c8e2d1297b8", "version-date": "2021-02-21", diff --git a/external_imported/vcpkg/versions/n-/nspr.json b/external_imported/vcpkg/versions/n-/nspr.json new file mode 100644 index 000000000..a784fd068 --- /dev/null +++ b/external_imported/vcpkg/versions/n-/nspr.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ec6fe24b3b4db98f624391627f113a7bd93397eb", + "version": "4.33", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/n-/nss.json b/external_imported/vcpkg/versions/n-/nss.json new file mode 100644 index 000000000..f715e04fb --- /dev/null +++ b/external_imported/vcpkg/versions/n-/nss.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "06e7680df336bb6be816c75e42c6304d11566a3d", + "version": "3.77", + "port-version": 0 + }, + { + "git-tree": "a5eabb67b345be280f94a3615aa3e08886ad4ec7", + "version": "3.76.1", + "port-version": 0 + }, + { + "git-tree": "ffcb42dbcb29e96a2e367dbbe473f447d67f54ce", + "version": "3.76", + "port-version": 0 + }, + { + "git-tree": "96cd78f1c74951c2e623deff9549d776bf4968b5", + "version": "3.75", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/n-/nsync.json b/external_imported/vcpkg/versions/n-/nsync.json index 44af83133..e88b93ba9 100644 --- a/external_imported/vcpkg/versions/n-/nsync.json +++ b/external_imported/vcpkg/versions/n-/nsync.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f2333cb932309608aa164aadaacb8d4592c71068", + "version": "1.24.0", + "port-version": 1 + }, { "git-tree": "65f07dbc95a609c95de7befffbf37da598652cee", "version": "1.24.0", diff --git a/external_imported/vcpkg/versions/n-/nu-book-zxing-cpp.json b/external_imported/vcpkg/versions/n-/nu-book-zxing-cpp.json new file mode 100644 index 000000000..09a5878c1 --- /dev/null +++ b/external_imported/vcpkg/versions/n-/nu-book-zxing-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b807d508317d0b4bfc5a368fae07f81770851c0b", + "version": "1.2.0", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/n-/nvtt.json b/external_imported/vcpkg/versions/n-/nvtt.json index 6941d034b..9eb4a0ee0 100644 --- a/external_imported/vcpkg/versions/n-/nvtt.json +++ b/external_imported/vcpkg/versions/n-/nvtt.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5889b2b68d1c3b13bf681c75e0b8347fff3d72fc", + "version": "2.1.2", + "port-version": 4 + }, + { + "git-tree": "e2db690561d6b3d44308bd53e0da9d3dc5794ea1", + "version": "2.1.2", + "port-version": 3 + }, { "git-tree": "80005bae9d45f506abd7b21dd09b246703381174", "version-string": "2.1.2", diff --git a/external_imported/vcpkg/versions/o-/oatpp-consul.json b/external_imported/vcpkg/versions/o-/oatpp-consul.json index bb5c05090..3dfcbc547 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": "a7dbba8dd8a15ee5a573d8893af3755c2c61e082", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "595495963d23d1c6b4c6c17d00ecd7c77482d3a2", "version": "1.2.5", diff --git a/external_imported/vcpkg/versions/o-/oatpp-curl.json b/external_imported/vcpkg/versions/o-/oatpp-curl.json index e74632da6..2302f299d 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": "ae678502914406793d56adb1bffbede8febdfb77", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "347efe19ad9ba33369ad147e83ac1c634cc63ca6", "version": "1.2.5", diff --git a/external_imported/vcpkg/versions/o-/oatpp-libressl.json b/external_imported/vcpkg/versions/o-/oatpp-libressl.json index 00953cf30..0440e9e5f 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": "9a94780d515079c88f644ac92b35f935fff138b5", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "e8b1d151bbd0338da87480893b466829b55ecc7a", "version": "1.2.5", diff --git a/external_imported/vcpkg/versions/o-/oatpp-mbedtls.json b/external_imported/vcpkg/versions/o-/oatpp-mbedtls.json index b438b0e99..9a2bda18b 100644 --- a/external_imported/vcpkg/versions/o-/oatpp-mbedtls.json +++ b/external_imported/vcpkg/versions/o-/oatpp-mbedtls.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f3ed8d7f9afd6d6e5010b136ac0a8b516532b41f", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "9d453e8fdce152be19d4f0bda197adfdaeebb118", "version": "1.2.5", diff --git a/external_imported/vcpkg/versions/o-/oatpp-mongo.json b/external_imported/vcpkg/versions/o-/oatpp-mongo.json index 9888322aa..e89f32c69 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": "bb2cca9b0d5255e9c250210b6da94b8383673530", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "e6adcb5eb014357414879a0677983d6a7b4bc9db", "version": "1.2.5", diff --git a/external_imported/vcpkg/versions/o-/oatpp-openssl.json b/external_imported/vcpkg/versions/o-/oatpp-openssl.json index 80b4c28e4..b2c506111 100644 --- a/external_imported/vcpkg/versions/o-/oatpp-openssl.json +++ b/external_imported/vcpkg/versions/o-/oatpp-openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "30adf601290c4dc9d8fd834701df6c3d84db7764", + "version-semver": "1.3.0", + "port-version": 0 + }, { "git-tree": "d127d675e359a2f4a430f49f9dab815dd7991bfb", "version-semver": "1.2.5", diff --git a/external_imported/vcpkg/versions/o-/oatpp-postgresql.json b/external_imported/vcpkg/versions/o-/oatpp-postgresql.json index b8b581480..76f2a3112 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": "f5475ec4475805e185290f9b6676cb0b3471d469", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "f2cbdc4de3f10789d3b258636819bdec76f55850", "version": "1.2.5", diff --git a/external_imported/vcpkg/versions/o-/oatpp-sqlite.json b/external_imported/vcpkg/versions/o-/oatpp-sqlite.json index 3351a6163..29af51afe 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": "83864d8dac636388be925bc5228fb6067ff0c634", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "998bc24ce7db8343441a34779f38d500edd5a2c8", "version": "1.2.5", diff --git a/external_imported/vcpkg/versions/o-/oatpp-ssdp.json b/external_imported/vcpkg/versions/o-/oatpp-ssdp.json new file mode 100644 index 000000000..dbd84e5c2 --- /dev/null +++ b/external_imported/vcpkg/versions/o-/oatpp-ssdp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "37d034f06503445f5a4ac52a960f4360cb68ce58", + "version": "1.3.0", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/o-/oatpp-swagger.json b/external_imported/vcpkg/versions/o-/oatpp-swagger.json index 21161946e..e2107262e 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": "4f0bc8c1d3f156e6d2a7cee4691154c0973b12bd", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "b1859f1a4fa6e90da2ed150098a07aa86189d681", "version": "1.2.5", diff --git a/external_imported/vcpkg/versions/o-/oatpp-websocket.json b/external_imported/vcpkg/versions/o-/oatpp-websocket.json index 69275f15b..53c7f9194 100644 --- a/external_imported/vcpkg/versions/o-/oatpp-websocket.json +++ b/external_imported/vcpkg/versions/o-/oatpp-websocket.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2bfe9a22be4776d9da6022b006d0adca20da7222", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "e492744484bc660010ae5e038aaa5703abce53f5", "version": "1.2.5", diff --git a/external_imported/vcpkg/versions/o-/oatpp-zlib.json b/external_imported/vcpkg/versions/o-/oatpp-zlib.json index eb9d7b126..db9f47ae2 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": "74e51d02fac6e71c8bad4856fc97767f8d3041ea", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "9cbd1b70447175716f4415c18d4e66696c78ad80", "version": "1.2.5", diff --git a/external_imported/vcpkg/versions/o-/oatpp.json b/external_imported/vcpkg/versions/o-/oatpp.json index de4c162da..5ec6257b2 100644 --- a/external_imported/vcpkg/versions/o-/oatpp.json +++ b/external_imported/vcpkg/versions/o-/oatpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "85f50043f867de15e428b3d0f8749a5aabc34e86", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "f6f5d0cb4da86c170670f9d3947b5704ed213a5c", "version": "1.2.5", diff --git a/external_imported/vcpkg/versions/o-/ocilib.json b/external_imported/vcpkg/versions/o-/ocilib.json index a5249e866..29c753471 100644 --- a/external_imported/vcpkg/versions/o-/ocilib.json +++ b/external_imported/vcpkg/versions/o-/ocilib.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "04a952ec38bbc46e3cfa6d5ee6ced8a5e9989e31", + "version": "4.7.3", + "port-version": 2 + }, + { + "git-tree": "76e672a75b678329bb9646c61e9f4bdba02aeedd", + "version": "4.7.3", + "port-version": 1 + }, { "git-tree": "cc328210424ed585e62cd1ec47b1a48b3a2174c2", "version": "4.7.3", diff --git a/external_imported/vcpkg/versions/o-/ogre-next.json b/external_imported/vcpkg/versions/o-/ogre-next.json index 88181a1f3..40f6f7475 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": "0b1cca4f491d535e198fc79195bf357811b4122a", + "version": "2.3.0", + "port-version": 0 + }, { "git-tree": "8d2e2e06d0b21779df8bd6579387805dc06ca6ff", "version-string": "2019-10-20", diff --git a/external_imported/vcpkg/versions/o-/ogre.json b/external_imported/vcpkg/versions/o-/ogre.json index 5dd8f1b76..a717a3e98 100644 --- a/external_imported/vcpkg/versions/o-/ogre.json +++ b/external_imported/vcpkg/versions/o-/ogre.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "fd55a098294ab4f2f8b46bc67172e6a8be3c1df0", + "version": "1.12.9", + "port-version": 7 + }, + { + "git-tree": "64cee22caf52cb15e120895e0689281e8664f42a", + "version": "1.12.9", + "port-version": 6 + }, { "git-tree": "322b9a5290ce1656aa66b684b07d1e327b18eeeb", "version-string": "1.12.9", diff --git a/external_imported/vcpkg/versions/o-/ois.json b/external_imported/vcpkg/versions/o-/ois.json index d273f8c52..39d8df3b2 100644 --- a/external_imported/vcpkg/versions/o-/ois.json +++ b/external_imported/vcpkg/versions/o-/ois.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "79d79b0c5901492572044ad873cdf4df864accea", + "version": "1.5.1", + "port-version": 1 + }, { "git-tree": "05dc4bcc0372eaa7b8a86f89a268c5ef0c69c5bf", "version": "1.5.1", diff --git a/external_imported/vcpkg/versions/o-/onednn.json b/external_imported/vcpkg/versions/o-/onednn.json index 9a62af9fd..f21847d63 100644 --- a/external_imported/vcpkg/versions/o-/onednn.json +++ b/external_imported/vcpkg/versions/o-/onednn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0ac578f6078a2120900435434f0df8c96d4a7a54", + "version-semver": "2.4.3", + "port-version": 1 + }, { "git-tree": "d2c75b6924fc7301f68d484674419fad3f076ca5", "version-semver": "2.4.3", diff --git a/external_imported/vcpkg/versions/o-/onnx.json b/external_imported/vcpkg/versions/o-/onnx.json index de8a62fc6..a61d8ee3f 100644 --- a/external_imported/vcpkg/versions/o-/onnx.json +++ b/external_imported/vcpkg/versions/o-/onnx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "62ee0b78332273115540d669065a467314aace3a", + "version-semver": "1.10.2", + "port-version": 1 + }, { "git-tree": "a83605bd84787898f92ada1bf1874e162a441c10", "version-semver": "1.10.2", diff --git a/external_imported/vcpkg/versions/o-/onnxruntime-gpu.json b/external_imported/vcpkg/versions/o-/onnxruntime-gpu.json index 2b98c4448..1fe9bafd6 100644 --- a/external_imported/vcpkg/versions/o-/onnxruntime-gpu.json +++ b/external_imported/vcpkg/versions/o-/onnxruntime-gpu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9741bef63d2b0c74277568da67ab7aa1ab50c51b", + "version": "1.5.1", + "port-version": 1 + }, { "git-tree": "36273dd148753f754c51a4835aeb29bf5aa1556e", "version-string": "1.5.1", diff --git a/external_imported/vcpkg/versions/o-/open62541.json b/external_imported/vcpkg/versions/o-/open62541.json index 0dc94c24b..30f520ebd 100644 --- a/external_imported/vcpkg/versions/o-/open62541.json +++ b/external_imported/vcpkg/versions/o-/open62541.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "78181e46126a93ba6bbea749a985ba675fb53c03", + "version": "1.2.3", + "port-version": 1 + }, + { + "git-tree": "7a42ce1cf8d2a5f4380a4dcc2807a0d86962d49d", + "version": "1.2.3", + "port-version": 0 + }, { "git-tree": "62aab840d7f987d8ca2ad5b9d81111a0b6f93dfd", "version": "1.2.2", diff --git a/external_imported/vcpkg/versions/o-/openal-soft.json b/external_imported/vcpkg/versions/o-/openal-soft.json index fe1afc014..1d70617a9 100644 --- a/external_imported/vcpkg/versions/o-/openal-soft.json +++ b/external_imported/vcpkg/versions/o-/openal-soft.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a1dee3171a9184c0a13631fda79f6aa58d2b80b6", + "version-semver": "1.21.1", + "port-version": 4 + }, { "git-tree": "b6672158f9eda4512b07d89ba193c51ef2802641", "version-semver": "1.21.1", diff --git a/external_imported/vcpkg/versions/o-/openblas.json b/external_imported/vcpkg/versions/o-/openblas.json index 7a54f9b2c..0cf8441a7 100644 --- a/external_imported/vcpkg/versions/o-/openblas.json +++ b/external_imported/vcpkg/versions/o-/openblas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "631541b0dcf2ea300f96829885d9bc0282d38a65", + "version": "0.3.19", + "port-version": 0 + }, { "git-tree": "048ae3833af8e5633ce86c3174e20c2794fe573d", "version": "0.3.15", diff --git a/external_imported/vcpkg/versions/o-/opencc.json b/external_imported/vcpkg/versions/o-/opencc.json index f4b6768bf..525db85fd 100644 --- a/external_imported/vcpkg/versions/o-/opencc.json +++ b/external_imported/vcpkg/versions/o-/opencc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "10bc4f21926d1c116227ba57e954c4f8a6c9e999", + "version-date": "2020-04-26", + "port-version": 10 + }, { "git-tree": "b7f1756b470f31ae2da4a2d65eb5c409d4798b8e", "version-string": "2020-04-26", diff --git a/external_imported/vcpkg/versions/o-/opencolorio.json b/external_imported/vcpkg/versions/o-/opencolorio.json index 65bf64a61..ac457821b 100644 --- a/external_imported/vcpkg/versions/o-/opencolorio.json +++ b/external_imported/vcpkg/versions/o-/opencolorio.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "80e8a46f8c1c2cd748834cd225edbe127a489d5a", + "version-semver": "2.1.1", + "port-version": 2 + }, + { + "git-tree": "c68079d3d055b028af29997748784c7fa8457f7c", + "version-semver": "2.1.1", + "port-version": 1 + }, + { + "git-tree": "5027649e2b69070030097c754018913b6ae0d8b0", + "version-semver": "2.1.1", + "port-version": 0 + }, + { + "git-tree": "5b4c12d0a01185796534d2925a87fe3b874f1b91", + "version-semver": "2.1.0", + "port-version": 2 + }, { "git-tree": "512f32dd15d09dbb73d83b778898c99bf0697aa2", "version-semver": "2.1.0", diff --git a/external_imported/vcpkg/versions/o-/opencv.json b/external_imported/vcpkg/versions/o-/opencv.json index 13ab9afd7..60ab4980b 100644 --- a/external_imported/vcpkg/versions/o-/opencv.json +++ b/external_imported/vcpkg/versions/o-/opencv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "afe6b1b5c7be14be0656724754f95e537416c763", + "version": "4.5.5", + "port-version": 0 + }, { "git-tree": "c120b015f37bc79900712d64e8ca612d71be22cc", "version": "4.5.4", diff --git a/external_imported/vcpkg/versions/o-/opencv2.json b/external_imported/vcpkg/versions/o-/opencv2.json index c52b5ccf6..601e9b465 100644 --- a/external_imported/vcpkg/versions/o-/opencv2.json +++ b/external_imported/vcpkg/versions/o-/opencv2.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d90ae2125e2fa18011bd9defe7a651d110113b76", + "version": "2.4.13.7", + "port-version": 11 + }, + { + "git-tree": "04d0949582f825d8a93c13fe0be0acbe8183073b", + "version": "2.4.13.7", + "port-version": 10 + }, { "git-tree": "e02e468ae088086be3b3579366e0bc4c3c8be6cc", "version": "2.4.13.7", diff --git a/external_imported/vcpkg/versions/o-/opencv3.json b/external_imported/vcpkg/versions/o-/opencv3.json index c9033b42a..c767104ac 100644 --- a/external_imported/vcpkg/versions/o-/opencv3.json +++ b/external_imported/vcpkg/versions/o-/opencv3.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "55064c574fa80aef66dd85a330f669ba7ad402e9", + "version": "3.4.16", + "port-version": 5 + }, + { + "git-tree": "7060d481bf3045fdd24aa8ef0d83cf2db3b13a50", + "version": "3.4.16", + "port-version": 4 + }, + { + "git-tree": "76d605b750c5535590489574dc24fa30ffe249f8", + "version": "3.4.16", + "port-version": 3 + }, + { + "git-tree": "a11dd583ecb7212732fedb0ab3e3308ea84f10d9", + "version": "3.4.16", + "port-version": 2 + }, { "git-tree": "0bf28e1704eae1d6f24b98fe884b27c71db798a7", "version": "3.4.16", diff --git a/external_imported/vcpkg/versions/o-/opencv4.json b/external_imported/vcpkg/versions/o-/opencv4.json index 2bde4f038..63730e2fe 100644 --- a/external_imported/vcpkg/versions/o-/opencv4.json +++ b/external_imported/vcpkg/versions/o-/opencv4.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "dcdd746ffc69d5f3234b67ee17fdd54966c8f5cb", + "version": "4.5.5", + "port-version": 1 + }, + { + "git-tree": "afed148d21295bf99e8ac657fdb808ed82467871", + "version": "4.5.5", + "port-version": 0 + }, + { + "git-tree": "ce474a40e6572ced8dd1229f22f6cbed9cc74212", + "version": "4.5.4", + "port-version": 4 + }, + { + "git-tree": "b170a087d34521462cd247a24f230627a272975e", + "version": "4.5.4", + "port-version": 3 + }, { "git-tree": "537abba5a070d173cf42510f86ff4ffe057dd77f", "version": "4.5.4", diff --git a/external_imported/vcpkg/versions/o-/opendnp3.json b/external_imported/vcpkg/versions/o-/opendnp3.json index c4d4381ee..4eac48822 100644 --- a/external_imported/vcpkg/versions/o-/opendnp3.json +++ b/external_imported/vcpkg/versions/o-/opendnp3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e9315f4a8ad7564c1fc8b81c4a9f4c7b0305c0b3", + "version": "3.1.1", + "port-version": 1 + }, { "git-tree": "bf6ee46efb76af8f7f317fabfb24358fd82312de", "version": "3.1.1", diff --git a/external_imported/vcpkg/versions/o-/opengl.json b/external_imported/vcpkg/versions/o-/opengl.json index 687d48943..f2e28fba5 100644 --- a/external_imported/vcpkg/versions/o-/opengl.json +++ b/external_imported/vcpkg/versions/o-/opengl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6778094e7a9e5027545a46af473d27ce28890c53", + "version-date": "2022-03-14", + "port-version": 0 + }, { "git-tree": "9fa8ed2a1fb625613a32ee95d2413dbc921860f7", "version-string": "0.0", diff --git a/external_imported/vcpkg/versions/o-/openimageio.json b/external_imported/vcpkg/versions/o-/openimageio.json index decb4f15a..821542404 100644 --- a/external_imported/vcpkg/versions/o-/openimageio.json +++ b/external_imported/vcpkg/versions/o-/openimageio.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "2fa8debd832d46f5ad96798be8a335b8a251c2ca", + "version": "2.3.10.1", + "port-version": 3 + }, + { + "git-tree": "a52afa5ed0495b47dd1c123d975746fdfa0b3459", + "version": "2.3.10.1", + "port-version": 2 + }, + { + "git-tree": "00b94623cc9528075483e57034da95bb356c6848", + "version": "2.3.10.1", + "port-version": 1 + }, { "git-tree": "f5a6955a1595a5d3ea429059d9be4ddedc8e7cab", "version": "2.3.10.1", diff --git a/external_imported/vcpkg/versions/o-/openmpi.json b/external_imported/vcpkg/versions/o-/openmpi.json index e98a3395b..dc5df6dfa 100644 --- a/external_imported/vcpkg/versions/o-/openmpi.json +++ b/external_imported/vcpkg/versions/o-/openmpi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "96a3a8cd636443eaf50648e749ff144cb65ad851", + "version": "4.1.0", + "port-version": 4 + }, { "git-tree": "5d701c1350d6cb8e4380f829460e8287b0e2f6cc", "version": "4.1.0", diff --git a/external_imported/vcpkg/versions/o-/openmvg.json b/external_imported/vcpkg/versions/o-/openmvg.json index ca980eaaa..beea957ca 100644 --- a/external_imported/vcpkg/versions/o-/openmvg.json +++ b/external_imported/vcpkg/versions/o-/openmvg.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "f32be4f15d0babca5ba5a6e02b78f4610ab6d2f4", + "version": "2.0", + "port-version": 3 + }, + { + "git-tree": "894793611702efbc0abc44768002cdd12f73557a", + "version": "2.0", + "port-version": 2 + }, + { + "git-tree": "eea9187e35c87676d442453e6942a47417d7c2dd", + "version": "2.0", + "port-version": 1 + }, { "git-tree": "08113de9c7bc1b9201be4c3a01c1c3e5a1cf5acd", "version": "2.0", diff --git a/external_imported/vcpkg/versions/o-/openssl.json b/external_imported/vcpkg/versions/o-/openssl.json index 0bb78010f..207c89627 100644 --- a/external_imported/vcpkg/versions/o-/openssl.json +++ b/external_imported/vcpkg/versions/o-/openssl.json @@ -1,5 +1,40 @@ { "versions": [ + { + "git-tree": "66e7ff434d21a4fc00cab9bbe6167db295ffefd3", + "version": "3.0.2", + "port-version": 2 + }, + { + "git-tree": "3505d3717ae864160fdb273eb2ec9d614eb6711e", + "version": "3.0.2", + "port-version": 1 + }, + { + "git-tree": "2ba2e59ee4f32c11e30aeccc0ecabc09b69c5d22", + "version": "3.0.2", + "port-version": 0 + }, + { + "git-tree": "06b9e0464af9c7c73227ba9f0fa93c77ef62496e", + "version-string": "1.1.1n", + "port-version": 1 + }, + { + "git-tree": "7e4d802e3bde4154c227c0dd1da75c719be9f07a", + "version-string": "1.1.1n", + "port-version": 0 + }, + { + "git-tree": "29c9d32a703896143a51c55f0b7ae4298684afd6", + "version-string": "1.1.1m", + "port-version": 2 + }, + { + "git-tree": "9b8e2ac096b1cd8782137a853c5fc76e07c2af9a", + "version-string": "1.1.1m", + "port-version": 1 + }, { "git-tree": "1dbcaacad14ed0761323aa12c13e917270153594", "version-string": "1.1.1m", diff --git a/external_imported/vcpkg/versions/o-/opensubdiv.json b/external_imported/vcpkg/versions/o-/opensubdiv.json index be8519959..963073c9d 100644 --- a/external_imported/vcpkg/versions/o-/opensubdiv.json +++ b/external_imported/vcpkg/versions/o-/opensubdiv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "91fabcb273d865674e59979585b5f9a6739ad6c5", + "version-semver": "3.4.3", + "port-version": 4 + }, { "git-tree": "786a994b5a4637b9cd43eaf2b790d913bce9cdce", "version-semver": "3.4.3", diff --git a/external_imported/vcpkg/versions/o-/opentelemetry-cpp.json b/external_imported/vcpkg/versions/o-/opentelemetry-cpp.json index 6b00edcbd..f10a1c230 100644 --- a/external_imported/vcpkg/versions/o-/opentelemetry-cpp.json +++ b/external_imported/vcpkg/versions/o-/opentelemetry-cpp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c8c4bd4f115feaa3faed25dc74c695c1627d4f0d", + "version-semver": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "c6f08af646f830d343e50f00d01775f6ce8fc7d8", + "version-semver": "1.1.1", + "port-version": 0 + }, { "git-tree": "054971acff976718841101e8bad641169cf11a5d", "version-semver": "1.0.1", diff --git a/external_imported/vcpkg/versions/o-/opentracing.json b/external_imported/vcpkg/versions/o-/opentracing.json index 616b68288..94c1d40af 100644 --- a/external_imported/vcpkg/versions/o-/opentracing.json +++ b/external_imported/vcpkg/versions/o-/opentracing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6bd6797b313b265c51c85ea2838efcdaa70f87f7", + "version": "1.6.0", + "port-version": 2 + }, { "git-tree": "001eac5d529c5b20dd9dbfc85879568e07d9b55d", "version-string": "1.6.0", diff --git a/external_imported/vcpkg/versions/o-/openvdb.json b/external_imported/vcpkg/versions/o-/openvdb.json index 3549324df..75ee6fac0 100644 --- a/external_imported/vcpkg/versions/o-/openvdb.json +++ b/external_imported/vcpkg/versions/o-/openvdb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a026562abe75e40d4b60d97108ef057b2e28629a", + "version": "9.0.0", + "port-version": 0 + }, { "git-tree": "8546c4c4d392f4b0bb9a604e8bb6a831d39b99e8", "version": "8.2.0", diff --git a/external_imported/vcpkg/versions/o-/openvr.json b/external_imported/vcpkg/versions/o-/openvr.json index d26235515..f93111b2a 100644 --- a/external_imported/vcpkg/versions/o-/openvr.json +++ b/external_imported/vcpkg/versions/o-/openvr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "29e327e41442a81d5bc3040244132649f032edb6", + "version": "1.16.8", + "port-version": 2 + }, { "git-tree": "cd3839d56ad4263ecc52a94440b22333ab1d7bfe", "version-string": "1.16.8", diff --git a/external_imported/vcpkg/versions/o-/openxr-loader.json b/external_imported/vcpkg/versions/o-/openxr-loader.json index 0fb8c87a3..6385ac6a9 100644 --- a/external_imported/vcpkg/versions/o-/openxr-loader.json +++ b/external_imported/vcpkg/versions/o-/openxr-loader.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "e26b91f539cbbba23cc6ccd2eb9106322ba1c81c", + "version": "1.0.22", + "port-version": 3 + }, + { + "git-tree": "27baef30397d0db0e6cc01d6f60a86e2ff4df238", + "version": "1.0.22", + "port-version": 2 + }, + { + "git-tree": "9d673fe500c4b38f0806bd4b3c23a82bba897967", + "version": "1.0.22", + "port-version": 1 + }, + { + "git-tree": "445bbc9debe9866fad35544bd948d54fda4e72c4", + "version": "1.0.22", + "port-version": 0 + }, { "git-tree": "435893c175c6462b476e03f95d30717c9653eac3", "version": "1.0.20", diff --git a/external_imported/vcpkg/versions/o-/osgearth.json b/external_imported/vcpkg/versions/o-/osgearth.json index 7c76807e2..80893cbe4 100644 --- a/external_imported/vcpkg/versions/o-/osgearth.json +++ b/external_imported/vcpkg/versions/o-/osgearth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "99b20c5ff2821870694fdc973b7f44d4b54db2ba", + "version": "3.2", + "port-version": 4 + }, { "git-tree": "2e3d8cf49728cdb23060f31152768a2292c24ab8", "version": "3.2", diff --git a/external_imported/vcpkg/versions/o-/otl.json b/external_imported/vcpkg/versions/o-/otl.json index a1808f816..48fe11f98 100644 --- a/external_imported/vcpkg/versions/o-/otl.json +++ b/external_imported/vcpkg/versions/o-/otl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "02a8c353e8a348eb320fdfaf7dfd7d4a40d3d2e1", + "version": "4.0.463", + "port-version": 1 + }, { "git-tree": "bce79d0a6767b5593182564f94f3db98eea61be7", "version": "4.0.463", diff --git a/external_imported/vcpkg/versions/p-/pango.json b/external_imported/vcpkg/versions/p-/pango.json index 59ae5304a..4533caaec 100644 --- a/external_imported/vcpkg/versions/p-/pango.json +++ b/external_imported/vcpkg/versions/p-/pango.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "db85fd904e40578950bcc478e2bfad06c70e787a", + "version": "1.50.6", + "port-version": 0 + }, { "git-tree": "024f716f80c8454769393287ef14a75de4785f32", "version": "1.50.3", diff --git a/external_imported/vcpkg/versions/p-/pangomm.json b/external_imported/vcpkg/versions/p-/pangomm.json index f5e5d28e1..1f966eb47 100644 --- a/external_imported/vcpkg/versions/p-/pangomm.json +++ b/external_imported/vcpkg/versions/p-/pangomm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5aebede0dd324cd7e5db1460e1d9be26d18685ba", + "version": "2.50.0", + "port-version": 1 + }, { "git-tree": "72d0e19b3eb2fdb5d8c60c1ae78bafc51866325d", "version": "2.50.0", diff --git a/external_imported/vcpkg/versions/p-/parallel-hashmap.json b/external_imported/vcpkg/versions/p-/parallel-hashmap.json index eb98c22e2..eadbb2813 100644 --- a/external_imported/vcpkg/versions/p-/parallel-hashmap.json +++ b/external_imported/vcpkg/versions/p-/parallel-hashmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f72efb2dae42b2f746be8e239b00b707b3a61449", + "version": "1.34", + "port-version": 0 + }, { "git-tree": "4c8c5305bf3135855a29acfde1effc1f9897ea4d", "version-string": "1.33", diff --git a/external_imported/vcpkg/versions/p-/paraview.json b/external_imported/vcpkg/versions/p-/paraview.json index c90ffe0d8..d3c3cbbab 100644 --- a/external_imported/vcpkg/versions/p-/paraview.json +++ b/external_imported/vcpkg/versions/p-/paraview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7011d869273b8aa610ef7b302587c614137c73e5", + "version-semver": "5.9.1", + "port-version": 1 + }, { "git-tree": "a43b7d1bc53e7bdafcb4b73c3e9d84b9f80ecc22", "version-semver": "5.9.1", diff --git a/external_imported/vcpkg/versions/p-/pbc.json b/external_imported/vcpkg/versions/p-/pbc.json index 8231fad8f..1e3b17445 100644 --- a/external_imported/vcpkg/versions/p-/pbc.json +++ b/external_imported/vcpkg/versions/p-/pbc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "23742abe8879e71a911c56845977ad2387e9bfa6", + "version": "0.5.14", + "port-version": 6 + }, { "git-tree": "de531bdf83ba5c3a005655bde246d58074a28937", "version-string": "0.5.14", diff --git a/external_imported/vcpkg/versions/p-/pcapplusplus.json b/external_imported/vcpkg/versions/p-/pcapplusplus.json index 7c5b4840c..c90a7c049 100644 --- a/external_imported/vcpkg/versions/p-/pcapplusplus.json +++ b/external_imported/vcpkg/versions/p-/pcapplusplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f1f63c9365f0cb128761835ebceeafb6b162c815", + "version": "21.11", + "port-version": 1 + }, { "git-tree": "e0480fc24edf7b699eb027d24c3737026dd1128c", "version-string": "21.11", diff --git a/external_imported/vcpkg/versions/p-/pcl.json b/external_imported/vcpkg/versions/p-/pcl.json index 71cc67754..de398084c 100644 --- a/external_imported/vcpkg/versions/p-/pcl.json +++ b/external_imported/vcpkg/versions/p-/pcl.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "af82798f0369372866e38d58f1e38a1165801c1d", + "version": "1.12.0", + "port-version": 6 + }, + { + "git-tree": "5e5ebb57bf0a08e7eab28fe3571ebaa55c3d4ba8", + "version": "1.12.0", + "port-version": 5 + }, + { + "git-tree": "7e54ab86574dfc901275996e282f8db5c6c9c3fb", + "version": "1.12.0", + "port-version": 4 + }, + { + "git-tree": "0f0c24ef83692fbcc9434ec9622592ba9b16e0d5", + "version": "1.12.0", + "port-version": 3 + }, { "git-tree": "5d02740fc9422f1b520ae322cda71e8e6e5323cf", "version": "1.12.0", diff --git a/external_imported/vcpkg/versions/p-/pdal-c.json b/external_imported/vcpkg/versions/p-/pdal-c.json index b989fb33f..0eb2c8be9 100644 --- a/external_imported/vcpkg/versions/p-/pdal-c.json +++ b/external_imported/vcpkg/versions/p-/pdal-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c19bcf077b95f0d81ef14bfdf9774795521d6013", + "version-string": "2.1", + "port-version": 0 + }, { "git-tree": "9319bb871924d143523c4e79ecc45bc9260360b5", "version-string": "1.8", diff --git a/external_imported/vcpkg/versions/p-/pdal.json b/external_imported/vcpkg/versions/p-/pdal.json index 65cfa4505..d9f41bdfc 100644 --- a/external_imported/vcpkg/versions/p-/pdal.json +++ b/external_imported/vcpkg/versions/p-/pdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "408d14a540c0a1e217efec2deea453594d9d1bde", + "version": "2.3.0", + "port-version": 0 + }, { "git-tree": "11280c0564220eb3e82eae1c596843daf5b79294", "version": "1.7.1", diff --git a/external_imported/vcpkg/versions/p-/pegtl.json b/external_imported/vcpkg/versions/p-/pegtl.json index 8e6ca64f0..dae6a54d3 100644 --- a/external_imported/vcpkg/versions/p-/pegtl.json +++ b/external_imported/vcpkg/versions/p-/pegtl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "43adc8ee136a8dd0ea88b54a6a7fdc7325cf7327", + "version-semver": "3.2.5", + "port-version": 0 + }, { "git-tree": "9e9bdd7c1860ebc540ca2df7ab8451e596dfff3a", "version-semver": "3.2.2", diff --git a/external_imported/vcpkg/versions/p-/pfring.json b/external_imported/vcpkg/versions/p-/pfring.json index a38584c0b..c16247064 100644 --- a/external_imported/vcpkg/versions/p-/pfring.json +++ b/external_imported/vcpkg/versions/p-/pfring.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ed3dbffb4364b80331f2b986435bad956f39ad09", + "version-date": "2019-10-17", + "port-version": 4 + }, { "git-tree": "cc03f1b404adc6a550e8d7b9d5d36795fac6b4b7", "version-string": "2019-10-17", diff --git a/external_imported/vcpkg/versions/p-/physx.json b/external_imported/vcpkg/versions/p-/physx.json index 4d5ac929d..5cbbdf356 100644 --- a/external_imported/vcpkg/versions/p-/physx.json +++ b/external_imported/vcpkg/versions/p-/physx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3efd7a1c7727eec4a15ba3ac6f8f013550750760", + "version-semver": "4.1.2", + "port-version": 1 + }, { "git-tree": "c2731461cec1f38b720c3db1038e3096957244a4", "version-semver": "4.1.2", diff --git a/external_imported/vcpkg/versions/p-/piex.json b/external_imported/vcpkg/versions/p-/piex.json index fcca063f2..dd5cd3745 100644 --- a/external_imported/vcpkg/versions/p-/piex.json +++ b/external_imported/vcpkg/versions/p-/piex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f9f7ad5427c18be18708d00150fe9ca33dc30a8a", + "version-date": "2019-07-11", + "port-version": 2 + }, { "git-tree": "08ede8e9e8ed0d849edd62a316b407041cc8d4aa", "version-string": "2019-07-11", diff --git a/external_imported/vcpkg/versions/p-/pixel.json b/external_imported/vcpkg/versions/p-/pixel.json index d10f82cfa..f0bfad783 100644 --- a/external_imported/vcpkg/versions/p-/pixel.json +++ b/external_imported/vcpkg/versions/p-/pixel.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "dbf76415a78802e7dc2717280e2a44123a04df69", + "version-date": "2022-03-15", + "port-version": 0 + }, + { + "git-tree": "346ea5fe92b2cfe055a1cd242868605e56d94318", + "version": "0.3", + "port-version": 4 + }, { "git-tree": "57198090e451e125ad231a0a1068643cbd06cb61", "version-string": "0.3", diff --git a/external_imported/vcpkg/versions/p-/pixman.json b/external_imported/vcpkg/versions/p-/pixman.json index 5379531d8..0faacd4b5 100644 --- a/external_imported/vcpkg/versions/p-/pixman.json +++ b/external_imported/vcpkg/versions/p-/pixman.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "85d5aa0bbd91cff8853d0767bc9dc73e97156291", + "version": "0.40.0", + "port-version": 2 + }, { "git-tree": "c2dd7fec404954b43ad0da4ee86c29a4cfdd8fc1", "version": "0.40.0", diff --git a/external_imported/vcpkg/versions/p-/pkgconf.json b/external_imported/vcpkg/versions/p-/pkgconf.json index 1b3ed2d12..87f63902c 100644 --- a/external_imported/vcpkg/versions/p-/pkgconf.json +++ b/external_imported/vcpkg/versions/p-/pkgconf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5b599bd7dbbbc7837f7dbcf1b111478da076e2a4", + "version": "1.8.0", + "port-version": 2 + }, { "git-tree": "cbcb5f984f7713a636caa075f06b755d37493dbd", "version": "1.8.0", diff --git a/external_imported/vcpkg/versions/p-/plibsys.json b/external_imported/vcpkg/versions/p-/plibsys.json index 4f2ce556b..4fa3dacd2 100644 --- a/external_imported/vcpkg/versions/p-/plibsys.json +++ b/external_imported/vcpkg/versions/p-/plibsys.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6691b7f463d3a1bf27ebafa6e317cdc41735665c", + "version": "0.0.4", + "port-version": 6 + }, { "git-tree": "1af02f154f0a23e71a9547cf67f4dc7b0cab732d", "version-string": "0.0.4", diff --git a/external_imported/vcpkg/versions/p-/pmdk.json b/external_imported/vcpkg/versions/p-/pmdk.json index e8e653c48..762bd4b32 100644 --- a/external_imported/vcpkg/versions/p-/pmdk.json +++ b/external_imported/vcpkg/versions/p-/pmdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a6a893e78e485b907148252308a5ea11befde1d9", + "version": "1.11.0", + "port-version": 1 + }, { "git-tree": "a2083c3fd577af1074c046235d2d0c73ad77d011", "version": "1.11.0", diff --git a/external_imported/vcpkg/versions/p-/poco.json b/external_imported/vcpkg/versions/p-/poco.json index cf37d6ed0..9a6677049 100644 --- a/external_imported/vcpkg/versions/p-/poco.json +++ b/external_imported/vcpkg/versions/p-/poco.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ae7e310067c34beca24a055b9b25e24fe1b42190", + "version": "1.11.1", + "port-version": 0 + }, { "git-tree": "6dec8737e7e8e89f212ae2ab75c55c6e977d8ab8", "version-semver": "1.11.0", diff --git a/external_imported/vcpkg/versions/p-/polyhook2.json b/external_imported/vcpkg/versions/p-/polyhook2.json index a86411d5f..33d7a2951 100644 --- a/external_imported/vcpkg/versions/p-/polyhook2.json +++ b/external_imported/vcpkg/versions/p-/polyhook2.json @@ -1,5 +1,30 @@ { "versions": [ + { + "git-tree": "bd2324e09d967fab5a098f0c2d42682abf5b4113", + "version-date": "2022-03-01", + "port-version": 0 + }, + { + "git-tree": "106988bbbfbb0402ee0263e7d71753b4df830a5d", + "version-date": "2022-02-21", + "port-version": 0 + }, + { + "git-tree": "8ad15683e3f77fd7301903e9dab7aa57302f4e80", + "version-date": "2022-02-06", + "port-version": 0 + }, + { + "git-tree": "519f086961afed4ccad13eb8d56ac009221f1714", + "version-date": "2022-02-02", + "port-version": 0 + }, + { + "git-tree": "bae35bd5e732a2468beb53b4407668d515204514", + "version-date": "2021-05-09", + "port-version": 2 + }, { "git-tree": "9b4af767d959bb37711e474327acba689127749c", "version-string": "2021-05-09", diff --git a/external_imported/vcpkg/versions/p-/poppler.json b/external_imported/vcpkg/versions/p-/poppler.json index 0b609a36c..275069c77 100644 --- a/external_imported/vcpkg/versions/p-/poppler.json +++ b/external_imported/vcpkg/versions/p-/poppler.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "2d14bc508abd0861bda1a16290ad65b061a82b7c", + "version": "22.3.0", + "port-version": 1 + }, + { + "git-tree": "9928fbfbe44a32d0a4ff7efed4de2a7797958322", + "version": "22.3.0", + "port-version": 0 + }, + { + "git-tree": "139058e4ec62f875c5538cbd1577c95938183364", + "version": "22.2.0", + "port-version": 0 + }, { "git-tree": "3f15f5c09cc977692e0c081d39e7e85f2229efe1", "version": "20.12.1", diff --git a/external_imported/vcpkg/versions/p-/popsift.json b/external_imported/vcpkg/versions/p-/popsift.json index f2f024bbb..f1bc9ec3c 100644 --- a/external_imported/vcpkg/versions/p-/popsift.json +++ b/external_imported/vcpkg/versions/p-/popsift.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b3c9c601da86fd7d73cf3cb8b00c08ddb390acdd", + "version": "0.9", + "port-version": 3 + }, { "git-tree": "c4901cdc3f98676dba684b75fd292b6570a46d35", "version-string": "0.9", diff --git a/external_imported/vcpkg/versions/p-/portaudio.json b/external_imported/vcpkg/versions/p-/portaudio.json index a44336cb8..34cfaa0f4 100644 --- a/external_imported/vcpkg/versions/p-/portaudio.json +++ b/external_imported/vcpkg/versions/p-/portaudio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ecfe7da0a3a51b33e76443799786bbcce7646f27", + "version": "19.7", + "port-version": 3 + }, { "git-tree": "b090c514cbfce25b342a884efc937ede432df55a", "version": "19.7", diff --git a/external_imported/vcpkg/versions/p-/portmidi.json b/external_imported/vcpkg/versions/p-/portmidi.json index 02cd8a9be..2cbea12a1 100644 --- a/external_imported/vcpkg/versions/p-/portmidi.json +++ b/external_imported/vcpkg/versions/p-/portmidi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9aba0f6770f874c56c8e8bebf2a6a9b3edbe899a", + "version": "2.0.2", + "port-version": 1 + }, { "git-tree": "a32d3d5e0e58e38089378c3f723f2b4862714a4c", "version": "2.0.2", diff --git a/external_imported/vcpkg/versions/p-/portsmf.json b/external_imported/vcpkg/versions/p-/portsmf.json index c5124438c..807b4337a 100644 --- a/external_imported/vcpkg/versions/p-/portsmf.json +++ b/external_imported/vcpkg/versions/p-/portsmf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "60b00990b46bbac28e91a94533d212be1af49ffb", + "version": "0.238", + "port-version": 1 + }, { "git-tree": "6edc5e2a3d90cd44a65b5d0f28207b5eb3c2dec5", "version": "0.238", diff --git a/external_imported/vcpkg/versions/p-/presentmon.json b/external_imported/vcpkg/versions/p-/presentmon.json index 5c83b268f..23521c07a 100644 --- a/external_imported/vcpkg/versions/p-/presentmon.json +++ b/external_imported/vcpkg/versions/p-/presentmon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "daf02980cb0bef9bd56209e550d134f2bc06c699", + "version-semver": "1.7.0", + "port-version": 1 + }, { "git-tree": "0d57616105f23dbcceb4477bb30354e0d3e4a5b6", "version-semver": "1.7.0", diff --git a/external_imported/vcpkg/versions/p-/proj.json b/external_imported/vcpkg/versions/p-/proj.json index b41860597..59f4dd4bc 100644 --- a/external_imported/vcpkg/versions/p-/proj.json +++ b/external_imported/vcpkg/versions/p-/proj.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1566fbbbd7d8abba35cebac6c8821339d1da1d16", + "version": "9.0.0", + "port-version": 0 + }, { "git-tree": "a90853a886ef1a9425ad477bc996b99c0824ff33", "version-string": "0", diff --git a/external_imported/vcpkg/versions/p-/proj4.json b/external_imported/vcpkg/versions/p-/proj4.json index 7dc6527d7..664453931 100644 --- a/external_imported/vcpkg/versions/p-/proj4.json +++ b/external_imported/vcpkg/versions/p-/proj4.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "284d584afb127d11beb4126bf1ee7eccef413229", + "version-semver": "8.9.9", + "port-version": 1 + }, + { + "git-tree": "4ccf46b756dabd4cd841b866dcd5491d84a946e1", + "version-semver": "8.9.9", + "port-version": 0 + }, + { + "git-tree": "de72240f9bceda0263f58b734ab6de4f97632dbe", + "version-semver": "8.2.1", + "port-version": 1 + }, { "git-tree": "97a7f5c2cabaf598c15dc357d0e53d5c44e10225", "version-semver": "8.2.1", diff --git a/external_imported/vcpkg/versions/p-/protobuf.json b/external_imported/vcpkg/versions/p-/protobuf.json index a91d6210a..fab9f2a67 100644 --- a/external_imported/vcpkg/versions/p-/protobuf.json +++ b/external_imported/vcpkg/versions/p-/protobuf.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "984039810172eb397ca0ec6d426d60764d6dfe46", + "version-semver": "3.19.4", + "port-version": 0 + }, + { + "git-tree": "5f6aa04d94e184b89c1887946fb4684bc51c4611", + "version-semver": "3.18.0", + "port-version": 1 + }, { "git-tree": "19c2bf45c235e6126161bae36aa7ff7e1fcda479", "version-semver": "3.18.0", diff --git a/external_imported/vcpkg/versions/p-/protozero.json b/external_imported/vcpkg/versions/p-/protozero.json index d05d0ecf2..55c02b1a1 100644 --- a/external_imported/vcpkg/versions/p-/protozero.json +++ b/external_imported/vcpkg/versions/p-/protozero.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e617bcd5ceeebd89da7229c7daeecacf7581d767", + "version-semver": "1.7.0", + "port-version": 1 + }, { "git-tree": "23f6ec11be6bbf623dc7590b128027ccb7f69727", "version-semver": "1.7.0", diff --git a/external_imported/vcpkg/versions/p-/proxygen.json b/external_imported/vcpkg/versions/p-/proxygen.json index 24859be60..3b9e34252 100644 --- a/external_imported/vcpkg/versions/p-/proxygen.json +++ b/external_imported/vcpkg/versions/p-/proxygen.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "fb9493259e80636642c06b40479c36b6b4c9cba2", + "version-string": "2022.03.21.00", + "port-version": 1 + }, + { + "git-tree": "3d4554283cc0401f123164636046763fa9808475", + "version-string": "2022.03.21.00", + "port-version": 0 + }, + { + "git-tree": "d17fc3eb415126e6e9d5d77eb2de69ffd3c30869", + "version-string": "2022.01.31.00", + "port-version": 0 + }, + { + "git-tree": "8dd3b93e98f28386e8c44f50df2efb4c2bb30ce1", + "version-string": "2021.06.14.00", + "port-version": 1 + }, { "git-tree": "a4a04ef230bcd866c6c1a078ac3e11d926333b21", "version-string": "2021.06.14.00", diff --git a/external_imported/vcpkg/versions/p-/ptex.json b/external_imported/vcpkg/versions/p-/ptex.json index 47f9c2dca..4c8c95a67 100644 --- a/external_imported/vcpkg/versions/p-/ptex.json +++ b/external_imported/vcpkg/versions/p-/ptex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3f04f712745e5fb558f79324199b3fe8c1a00b84", + "version": "2.3.2", + "port-version": 4 + }, { "git-tree": "c524a2ab1940315d3481e9fbf745425caf5b7c15", "version": "2.3.2", diff --git a/external_imported/vcpkg/versions/p-/pybind11.json b/external_imported/vcpkg/versions/p-/pybind11.json index 83ddc0af6..9340b71f1 100644 --- a/external_imported/vcpkg/versions/p-/pybind11.json +++ b/external_imported/vcpkg/versions/p-/pybind11.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "0723f5ac350935e5d68d8087c82883dffa706812", + "version": "2.9.2", + "port-version": 0 + }, + { + "git-tree": "b1eb3bb762f1ba08ffd2ffb216df9504ed9fda3c", + "version": "2.9.1", + "port-version": 1 + }, + { + "git-tree": "24ea84c002f9cc529a54996dbbf2e9b2cce9cadf", + "version-semver": "2.9.1", + "port-version": 0 + }, + { + "git-tree": "66591866c63bfff5fea690e23a05aa14cad10967", + "version-semver": "2.9.0", + "port-version": 0 + }, { "git-tree": "16618fe9543461ee68ba815f511afacbbcfd8330", "version-semver": "2.8.1", diff --git a/external_imported/vcpkg/versions/p-/python2.json b/external_imported/vcpkg/versions/p-/python2.json index 95fa12088..60a67697b 100644 --- a/external_imported/vcpkg/versions/p-/python2.json +++ b/external_imported/vcpkg/versions/p-/python2.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "355e949adaecb1603d0cdc3d690101e49ad9fb13", + "version": "2.7.18", + "port-version": 4 + }, + { + "git-tree": "2a9fb7f96d762e213e9901452492aee00f6fe049", + "version": "2.7.18", + "port-version": 3 + }, + { + "git-tree": "fc1f7aaa8a2312a56ce7dc1324c2eaf608a7a331", + "version": "2.7.18", + "port-version": 2 + }, { "git-tree": "052ef22af59535134ca2944cfd8e7e7d3ea24d67", "version": "2.7.18", diff --git a/external_imported/vcpkg/versions/p-/python3.json b/external_imported/vcpkg/versions/p-/python3.json index 9b4fc1879..a89a02eb1 100644 --- a/external_imported/vcpkg/versions/p-/python3.json +++ b/external_imported/vcpkg/versions/p-/python3.json @@ -1,5 +1,35 @@ { "versions": [ + { + "git-tree": "4e348bd50d8c4252bda83903ce22f1e60d34be88", + "version": "3.10.2", + "port-version": 1 + }, + { + "git-tree": "0cf2e0bbf8fd712f82ed1997be82b136f1c13108", + "version-semver": "3.10.2", + "port-version": 0 + }, + { + "git-tree": "ce4fddbb41412be06577c61632e8e9ef0a67901c", + "version-semver": "3.10.1", + "port-version": 8 + }, + { + "git-tree": "31155fa7fa6cfa0fd2554e89584c92a2135bce19", + "version-semver": "3.10.1", + "port-version": 7 + }, + { + "git-tree": "a7ef4a1d73a9e486cd23edd98f12a2f4d4216920", + "version-semver": "3.10.1", + "port-version": 6 + }, + { + "git-tree": "c9b705608afc0485c03effb5aaa439f027b20af4", + "version-semver": "3.10.1", + "port-version": 5 + }, { "git-tree": "75172bc36c45d15ee298de1803625af1770cb805", "version-semver": "3.10.1", diff --git a/external_imported/vcpkg/versions/q-/qhttpengine.json b/external_imported/vcpkg/versions/q-/qhttpengine.json index 7ce14ff67..16d3df94e 100644 --- a/external_imported/vcpkg/versions/q-/qhttpengine.json +++ b/external_imported/vcpkg/versions/q-/qhttpengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "df41e64df52df962bbd8836762d3946358819690", + "version": "1.0.2", + "port-version": 1 + }, { "git-tree": "7981cbfcf13bef7cfede8cf40a9d69967cc63dfb", "version": "1.0.2", diff --git a/external_imported/vcpkg/versions/q-/qhull.json b/external_imported/vcpkg/versions/q-/qhull.json index 52eb5af94..69b98685f 100644 --- a/external_imported/vcpkg/versions/q-/qhull.json +++ b/external_imported/vcpkg/versions/q-/qhull.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "afe7d7f235d72db1da52a99ebe085cafd21577b3", + "version": "8.0.2", + "port-version": 3 + }, { "git-tree": "574301a0f60d743f5ea7165dda5e45bd0f1082ba", "version-string": "8.0.2", diff --git a/external_imported/vcpkg/versions/q-/qnnpack.json b/external_imported/vcpkg/versions/q-/qnnpack.json index b9f21aaa7..802a45951 100644 --- a/external_imported/vcpkg/versions/q-/qnnpack.json +++ b/external_imported/vcpkg/versions/q-/qnnpack.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "907c113d0c35b674976b5c3b7dc96b2c71084061", + "version-date": "2021-02-26", + "port-version": 2 + }, + { + "git-tree": "8dbc0dd7bdcf36b48124351fbc2ecc44d0b2e961", + "version-date": "2021-02-26", + "port-version": 1 + }, { "git-tree": "b433ea1861106777f4f358ba433eeea488e91c3a", "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 82017e48c..f96fe6984 100644 --- a/external_imported/vcpkg/versions/q-/qpid-proton.json +++ b/external_imported/vcpkg/versions/q-/qpid-proton.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "be327f08d64834a36d80a140832abbbc66e67207", + "version": "0.32.0", + "port-version": 4 + }, + { + "git-tree": "109a9bb4fac5d5c5a52cd620d7ddb22da6fe47f7", + "version": "0.32.0", + "port-version": 3 + }, { "git-tree": "c6ab0bd896fa44681e2c3d4b325915ddacb38a1a", "version": "0.32.0", diff --git a/external_imported/vcpkg/versions/q-/qt.json b/external_imported/vcpkg/versions/q-/qt.json index 90bb7506e..8d7d76610 100644 --- a/external_imported/vcpkg/versions/q-/qt.json +++ b/external_imported/vcpkg/versions/q-/qt.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "38c269c72f98a9fd49b28d428ad29cc5f1079fac", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "174cc984a142087680da0f0f42e659b835bb17b8", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "0270bf15601be63bc4e72bee1edc44e1241cbbfc", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-3d.json b/external_imported/vcpkg/versions/q-/qt5-3d.json index 714056ab0..f1bdb8731 100644 --- a/external_imported/vcpkg/versions/q-/qt5-3d.json +++ b/external_imported/vcpkg/versions/q-/qt5-3d.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5538f55e5cb938c965447c3a5ce67b243f5d97f1", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "4c43f4aec27c0ac682f88d1edfcce7c28e4a9458", + "version-string": "5.15.2", + "port-version": 3 + }, { "git-tree": "f46ab15ed74e4680e16b61851b9eb41523a626f6", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-activeqt.json b/external_imported/vcpkg/versions/q-/qt5-activeqt.json index 83332ee66..35044981c 100644 --- a/external_imported/vcpkg/versions/q-/qt5-activeqt.json +++ b/external_imported/vcpkg/versions/q-/qt5-activeqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ebae9d515816c48a9bbb2550acd02d02bfcfddc7", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "8bf9b51fd87d81531f301ee9060b76c829221afb", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-androidextras.json b/external_imported/vcpkg/versions/q-/qt5-androidextras.json index a8f18ffd4..1c72b66ea 100644 --- a/external_imported/vcpkg/versions/q-/qt5-androidextras.json +++ b/external_imported/vcpkg/versions/q-/qt5-androidextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b0e32e6213649f8645b05c868b81dc3c982bfb30", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "b8ff6ba90c3b7046e2728056998ff79665353503", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-base.json b/external_imported/vcpkg/versions/q-/qt5-base.json index 829c9e123..a14cf4e64 100644 --- a/external_imported/vcpkg/versions/q-/qt5-base.json +++ b/external_imported/vcpkg/versions/q-/qt5-base.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "abaaa592badf33576f197d915ed1f4ddd91d0931", + "version": "5.15.3", + "port-version": 2 + }, + { + "git-tree": "0b581b90072df50364b8c863110b2034a6b9f28e", + "version": "5.15.3", + "port-version": 1 + }, + { + "git-tree": "8c2fa92b6281b496e3aead1b02238ab7668c204a", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "f21ebf7bf6644292d70d9c564c1408a224f26c77", + "version-semver": "5.15.2", + "port-version": 20 + }, { "git-tree": "5a9c2b85fd5f62bb1b52f18c4628b0e08d765dd4", "version-semver": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-charts.json b/external_imported/vcpkg/versions/q-/qt5-charts.json index 7e8eac197..4a69f2305 100644 --- a/external_imported/vcpkg/versions/q-/qt5-charts.json +++ b/external_imported/vcpkg/versions/q-/qt5-charts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a4fa404a600c749529faae7807d2f24f5a6f8673", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "d51381395f58fbcf7b9488c2e49708522d968ffb", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-connectivity.json b/external_imported/vcpkg/versions/q-/qt5-connectivity.json index 58a0903bb..9e4118aed 100644 --- a/external_imported/vcpkg/versions/q-/qt5-connectivity.json +++ b/external_imported/vcpkg/versions/q-/qt5-connectivity.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8929178e2d3f0d544b21ed4bd1ad635e81fdefc5", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "4f34765d100d517dc137a96aabc37ab5cb95ea13", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-datavis3d.json b/external_imported/vcpkg/versions/q-/qt5-datavis3d.json index 1bc9e9764..db45fe7b3 100644 --- a/external_imported/vcpkg/versions/q-/qt5-datavis3d.json +++ b/external_imported/vcpkg/versions/q-/qt5-datavis3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8300805371f9fb2d98a2a2ace37e9e93149483e7", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "8a675679d46b85666ef053efb36a2bb70b40b8ee", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-declarative.json b/external_imported/vcpkg/versions/q-/qt5-declarative.json index dd12f79f2..734ecb969 100644 --- a/external_imported/vcpkg/versions/q-/qt5-declarative.json +++ b/external_imported/vcpkg/versions/q-/qt5-declarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "51388bc681cd6616f0d2ecb29b1f3901b2e66613", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "670f3d6bfa437ca047f1d1644743e2f2012524c8", "version": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-doc.json b/external_imported/vcpkg/versions/q-/qt5-doc.json index 7ccfe2d85..df590ce00 100644 --- a/external_imported/vcpkg/versions/q-/qt5-doc.json +++ b/external_imported/vcpkg/versions/q-/qt5-doc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5cecc56a1a87cf86f87dcde5bc650f8de1e53b60", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "4cb09a0ee4bcb79b460c69a4e924cbe19538a2d1", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-gamepad.json b/external_imported/vcpkg/versions/q-/qt5-gamepad.json index 5a9c6b847..d937d0954 100644 --- a/external_imported/vcpkg/versions/q-/qt5-gamepad.json +++ b/external_imported/vcpkg/versions/q-/qt5-gamepad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "53e4e7090cc36a827b518f376c485aacade15d37", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "d74a2774e03103111a4e73c990eb65e78416e784", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-graphicaleffects.json b/external_imported/vcpkg/versions/q-/qt5-graphicaleffects.json index 4f9f479b2..fc40fa163 100644 --- a/external_imported/vcpkg/versions/q-/qt5-graphicaleffects.json +++ b/external_imported/vcpkg/versions/q-/qt5-graphicaleffects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9bb49ed2d96c2ad0d18a0508f2c170a0ef0a51cf", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "7548a80471fd031625a4395776ea298e2737c280", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-imageformats.json b/external_imported/vcpkg/versions/q-/qt5-imageformats.json index 4b13e404f..d04465539 100644 --- a/external_imported/vcpkg/versions/q-/qt5-imageformats.json +++ b/external_imported/vcpkg/versions/q-/qt5-imageformats.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "bdb4dae2e952e636c45967063bcb7c5dbb9cea65", + "version": "5.15.3", + "port-version": 0 + }, + { + "git-tree": "5bf32f350b7d08389629bc565c66aeb5f84e93b0", + "version": "5.15.2", + "port-version": 2 + }, { "git-tree": "6f6ca0b9e789dbfafa84ca02eec3da94f2728494", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-location.json b/external_imported/vcpkg/versions/q-/qt5-location.json index cffd62afa..a3db41f5a 100644 --- a/external_imported/vcpkg/versions/q-/qt5-location.json +++ b/external_imported/vcpkg/versions/q-/qt5-location.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "374ad16cce9ae4eee7c91f701a72c21ede178794", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "7fb1b17892d53638ec4ada0a73b19ecef4062ec8", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-macextras.json b/external_imported/vcpkg/versions/q-/qt5-macextras.json index fcd900192..b342d08f9 100644 --- a/external_imported/vcpkg/versions/q-/qt5-macextras.json +++ b/external_imported/vcpkg/versions/q-/qt5-macextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "35696a5675057de9b50f3bbb2215b3f0879d3261", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "fb1f68ce5b03012e9fa7ed0924bc2036c4d97edd", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-mqtt.json b/external_imported/vcpkg/versions/q-/qt5-mqtt.json index 36e684e44..6d45e47f2 100644 --- a/external_imported/vcpkg/versions/q-/qt5-mqtt.json +++ b/external_imported/vcpkg/versions/q-/qt5-mqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c8622cf28b900e34394e7c67ee272a0f0ae1a945", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "9a02099176012e710ae215855f4e72fe6f5b704a", "version": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-multimedia.json b/external_imported/vcpkg/versions/q-/qt5-multimedia.json index 9f8782b6d..924826349 100644 --- a/external_imported/vcpkg/versions/q-/qt5-multimedia.json +++ b/external_imported/vcpkg/versions/q-/qt5-multimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8336d9a40e956b24f846b25c7b017cfac417f1d8", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "b909b49f99e6080fdd74b20419ac9f1059d993f6", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-networkauth.json b/external_imported/vcpkg/versions/q-/qt5-networkauth.json index dd4149833..71860f30e 100644 --- a/external_imported/vcpkg/versions/q-/qt5-networkauth.json +++ b/external_imported/vcpkg/versions/q-/qt5-networkauth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fed32ceb703389b16ddbf6843597358c92ff27e2", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "f6fcb48f7415ecf2a5f2f3966c48a08abd9b0355", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-purchasing.json b/external_imported/vcpkg/versions/q-/qt5-purchasing.json index b3a1c0849..e95c72dd4 100644 --- a/external_imported/vcpkg/versions/q-/qt5-purchasing.json +++ b/external_imported/vcpkg/versions/q-/qt5-purchasing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c1507aeba5c46c35cccbf662602be9bcfe6d4bc1", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "0e0745a65f393550ec04750071456604a5db72ba", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-quickcontrols.json b/external_imported/vcpkg/versions/q-/qt5-quickcontrols.json index ab5305153..cf1e69cbd 100644 --- a/external_imported/vcpkg/versions/q-/qt5-quickcontrols.json +++ b/external_imported/vcpkg/versions/q-/qt5-quickcontrols.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0023d4eae57568295996c372c262c746fce54cd1", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "49313a150ff19dacc9614849648f29c90e424cd3", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-quickcontrols2.json b/external_imported/vcpkg/versions/q-/qt5-quickcontrols2.json index cea41fe23..c499391c8 100644 --- a/external_imported/vcpkg/versions/q-/qt5-quickcontrols2.json +++ b/external_imported/vcpkg/versions/q-/qt5-quickcontrols2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "da9577fcd83a97070fbb31e9723645e1a353e780", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "c0f3cb1b07b4ac8c05297fd8c438ba7e1ba97ed8", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-remoteobjects.json b/external_imported/vcpkg/versions/q-/qt5-remoteobjects.json index f148c990d..f51c7a4ac 100644 --- a/external_imported/vcpkg/versions/q-/qt5-remoteobjects.json +++ b/external_imported/vcpkg/versions/q-/qt5-remoteobjects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc4b1cc8e132e4c53c32401e8eaea14140f39906", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "73a19321158fe546f1469f290a83050fa6af14f1", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-script.json b/external_imported/vcpkg/versions/q-/qt5-script.json index 842001bcc..491fdc3d4 100644 --- a/external_imported/vcpkg/versions/q-/qt5-script.json +++ b/external_imported/vcpkg/versions/q-/qt5-script.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "450d4c10bbd324c74ddca59e7d16c6cb215aa077", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "d412fb9a21bbf733e6e2e00c2015787a7c262c6a", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-scxml.json b/external_imported/vcpkg/versions/q-/qt5-scxml.json index 70cfc0bb7..8ed279f7e 100644 --- a/external_imported/vcpkg/versions/q-/qt5-scxml.json +++ b/external_imported/vcpkg/versions/q-/qt5-scxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "894ab2a120cd88e276b795234c66715ac787e4ab", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "657fa8e20641b75338667e14b696127b252fcfd5", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-sensors.json b/external_imported/vcpkg/versions/q-/qt5-sensors.json index 87c364575..8604dd80b 100644 --- a/external_imported/vcpkg/versions/q-/qt5-sensors.json +++ b/external_imported/vcpkg/versions/q-/qt5-sensors.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d7faff943ee0ed0c4be86730ded240b322d2b829", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "5ab7355283e60f00090972eafddf269519155344", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-serialbus.json b/external_imported/vcpkg/versions/q-/qt5-serialbus.json index eefb33d0c..70492fed0 100644 --- a/external_imported/vcpkg/versions/q-/qt5-serialbus.json +++ b/external_imported/vcpkg/versions/q-/qt5-serialbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e16c9b0f5f3bb86c3fe988f049069901ae578d0e", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "23c4f38498a3eeaef1a0428cc0f9facb77c50bb5", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-serialport.json b/external_imported/vcpkg/versions/q-/qt5-serialport.json index 17d9dae6d..dbe096719 100644 --- a/external_imported/vcpkg/versions/q-/qt5-serialport.json +++ b/external_imported/vcpkg/versions/q-/qt5-serialport.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc7ba67e09a801eca90691b7c7db4baf43369a09", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "b6e0403e0e46d6b3aa07ea90da894a33589c3dde", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-speech.json b/external_imported/vcpkg/versions/q-/qt5-speech.json index 86bfb4207..07c2e5ae9 100644 --- a/external_imported/vcpkg/versions/q-/qt5-speech.json +++ b/external_imported/vcpkg/versions/q-/qt5-speech.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf21b1bb4dc124cba22d170e77ceb78315ab7de2", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "12c00b4bbf2206f8bb68ad44e8b44dbfd65fa6e4", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-svg.json b/external_imported/vcpkg/versions/q-/qt5-svg.json index 9954a1f1f..f57f54bc1 100644 --- a/external_imported/vcpkg/versions/q-/qt5-svg.json +++ b/external_imported/vcpkg/versions/q-/qt5-svg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a43bcf48e884abdd82502f747342962e2a2c4b8", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "75e1a170720117fcc34369aae8ab7ee4816974a3", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-tools.json b/external_imported/vcpkg/versions/q-/qt5-tools.json index f4df8a348..a5deb8aa6 100644 --- a/external_imported/vcpkg/versions/q-/qt5-tools.json +++ b/external_imported/vcpkg/versions/q-/qt5-tools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0f3066692eacc724dde9d8f17d4cb67f019ecc75", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "b28b98fb7bd66abe2c108d66c3a89c0e388d638f", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-translations.json b/external_imported/vcpkg/versions/q-/qt5-translations.json index 687f16bb8..b2f540c9e 100644 --- a/external_imported/vcpkg/versions/q-/qt5-translations.json +++ b/external_imported/vcpkg/versions/q-/qt5-translations.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a0df59e14f9c24d2584e7f0424424f50eb4c9f7", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "195b59491201660e5c6299f6f3f78c446827e8d7", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-virtualkeyboard.json b/external_imported/vcpkg/versions/q-/qt5-virtualkeyboard.json index 1cabc7e94..81eb34974 100644 --- a/external_imported/vcpkg/versions/q-/qt5-virtualkeyboard.json +++ b/external_imported/vcpkg/versions/q-/qt5-virtualkeyboard.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c8514424cbc1c746ec7149ec383fbdd5174a0e4", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "45281062a0b509d6c5f2cfce1f26e77e90fa6192", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-wayland.json b/external_imported/vcpkg/versions/q-/qt5-wayland.json index 5960d4316..77179d15c 100644 --- a/external_imported/vcpkg/versions/q-/qt5-wayland.json +++ b/external_imported/vcpkg/versions/q-/qt5-wayland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4e8f0ffa97c7f3d1dfe627808bcafc4d4a77d3e2", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "10dc10d68dd34e3db201364ec60567459c6857dc", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-webchannel.json b/external_imported/vcpkg/versions/q-/qt5-webchannel.json index 361bfbd96..28d7cc5a6 100644 --- a/external_imported/vcpkg/versions/q-/qt5-webchannel.json +++ b/external_imported/vcpkg/versions/q-/qt5-webchannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cd0f8bbb8bb85bc208907a24c82fe9db0b902922", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "39e51839b2f67b03e0f72bf862dc44ad72bcc804", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-webengine.json b/external_imported/vcpkg/versions/q-/qt5-webengine.json index a3228a8ba..159af0652 100644 --- a/external_imported/vcpkg/versions/q-/qt5-webengine.json +++ b/external_imported/vcpkg/versions/q-/qt5-webengine.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "533cd8995acbdf2a8cc24a96da7515777dfe7c38", + "version": "5.15.3", + "port-version": 1 + }, + { + "git-tree": "4b097155aca1faecdaa639daec2395e9a8c0cdad", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "365537bee64190f604e1be03f0473ffe41067a82", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-webglplugin.json b/external_imported/vcpkg/versions/q-/qt5-webglplugin.json index 943982291..0c8b2fb9e 100644 --- a/external_imported/vcpkg/versions/q-/qt5-webglplugin.json +++ b/external_imported/vcpkg/versions/q-/qt5-webglplugin.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3d081435832cdf86757d280e7fbf1bf2b5780199", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "44c3faa9de1a6f18a9f496e828c4ee64f0fcc315", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-websockets.json b/external_imported/vcpkg/versions/q-/qt5-websockets.json index 671a9ca61..ec5af0ba6 100644 --- a/external_imported/vcpkg/versions/q-/qt5-websockets.json +++ b/external_imported/vcpkg/versions/q-/qt5-websockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c0380195d2431d25311a4fa542d3437d05f339da", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "0ca77dc0c75bd411f1d1e51257c761e775ca341d", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-webview.json b/external_imported/vcpkg/versions/q-/qt5-webview.json index f4e2014f7..d1dac375d 100644 --- a/external_imported/vcpkg/versions/q-/qt5-webview.json +++ b/external_imported/vcpkg/versions/q-/qt5-webview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb6129ae1fa4b8945885ca352eca1bde34e1a345", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "8c8a8916c8fda707b4c8096388ea7156bada9a4c", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-winextras.json b/external_imported/vcpkg/versions/q-/qt5-winextras.json index 1d4926a14..144d13db8 100644 --- a/external_imported/vcpkg/versions/q-/qt5-winextras.json +++ b/external_imported/vcpkg/versions/q-/qt5-winextras.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5a7881475902048fa453bff04c347caa7e9a615b", + "version": "5.15.3", + "port-version": 1 + }, + { + "git-tree": "89250816793ceacdf74730157af6f287070b8bf1", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "85a345a5fdc5a15584e6b2add00f1669e4099dbc", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-x11extras.json b/external_imported/vcpkg/versions/q-/qt5-x11extras.json index 1042604af..2a5fc9c44 100644 --- a/external_imported/vcpkg/versions/q-/qt5-x11extras.json +++ b/external_imported/vcpkg/versions/q-/qt5-x11extras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5321c86715348b879cee60dc4323c2e1d8fc9fe9", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "ce0ca52833bf80d8bc958cd4428acd10ab397911", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5-xmlpatterns.json b/external_imported/vcpkg/versions/q-/qt5-xmlpatterns.json index 3777966f9..27f8c21d6 100644 --- a/external_imported/vcpkg/versions/q-/qt5-xmlpatterns.json +++ b/external_imported/vcpkg/versions/q-/qt5-xmlpatterns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b87833daca4ff1492a4890d0f73bcbb416dfc615", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "d4531f24cddd2692989fac9e84a9eb09301ee180", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5.json b/external_imported/vcpkg/versions/q-/qt5.json index 39ad38894..2f4ee258a 100644 --- a/external_imported/vcpkg/versions/q-/qt5.json +++ b/external_imported/vcpkg/versions/q-/qt5.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "979ef9acc281793cef4f43f1e1eaed177ed9b408", + "version": "5.15.3", + "port-version": 1 + }, + { + "git-tree": "428cdd43abdc1200e889c66b9c388b421d16bf58", + "version": "5.15.3", + "port-version": 0 + }, { "git-tree": "9810d811337a74ca11e032b94b52f4e4bed5d1b1", "version-string": "5.15.2", diff --git a/external_imported/vcpkg/versions/q-/qt5compat.json b/external_imported/vcpkg/versions/q-/qt5compat.json index 612a20c90..b88ffd90d 100644 --- a/external_imported/vcpkg/versions/q-/qt5compat.json +++ b/external_imported/vcpkg/versions/q-/qt5compat.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e9ffdd0f5186b67741f04c15121449eb62f21f45", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "d650b3405a677deca9110c6ea6861bfaa24645f2", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "766a30524747e5382462c57836e5a8a6a67a1b86", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qtactiveqt.json b/external_imported/vcpkg/versions/q-/qtactiveqt.json index fe62210cc..ef6edccc2 100644 --- a/external_imported/vcpkg/versions/q-/qtactiveqt.json +++ b/external_imported/vcpkg/versions/q-/qtactiveqt.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f58617e4fa4a6e358daffccd8d286cd9dab162ee", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "bc03ec029e90f445ee878ad27b476b60da06ee3e", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "adbc35d451c9ac13adbd23980b1609bce61e3dd9", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qtapplicationmanager.json b/external_imported/vcpkg/versions/q-/qtapplicationmanager.json index f6d3dcf73..2e6fdb2a1 100644 --- a/external_imported/vcpkg/versions/q-/qtapplicationmanager.json +++ b/external_imported/vcpkg/versions/q-/qtapplicationmanager.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "d51f980344bfb14ace79b30fbf510e92b4924da8", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "3c971f01c7b3ee85236a451ad93fd00fe4cc17e6", + "version": "6.2.3", + "port-version": 1 + }, + { + "git-tree": "9597e662be8fbe3317e0fd88058071db708da977", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "79db0a47002752179eb5aacedca44c0bc670030c", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qtbase.json b/external_imported/vcpkg/versions/q-/qtbase.json index 40e963eb3..42f90f865 100644 --- a/external_imported/vcpkg/versions/q-/qtbase.json +++ b/external_imported/vcpkg/versions/q-/qtbase.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "35e9386f344f01e0e37df7b2d2ae991db6bbb1cc", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "bfac5075bd2dcb338153b016e27ff8789b05688b", + "version": "6.2.3", + "port-version": 0 + }, + { + "git-tree": "2362188815f81dd666df3eaee1d96a208c1a0838", + "version-semver": "6.2.2", + "port-version": 4 + }, + { + "git-tree": "e9fa18e04e930f9ada49aac4dca2e9fe4958b89a", + "version-semver": "6.2.2", + "port-version": 3 + }, { "git-tree": "bb6485a4e65e52d1a157f6e0c478a47bdc884726", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qtcharts.json b/external_imported/vcpkg/versions/q-/qtcharts.json index 3aea539e5..b840a15b6 100644 --- a/external_imported/vcpkg/versions/q-/qtcharts.json +++ b/external_imported/vcpkg/versions/q-/qtcharts.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d5e059fea3a95f9b719d3b3069f09be05413ef99", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "f4676a2659098089318793815dcbff8cdb55ea9f", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "5fd0c04f1b0758cb38a161d2ec6a9b8757bb243c", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qtcoap.json b/external_imported/vcpkg/versions/q-/qtcoap.json index 94fc0ad49..3473d9933 100644 --- a/external_imported/vcpkg/versions/q-/qtcoap.json +++ b/external_imported/vcpkg/versions/q-/qtcoap.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7f05c6aaeb825647d3c802feeb1b06a0d14a83c0", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "948308d4ae9a45ee3c438fb512b2fe25c3661773", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "0fdd3a57eee65ddaa5bd2c83ece98efcc0a6e7e5", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qtconnectivity.json b/external_imported/vcpkg/versions/q-/qtconnectivity.json index 07c97c090..b4b4e9741 100644 --- a/external_imported/vcpkg/versions/q-/qtconnectivity.json +++ b/external_imported/vcpkg/versions/q-/qtconnectivity.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "db0fc2cda2cc383043f8e1fc4b48849183f038b8", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "fbe8db54ab4377615f8328227d21c8bf470551d6", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "9f62102338302645f71d4b060100dee977a5c744", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qtdatavis3d.json b/external_imported/vcpkg/versions/q-/qtdatavis3d.json index 629662cd5..ebd18f8b5 100644 --- a/external_imported/vcpkg/versions/q-/qtdatavis3d.json +++ b/external_imported/vcpkg/versions/q-/qtdatavis3d.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c35b1ffb8bc3d76b8537e2d5d59176545f4a02bc", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "014813f75ac07a1207692d81609b4cc6e28e5737", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "be38aa1f2d19491f9195779ab9bc5cf9469e2d46", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qtdeclarative.json b/external_imported/vcpkg/versions/q-/qtdeclarative.json index 8367b3eb2..5d3827b0e 100644 --- a/external_imported/vcpkg/versions/q-/qtdeclarative.json +++ b/external_imported/vcpkg/versions/q-/qtdeclarative.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ea64315431fd028d453a27e999d7e696f48923d4", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "ede6e28a20ddf3b6d4cc7b1e7ac7dc41f80e64a8", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "986c605c0c11adc3c756743307730e41d1c16b5f", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qtdeviceutilities.json b/external_imported/vcpkg/versions/q-/qtdeviceutilities.json index 3fafa7c45..2b269d377 100644 --- a/external_imported/vcpkg/versions/q-/qtdeviceutilities.json +++ b/external_imported/vcpkg/versions/q-/qtdeviceutilities.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "a688914d635b3b8f3295bfa76e3581b2db6d3d44", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "91bd6966a66abed85eab29725a1fa838b7416c9f", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "f6122e9d022e0d407e75f0af4b1faafa926f40cf", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qtdoc.json b/external_imported/vcpkg/versions/q-/qtdoc.json index d8395b0d4..5edb3f9b8 100644 --- a/external_imported/vcpkg/versions/q-/qtdoc.json +++ b/external_imported/vcpkg/versions/q-/qtdoc.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5e04878cf2a70ff87ae027aaefc5d40c328cffba", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "86089f5d381b17bdd89c9fd7953db2ff38dcec38", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "585382ff1e60120a0cf35e8b22e1b8152b83fa1d", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qtimageformats.json b/external_imported/vcpkg/versions/q-/qtimageformats.json index 6cd791566..52ba49b71 100644 --- a/external_imported/vcpkg/versions/q-/qtimageformats.json +++ b/external_imported/vcpkg/versions/q-/qtimageformats.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "721c778bc9a6bd4e04a2e1cfb5437ffb7e59abc0", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "fff7150f31fcb2531adcb2f8fa42b6106c2893d1", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "038c5575e3e47c1512381b63138896df5fd713b6", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qtinterfaceframework.json b/external_imported/vcpkg/versions/q-/qtinterfaceframework.json index 6e2cc2fd6..33909a951 100644 --- a/external_imported/vcpkg/versions/q-/qtinterfaceframework.json +++ b/external_imported/vcpkg/versions/q-/qtinterfaceframework.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "e36f5d74c2e94aa38c74b0fdfec8778fb7851523", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "42968cd54d91bbbf94a3c5aaaf6f1de876b0efac", + "version": "6.2.3", + "port-version": 2 + }, + { + "git-tree": "26fa7610125a5a6b54ced0cda87ab6621a42a1d9", + "version": "6.2.3", + "port-version": 1 + }, + { + "git-tree": "bdbc69bff861cdbd2dad8178d022b10d4f6abfe2", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "cf3fdd99f01775fe030233d5526e5e3069e3e813", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qtlocation.json b/external_imported/vcpkg/versions/q-/qtlocation.json index 923349954..de75ba18c 100644 --- a/external_imported/vcpkg/versions/q-/qtlocation.json +++ b/external_imported/vcpkg/versions/q-/qtlocation.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ef7c3db0a80c38d01ff341d090a291f4f1a098aa", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "589d851aebfb0c2dd786a5b0a8d7c33e56083223", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "d931a7ce122989a7d7740e0c196e736fa8caa3c3", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qtlottie.json b/external_imported/vcpkg/versions/q-/qtlottie.json index 913afec22..cf263c8b0 100644 --- a/external_imported/vcpkg/versions/q-/qtlottie.json +++ b/external_imported/vcpkg/versions/q-/qtlottie.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "57035eea5acd484e3a6a51f5da16046283c58f50", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "ab8ffeb4492e7cabd51fa8c5ead514e4764f67e5", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "1f23eead56f7491312b8b16fe1729aa1e808598d", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qtmqtt.json b/external_imported/vcpkg/versions/q-/qtmqtt.json index baf41523e..b62a83680 100644 --- a/external_imported/vcpkg/versions/q-/qtmqtt.json +++ b/external_imported/vcpkg/versions/q-/qtmqtt.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "0b09100a4e32240e79258ab69386b77370d916a0", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "adfab6c76e26f420db304e6d131cab246da43200", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "ab25c644271573b1106cea249b17740ff645a0dd", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qtmultimedia.json b/external_imported/vcpkg/versions/q-/qtmultimedia.json index 17d860286..fc552d130 100644 --- a/external_imported/vcpkg/versions/q-/qtmultimedia.json +++ b/external_imported/vcpkg/versions/q-/qtmultimedia.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d0e46329a8e66cf3f95eca5d4018c955a8b54a15", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "3a6cdbf95fd19f196f2e0d7c9ed149e621690a7a", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "ddf67ffb4169c0c1d2a8e3b0cc317101fd2dfd95", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qtnetworkauth.json b/external_imported/vcpkg/versions/q-/qtnetworkauth.json index 918613cf4..a524dc86a 100644 --- a/external_imported/vcpkg/versions/q-/qtnetworkauth.json +++ b/external_imported/vcpkg/versions/q-/qtnetworkauth.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "edc058f97084276593fa00ebc1ad1dbf865abb57", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "205649afe146022c19e1246083c83c4ca1573959", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "e6a02544f81615f1628e9f75af57af10697d51b0", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qtopcua.json b/external_imported/vcpkg/versions/q-/qtopcua.json index ad08cb2cb..47a362cff 100644 --- a/external_imported/vcpkg/versions/q-/qtopcua.json +++ b/external_imported/vcpkg/versions/q-/qtopcua.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7a9e72b88e14594db1752854941cb95174565be6", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "3fef74b1cf459126f776aa964fa6900e7be903fb", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "45d2bb4f558ea5cd5d321d92bd9d361cb53acb49", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qtpositioning.json b/external_imported/vcpkg/versions/q-/qtpositioning.json index a118162cb..88693a1df 100644 --- a/external_imported/vcpkg/versions/q-/qtpositioning.json +++ b/external_imported/vcpkg/versions/q-/qtpositioning.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "26bbae5f5512a6ca58eada26e54c94666174ec71", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "1c16604affb63067fcad166931565e516250434f", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "9e9bfb4dd17aa86cfcd5c80f0725c585ec140670", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qtquick3d.json b/external_imported/vcpkg/versions/q-/qtquick3d.json index 0b57faccc..bcbffd2c7 100644 --- a/external_imported/vcpkg/versions/q-/qtquick3d.json +++ b/external_imported/vcpkg/versions/q-/qtquick3d.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "0782a581d66c7895e5fe12eb225bbd63ff6d0799", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "822ca9b71fbf3eb7ae119c25e87dc8e00f70b0a5", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "81a5365f84b789b91715504392ce6e8b09b8702b", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qtquicktimeline.json b/external_imported/vcpkg/versions/q-/qtquicktimeline.json index 4dec0d20d..b546a117c 100644 --- a/external_imported/vcpkg/versions/q-/qtquicktimeline.json +++ b/external_imported/vcpkg/versions/q-/qtquicktimeline.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7797c7b3d33d915ba656bfc26717623fcd187109", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "d213e9348a705383181332c7448c14b94235f89e", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "43a873627defa053a83b64a73f4deb978a55cdcb", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qtremoteobjects.json b/external_imported/vcpkg/versions/q-/qtremoteobjects.json index e3fac5b7c..2866acc00 100644 --- a/external_imported/vcpkg/versions/q-/qtremoteobjects.json +++ b/external_imported/vcpkg/versions/q-/qtremoteobjects.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c9f576479ffa0be9262702030362c0b030b1497b", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "a7a71c783e081189c9edb6a9e59707472863738f", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "caa274f1cb2a4e59d44aa9a22f039c040cf8823d", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qtscxml.json b/external_imported/vcpkg/versions/q-/qtscxml.json index e09c37e7d..1073b8826 100644 --- a/external_imported/vcpkg/versions/q-/qtscxml.json +++ b/external_imported/vcpkg/versions/q-/qtscxml.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "82cfc4f68723b511524573f7492e44c0326378f7", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "e7c00e022f07f448e2c6d2509bc6986f5b75d3b8", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "011114ad3a3f710f7229eef99eb75cb0a061fbe1", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qtsensors.json b/external_imported/vcpkg/versions/q-/qtsensors.json index 8c7413e2a..34a1cbb8c 100644 --- a/external_imported/vcpkg/versions/q-/qtsensors.json +++ b/external_imported/vcpkg/versions/q-/qtsensors.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "b52c1c71cc2c185f936b5e1e278ed4758bae6d6e", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "5515c06070b3f4b8ae13497824653e91d09476d7", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "d712603b6a1fd9781f0ecd55bed2a905256a1c14", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qtserialbus.json b/external_imported/vcpkg/versions/q-/qtserialbus.json index 00f085fae..aab2381f8 100644 --- a/external_imported/vcpkg/versions/q-/qtserialbus.json +++ b/external_imported/vcpkg/versions/q-/qtserialbus.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "97a896e4a1812c908a3db8b73676fbda9280569b", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "413e942ee8da80bd4f4f64b4eb4de978740a9d65", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "8f038e84c8f9b127bc7998328e546ca7fb4e7553", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qtserialport.json b/external_imported/vcpkg/versions/q-/qtserialport.json index 4adffa4a6..67aa32223 100644 --- a/external_imported/vcpkg/versions/q-/qtserialport.json +++ b/external_imported/vcpkg/versions/q-/qtserialport.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "3a4f36aca9457e6a78f5b6c1f65b1d36f7666fd7", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "e500faa24ed6ecba0cfe64ce061763c47612c767", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "791608d6a9d95afa77b8db4a13a8f75928626926", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qtshadertools.json b/external_imported/vcpkg/versions/q-/qtshadertools.json index dbb0c5d89..0c4363ce2 100644 --- a/external_imported/vcpkg/versions/q-/qtshadertools.json +++ b/external_imported/vcpkg/versions/q-/qtshadertools.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7d8e8be656c7dc865d98021272c0f716c14866ed", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "cd4279442737df6c5e8ba533f8ce52b0a03cdc08", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "70e894d24707b42dd208c14f491cf3164caf22f9", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qtsvg.json b/external_imported/vcpkg/versions/q-/qtsvg.json index bb7af3ff7..763ca70f6 100644 --- a/external_imported/vcpkg/versions/q-/qtsvg.json +++ b/external_imported/vcpkg/versions/q-/qtsvg.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "df716d6718c7fad4a45e9eecc493c6c4cc752744", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "37349a1661b8bfda73318abcb5db080fb6fc71d6", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "d6c1c34779691c0150e573246351f00b6fe1126f", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qttools.json b/external_imported/vcpkg/versions/q-/qttools.json index a5e6a74ad..8f8275463 100644 --- a/external_imported/vcpkg/versions/q-/qttools.json +++ b/external_imported/vcpkg/versions/q-/qttools.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "a00f4470b9264ccffc7dfb230684126e61fb0f2c", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "79247ffe31fa15579c9069634c3d8778672928ca", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "655cd4b3e9d57ebee9768c2ab0d1d4936b409c02", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qttranslations.json b/external_imported/vcpkg/versions/q-/qttranslations.json index 02da4f846..c702c0ccd 100644 --- a/external_imported/vcpkg/versions/q-/qttranslations.json +++ b/external_imported/vcpkg/versions/q-/qttranslations.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d16f4613ad42d01be87aa75bf23013dc7da1845a", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "3df8c89676608f1a4a58aeef4cb6e9edfe5666fb", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "51a188d5a80a0a9a3b5ec6319bfd0710e82d1769", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qtvirtualkeyboard.json b/external_imported/vcpkg/versions/q-/qtvirtualkeyboard.json index 77a4c00f1..e95d822c8 100644 --- a/external_imported/vcpkg/versions/q-/qtvirtualkeyboard.json +++ b/external_imported/vcpkg/versions/q-/qtvirtualkeyboard.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "fcfb5975545e28e64e2f5c71c5f5a2cbc0b22c70", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "7ec572e9663958105a8c2b89c24a93d4280f002c", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "9bc69668572f2a83bf742b8b10ec3085f159d513", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qtwayland.json b/external_imported/vcpkg/versions/q-/qtwayland.json index 6d2d94cae..eb7c39687 100644 --- a/external_imported/vcpkg/versions/q-/qtwayland.json +++ b/external_imported/vcpkg/versions/q-/qtwayland.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "9930653065c44653bdf5f7285799d1a9ebb44d83", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "6eaf26953606c37b93a2e03d2162f80e4d2d4d6a", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "7df54bd36afd381966e0b082e49154b1eb818bf0", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qtwebchannel.json b/external_imported/vcpkg/versions/q-/qtwebchannel.json index 7189456e1..55122a8db 100644 --- a/external_imported/vcpkg/versions/q-/qtwebchannel.json +++ b/external_imported/vcpkg/versions/q-/qtwebchannel.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7bc22dab6b47734c9163edde8bef8e9088a04301", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "0f4fee2471dba6631d06fcac6a9f99c38fe14649", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "d3f7068b76b91006bd426b173fe5e723ca6364c4", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qtwebengine.json b/external_imported/vcpkg/versions/q-/qtwebengine.json index de6edd846..edb49ebc8 100644 --- a/external_imported/vcpkg/versions/q-/qtwebengine.json +++ b/external_imported/vcpkg/versions/q-/qtwebengine.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "7972a7fa77f29d83f91787c942f4f85d50651c05", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "c09764532fe7b4367f6438db92b59f41cb3d4e52", + "version": "6.2.3", + "port-version": 1 + }, + { + "git-tree": "97ae42eec1de17a95e9d48132ee94dd80ab4a239", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "9a3f041f2f3f5fdb5e1304efbae7ae0e9abbef79", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qtwebsockets.json b/external_imported/vcpkg/versions/q-/qtwebsockets.json index 48668376a..459c87c45 100644 --- a/external_imported/vcpkg/versions/q-/qtwebsockets.json +++ b/external_imported/vcpkg/versions/q-/qtwebsockets.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "78911113c7407ff6403479ace90d0f4b2656e517", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "cc3e9ce12b12aecdb4372cee226fcb0ddc4b0f34", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "e051a024f04ac4bbb3700a022df3dfb85c35267d", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/qtwebview.json b/external_imported/vcpkg/versions/q-/qtwebview.json index 1907ce928..f4da583d9 100644 --- a/external_imported/vcpkg/versions/q-/qtwebview.json +++ b/external_imported/vcpkg/versions/q-/qtwebview.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "8a8cb6fb5af80519ad2f3d0e9f80a027f1d16165", + "version": "6.2.4", + "port-version": 0 + }, + { + "git-tree": "36832dd9f2bf65b94b7b51bf37db50eaf266baf8", + "version": "6.2.3", + "port-version": 0 + }, { "git-tree": "ef310559b2cef5f8dd1e2eee6c2f52c3942d0f26", "version-semver": "6.2.2", diff --git a/external_imported/vcpkg/versions/q-/quantlib.json b/external_imported/vcpkg/versions/q-/quantlib.json index 3277be862..c8bb6a47b 100644 --- a/external_imported/vcpkg/versions/q-/quantlib.json +++ b/external_imported/vcpkg/versions/q-/quantlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4d702f6d14c1a91b83a4950dd05e3b200700cfd8", + "version": "1.25", + "port-version": 0 + }, { "git-tree": "d8519a43e706ff22152e65942f48e5abd75bb76f", "version": "1.24", diff --git a/external_imported/vcpkg/versions/q-/quickfix.json b/external_imported/vcpkg/versions/q-/quickfix.json index 45666d9a0..87b646b89 100644 --- a/external_imported/vcpkg/versions/q-/quickfix.json +++ b/external_imported/vcpkg/versions/q-/quickfix.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "73e9e7e7bcc08f6f0f491d68cd2ff93f5571353f", + "version": "1.15.1", + "port-version": 7 + }, + { + "git-tree": "a9ec8c3d5dfd310a3f5d5c54bebc6030b4cad0c6", + "version": "1.15.1", + "port-version": 6 + }, { "git-tree": "d374a1da06a6765ceeb510d6b65afd8ee97194ad", "version-string": "1.15.1", diff --git a/external_imported/vcpkg/versions/q-/quill.json b/external_imported/vcpkg/versions/q-/quill.json index da355a2fc..fdd44a202 100644 --- a/external_imported/vcpkg/versions/q-/quill.json +++ b/external_imported/vcpkg/versions/q-/quill.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "19f0208595bbec6d64a4e34e351b530d091212bd", + "version-semver": "1.6.3", + "port-version": 4 + }, { "git-tree": "037a819f5cf482d84083318e120e076c711a2760", "version-semver": "1.6.3", diff --git a/external_imported/vcpkg/versions/q-/qwtw.json b/external_imported/vcpkg/versions/q-/qwtw.json index 81d0fd2cc..c1b92e2b2 100644 --- a/external_imported/vcpkg/versions/q-/qwtw.json +++ b/external_imported/vcpkg/versions/q-/qwtw.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b5e27a5ec415b3edbce8dd6ea8d09bf2022b75f1", + "version": "3.1.0", + "port-version": 2 + }, { "git-tree": "debc8598b11213981d8489a27ca97894a72621c6", "version-string": "3.1.0", diff --git a/external_imported/vcpkg/versions/r-/randomstr.json b/external_imported/vcpkg/versions/r-/randomstr.json new file mode 100644 index 000000000..d0edba7c4 --- /dev/null +++ b/external_imported/vcpkg/versions/r-/randomstr.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "231d69b973b9219271281ebe6d125c4c31380b87", + "version-date": "2022-02-03", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/r-/raylib.json b/external_imported/vcpkg/versions/r-/raylib.json index 27e111f9a..91b54dde0 100644 --- a/external_imported/vcpkg/versions/r-/raylib.json +++ b/external_imported/vcpkg/versions/r-/raylib.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "0b15021a8c0247cf83d5e4ca352b7e53b510b743", + "version-semver": "4.0.0", + "port-version": 3 + }, + { + "git-tree": "94a36f9f2d45dcba0e7ee689b5d58ad11bc4a4b9", + "version-semver": "4.0.0", + "port-version": 2 + }, + { + "git-tree": "4ab1c8406a740fce2da5e0844b10aea89850d044", + "version-semver": "4.0.0", + "port-version": 1 + }, { "git-tree": "394d0afab6e94ac36b289e350cdf2b8886560bb4", "version-semver": "4.0.0", diff --git a/external_imported/vcpkg/versions/r-/readline-unix.json b/external_imported/vcpkg/versions/r-/readline-unix.json index 479f36c56..a0284c726 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": "cc7ba8176a2492af17dc561bcb82c36f7c89e540", + "version": "8.1", + "port-version": 1 + }, { "git-tree": "e2ef4d4f472d6fe4f36009032dfdd3279a50c754", "version": "8.1", diff --git a/external_imported/vcpkg/versions/r-/readline-win32.json b/external_imported/vcpkg/versions/r-/readline-win32.json index b2d5f3ac5..cfba59150 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": "b1ed33b8ec37a1cf44926c9954b6943bce302b70", + "version": "5.0", + "port-version": 4 + }, { "git-tree": "5d2ea2655a570f6c0fd17689715d542336d531ea", "version-string": "5.0", diff --git a/external_imported/vcpkg/versions/r-/realsense2.json b/external_imported/vcpkg/versions/r-/realsense2.json index 24eec753a..8a9edfebc 100644 --- a/external_imported/vcpkg/versions/r-/realsense2.json +++ b/external_imported/vcpkg/versions/r-/realsense2.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "1b967b8979ae93b95b16a7021348e04f534f28c0", + "version": "2.50.0", + "port-version": 1 + }, + { + "git-tree": "310025edf50886cce00c7864f6f21d1eda53b51b", + "version": "2.50.0", + "port-version": 0 + }, { "git-tree": "23387c9d073a3e686615bd5c9da9dbf81ae6406d", "version": "2.49.0", diff --git a/external_imported/vcpkg/versions/r-/redis-plus-plus.json b/external_imported/vcpkg/versions/r-/redis-plus-plus.json index 76887d28a..de899f3b7 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": "a58c88604be6da2e638127442cc413c0504e2f51", + "version-semver": "1.3.2", + "port-version": 0 + }, { "git-tree": "4da3b8dd26c05426ae7d2a844f854423e9d0624d", "version-semver": "1.3.1", diff --git a/external_imported/vcpkg/versions/r-/rendergraph.json b/external_imported/vcpkg/versions/r-/rendergraph.json new file mode 100644 index 000000000..8bc394ff1 --- /dev/null +++ b/external_imported/vcpkg/versions/r-/rendergraph.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d9a3f94947632fcba47a0110eecbbc8a72f5f908", + "version": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/r-/replxx.json b/external_imported/vcpkg/versions/r-/replxx.json index 1481e7595..9e09a73bc 100644 --- a/external_imported/vcpkg/versions/r-/replxx.json +++ b/external_imported/vcpkg/versions/r-/replxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5f699bd3a8850016bfd6ff8a8eb03d82fe83bdb9", + "version": "0.0.4", + "port-version": 1 + }, { "git-tree": "d4ea343882654077d63b8e2781b380a545331935", "version": "0.0.4", diff --git a/external_imported/vcpkg/versions/r-/reproc.json b/external_imported/vcpkg/versions/r-/reproc.json index ed13fab3f..b90be3789 100644 --- a/external_imported/vcpkg/versions/r-/reproc.json +++ b/external_imported/vcpkg/versions/r-/reproc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eeac14685480439ee52ac05ec68faebb2cbaffad", + "version": "14.2.4", + "port-version": 1 + }, { "git-tree": "7fd87804e3a4b51c657b56c1be69d11e29168b89", "version": "14.2.4", diff --git a/external_imported/vcpkg/versions/r-/restclient-cpp.json b/external_imported/vcpkg/versions/r-/restclient-cpp.json index 398b5ed52..06de99400 100644 --- a/external_imported/vcpkg/versions/r-/restclient-cpp.json +++ b/external_imported/vcpkg/versions/r-/restclient-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7eeae27247c8a1e6f5dab2356cb94370aaabb7fc", + "version-date": "2022-02-09", + "port-version": 0 + }, { "git-tree": "ab5e52242e8403aa8b9b26a60baead129e2a1798", "version-string": "0.5.2", diff --git a/external_imported/vcpkg/versions/r-/rhash.json b/external_imported/vcpkg/versions/r-/rhash.json index 32c38505f..5645f7458 100644 --- a/external_imported/vcpkg/versions/r-/rhash.json +++ b/external_imported/vcpkg/versions/r-/rhash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "db6e2fc777b1ffb5257989484d303fc52e9b39f5", + "version": "1.4.0", + "port-version": 2 + }, { "git-tree": "ade1e1726434d28ad58715f9b6a3c005a1f243bb", "version-string": "1.4.0", diff --git a/external_imported/vcpkg/versions/r-/rhasheq.json b/external_imported/vcpkg/versions/r-/rhasheq.json new file mode 100644 index 000000000..74506bc1e --- /dev/null +++ b/external_imported/vcpkg/versions/r-/rhasheq.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1f26547ad3e879dcf8083e3db488bdb1cda587f4", + "version": "0.0.1", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/r-/robin-hood-hashing.json b/external_imported/vcpkg/versions/r-/robin-hood-hashing.json index 17275d625..071d88471 100644 --- a/external_imported/vcpkg/versions/r-/robin-hood-hashing.json +++ b/external_imported/vcpkg/versions/r-/robin-hood-hashing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "79b90adbe2f012facdd920fdb6454bc21c84399e", + "version": "3.11.5", + "port-version": 0 + }, { "git-tree": "6f9ac2b49724c52f213148e36f09e886e346f1f8", "version": "3.11.4", diff --git a/external_imported/vcpkg/versions/r-/rsasynccpp.json b/external_imported/vcpkg/versions/r-/rsasynccpp.json index 398e8cc0f..fbd102a5d 100644 --- a/external_imported/vcpkg/versions/r-/rsasynccpp.json +++ b/external_imported/vcpkg/versions/r-/rsasynccpp.json @@ -1,9 +1,14 @@ { "versions": [ + { + "git-tree": "7fc33d5002210774c5e4d7450a0cd88c3be82ca8", + "version": "0.0.7", + "port-version": 1 + }, { "git-tree": "80995d80f9e7e551f8305ce2cecb0a91bc9c457a", "version": "0.0.7", "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 168955fe1..34c422faf 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": "954debdfb4b8f785728e7c263ea3ea3ee7093253", + "version-semver": "2.0.4", + "port-version": 1 + }, { "git-tree": "36b0aaf84f89c1ba6e63fe0da7ab72b6c1ccf535", "version-semver": "2.0.4", diff --git a/external_imported/vcpkg/versions/r-/rsm-bsa.json b/external_imported/vcpkg/versions/r-/rsm-bsa.json index 2623b9cb9..4211b79cd 100644 --- a/external_imported/vcpkg/versions/r-/rsm-bsa.json +++ b/external_imported/vcpkg/versions/r-/rsm-bsa.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "f91c3a5ffa0abe0eb4b3dc47421fb302dd258b05", + "version-semver": "4.0.3", + "port-version": 0 + }, + { + "git-tree": "c1791d77c435bd1a78a330e3c0bab2da49b8f183", + "version-semver": "4.0.2", + "port-version": 0 + }, + { + "git-tree": "ab00b90abe4a8c06ede41183ef67b2208ae42297", + "version-semver": "4.0.0", + "port-version": 1 + }, { "git-tree": "a41057388bf027523e46eed7031efc1fb3920c17", "version-semver": "4.0.0", diff --git a/external_imported/vcpkg/versions/r-/rsm-mmio.json b/external_imported/vcpkg/versions/r-/rsm-mmio.json index ac662f975..31ae61086 100644 --- a/external_imported/vcpkg/versions/r-/rsm-mmio.json +++ b/external_imported/vcpkg/versions/r-/rsm-mmio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b64c5538a5de9cc3e4e516ba97f437480b94c6f0", + "version-semver": "1.1.0", + "port-version": 2 + }, { "git-tree": "634597e88010f239748fafb52c6e8f431242b53a", "version-semver": "1.1.0", diff --git a/external_imported/vcpkg/versions/r-/rsocket.json b/external_imported/vcpkg/versions/r-/rsocket.json index 33d509de5..9b4d581a3 100644 --- a/external_imported/vcpkg/versions/r-/rsocket.json +++ b/external_imported/vcpkg/versions/r-/rsocket.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "073c3faa3992179768ce7e76cc7d39b654db9e8c", + "version-string": "2021.08.30.00", + "port-version": 1 + }, { "git-tree": "9dbf0f51130cc7c6e2c23a2ca3a104e22384f4e7", "version-string": "2021.08.30.00", diff --git a/external_imported/vcpkg/versions/r-/rtabmap.json b/external_imported/vcpkg/versions/r-/rtabmap.json index d9d7bb4fb..1ef4831fd 100644 --- a/external_imported/vcpkg/versions/r-/rtabmap.json +++ b/external_imported/vcpkg/versions/r-/rtabmap.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "cf41f524585ec0c2dd5b8c7d8b455a79265b62ea", + "version": "0.20.13", + "port-version": 3 + }, + { + "git-tree": "3dc228c0e837f979396a930bc24e8cf92f6190e3", + "version": "0.20.13", + "port-version": 2 + }, { "git-tree": "93a792dbedcec5e900509396ebbe4461cde51320", "version-string": "0.20.13", diff --git a/external_imported/vcpkg/versions/r-/rtlsdr.json b/external_imported/vcpkg/versions/r-/rtlsdr.json index 491572e70..38c873144 100644 --- a/external_imported/vcpkg/versions/r-/rtlsdr.json +++ b/external_imported/vcpkg/versions/r-/rtlsdr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "62e4eb78a7e4f9cbbd24db08dd3f59ed284222e1", + "version-date": "2020-04-16", + "port-version": 3 + }, { "git-tree": "5ba19a6253c583cb9d97ea7ad3570c49284fadb1", "version-string": "2020-04-16", diff --git a/external_imported/vcpkg/versions/r-/rtmidi.json b/external_imported/vcpkg/versions/r-/rtmidi.json index 07e63c77a..ebda6dd64 100644 --- a/external_imported/vcpkg/versions/r-/rtmidi.json +++ b/external_imported/vcpkg/versions/r-/rtmidi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d72ff2345f2c1b08f4808cedaa0caf87156d295", + "version-semver": "4.0.0", + "port-version": 4 + }, { "git-tree": "4c13583da321fa3efa7a075032d0ed880dd15e48", "version-semver": "4.0.0", diff --git a/external_imported/vcpkg/versions/r-/rxspencer.json b/external_imported/vcpkg/versions/r-/rxspencer.json index 9a23c4747..1d4df6e4b 100644 --- a/external_imported/vcpkg/versions/r-/rxspencer.json +++ b/external_imported/vcpkg/versions/r-/rxspencer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d0db813c47fd33b7e6f5ffb95790b66aafcaa53e", + "version": "3.9.0", + "port-version": 1 + }, { "git-tree": "c3b5bac6d89f6ae425bfe95a4309e72146f944dd", "version": "3.9.0", diff --git a/external_imported/vcpkg/versions/r-/ryu.json b/external_imported/vcpkg/versions/r-/ryu.json index 5bad84baa..5b448e6a1 100644 --- a/external_imported/vcpkg/versions/r-/ryu.json +++ b/external_imported/vcpkg/versions/r-/ryu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b500b4b86daab326db966564fcd439215eae86ee", + "version": "2.0", + "port-version": 6 + }, { "git-tree": "e620954b8262664cd847436d34b412bc89292854", "version-string": "2.0", diff --git a/external_imported/vcpkg/versions/s-/s2geometry.json b/external_imported/vcpkg/versions/s-/s2geometry.json index c439b2619..d7824d975 100644 --- a/external_imported/vcpkg/versions/s-/s2geometry.json +++ b/external_imported/vcpkg/versions/s-/s2geometry.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e72b94e77bff8c357c4cd2430094c4dadf21c174", + "version": "0.9.0", + "port-version": 1 + }, { "git-tree": "3cfb53e7df6cf6c9602e63606daa377568c52cd8", "version": "0.9.0", diff --git a/external_imported/vcpkg/versions/s-/s2n.json b/external_imported/vcpkg/versions/s-/s2n.json index bebf0bbc9..73f3e5e03 100644 --- a/external_imported/vcpkg/versions/s-/s2n.json +++ b/external_imported/vcpkg/versions/s-/s2n.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6eed0d44ebcda6eea8c4a79b37ee119b9125060a", + "version": "1.3.5", + "port-version": 0 + }, + { + "git-tree": "7cb2325defd326de178cf524bd5db039ff1dc112", + "version": "1.3.0", + "port-version": 1 + }, { "git-tree": "a8252a918117164e1f6472663244fda74690f849", "version": "1.3.0", diff --git a/external_imported/vcpkg/versions/s-/sail.json b/external_imported/vcpkg/versions/s-/sail.json index e10cf4022..7ee6592ba 100644 --- a/external_imported/vcpkg/versions/s-/sail.json +++ b/external_imported/vcpkg/versions/s-/sail.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5604acc45bd6e7fc2123a52f3742ffa674a0c2f7", + "version-semver": "0.9.0-pre21", + "port-version": 0 + }, + { + "git-tree": "a5a0265e855d48cc304d1e811a62e8b6f9603134", + "version-semver": "0.9.0-pre20", + "port-version": 0 + }, { "git-tree": "096fcf183ab11a1dd35b0fc3039e7cbee1826a82", "version-semver": "0.9.0-pre19", diff --git a/external_imported/vcpkg/versions/s-/sbp.json b/external_imported/vcpkg/versions/s-/sbp.json index cd9ea4056..1a8b87aca 100644 --- a/external_imported/vcpkg/versions/s-/sbp.json +++ b/external_imported/vcpkg/versions/s-/sbp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ef46c718c23128379c5050d907d0a90d335206b3", + "version-semver": "3.4.10", + "port-version": 1 + }, { "git-tree": "d3d3511804be8ef1277c4bce734379748ee615f4", "version-semver": "3.4.10", diff --git a/external_imported/vcpkg/versions/s-/scintilla.json b/external_imported/vcpkg/versions/s-/scintilla.json index 95e205182..649075160 100644 --- a/external_imported/vcpkg/versions/s-/scintilla.json +++ b/external_imported/vcpkg/versions/s-/scintilla.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "65fa530f4695dbecf4c90bc60d89d59abc6eab2f", + "version": "4.4.6", + "port-version": 1 + }, { "git-tree": "725d3e47a1e30713a272b1ef12251b65696f8a3e", "version": "4.4.6", diff --git a/external_imported/vcpkg/versions/s-/sciter-js.json b/external_imported/vcpkg/versions/s-/sciter-js.json index 7f0cd51fd..c8c3f6352 100644 --- a/external_imported/vcpkg/versions/s-/sciter-js.json +++ b/external_imported/vcpkg/versions/s-/sciter-js.json @@ -1,9 +1,14 @@ -{ - "versions": [ - { - "git-tree": "d8b949852b38b18eac5c4fa0c25282d531c596fd", - "version-string": "4.4.8.16", - "port-version": 0 - } - ] -} +{ + "versions": [ + { + "git-tree": "01c76a267b6924a5f1f03349738e479e8bbe2c0b", + "version": "4.4.8.31", + "port-version": 0 + }, + { + "git-tree": "d8b949852b38b18eac5c4fa0c25282d531c596fd", + "version-string": "4.4.8.16", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/s-/sciter.json b/external_imported/vcpkg/versions/s-/sciter.json index 2acb342cc..4ace0cff5 100644 --- a/external_imported/vcpkg/versions/s-/sciter.json +++ b/external_imported/vcpkg/versions/s-/sciter.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4fac1265134a68da104d27106ec6b409b23ba377", + "version": "0", + "port-version": 1 + }, { "git-tree": "1ff6683a2d398db76e1791b994dc157ffb21e88c", "version-string": "deprecated", diff --git a/external_imported/vcpkg/versions/s-/scnlib.json b/external_imported/vcpkg/versions/s-/scnlib.json index abda95cf9..8581c2417 100644 --- a/external_imported/vcpkg/versions/s-/scnlib.json +++ b/external_imported/vcpkg/versions/s-/scnlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "81ca9aa67e4f00245a233d075c9ae95726a2d4e3", + "version": "1.0", + "port-version": 0 + }, { "git-tree": "d3ec8f415e27c9ca79bcaf3580692d28c6cf3a14", "version-string": "0.4", diff --git a/external_imported/vcpkg/versions/s-/scylla-wrapper.json b/external_imported/vcpkg/versions/s-/scylla-wrapper.json index 0093f06b3..2b12423a4 100644 --- a/external_imported/vcpkg/versions/s-/scylla-wrapper.json +++ b/external_imported/vcpkg/versions/s-/scylla-wrapper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c1633de82a41a7dac94c972377145d3bf67b80a4", + "version-string": "2018-08-26-16e6f435", + "port-version": 2 + }, { "git-tree": "358f082e98f164d3b0fdd5ef1a88dc2ec627610e", "version-string": "2018-08-26-16e6f435", diff --git a/external_imported/vcpkg/versions/s-/sdformat10.json b/external_imported/vcpkg/versions/s-/sdformat10.json index 20eadc101..00cd92457 100644 --- a/external_imported/vcpkg/versions/s-/sdformat10.json +++ b/external_imported/vcpkg/versions/s-/sdformat10.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "abf1fc376b102a9ef833522a615261e5d3e155b8", + "version": "10.0.0", + "port-version": 2 + }, { "git-tree": "13fbbc3bb6bf9c38cb97d4e14af7c3a46ecba6e6", "version-string": "10.0.0", diff --git a/external_imported/vcpkg/versions/s-/sdformat6.json b/external_imported/vcpkg/versions/s-/sdformat6.json index 2429b11d2..b30a5ca67 100644 --- a/external_imported/vcpkg/versions/s-/sdformat6.json +++ b/external_imported/vcpkg/versions/s-/sdformat6.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "bdc0f927266aa4195c3795075c9e07c426c4556c", + "version": "6.2.0", + "port-version": 6 + }, + { + "git-tree": "f3ec7ce50f9e64316ed940878271ade6cea1c0e3", + "version": "6.2.0", + "port-version": 5 + }, { "git-tree": "dc94f6d1e0351bb777ccd1823470fe22ad896c34", "version": "6.2.0", diff --git a/external_imported/vcpkg/versions/s-/sdformat9.json b/external_imported/vcpkg/versions/s-/sdformat9.json index 5ec5fee79..547317e56 100644 --- a/external_imported/vcpkg/versions/s-/sdformat9.json +++ b/external_imported/vcpkg/versions/s-/sdformat9.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d050d624faf72f8dcb62fdb7a5378ae5d8e8b5d8", + "version": "9.4.0", + "port-version": 5 + }, + { + "git-tree": "2b064abf9a6849ed5234b03bf5604ccd0169db4a", + "version": "9.4.0", + "port-version": 4 + }, { "git-tree": "5f47672c7e4349da14189c38db3a15dcdad5a196", "version": "9.4.0", diff --git a/external_imported/vcpkg/versions/s-/sdl1.json b/external_imported/vcpkg/versions/s-/sdl1.json index 16a3f5827..eaa05de79 100644 --- a/external_imported/vcpkg/versions/s-/sdl1.json +++ b/external_imported/vcpkg/versions/s-/sdl1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a3aba1bba75ee6d613144dbd6b2c64cbe6a090c", + "version": "1.2.15", + "port-version": 15 + }, { "git-tree": "dd8e1026af78ffd7bb4e9d6fa1455579367206e1", "version-string": "1.2.15", diff --git a/external_imported/vcpkg/versions/s-/sdl2-image.json b/external_imported/vcpkg/versions/s-/sdl2-image.json index 9c30ac3ec..9e0ed9100 100644 --- a/external_imported/vcpkg/versions/s-/sdl2-image.json +++ b/external_imported/vcpkg/versions/s-/sdl2-image.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9042c449fc4c728c5b428332e09bc6d21a2acf34", + "version-string": "2.0.5", + "port-version": 4 + }, { "git-tree": "7cd6ce4e9108671f3f4bad86c37ee2586acbf440", "version-string": "2.0.5", diff --git a/external_imported/vcpkg/versions/s-/sdl2.json b/external_imported/vcpkg/versions/s-/sdl2.json index a60265610..16b746b1f 100644 --- a/external_imported/vcpkg/versions/s-/sdl2.json +++ b/external_imported/vcpkg/versions/s-/sdl2.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "9900463f2847ed86e25bac1688c527ae3486a024", + "version": "2.0.20", + "port-version": 1 + }, + { + "git-tree": "d5865b5fb9c52f255629f4c015f37df9ca788a33", + "version": "2.0.20", + "port-version": 0 + }, { "git-tree": "4d0926c154515596d8f178d7350c37433b05957b", "version": "2.0.16", diff --git a/external_imported/vcpkg/versions/s-/seal.json b/external_imported/vcpkg/versions/s-/seal.json index f8d84e29d..5fd1786ea 100644 --- a/external_imported/vcpkg/versions/s-/seal.json +++ b/external_imported/vcpkg/versions/s-/seal.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c3499eaa1c19049bc521c3d2799d8d7d6d032a8a", + "version-semver": "3.7.2", + "port-version": 2 + }, + { + "git-tree": "11dc6c4e8b720416ff6ce195e48287982a6131ec", + "version-semver": "3.7.2", + "port-version": 1 + }, { "git-tree": "f60c9b8a5bafea149666d032b375f1b3980dd3ca", "version-semver": "3.7.2", diff --git a/external_imported/vcpkg/versions/s-/sentencepiece.json b/external_imported/vcpkg/versions/s-/sentencepiece.json index 311ecd373..5d3c9d9ac 100644 --- a/external_imported/vcpkg/versions/s-/sentencepiece.json +++ b/external_imported/vcpkg/versions/s-/sentencepiece.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b243e85760f8f59100632997fdc34cdae47bcfd4", + "version": "0.1.96", + "port-version": 1 + }, { "git-tree": "b83e7b28dc28e405cfee3c94385e2039c8564040", "version": "0.1.96", diff --git a/external_imported/vcpkg/versions/s-/sentry-native.json b/external_imported/vcpkg/versions/s-/sentry-native.json index 59119fc81..20d816302 100644 --- a/external_imported/vcpkg/versions/s-/sentry-native.json +++ b/external_imported/vcpkg/versions/s-/sentry-native.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "3dff7be1b47155d1580f43be48d8b95761251883", + "version-semver": "0.4.15", + "port-version": 0 + }, + { + "git-tree": "789ced09501be535989b9eadfc5b04317b4be8d6", + "version-semver": "0.4.14", + "port-version": 0 + }, + { + "git-tree": "02e695aa00b661662dfae906a4cd55c0d8371f73", + "version-semver": "0.4.13", + "port-version": 2 + }, + { + "git-tree": "9fb136cdde824d2f306a1afbd99830af76446158", + "version-semver": "0.4.13", + "port-version": 1 + }, { "git-tree": "d0ab3adf0fe8f521553af8345c6c11e6e883f065", "version-semver": "0.4.13", diff --git a/external_imported/vcpkg/versions/s-/serdepp.json b/external_imported/vcpkg/versions/s-/serdepp.json new file mode 100644 index 000000000..a6effc714 --- /dev/null +++ b/external_imported/vcpkg/versions/s-/serdepp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "37783a8fa004467ce9ee44c8f1e79fd994abd8e7", + "version": "0.1.4", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/s-/sfml.json b/external_imported/vcpkg/versions/s-/sfml.json index d14e2ee1a..d9360682b 100644 --- a/external_imported/vcpkg/versions/s-/sfml.json +++ b/external_imported/vcpkg/versions/s-/sfml.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "bc9b03c639a91f2deff1fb78ab943cce64876ffe", + "version": "2.5.1", + "port-version": 12 + }, + { + "git-tree": "c9d7e4e8a4aeec1731d48bac0c2b59b53ee30ba8", + "version": "2.5.1", + "port-version": 11 + }, { "git-tree": "02d4e2c1c253e1ef48dd9c37d24bec0a47a716ff", "version": "2.5.1", diff --git a/external_imported/vcpkg/versions/s-/shaderc.json b/external_imported/vcpkg/versions/s-/shaderc.json index 8c608dcec..840e9fe99 100644 --- a/external_imported/vcpkg/versions/s-/shaderc.json +++ b/external_imported/vcpkg/versions/s-/shaderc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "376570ffd232d9c4e0dad095ae3dea964dec52ed", + "version": "2021.1", + "port-version": 2 + }, { "git-tree": "e8590ab232dd5ccd2331bb321127f00788b573a3", "version": "2021.1", diff --git a/external_imported/vcpkg/versions/s-/shaderwriter.json b/external_imported/vcpkg/versions/s-/shaderwriter.json index 926173458..1e295e8e7 100644 --- a/external_imported/vcpkg/versions/s-/shaderwriter.json +++ b/external_imported/vcpkg/versions/s-/shaderwriter.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "09802faaae65b3f6ac6adfe5687bf581f0189dba", + "version": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "e9ad5b26c40e2048a99c618972827c8f8e802eaa", + "version": "2.1.0", + "port-version": 0 + }, + { + "git-tree": "74d64baacf8733ed2cb0a0ded83ac86b8213a609", + "version": "2.0.0", + "port-version": 0 + }, { "git-tree": "3ed37649aa1fcdb0323fdf75fdfe3ffa038d0dfe", "version": "1.1.0", diff --git a/external_imported/vcpkg/versions/s-/shapelib.json b/external_imported/vcpkg/versions/s-/shapelib.json index e874311a9..e558b2abd 100644 --- a/external_imported/vcpkg/versions/s-/shapelib.json +++ b/external_imported/vcpkg/versions/s-/shapelib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "befbba83687abe4b10f1fb55ac5ccc344bd11084", + "version": "1.5.0", + "port-version": 3 + }, { "git-tree": "d70a93c1899b5607ca1894c66beacec5c1afec9c", "version-string": "1.5.0", diff --git a/external_imported/vcpkg/versions/s-/shiva.json b/external_imported/vcpkg/versions/s-/shiva.json index 67c2c2a13..81d1b1b42 100644 --- a/external_imported/vcpkg/versions/s-/shiva.json +++ b/external_imported/vcpkg/versions/s-/shiva.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "821cf61c76079cfd5c7a635dc36e01c0f33c38f5", + "version": "1.0", + "port-version": 5 + }, { "git-tree": "5ff8f81870f8963dc86da05ce330bbde585e940d", "version-string": "1.0", diff --git a/external_imported/vcpkg/versions/s-/shogun.json b/external_imported/vcpkg/versions/s-/shogun.json index 8fd9b801e..5cbf107c7 100644 --- a/external_imported/vcpkg/versions/s-/shogun.json +++ b/external_imported/vcpkg/versions/s-/shogun.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "13454c6a31030e65fdac9764f8b38c90bf40c9a9", + "version-string": "6.1.4", + "port-version": 7 + }, { "git-tree": "0ae86e647188a99b1602164f4614ba54d55cf22a", "version-string": "6.1.4", diff --git a/external_imported/vcpkg/versions/s-/simage.json b/external_imported/vcpkg/versions/s-/simage.json index 92165a5c2..6f298cfd7 100644 --- a/external_imported/vcpkg/versions/s-/simage.json +++ b/external_imported/vcpkg/versions/s-/simage.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6c2ccc36f5c1ebb27f820fe4f6e89df014e4bafa", + "version-semver": "1.8.1", + "port-version": 4 + }, { "git-tree": "97e1edfae380f76bdb4d6e9a94a91bbccd82c3a2", "version-semver": "1.8.1", diff --git a/external_imported/vcpkg/versions/s-/simbody.json b/external_imported/vcpkg/versions/s-/simbody.json index 6c2380d95..d3c76f8e0 100644 --- a/external_imported/vcpkg/versions/s-/simbody.json +++ b/external_imported/vcpkg/versions/s-/simbody.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "09ced08b16274ddf38f64031b659a76b8aea2e85", + "version-date": "2022-01-04", + "port-version": 1 + }, { "git-tree": "9474ba4a8027fb4f8e3e160decc4fa9f443a16e9", "version-date": "2022-01-04", diff --git a/external_imported/vcpkg/versions/s-/simpleini.json b/external_imported/vcpkg/versions/s-/simpleini.json index 90cba4bbb..e4583be99 100644 --- a/external_imported/vcpkg/versions/s-/simpleini.json +++ b/external_imported/vcpkg/versions/s-/simpleini.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "edfed522ec88f3bd721e2ee1b09c177b0d93d378", + "version": "4.19", + "port-version": 0 + }, { "git-tree": "da811f3fb2f252e4f1eff0f42047c539315b60dd", "version-string": "2018-08-31", diff --git a/external_imported/vcpkg/versions/s-/skia.json b/external_imported/vcpkg/versions/s-/skia.json index b35420ba8..168d625e7 100644 --- a/external_imported/vcpkg/versions/s-/skia.json +++ b/external_imported/vcpkg/versions/s-/skia.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "104ba7c5e5e46398000e92e0f9cc3c9f0999e142", + "version-date": "2020-05-18", + "port-version": 8 + }, + { + "git-tree": "f7b3961a52ea4c43d781a5c8ace67d0ef100cce7", + "version-date": "2020-05-18", + "port-version": 7 + }, { "git-tree": "100eb7e29ed2959e793dfce6500b408e84d56562", "version-date": "2020-05-18", diff --git a/external_imported/vcpkg/versions/s-/skyr-url.json b/external_imported/vcpkg/versions/s-/skyr-url.json index 3228ab10b..98ad90124 100644 --- a/external_imported/vcpkg/versions/s-/skyr-url.json +++ b/external_imported/vcpkg/versions/s-/skyr-url.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "429bf1616eeeb9c2315b09d9a6c741245e3eae6a", + "version": "1.13.0", + "port-version": 2 + }, { "git-tree": "174f5bc4cc8080f2cb34c7a1aad9b14bedaa2c9a", "version-string": "1.13.0", diff --git a/external_imported/vcpkg/versions/s-/sleef.json b/external_imported/vcpkg/versions/s-/sleef.json index 304db6224..445a52d6c 100644 --- a/external_imported/vcpkg/versions/s-/sleef.json +++ b/external_imported/vcpkg/versions/s-/sleef.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "24d704091e9827b6e0192fb51f0798422da9707e", + "version": "3.5.1", + "port-version": 2 + }, + { + "git-tree": "ea33cc5343944b32ab14b772d5242a07fb84865b", + "version": "3.5.1", + "port-version": 1 + }, { "git-tree": "0c195bd94ab64769463a4891db9d140fa37508a4", "version": "3.5.1", diff --git a/external_imported/vcpkg/versions/s-/sleepy-discord.json b/external_imported/vcpkg/versions/s-/sleepy-discord.json index d3d2a31a8..1105f0b27 100644 --- a/external_imported/vcpkg/versions/s-/sleepy-discord.json +++ b/external_imported/vcpkg/versions/s-/sleepy-discord.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5e868f4817878ec1c9686ab467b60f8086c50a00", + "version-date": "2022-02-05", + "port-version": 0 + }, { "git-tree": "0aba637e01389ec4ed5923eaf898ca78dac96cbb", "version-date": "2021-07-07", diff --git a/external_imported/vcpkg/versions/s-/slikenet.json b/external_imported/vcpkg/versions/s-/slikenet.json index ee83f0113..72f5c2937 100644 --- a/external_imported/vcpkg/versions/s-/slikenet.json +++ b/external_imported/vcpkg/versions/s-/slikenet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "470cffd8e68b737e7131beccd5fc7a87be9c3151", + "version-date": "2021-06-07", + "port-version": 1 + }, { "git-tree": "ac7b0f3e2e112489c1d66b390c22e050bd410783", "version-date": "2021-06-07", diff --git a/external_imported/vcpkg/versions/s-/sockpp.json b/external_imported/vcpkg/versions/s-/sockpp.json index 12e5a5bd0..d54217a9c 100644 --- a/external_imported/vcpkg/versions/s-/sockpp.json +++ b/external_imported/vcpkg/versions/s-/sockpp.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "d54d2c1ee9ebaae60a83c72c50207b83d56f3917", + "version": "0.7.1", + "port-version": 0 + }, + { + "git-tree": "18dad1cf56b14fdf423311b6f277014e0c3f6762", + "version-date": "2022-01-24", + "port-version": 0 + }, + { + "git-tree": "3afb916458a5548b20996882ed7f7054d041f0ff", + "version": "0.7", + "port-version": 2 + }, { "git-tree": "69d23d693d1ab8cfeeab35c6b2794d6f2a9ca748", "version-string": "0.7", diff --git a/external_imported/vcpkg/versions/s-/soem.json b/external_imported/vcpkg/versions/s-/soem.json index 5cf0babc9..a758daeb6 100644 --- a/external_imported/vcpkg/versions/s-/soem.json +++ b/external_imported/vcpkg/versions/s-/soem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc08020790a9060eb6adaa1e989af4463197854b", + "version": "1.4.0", + "port-version": 3 + }, { "git-tree": "df36d49ff0f6b1755c5a1a046c98c4d0df0e7d77", "version-string": "1.4.0", diff --git a/external_imported/vcpkg/versions/s-/soil.json b/external_imported/vcpkg/versions/s-/soil.json index c06dd8898..76994b7e0 100644 --- a/external_imported/vcpkg/versions/s-/soil.json +++ b/external_imported/vcpkg/versions/s-/soil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b4abbbc20cd42bad536a6aee64949a40ec3d850", + "version-date": "2021-04-22", + "port-version": 1 + }, { "git-tree": "9798401f421c850fbce93d990b143283ae5af293", "version-date": "2021-04-22", diff --git a/external_imported/vcpkg/versions/s-/soil2.json b/external_imported/vcpkg/versions/s-/soil2.json index e85069310..849a933db 100644 --- a/external_imported/vcpkg/versions/s-/soil2.json +++ b/external_imported/vcpkg/versions/s-/soil2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "20e7e06d73b0119e99f870bcffc70be22a7c8287", + "version-date": "2021-05-01", + "port-version": 1 + }, { "git-tree": "e72741e77acc80b5d72a64ce396f6a713548e3a1", "version-date": "2021-05-01", diff --git a/external_imported/vcpkg/versions/s-/sophus.json b/external_imported/vcpkg/versions/s-/sophus.json index f31dd71d6..64f100f3c 100644 --- a/external_imported/vcpkg/versions/s-/sophus.json +++ b/external_imported/vcpkg/versions/s-/sophus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "90c7c425fb7d1af0e2201091c0ec00e97309e12e", + "version-date": "2021-09-14", + "port-version": 0 + }, { "git-tree": "4826fe050e6cfd22a46d50ab3d6258a39d2bb69f", "version": "1.0.0", diff --git a/external_imported/vcpkg/versions/s-/soundtouch.json b/external_imported/vcpkg/versions/s-/soundtouch.json index 81b7f378c..5c37a47d7 100644 --- a/external_imported/vcpkg/versions/s-/soundtouch.json +++ b/external_imported/vcpkg/versions/s-/soundtouch.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f4f307065b40b131fd80ce953afcc121aba46f9f", + "version": "2.3.1", + "port-version": 2 + }, { "git-tree": "a91341e5eb80526c64b263e5b10e0a6c800daa7e", "version": "2.3.1", diff --git a/external_imported/vcpkg/versions/s-/spdk-isal.json b/external_imported/vcpkg/versions/s-/spdk-isal.json index 09c473488..7439aac29 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": "de270891534b1e4332e4cfbd67437653a9217823", + "version-string": "20181006", + "port-version": 2 + }, { "git-tree": "a3b83f2844457a26c4f286c651a85ec6b5cc43e2", "version-string": "20181006", diff --git a/external_imported/vcpkg/versions/s-/spdlog.json b/external_imported/vcpkg/versions/s-/spdlog.json index 3dac5575c..7f9464fa0 100644 --- a/external_imported/vcpkg/versions/s-/spdlog.json +++ b/external_imported/vcpkg/versions/s-/spdlog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1ac795913d88241171b45d796d3fe5dd38519d5a", + "version-semver": "1.10.0", + "port-version": 0 + }, { "git-tree": "1f4916f57dae6db50491857c063970d811beb33a", "version-semver": "1.9.2", diff --git a/external_imported/vcpkg/versions/s-/speex.json b/external_imported/vcpkg/versions/s-/speex.json index ea743307e..87a027137 100644 --- a/external_imported/vcpkg/versions/s-/speex.json +++ b/external_imported/vcpkg/versions/s-/speex.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7cbe163c0a5fabd08cb6665c092d6b13dfa51d69", + "version": "1.2.0", + "port-version": 11 + }, + { + "git-tree": "0f443cef71fd44439aa559063a219da440f6665d", + "version": "1.2.0", + "port-version": 10 + }, { "git-tree": "8713e87cf40c60307dfdef2102392b97cb3b4c3d", "version-string": "1.2.0", diff --git a/external_imported/vcpkg/versions/s-/speexdsp.json b/external_imported/vcpkg/versions/s-/speexdsp.json index 16ca82f1d..c97f95cd7 100644 --- a/external_imported/vcpkg/versions/s-/speexdsp.json +++ b/external_imported/vcpkg/versions/s-/speexdsp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6606b66ecc502c89de6a1e570c1407bf1f8b2d03", + "version": "1.2.0", + "port-version": 7 + }, { "git-tree": "911ea65a3db9f26e595990e94ab4ec911cd8ef82", "version-string": "1.2.0", diff --git a/external_imported/vcpkg/versions/s-/spirv-headers.json b/external_imported/vcpkg/versions/s-/spirv-headers.json index 4922cc971..99267955d 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": "2b51afa759a0312e325533a909418ed5b7803cda", + "version": "1.3.204.1", + "port-version": 0 + }, { "git-tree": "28d7c25f7908e3ac693c769c3ce6474855a05bcb", "version-date": "2021-03-25", diff --git a/external_imported/vcpkg/versions/s-/spirv-reflect.json b/external_imported/vcpkg/versions/s-/spirv-reflect.json new file mode 100644 index 000000000..ced99692d --- /dev/null +++ b/external_imported/vcpkg/versions/s-/spirv-reflect.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "ca2155d2cbf6c3493ac3129f333308976975cb50", + "version": "1.3.204.1", + "port-version": 0 + }, + { + "git-tree": "bcebcfdd9e9332b68c4185b3127fc898fc91402a", + "version-date": "2021-12-31", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/s-/spirv-tools.json b/external_imported/vcpkg/versions/s-/spirv-tools.json index 26c205513..7d6a5510b 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": "459985359177e0c0774ac341db9721650499844b", + "version": "2022.1", + "port-version": 0 + }, { "git-tree": "c18f04e12fa671a9067896ccdf8c932601f81115", "version-string": "2021.1", diff --git a/external_imported/vcpkg/versions/s-/sqlcipher.json b/external_imported/vcpkg/versions/s-/sqlcipher.json index 46c15f425..391a0ed1d 100644 --- a/external_imported/vcpkg/versions/s-/sqlcipher.json +++ b/external_imported/vcpkg/versions/s-/sqlcipher.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "3803a9648861130c25517c8b330c17d054fe6cd7", + "version": "4.5.1", + "port-version": 0 + }, + { + "git-tree": "e38664c89497e1686362947290d62bcf0eb6abaa", + "version": "4.5.0", + "port-version": 1 + }, { "git-tree": "dd42a5be2c9409d8e5c35b9821765f504ef960ff", "version": "4.5.0", diff --git a/external_imported/vcpkg/versions/s-/sqlite3.json b/external_imported/vcpkg/versions/s-/sqlite3.json index f22aad189..419fec4f3 100644 --- a/external_imported/vcpkg/versions/s-/sqlite3.json +++ b/external_imported/vcpkg/versions/s-/sqlite3.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f49ad405225c6326558adb79f2082814002a8cda", + "version": "3.37.2", + "port-version": 1 + }, + { + "git-tree": "ac17b6f385706852a3895200764c358697c5c584", + "version": "3.37.1", + "port-version": 0 + }, { "git-tree": "abbe21d1a38c7eb9e8c87965235d92721001e997", "version": "3.37.0", diff --git a/external_imported/vcpkg/versions/s-/starlink-ast.json b/external_imported/vcpkg/versions/s-/starlink-ast.json index dc9744f01..1ebc5ce94 100644 --- a/external_imported/vcpkg/versions/s-/starlink-ast.json +++ b/external_imported/vcpkg/versions/s-/starlink-ast.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f749208cd4ad912baf5f9b84482f32a176ef910a", + "version": "9.2.7", + "port-version": 1 + }, + { + "git-tree": "9f0217b4694092c4b440de6e864986ee8c567f5e", + "version": "9.2.7", + "port-version": 0 + }, { "git-tree": "b5cfb9d9ff68b40b5a910240d3b0d09190b17b36", "version-semver": "9.2.5", diff --git a/external_imported/vcpkg/versions/s-/superlu.json b/external_imported/vcpkg/versions/s-/superlu.json index 7d13bfe6b..c048cc9ae 100644 --- a/external_imported/vcpkg/versions/s-/superlu.json +++ b/external_imported/vcpkg/versions/s-/superlu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5bee1e0197c0e768c6ee8b9acdf815b4d46b5978", + "version-date": "2020-01-07", + "port-version": 5 + }, { "git-tree": "88c6ebaf1337aa31cf3afec8250fd7ee1b990b6e", "version-string": "2020-01-07", diff --git a/external_imported/vcpkg/versions/t-/taglib.json b/external_imported/vcpkg/versions/t-/taglib.json index 4c463e5a2..4c35acb64 100644 --- a/external_imported/vcpkg/versions/t-/taglib.json +++ b/external_imported/vcpkg/versions/t-/taglib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "246255cab48b434b3c78aaa315f5f62b4692f255", + "version-semver": "1.12.0", + "port-version": 2 + }, { "git-tree": "d14774690f0692baa62237a6ee67f8aa7e7974f9", "version-semver": "1.12.0", diff --git a/external_imported/vcpkg/versions/t-/taskflow.json b/external_imported/vcpkg/versions/t-/taskflow.json index 4d3bfdb83..7bfe3dd2b 100644 --- a/external_imported/vcpkg/versions/t-/taskflow.json +++ b/external_imported/vcpkg/versions/t-/taskflow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "68130a893501e5e9bbe48c41ad00ef5de0a0a060", + "version": "3.3.0", + "port-version": 0 + }, { "git-tree": "49d827de9e8309cb0f16fbb84ec611a1a44d18ec", "version": "3.2.0", diff --git a/external_imported/vcpkg/versions/t-/tbb.json b/external_imported/vcpkg/versions/t-/tbb.json index 9c56bf8a5..bc96b9383 100644 --- a/external_imported/vcpkg/versions/t-/tbb.json +++ b/external_imported/vcpkg/versions/t-/tbb.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "016aeb70aa2dfba55a141a928863a0191314d4a9", + "version-string": "2020_U3", + "port-version": 8 + }, + { + "git-tree": "275198e39d268c87b807d7f552b51396d5cf6242", + "version-string": "2020_U3", + "port-version": 7 + }, { "git-tree": "e168e03c2e5776bdee59accf5f643ae26b0ddd84", "version-string": "2020_U3", diff --git a/external_imported/vcpkg/versions/t-/tcb-span.json b/external_imported/vcpkg/versions/t-/tcb-span.json new file mode 100644 index 000000000..64e48cc52 --- /dev/null +++ b/external_imported/vcpkg/versions/t-/tcb-span.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "191bf0b7971f5aac50a5d81224d04e8f9aef7e38", + "version-date": "2021-12-15", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/t-/teemo.json b/external_imported/vcpkg/versions/t-/teemo.json index 163baab56..f06a0abfe 100644 --- a/external_imported/vcpkg/versions/t-/teemo.json +++ b/external_imported/vcpkg/versions/t-/teemo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6eff96ba13b50bd8a7b7b3d1197fdbda11c09712", + "version": "2.6", + "port-version": 1 + }, { "git-tree": "668ad24ea1e187f27877ffe3570555df857460d8", "version": "2.6", diff --git a/external_imported/vcpkg/versions/t-/tensorflow-cc.json b/external_imported/vcpkg/versions/t-/tensorflow-cc.json index b658dd780..475c71d10 100644 --- a/external_imported/vcpkg/versions/t-/tensorflow-cc.json +++ b/external_imported/vcpkg/versions/t-/tensorflow-cc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c0b8bf99d3056c5b117dd2eabba3125f1d867442", + "version-semver": "2.7.0", + "port-version": 2 + }, { "git-tree": "48be8a2aea85f73821084ea35d307e4033726565", "version-semver": "2.7.0", diff --git a/external_imported/vcpkg/versions/t-/tensorflow.json b/external_imported/vcpkg/versions/t-/tensorflow.json index f4aa05bc7..e47e81c73 100644 --- a/external_imported/vcpkg/versions/t-/tensorflow.json +++ b/external_imported/vcpkg/versions/t-/tensorflow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "07b6bd8bae65b448a163db4e720c46afd605a1cc", + "version-semver": "2.7.0", + "port-version": 2 + }, { "git-tree": "4f02ceeb872646409f83a5b164c9892322d75e6b", "version-semver": "2.7.0", diff --git a/external_imported/vcpkg/versions/t-/tensorpipe.json b/external_imported/vcpkg/versions/t-/tensorpipe.json index 534b63696..7ecdfe6e7 100644 --- a/external_imported/vcpkg/versions/t-/tensorpipe.json +++ b/external_imported/vcpkg/versions/t-/tensorpipe.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fc442cfbc144a4fc95ca41d9349ef04564d7ce5a", + "version-date": "2021-04-26", + "port-version": 1 + }, { "git-tree": "ab0e7e22e13c4ebe8c308008aaabb803dca57cdc", "version-date": "2021-04-26", diff --git a/external_imported/vcpkg/versions/t-/tesseract.json b/external_imported/vcpkg/versions/t-/tesseract.json index ec7094f6c..e13ddd025 100644 --- a/external_imported/vcpkg/versions/t-/tesseract.json +++ b/external_imported/vcpkg/versions/t-/tesseract.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ac84bef93d2709f28bf4ab8341a80dab949a8cf1", + "version": "4.1.1", + "port-version": 10 + }, { "git-tree": "10ffafb1de68c463fbac91a484d2c27cc618c0c9", "version": "4.1.1", diff --git a/external_imported/vcpkg/versions/t-/tfhe.json b/external_imported/vcpkg/versions/t-/tfhe.json index d44f73e0c..dd960cfc1 100644 --- a/external_imported/vcpkg/versions/t-/tfhe.json +++ b/external_imported/vcpkg/versions/t-/tfhe.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "657bf75ef9440b68186eeeccc1c7e3f2c55d3ec4", + "version-semver": "1.0.1", + "port-version": 3 + }, { "git-tree": "e87faaf58cb9feb686fe28d31f24cedf27e2aec1", "version-semver": "1.0.1", diff --git a/external_imported/vcpkg/versions/t-/tgbot-cpp.json b/external_imported/vcpkg/versions/t-/tgbot-cpp.json index 221b6611c..e21e04e02 100644 --- a/external_imported/vcpkg/versions/t-/tgbot-cpp.json +++ b/external_imported/vcpkg/versions/t-/tgbot-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e6256e56c77c074f61eaf4dda7bb2962e13e8e4b", + "version": "1.3", + "port-version": 0 + }, { "git-tree": "a48e654a56a7017acf3d0f0b119a96e9235119f9", "version-string": "1.2.1", diff --git a/external_imported/vcpkg/versions/t-/tgui.json b/external_imported/vcpkg/versions/t-/tgui.json index f04e637e7..c808cac11 100644 --- a/external_imported/vcpkg/versions/t-/tgui.json +++ b/external_imported/vcpkg/versions/t-/tgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0fe7d561ea6d038584711e8581f6a5a72062c543", + "version-date": "2021-04-19", + "port-version": 3 + }, { "git-tree": "0fd517c4e738da62e959b791a6cdd952e7bd8345", "version-date": "2021-04-19", diff --git a/external_imported/vcpkg/versions/t-/theia.json b/external_imported/vcpkg/versions/t-/theia.json index 5afa2da9c..4ce29911e 100644 --- a/external_imported/vcpkg/versions/t-/theia.json +++ b/external_imported/vcpkg/versions/t-/theia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f19561fe41ab71864fbf9640e491cc6a567c06b8", + "version-string": "0.8", + "port-version": 6 + }, { "git-tree": "eff19230130911fb05e12a22ba59fc35f0d4b341", "version-string": "0.8", diff --git a/external_imported/vcpkg/versions/t-/tidy-html5.json b/external_imported/vcpkg/versions/t-/tidy-html5.json index 372b54858..8a48d8d42 100644 --- a/external_imported/vcpkg/versions/t-/tidy-html5.json +++ b/external_imported/vcpkg/versions/t-/tidy-html5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf333a8afdee1d7e0129928022e228cc092ed5de", + "version": "5.7.28", + "port-version": 5 + }, { "git-tree": "ba5557c5b17df0184bd2ee1eeee06ec1131576f8", "version-string": "5.7.28", diff --git a/external_imported/vcpkg/versions/t-/tiff.json b/external_imported/vcpkg/versions/t-/tiff.json index 5a9359100..8882dafc3 100644 --- a/external_imported/vcpkg/versions/t-/tiff.json +++ b/external_imported/vcpkg/versions/t-/tiff.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "7d1677b9568234f05c4be9f04f321b9506884376", + "version": "4.3.0", + "port-version": 6 + }, + { + "git-tree": "29af46222dc88425d734288253d807f1a9b96419", + "version": "4.3.0", + "port-version": 5 + }, + { + "git-tree": "b416d3e62450590e19a43f04b573c65555f3bc62", + "version": "4.3.0", + "port-version": 4 + }, { "git-tree": "d96194297723032655164b0fcb88027e38e06003", "version": "4.3.0", diff --git a/external_imported/vcpkg/versions/t-/tinkerforge.json b/external_imported/vcpkg/versions/t-/tinkerforge.json index 0969ff465..433a2ef3a 100644 --- a/external_imported/vcpkg/versions/t-/tinkerforge.json +++ b/external_imported/vcpkg/versions/t-/tinkerforge.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d9c644023147820bc9c89e9fe9f896e1a5fa0913", + "version": "2.1.25", + "port-version": 2 + }, { "git-tree": "684528ec07914569ba89b0d42230290cc55fdd4a", "version-string": "2.1.25", diff --git a/external_imported/vcpkg/versions/t-/tinycbor.json b/external_imported/vcpkg/versions/t-/tinycbor.json new file mode 100644 index 000000000..999afd64c --- /dev/null +++ b/external_imported/vcpkg/versions/t-/tinycbor.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "0579e95478ca32302fe6680fb0f953441d043a27", + "version-semver": "0.6.0", + "port-version": 1 + }, + { + "git-tree": "ecf65457801ba4aa8d8ae75886f87e740fb04783", + "version-semver": "0.6.0", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/t-/tinyexif.json b/external_imported/vcpkg/versions/t-/tinyexif.json index 707935223..32a1382c1 100644 --- a/external_imported/vcpkg/versions/t-/tinyexif.json +++ b/external_imported/vcpkg/versions/t-/tinyexif.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "50ad94147ea76f0e34a0e2afdcd92d83ad0102b1", + "version-date": "2022-02-15", + "port-version": 0 + }, { "git-tree": "350cf76237d8fc38f67cba9766e25b2f68d50d64", "version-string": "1.0.2", diff --git a/external_imported/vcpkg/versions/t-/tinyfiledialogs.json b/external_imported/vcpkg/versions/t-/tinyfiledialogs.json index 709661158..2b062876f 100644 --- a/external_imported/vcpkg/versions/t-/tinyfiledialogs.json +++ b/external_imported/vcpkg/versions/t-/tinyfiledialogs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "be887c4bad998770f49efced776f0ef5df71d342", + "version": "3.8.8", + "port-version": 4 + }, { "git-tree": "57a86420c47979e0b30dfb1e77482aad2836b07b", "version": "3.8.8", diff --git a/external_imported/vcpkg/versions/t-/tmx.json b/external_imported/vcpkg/versions/t-/tmx.json index d362504b4..862004cd4 100644 --- a/external_imported/vcpkg/versions/t-/tmx.json +++ b/external_imported/vcpkg/versions/t-/tmx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1b0ec7979f9a75aab71e9488940a4beff74bd745", + "version": "1.2.0", + "port-version": 1 + }, { "git-tree": "207601a8ff1891880a88013e3b36ea0f81979010", "version": "1.2.0", diff --git a/external_imported/vcpkg/versions/t-/tomlplusplus.json b/external_imported/vcpkg/versions/t-/tomlplusplus.json index 89c218d7f..6cbfc7a3c 100644 --- a/external_imported/vcpkg/versions/t-/tomlplusplus.json +++ b/external_imported/vcpkg/versions/t-/tomlplusplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "815508399a10ce972d933aa3f5b4f751c37c64d2", + "version": "3.0.1", + "port-version": 0 + }, { "git-tree": "06ce1fc365e8e7aa80b1a234a97665ca5e593d0d", "version": "2.5.0", diff --git a/external_imported/vcpkg/versions/t-/tool-meson.json b/external_imported/vcpkg/versions/t-/tool-meson.json index 0fdd3e2c0..046537d03 100644 --- a/external_imported/vcpkg/versions/t-/tool-meson.json +++ b/external_imported/vcpkg/versions/t-/tool-meson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cb1118e5da831de1c511424b6aaa7949777733a3", + "version-date": "2022-01-21", + "port-version": 0 + }, { "git-tree": "924a9b5b5dc11ea420a1be748873f8b252fd1417", "version-date": "2021-11-19", diff --git a/external_imported/vcpkg/versions/t-/tracy.json b/external_imported/vcpkg/versions/t-/tracy.json index 9bca38c73..8274402c9 100644 --- a/external_imported/vcpkg/versions/t-/tracy.json +++ b/external_imported/vcpkg/versions/t-/tracy.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "b34c2e1fb20aa7f46e350fbf5b90e8dda71aaf3a", + "version": "0.8.0", + "port-version": 0 + }, + { + "git-tree": "4495b1e35b5ce98b10a2a6f28eebdda0088903e2", + "version": "0.7.8", + "port-version": 2 + }, + { + "git-tree": "3995e035cf62c81d54be47133d37eb3073a44343", + "version": "0.7.8", + "port-version": 1 + }, { "git-tree": "9649d5716ad8d1ff208bc0b1e97e9700e915ef55", "version": "0.7.8", diff --git a/external_imported/vcpkg/versions/t-/trantor.json b/external_imported/vcpkg/versions/t-/trantor.json index aa9dae9a5..7f1733fc8 100644 --- a/external_imported/vcpkg/versions/t-/trantor.json +++ b/external_imported/vcpkg/versions/t-/trantor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d602ca62a711669efb9d496f9644334fecd8c9d", + "version-semver": "1.5.5", + "port-version": 0 + }, { "git-tree": "aa2acfecd4618d2da7aaae3e93e5f2bb4ec7172e", "version-semver": "1.5.4", diff --git a/external_imported/vcpkg/versions/t-/triangle.json b/external_imported/vcpkg/versions/t-/triangle.json index 71a72f6da..f3fae4ed4 100644 --- a/external_imported/vcpkg/versions/t-/triangle.json +++ b/external_imported/vcpkg/versions/t-/triangle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "645a20994580aa49313c0d9ef735ea60caf57976", + "version": "1.6", + "port-version": 2 + }, { "git-tree": "9b80b2815877547418bac0ed7ddba3fec7d0a2df", "version-string": "1.6", diff --git a/external_imported/vcpkg/versions/t-/triton.json b/external_imported/vcpkg/versions/t-/triton.json new file mode 100644 index 000000000..2bc406362 --- /dev/null +++ b/external_imported/vcpkg/versions/t-/triton.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "220ce7aa574609f64206fc02906b1bd2eafbc8aa", + "version": "0.9", + "port-version": 2 + }, + { + "git-tree": "1463df6dd74dfea7d12a8610b23009259b5c1e57", + "version": "0.9", + "port-version": 1 + }, + { + "git-tree": "168cc90ef1373fadb8b05ad53430eb37a022dd50", + "version": "0.9", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/t-/ttauri.json b/external_imported/vcpkg/versions/t-/ttauri.json index 74a61a87a..f1deb87b0 100644 --- a/external_imported/vcpkg/versions/t-/ttauri.json +++ b/external_imported/vcpkg/versions/t-/ttauri.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5990b7368bf89a8b6cd1fa2a7b33406c9ef3a24e", + "version": "0.5.0", + "port-version": 1 + }, { "git-tree": "8214a006b0e577a7c4076ed5bfd7f155abc99ace", "version": "0.5.0", diff --git a/external_imported/vcpkg/versions/t-/turbobase64.json b/external_imported/vcpkg/versions/t-/turbobase64.json index c7e663d29..761a503da 100644 --- a/external_imported/vcpkg/versions/t-/turbobase64.json +++ b/external_imported/vcpkg/versions/t-/turbobase64.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1077b7996d7d22e798b337bc29177a566ec64e4b", + "version-date": "2020-01-12", + "port-version": 2 + }, { "git-tree": "42e8e3b3a43b2170811c936708766470ad137cab", "version-string": "2020-01-12", diff --git a/external_imported/vcpkg/versions/t-/tvision.json b/external_imported/vcpkg/versions/t-/tvision.json index 888ab5edd..8dea359d6 100644 --- a/external_imported/vcpkg/versions/t-/tvision.json +++ b/external_imported/vcpkg/versions/t-/tvision.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "43ab1f9cb4407aab0a936520a82ddee84a48bd92", + "version-date": "2021-08-10", + "port-version": 1 + }, { "git-tree": "9d7a52a21054aae326fe5793acc7d54b04ec40f6", "version-date": "2021-08-10", diff --git a/external_imported/vcpkg/versions/u-/umock-c.json b/external_imported/vcpkg/versions/u-/umock-c.json index ec6028e36..366826108 100644 --- a/external_imported/vcpkg/versions/u-/umock-c.json +++ b/external_imported/vcpkg/versions/u-/umock-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "67f2fda1636719281706ebef0314a388ba5c8d15", + "version-date": "2022-01-21", + "port-version": 0 + }, { "git-tree": "b34153650a29eb81f88e48f53bd06ca05d4383c4", "version-string": "2020-06-17", diff --git a/external_imported/vcpkg/versions/u-/unicorn-lib.json b/external_imported/vcpkg/versions/u-/unicorn-lib.json index eec55aaa6..db2bc9f78 100644 --- a/external_imported/vcpkg/versions/u-/unicorn-lib.json +++ b/external_imported/vcpkg/versions/u-/unicorn-lib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "278115c391839dcfc66ac80339c8dcd9a660c9e0", + "version-date": "2022-01-24", + "port-version": 0 + }, { "git-tree": "e88ab2927a310295171887057ac0f6cc6502a8d5", "version-date": "2020-03-02", diff --git a/external_imported/vcpkg/versions/u-/unicorn.json b/external_imported/vcpkg/versions/u-/unicorn.json index f71f2b683..3ff8b2895 100644 --- a/external_imported/vcpkg/versions/u-/unicorn.json +++ b/external_imported/vcpkg/versions/u-/unicorn.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ec4ae5e99d2204a11e112c2f1a596ac2d4f5f2f9", + "version": "1.0.3", + "port-version": 0 + }, + { + "git-tree": "78e0a5d0840a6e2ae29d4922f34c858b821ab377", + "version-date": "2020-09-14", + "port-version": 2 + }, { "git-tree": "5126bae583b1f4d7d512b4bc06d799da0cd664be", "version-string": "2020-09-14", diff --git a/external_imported/vcpkg/versions/u-/unrar.json b/external_imported/vcpkg/versions/u-/unrar.json index 4d2dcb5c2..0aa96d38a 100644 --- a/external_imported/vcpkg/versions/u-/unrar.json +++ b/external_imported/vcpkg/versions/u-/unrar.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d2ade299ed837817b3d02522f990af3a64cb938b", + "version": "5.8.1", + "port-version": 3 + }, + { + "git-tree": "4d39c9643a67338a3252672f3c5910891c6a87cd", + "version": "5.8.1", + "port-version": 2 + }, { "git-tree": "31f7c1900da6148793b6b10c1b7be7b5e80d4172", "version-string": "5.8.1", diff --git a/external_imported/vcpkg/versions/u-/usd.json b/external_imported/vcpkg/versions/u-/usd.json index 1c7e2f2ff..f32c455a8 100644 --- a/external_imported/vcpkg/versions/u-/usd.json +++ b/external_imported/vcpkg/versions/u-/usd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "177f2af7397316cc1fa92a72ea8992f6acca8dfb", + "version-string": "20.08", + "port-version": 2 + }, { "git-tree": "44bef511fe3c249b1579ab696b8bd7e82147b788", "version-string": "20.08", diff --git a/external_imported/vcpkg/versions/u-/utf8h.json b/external_imported/vcpkg/versions/u-/utf8h.json index e6d95f597..9963adfbe 100644 --- a/external_imported/vcpkg/versions/u-/utf8h.json +++ b/external_imported/vcpkg/versions/u-/utf8h.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f26a3cff10653923f791bc424e4ed1839c33a9ad", + "version-date": "2021-11-18", + "port-version": 0 + }, { "git-tree": "e54d88f6fff213e5e7ab15eefffc3e2674f1da63", "version-date": "2021-10-21", diff --git a/external_imported/vcpkg/versions/u-/uthenticode.json b/external_imported/vcpkg/versions/u-/uthenticode.json index 8bb732073..f33c0b6cf 100644 --- a/external_imported/vcpkg/versions/u-/uthenticode.json +++ b/external_imported/vcpkg/versions/u-/uthenticode.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "673c5ea6d0982481405bbe54c1e993f696d29d23", + "version": "1.0.6", + "port-version": 2 + }, + { + "git-tree": "bc0bd0b234a79de442f7001bd1a216716333e067", + "version": "1.0.6", + "port-version": 1 + }, { "git-tree": "bd27c0f342a4c62251b30f323be232c86bc999af", "version-string": "1.0.6", diff --git a/external_imported/vcpkg/versions/u-/uvatlas.json b/external_imported/vcpkg/versions/u-/uvatlas.json index 21f25ac14..c1980b048 100644 --- a/external_imported/vcpkg/versions/u-/uvatlas.json +++ b/external_imported/vcpkg/versions/u-/uvatlas.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "100ee1b04f5da317153da9c52eb0c0def30e9b49", + "version-date": "2022-03-24", + "port-version": 0 + }, + { + "git-tree": "fe5522a95b1f9ef72d43c019948fd94055b42410", + "version-date": "2022-02-28", + "port-version": 0 + }, + { + "git-tree": "4f353fc6ad423c0a9d95c7b2d2f6c7a150e43b25", + "version-date": "2021-11-08", + "port-version": 1 + }, { "git-tree": "c9e1961e16fefb328333a2f99555a33cdc496356", "version-date": "2021-11-08", diff --git a/external_imported/vcpkg/versions/u-/uwebsockets.json b/external_imported/vcpkg/versions/u-/uwebsockets.json index 55ffaefc7..ce1397846 100644 --- a/external_imported/vcpkg/versions/u-/uwebsockets.json +++ b/external_imported/vcpkg/versions/u-/uwebsockets.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5b1e062e56cf8ea0bdfe07414a11791e62c964fe", + "version-semver": "20.11.0", + "port-version": 0 + }, + { + "git-tree": "bbc3058932f01e905d7cf4129e55da10496f8374", + "version-semver": "20.9.0", + "port-version": 0 + }, { "git-tree": "8a874bc8213f0b0a2e96710cce72f6e7d344ffac", "version-semver": "20.8.0", diff --git a/external_imported/vcpkg/versions/v-/v-hacd.json b/external_imported/vcpkg/versions/v-/v-hacd.json index 0be1cb57b..cfe1c12b8 100644 --- a/external_imported/vcpkg/versions/v-/v-hacd.json +++ b/external_imported/vcpkg/versions/v-/v-hacd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c65970db1719a0f4ac77a70859ce0a46a430c54a", + "version": "3.2.0", + "port-version": 3 + }, { "git-tree": "fb52b4b2323057dd987225a70627ed40016756ee", "version-string": "3.2.0", diff --git a/external_imported/vcpkg/versions/v-/v8.json b/external_imported/vcpkg/versions/v-/v8.json index eb1af1545..9583dc8d4 100644 --- a/external_imported/vcpkg/versions/v-/v8.json +++ b/external_imported/vcpkg/versions/v-/v8.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3abf0953ae7dcf4bb4b4ede21adb27ad850b1e1c", + "version": "9.1.269.39", + "port-version": 3 + }, { "git-tree": "b245f57cb85bfd7a699e2ceb9628682b39bcc150", "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 d43b51431..153a9e1f0 100644 --- a/external_imported/vcpkg/versions/v-/vamp-sdk.json +++ b/external_imported/vcpkg/versions/v-/vamp-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d2b2ab057b4e31d833668e82f95283c7afbc551", + "version": "2.10", + "port-version": 2 + }, { "git-tree": "1c71927e1997998f40a9d051d65ba4e5760f4257", "version": "2.10", diff --git a/external_imported/vcpkg/versions/v-/vc.json b/external_imported/vcpkg/versions/v-/vc.json index 03ffe16c1..2d7db7426 100644 --- a/external_imported/vcpkg/versions/v-/vc.json +++ b/external_imported/vcpkg/versions/v-/vc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "57204c2b095452a828860a6476b8b997463ee36d", + "version": "1.4.2", + "port-version": 2 + }, { "git-tree": "670b9bb5b2fe8a35ac2115b355d87995b1ee85b6", "version-string": "1.4.2", diff --git a/external_imported/vcpkg/versions/v-/vcpkg-cmake-config.json b/external_imported/vcpkg/versions/v-/vcpkg-cmake-config.json index c0cfef2f3..208504f94 100644 --- a/external_imported/vcpkg/versions/v-/vcpkg-cmake-config.json +++ b/external_imported/vcpkg/versions/v-/vcpkg-cmake-config.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "24dc7dfc704406e9f745f033643dc25f56e4ca18", + "version-date": "2022-02-06", + "port-version": 0 + }, + { + "git-tree": "fea8f92ffa5e14c7111fe526f8cc93ecd8f9dbf0", + "version-date": "2022-01-30", + "port-version": 0 + }, { "git-tree": "e33152002c946b93a0262931ba8bf54a2e6ab9ad", "version-date": "2021-12-28", diff --git a/external_imported/vcpkg/versions/v-/vcpkg-cmake.json b/external_imported/vcpkg/versions/v-/vcpkg-cmake.json index b5d88488d..fb83ccdf3 100644 --- a/external_imported/vcpkg/versions/v-/vcpkg-cmake.json +++ b/external_imported/vcpkg/versions/v-/vcpkg-cmake.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "3dcb01563c0de941013579456d19ce5b0bd08a6e", + "version-date": "2022-04-07", + "port-version": 0 + }, + { + "git-tree": "34d8604d164edd2903bdb833adf30fe1516c9982", + "version-date": "2022-04-05", + "port-version": 0 + }, + { + "git-tree": "bdfdf28cf28bc07d02af864315ca291dcfae180b", + "version-date": "2022-02-14", + "port-version": 0 + }, + { + "git-tree": "b7c050fe60f91dcedef6d87a3f87584151bf8aee", + "version-date": "2022-01-19", + "port-version": 0 + }, { "git-tree": "a35eb7c761372dc64526d59fa918a13c0dfbba1b", "version-date": "2021-12-20", diff --git a/external_imported/vcpkg/versions/v-/vcpkg-get-python-packages.json b/external_imported/vcpkg/versions/v-/vcpkg-get-python-packages.json new file mode 100644 index 000000000..6101d3fc2 --- /dev/null +++ b/external_imported/vcpkg/versions/v-/vcpkg-get-python-packages.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e429a4c957711115ea1b795327843acb05fc8b29", + "version-date": "2022-02-12", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/v-/vcpkg-gfortran.json b/external_imported/vcpkg/versions/v-/vcpkg-gfortran.json index 59725ac54..73e829664 100644 --- a/external_imported/vcpkg/versions/v-/vcpkg-gfortran.json +++ b/external_imported/vcpkg/versions/v-/vcpkg-gfortran.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5fa617d0b37f47f7f19210be936e25914d6f64c6", + "version": "3", + "port-version": 2 + }, { "git-tree": "46d6be1a505fd008358fc3b426a74a0063661f68", "version-string": "3", diff --git a/external_imported/vcpkg/versions/v-/vcpkg-gn.json b/external_imported/vcpkg/versions/v-/vcpkg-gn.json index 542393a83..b1802e0e8 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": "ba02b5d9d66b0e227762e6aeac0851fd8fb4314e", + "version-date": "2021-11-16", + "port-version": 1 + }, { "git-tree": "f0ec062fd9ed47e9a00f343e15f185e4201e661b", "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 7a206d061..1b3b6360a 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,15 @@ { "versions": [ + { + "git-tree": "d4f1fd82fd733b622ed83f5f502b8483e5b2ca3b", + "version-date": "2022-02-10", + "port-version": 0 + }, + { + "git-tree": "1fae7b16a1eb390ca9239c3e82aa0fdb41f9565b", + "version-date": "2022-01-10", + "port-version": 0 + }, { "git-tree": "558512de1cc52fd9e246d6e7b99575418dd8500f", "version-date": "2021-04-02", diff --git a/external_imported/vcpkg/versions/v-/vcpkg-qmake.json b/external_imported/vcpkg/versions/v-/vcpkg-qmake.json index baef9ddc8..5a33b4006 100644 --- a/external_imported/vcpkg/versions/v-/vcpkg-qmake.json +++ b/external_imported/vcpkg/versions/v-/vcpkg-qmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5096e32d02b21d8f2546edf3829cbb8ee2d50425", + "version-date": "2022-02-14", + "port-version": 0 + }, { "git-tree": "1b1cd1cfcca489897822287c15af473fa4380cb1", "version-date": "2021-10-23", diff --git a/external_imported/vcpkg/versions/v-/vcpkg-tool-gyp-nss.json b/external_imported/vcpkg/versions/v-/vcpkg-tool-gyp-nss.json new file mode 100644 index 000000000..2c153252c --- /dev/null +++ b/external_imported/vcpkg/versions/v-/vcpkg-tool-gyp-nss.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "724d29c42ace865fdba94d8c32bdbe987072eaaa", + "version-date": "2022-03-04", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/v-/vcpkg-tool-lessmsi.json b/external_imported/vcpkg/versions/v-/vcpkg-tool-lessmsi.json new file mode 100644 index 000000000..f515fe254 --- /dev/null +++ b/external_imported/vcpkg/versions/v-/vcpkg-tool-lessmsi.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "82ed573f8102d4ac7c15f40c64bba00968085d51", + "version": "1.10.0", + "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 69969c855..c5143684d 100644 --- a/external_imported/vcpkg/versions/v-/vcpkg-tool-meson.json +++ b/external_imported/vcpkg/versions/v-/vcpkg-tool-meson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6fe7cf1649af5d90c1e88765411a463cac55e99c", + "version": "0.60.2", + "port-version": 2 + }, { "git-tree": "932036adfc24dd5fa63787b825974b6938402700", "version": "0.60.2", diff --git a/external_imported/vcpkg/versions/v-/vcpkg-tool-mozbuild.json b/external_imported/vcpkg/versions/v-/vcpkg-tool-mozbuild.json new file mode 100644 index 000000000..16089f35d --- /dev/null +++ b/external_imported/vcpkg/versions/v-/vcpkg-tool-mozbuild.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9ec0167eafba536f0f5d8a83807f6b3b0dbb50be", + "version": "3.3", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/v-/vcpkg-tool-python2.json b/external_imported/vcpkg/versions/v-/vcpkg-tool-python2.json new file mode 100644 index 000000000..466cf26f9 --- /dev/null +++ b/external_imported/vcpkg/versions/v-/vcpkg-tool-python2.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "207c41205cd98688dda41cee13ecec02aae1f5fd", + "version": "2.7.18", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/v-/vectorclass.json b/external_imported/vcpkg/versions/v-/vectorclass.json index 02a9695eb..dc472b4a1 100644 --- a/external_imported/vcpkg/versions/v-/vectorclass.json +++ b/external_imported/vcpkg/versions/v-/vectorclass.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a1c1b1ca0e0ddb9d5c27129234b2c22c9b73bd16", + "version-string": "2.00.01", + "port-version": 2 + }, { "git-tree": "0e6cebabfff6ad5300bf2fd306e48a7a7392abcb", "version-string": "2.00.01", diff --git a/external_imported/vcpkg/versions/v-/vlpp.json b/external_imported/vcpkg/versions/v-/vlpp.json index 61c6b6577..37a6699ba 100644 --- a/external_imported/vcpkg/versions/v-/vlpp.json +++ b/external_imported/vcpkg/versions/v-/vlpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cfa763a8d53142b93748fde4a578ddbd95431ac2", + "version-string": "0.11.0.0", + "port-version": 2 + }, { "git-tree": "0497f92c39e00928468399f96b7da4ef729b4c4f", "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 774ef5f91..c5394f454 100644 --- a/external_imported/vcpkg/versions/v-/volk.json +++ b/external_imported/vcpkg/versions/v-/volk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "83175cabc17042125828c2e0230f75b60d140cc0", + "version": "1.3.204", + "port-version": 0 + }, { "git-tree": "0018a72c45ad8b5f9776d41ff067292b73cb7a31", "version-string": "2019-09-26", diff --git a/external_imported/vcpkg/versions/v-/vtk.json b/external_imported/vcpkg/versions/v-/vtk.json index 36d887d4c..d73625635 100644 --- a/external_imported/vcpkg/versions/v-/vtk.json +++ b/external_imported/vcpkg/versions/v-/vtk.json @@ -1,5 +1,30 @@ { "versions": [ + { + "git-tree": "6a7eea485be980aa5c9fae1e0a75084f98e5dc27", + "version-semver": "9.0.3-pv5.9.1", + "port-version": 10 + }, + { + "git-tree": "3fa106f1a3c80a3ad15d8db406067c5253decc8e", + "version-semver": "9.0.3-pv5.9.1", + "port-version": 9 + }, + { + "git-tree": "585d1bca8e71d950c6d12ceb6ad720825ecbd704", + "version-semver": "9.0.3-pv5.9.1", + "port-version": 8 + }, + { + "git-tree": "4ba3d3d0db6e98e9a47d8c5c86790da3ef9af25b", + "version-semver": "9.0.3-pv5.9.1", + "port-version": 7 + }, + { + "git-tree": "4a9a03829df133347e358e94e79953ac9d91ae82", + "version-semver": "9.0.3-pv5.9.1", + "port-version": 6 + }, { "git-tree": "bd6ac57e684fd8a2234509813248f64a6cb522d5", "version-semver": "9.0.3-pv5.9.1", diff --git a/external_imported/vcpkg/versions/v-/vulkan-memory-allocator.json b/external_imported/vcpkg/versions/v-/vulkan-memory-allocator.json index 44e4393e1..c54e345f9 100644 --- a/external_imported/vcpkg/versions/v-/vulkan-memory-allocator.json +++ b/external_imported/vcpkg/versions/v-/vulkan-memory-allocator.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1803d4239d0058bbdb03b3711dc69383895f4ea1", + "version": "3.0.0", + "port-version": 0 + }, { "git-tree": "9d6994b1a6f6cbaba84a63a78b3d97784a0722f5", "version-string": "2021-07-07", diff --git a/external_imported/vcpkg/versions/w-/wampcc.json b/external_imported/vcpkg/versions/w-/wampcc.json index 6c5eb55af..1c4f726c9 100644 --- a/external_imported/vcpkg/versions/w-/wampcc.json +++ b/external_imported/vcpkg/versions/w-/wampcc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1f712e2c2cd060bb7ee6888b8c00cd3f0cd4a937", + "version-date": "2019-09-04", + "port-version": 3 + }, { "git-tree": "00037d098a709bf36797f4cc768b5e62ad4db387", "version-string": "2019-09-04", diff --git a/external_imported/vcpkg/versions/w-/wangle.json b/external_imported/vcpkg/versions/w-/wangle.json index 80d9cd9a5..d764dcfea 100644 --- a/external_imported/vcpkg/versions/w-/wangle.json +++ b/external_imported/vcpkg/versions/w-/wangle.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6f0fec69eddf934964ee77b9923f68da2c3c7724", + "version-string": "2022.03.21.00", + "port-version": 0 + }, + { + "git-tree": "387fe8f00443c17cf01fe0ebc235dd8cc5dd3f03", + "version-string": "2022.01.31.00", + "port-version": 0 + }, { "git-tree": "070f35ba95d1f0b817f225896daa7bd48ce3e47d", "version-string": "2021.06.14.00", diff --git a/external_imported/vcpkg/versions/w-/wavpack.json b/external_imported/vcpkg/versions/w-/wavpack.json index 89722b850..a723cf110 100644 --- a/external_imported/vcpkg/versions/w-/wavpack.json +++ b/external_imported/vcpkg/versions/w-/wavpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "77b8c9ab85776abb2d049d562db7350525ddf7e2", + "version": "5.4.0", + "port-version": 1 + }, { "git-tree": "ba245d1ac0cf8e5024feca18df32365ceed6a402", "version": "5.4.0", diff --git a/external_imported/vcpkg/versions/w-/websocketpp.json b/external_imported/vcpkg/versions/w-/websocketpp.json index da556f2aa..d040079dc 100644 --- a/external_imported/vcpkg/versions/w-/websocketpp.json +++ b/external_imported/vcpkg/versions/w-/websocketpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "70d3b037559f580fa52bc50bb2dc26e58f5107d9", + "version": "0.8.2", + "port-version": 2 + }, { "git-tree": "495a31980417d3ca202b50c1951012d699af21f6", "version": "0.8.2", diff --git a/external_imported/vcpkg/versions/w-/wincrypt.json b/external_imported/vcpkg/versions/w-/wincrypt.json index f6a6f6867..8448b32dc 100644 --- a/external_imported/vcpkg/versions/w-/wincrypt.json +++ b/external_imported/vcpkg/versions/w-/wincrypt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "67bd745832f348a85a09259db83dd4d6db5c8843", + "version": "0.0", + "port-version": 4 + }, { "git-tree": "0ab415a2d32d39cf7dd59d5fd3ca4bf544c42f51", "version-string": "0.0", diff --git a/external_imported/vcpkg/versions/w-/winpcap.json b/external_imported/vcpkg/versions/w-/winpcap.json index 9d8a244b8..b29cb56e0 100644 --- a/external_imported/vcpkg/versions/w-/winpcap.json +++ b/external_imported/vcpkg/versions/w-/winpcap.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "85d70a721afa26cf8ff26aec62fd04a16f8e6f7b", + "version": "4.1.3", + "port-version": 8 + }, + { + "git-tree": "8b3f6f5a5e85be5df29d86d4e8e1621a9f3369f4", + "version": "4.1.3", + "port-version": 7 + }, { "git-tree": "12c456f2d3fc78f821ff85ac7bb55d89ce140ed6", "version": "4.1.3", diff --git a/external_imported/vcpkg/versions/w-/winreg.json b/external_imported/vcpkg/versions/w-/winreg.json index de6e0e42d..2b55d506c 100644 --- a/external_imported/vcpkg/versions/w-/winreg.json +++ b/external_imported/vcpkg/versions/w-/winreg.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "cdcb9cb9581869670509de4d2928b8821038d962", + "version": "5.1.0", + "port-version": 0 + }, + { + "git-tree": "a355bab9791bca02dc9ad9bc2b61f6ba72486a23", + "version": "5.0.1", + "port-version": 0 + }, + { + "git-tree": "a788126cfabb1299a7f43933fec7ced6074a7939", + "version": "5.0.0", + "port-version": 0 + }, + { + "git-tree": "303a59adfcedbd8c8acdc053ec6b1139d056ecae", + "version": "4.1.2", + "port-version": 1 + }, { "git-tree": "000a828ce0f4abd8b4732c7ca7e819e25e82144b", "version": "4.1.2", diff --git a/external_imported/vcpkg/versions/w-/winsock2.json b/external_imported/vcpkg/versions/w-/winsock2.json index ca48a65da..8c41d101f 100644 --- a/external_imported/vcpkg/versions/w-/winsock2.json +++ b/external_imported/vcpkg/versions/w-/winsock2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6fb217f4eea375e9691dbde28c72c01dddd0c9f", + "version": "0.0", + "port-version": 4 + }, { "git-tree": "64b2e9218e0f0a50655510451914a5e532613795", "version-string": "0.0", diff --git a/external_imported/vcpkg/versions/w-/winsparkle.json b/external_imported/vcpkg/versions/w-/winsparkle.json new file mode 100644 index 000000000..b642ca7d9 --- /dev/null +++ b/external_imported/vcpkg/versions/w-/winsparkle.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "8f1aed9d3a5aac4c967bc6e8be9b8bbe0ce09a76", + "version": "0.7.0", + "port-version": 1 + }, + { + "git-tree": "0d756f506e6a79a2a79706f9080c05b45e7df882", + "version": "0.7.0", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/w-/wintoast.json b/external_imported/vcpkg/versions/w-/wintoast.json index 712905b57..b61765e3e 100644 --- a/external_imported/vcpkg/versions/w-/wintoast.json +++ b/external_imported/vcpkg/versions/w-/wintoast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7e0b224e777c1a12676204204a97636e3639c4c1", + "version": "1.2.0", + "port-version": 2 + }, { "git-tree": "186a3b60dc0a76ecb0b1a5a2147306dbfe734797", "version-string": "1.2.0", diff --git a/external_imported/vcpkg/versions/w-/wpilib.json b/external_imported/vcpkg/versions/w-/wpilib.json index 9f7b2a523..2b2c63cfe 100644 --- a/external_imported/vcpkg/versions/w-/wpilib.json +++ b/external_imported/vcpkg/versions/w-/wpilib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cf10ef63982d54978a85c868d37462ce21643188", + "version-string": "2020.3.2", + "port-version": 2 + }, { "git-tree": "f656633935224ac3005954533294babd766921b1", "version-string": "2020.3.2", diff --git a/external_imported/vcpkg/versions/w-/wt.json b/external_imported/vcpkg/versions/w-/wt.json index 8fc39c07a..a96534263 100644 --- a/external_imported/vcpkg/versions/w-/wt.json +++ b/external_imported/vcpkg/versions/w-/wt.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "0d5d5d96583b44370437e567f086173a2c0ad51e", + "version": "4.6.1", + "port-version": 0 + }, + { + "git-tree": "62d1e8353f693697e3c7346c09afd96e1e6a1031", + "version": "4.5.0", + "port-version": 3 + }, { "git-tree": "1535b49590f6871ba9195f3a712e99ba1da27107", "version-string": "4.5.0", diff --git a/external_imported/vcpkg/versions/w-/wxwidgets.json b/external_imported/vcpkg/versions/w-/wxwidgets.json index f3b6af290..ec8442938 100644 --- a/external_imported/vcpkg/versions/w-/wxwidgets.json +++ b/external_imported/vcpkg/versions/w-/wxwidgets.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "dba058c37782edf771e7a62ae1bef98274c86b9f", + "version-semver": "3.1.5", + "port-version": 8 + }, + { + "git-tree": "9184caa631070403a5fd8c177b56907a313ad197", + "version-semver": "3.1.5", + "port-version": 7 + }, + { + "git-tree": "79ef97e2255a360a5515d0fbdbb839c15bb12548", + "version-semver": "3.1.5", + "port-version": 6 + }, { "git-tree": "f12ef0e93d9ca2f6d1c8cb4ad3703d98359abacd", "version-semver": "3.1.5", diff --git a/external_imported/vcpkg/versions/x-/x-plane.json b/external_imported/vcpkg/versions/x-/x-plane.json index 46907fbe4..34333db07 100644 --- a/external_imported/vcpkg/versions/x-/x-plane.json +++ b/external_imported/vcpkg/versions/x-/x-plane.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5b49030933a1014e1e897438a29a52fbb163b5f3", + "version": "3.0.3", + "port-version": 1 + }, { "git-tree": "abc8034ffafdac8f5840bc31600af7854c24f6b9", "version-string": "3.0.3", diff --git a/external_imported/vcpkg/versions/x-/x264.json b/external_imported/vcpkg/versions/x-/x264.json index 02de01a0a..bd8a969ea 100644 --- a/external_imported/vcpkg/versions/x-/x264.json +++ b/external_imported/vcpkg/versions/x-/x264.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7eea109502309e62a578bcc69811ad0659e00f9d", + "version-string": "164-5db6aa6cab1b146", + "port-version": 4 + }, { "git-tree": "6021c139214cb74f8fcc2e89344f05210ea4826d", "version-string": "164-5db6aa6cab1b146", diff --git a/external_imported/vcpkg/versions/x-/xaudio2redist.json b/external_imported/vcpkg/versions/x-/xaudio2redist.json index f87be3dcc..2f86ccea7 100644 --- a/external_imported/vcpkg/versions/x-/xaudio2redist.json +++ b/external_imported/vcpkg/versions/x-/xaudio2redist.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "8ae7aaec9ebb9859356736f91710e8d9727d7a81", + "version": "1.2.8", + "port-version": 2 + }, + { + "git-tree": "4fe6eda4ff7a68db79013f5c5632e6e1a87b98e9", + "version": "1.2.8", + "port-version": 1 + }, { "git-tree": "71315ed933daddc996ecb863c39fc178b3f80771", "version-string": "1.2.8", diff --git a/external_imported/vcpkg/versions/x-/xbyak.json b/external_imported/vcpkg/versions/x-/xbyak.json index 480d7d214..26f3261d0 100644 --- a/external_imported/vcpkg/versions/x-/xbyak.json +++ b/external_imported/vcpkg/versions/x-/xbyak.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ef05725cf97fc484f475a6db447bc6d503c8d42b", + "version-string": "6.00", + "port-version": 1 + }, { "git-tree": "ca393737aa37584343dc10008000c850f26b0881", "version-string": "6.00", diff --git a/external_imported/vcpkg/versions/x-/xerces-c.json b/external_imported/vcpkg/versions/x-/xerces-c.json index 2f515db5c..bb735c605 100644 --- a/external_imported/vcpkg/versions/x-/xerces-c.json +++ b/external_imported/vcpkg/versions/x-/xerces-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6e0b3743b100fd4c22291b3c55ff73aac8ae188c", + "version": "3.2.3", + "port-version": 4 + }, { "git-tree": "b920ebcb559e728e512c42e7e27ce5db58aba440", "version-string": "3.2.3", diff --git a/external_imported/vcpkg/versions/x-/xmlsec.json b/external_imported/vcpkg/versions/x-/xmlsec.json index 29672537a..0667e390f 100644 --- a/external_imported/vcpkg/versions/x-/xmlsec.json +++ b/external_imported/vcpkg/versions/x-/xmlsec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "635a9b0883829c524cc712d552d9a265ef984bf7", + "version": "1.2.33", + "port-version": 0 + }, { "git-tree": "f15cb0d0c8dd69a916421866901a7bce6d81666c", "version": "1.2.32", diff --git a/external_imported/vcpkg/versions/x-/xnnpack.json b/external_imported/vcpkg/versions/x-/xnnpack.json index b5261f4f6..aab502fa7 100644 --- a/external_imported/vcpkg/versions/x-/xnnpack.json +++ b/external_imported/vcpkg/versions/x-/xnnpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dba10dfefac481caee9f94c49fc60878c5bb57a1", + "version-date": "2021-05-17", + "port-version": 2 + }, { "git-tree": "d998602ed266e9cf140fb6740fea8625276a48f5", "version-date": "2021-05-17", diff --git a/external_imported/vcpkg/versions/x-/xqilla.json b/external_imported/vcpkg/versions/x-/xqilla.json new file mode 100644 index 000000000..edca35147 --- /dev/null +++ b/external_imported/vcpkg/versions/x-/xqilla.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "110b08065d892a635f1a8f2dd76f42727788020f", + "version": "2.3.4", + "port-version": 1 + }, + { + "git-tree": "5e0e7d4ac944e58a70a8a71a8a715598b22c7e73", + "version": "2.3.4", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/x-/xtensor.json b/external_imported/vcpkg/versions/x-/xtensor.json index b175c89b5..3d91ce24b 100644 --- a/external_imported/vcpkg/versions/x-/xtensor.json +++ b/external_imported/vcpkg/versions/x-/xtensor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b7e23c44907ce8f4ca8cec01cb5534f092e74dda", + "version": "0.24.0", + "port-version": 0 + }, { "git-tree": "ca365f721479380995943c5ab4e8cdd6866ec785", "version": "0.23.10", diff --git a/external_imported/vcpkg/versions/y-/yajl.json b/external_imported/vcpkg/versions/y-/yajl.json index d51bb4bee..a6494c169 100644 --- a/external_imported/vcpkg/versions/y-/yajl.json +++ b/external_imported/vcpkg/versions/y-/yajl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "348d0cb4e70b0db911dbd9e014d69164eb53cec4", + "version-string": "2.1.0", + "port-version": 3 + }, { "git-tree": "a1f09d6c9effe9aa148fb4c659498c3dc82c61d8", "version-string": "2.1.0", diff --git a/external_imported/vcpkg/versions/y-/yara.json b/external_imported/vcpkg/versions/y-/yara.json index 4bbf6d7c2..5931955d9 100644 --- a/external_imported/vcpkg/versions/y-/yara.json +++ b/external_imported/vcpkg/versions/y-/yara.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f071df4391cee4f96e8f7bb5820d7d3f70db50e1", + "version": "4.2.0", + "port-version": 0 + }, { "git-tree": "081abbbfc62033c4254ae833f61d48c5cea4151c", "version": "4.1.1", diff --git a/external_imported/vcpkg/versions/y-/yasm-tool-helper.json b/external_imported/vcpkg/versions/y-/yasm-tool-helper.json index 606a5eee5..c8ab8dabf 100644 --- a/external_imported/vcpkg/versions/y-/yasm-tool-helper.json +++ b/external_imported/vcpkg/versions/y-/yasm-tool-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0a2dfb294bebae79c48cc710756756164175be1d", + "version-date": "2020-03-11", + "port-version": 1 + }, { "git-tree": "7d0e3b2224338888cd1e2f7a00c182961a7ea760", "version-string": "2020-03-11", diff --git a/external_imported/vcpkg/versions/y-/yasm-tool.json b/external_imported/vcpkg/versions/y-/yasm-tool.json index 3ae9fc640..41a4f9b70 100644 --- a/external_imported/vcpkg/versions/y-/yasm-tool.json +++ b/external_imported/vcpkg/versions/y-/yasm-tool.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5dc61ac1b2f25ef005c279fd65cd98cbdedc161a", + "version-date": "2021-12-14", + "port-version": 0 + }, + { + "git-tree": "456004e2ac7a578572cb14ebf581c246b869516a", + "version": "1.3.0", + "port-version": 1 + }, { "git-tree": "cb913a26c18cde98be038655f65d2363ecee2cc1", "version": "1.3.0", diff --git a/external_imported/vcpkg/versions/y-/yasm.json b/external_imported/vcpkg/versions/y-/yasm.json index ba2175f48..8ce7047cc 100644 --- a/external_imported/vcpkg/versions/y-/yasm.json +++ b/external_imported/vcpkg/versions/y-/yasm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4368509dc3dfe6cab848b8713b22c9c0ef408527", + "version": "1.3.0", + "port-version": 3 + }, { "git-tree": "eaab6c3ae3bfc1ffcfaee3b1695d7ee21dacc7b1", "version-string": "1.3.0", diff --git a/external_imported/vcpkg/versions/y-/yato.json b/external_imported/vcpkg/versions/y-/yato.json index 6a7e311f8..856103ad3 100644 --- a/external_imported/vcpkg/versions/y-/yato.json +++ b/external_imported/vcpkg/versions/y-/yato.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "302773e4845f27896621a44a76a964baec26f3e8", + "version-date": "2022-03-06", + "port-version": 0 + }, { "git-tree": "8605c052211c8394b3f3a524ffe071307582a941", "version-string": "1.0", diff --git a/external_imported/vcpkg/versions/z-/z3.json b/external_imported/vcpkg/versions/z-/z3.json index ee81c0872..f04b7bd92 100644 --- a/external_imported/vcpkg/versions/z-/z3.json +++ b/external_imported/vcpkg/versions/z-/z3.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "78366a5b407998768b97ddee528306cf9cbe9847", + "version": "4.8.14", + "port-version": 0 + }, + { + "git-tree": "eb7c4238f0496b64a6527fd4b07dd753f31a1975", + "version": "4.8.12", + "port-version": 2 + }, { "git-tree": "679ab881c1277be69ffc601a568e3b47d4d55432", "version": "4.8.12", diff --git a/external_imported/vcpkg/versions/z-/zeromq.json b/external_imported/vcpkg/versions/z-/zeromq.json index 28e134099..03d110f38 100644 --- a/external_imported/vcpkg/versions/z-/zeromq.json +++ b/external_imported/vcpkg/versions/z-/zeromq.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "246f585e58f536087c5f70f918459d5500a4dc43", + "version": "4.3.4", + "port-version": 5 + }, + { + "git-tree": "efc9d6229adaef7b036d222004dd786353f8cd4e", + "version": "4.3.4", + "port-version": 4 + }, + { + "git-tree": "46cd1dcc3bc077341533cc01c32f467d1a7e181f", + "version": "4.3.4", + "port-version": 3 + }, { "git-tree": "423c351e8759303bc9ba74a065ce9b983a5f85f5", "version": "4.3.4", diff --git a/external_imported/vcpkg/versions/z-/zkpp.json b/external_imported/vcpkg/versions/z-/zkpp.json index 7c366122c..5cac9127c 100644 --- a/external_imported/vcpkg/versions/z-/zkpp.json +++ b/external_imported/vcpkg/versions/z-/zkpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bcef2196b5ca1a1cc813c22eb903e5a9677f9eab", + "version": "0.2.3", + "port-version": 2 + }, { "git-tree": "5d45cca2392d1a09d62bc9e2d53e1296f0bd49fc", "version-string": "0.2.3", diff --git a/external_imported/vcpkg/versions/z-/zlib.json b/external_imported/vcpkg/versions/z-/zlib.json index 7c0d68f33..b7830cc6d 100644 --- a/external_imported/vcpkg/versions/z-/zlib.json +++ b/external_imported/vcpkg/versions/z-/zlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9c4edb1fabbd87dd236a200ba55eaf241cd8c8d0", + "version": "1.2.12", + "port-version": 0 + }, { "git-tree": "92cfe30c807d343c6359d272242f0765ad906740", "version": "1.2.11", diff --git a/external_imported/vcpkg/versions/z-/zpp-bits.json b/external_imported/vcpkg/versions/z-/zpp-bits.json new file mode 100644 index 000000000..8b50b3560 --- /dev/null +++ b/external_imported/vcpkg/versions/z-/zpp-bits.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "cfb5cd37a6ed4a1ccab70eeb3112db9ad3d2f026", + "version": "4.3.3", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/z-/zstd.json b/external_imported/vcpkg/versions/z-/zstd.json index 3ba7ad7e7..7fe2aa211 100644 --- a/external_imported/vcpkg/versions/z-/zstd.json +++ b/external_imported/vcpkg/versions/z-/zstd.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "2f8a5da3f925dc994500dabb2d3b5c7e11df0afd", + "version": "1.5.2", + "port-version": 1 + }, + { + "git-tree": "4e0feee1fa5d2c318aa16702dc6c89d9301a8ddb", + "version": "1.5.2", + "port-version": 0 + }, { "git-tree": "1260425f27dec6dd2e795369d4c28de5a676daef", "version-semver": "1.5.0", diff --git a/external_imported/vcpkg/versions/z-/ztd-text.json b/external_imported/vcpkg/versions/z-/ztd-text.json new file mode 100644 index 000000000..11d2b3dc2 --- /dev/null +++ b/external_imported/vcpkg/versions/z-/ztd-text.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "594b7d2a437b6576bfd4993e9763cac18621e903", + "version-date": "2022-03-21", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/z-/zziplib.json b/external_imported/vcpkg/versions/z-/zziplib.json index 708656c37..3aec32b51 100644 --- a/external_imported/vcpkg/versions/z-/zziplib.json +++ b/external_imported/vcpkg/versions/z-/zziplib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e09e8bf85eff5c115f9dcf5372f8bdbab590ab6b", + "version": "0.13.72", + "port-version": 0 + }, { "git-tree": "af9957469a45f5b512845c4f180af1a7e4e2e886", "version-string": "0.13.71",